Convert values of Oid.UUID to java.util.UUID.

alaisi · alaisi · commit 8ce3712e3d00 · 2015-06-11T13:31:15.000+03:00
diff --git a/src/main/java/com/github/pgasync/impl/conversion/DataConverter.java b/src/main/java/com/github/pgasync/impl/conversion/DataConverter.java
@@ -178,6 +178,7 @@ public Object toObject(Oid oid, byte[] value) {
             case TIME: return toTime(oid, value);
             case TIMESTAMP: // fallthrough
             case TIMESTAMPTZ: return toTimestamp(oid, value);
+            case UUID: return UUID.fromString(toString(oid, value));
 
             case INT2_ARRAY:
             case INT4_ARRAY:
diff --git a/src/main/java/com/github/pgasync/impl/conversion/StringConversions.java b/src/main/java/com/github/pgasync/impl/conversion/StringConversions.java
@@ -19,6 +19,7 @@ static String toString(Oid oid, byte[] value) {
             case TEXT: // fallthrough
             case CHAR: // fallthrough
             case BPCHAR: // fallthrough
+            case UUID: // fallthrough
             case VARCHAR:
                 return new String(value, UTF_8);
             default:
diff --git a/src/test/java/com/github/pgasync/impl/TypeConverterTest.java b/src/test/java/com/github/pgasync/impl/TypeConverterTest.java
@@ -24,8 +24,10 @@
 import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.TimeZone;
+import java.util.UUID;
 
 import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
 import static org.junit.Assert.*;
 
 /**
@@ -171,7 +173,7 @@ public void shouldConvertTimestampToTimestamp() {
 
     @Test
     public void shouldConvertByteAToBytes() {
-        assertArrayEquals(new byte[] { 0x41, 0x41 }, dbr.query("select '\\x4141'::BYTEA").row(0).getBytes(0));
+        assertArrayEquals(new byte[]{0x41, 0x41}, dbr.query("select '\\x4141'::BYTEA").row(0).getBytes(0));
     }
 
     @Test
@@ -188,6 +190,13 @@ public void shouldConvertBoolean() {
         assertArrayEquals(new Boolean[]{ true, false}, dbr.query("select '{true,false}'::BOOL[]").row(0).getArray(0, Boolean[].class));
     }
 
+    @Test
+    public void shouldConvertUUID() {
+        UUID uuid = UUID.randomUUID();
+        PgRow row = (PgRow) dbr.query("select $1::UUID as uuid", singletonList(uuid)).row(0);
+        assertEquals(uuid, row.get("uuid"));
+    }
+
     static long millis(int year, int month, int day, int hour, int minute, int second, int millisecond) {
         Calendar cal = Calendar.getInstance();
         cal.clear();
