.getBytes(UTF_8) when passing to converter, and add UTF-8 roundtrip test

moea · moea · commit 59d42509b077 · 2015-01-20T15:17:02.000Z
diff --git a/src/main/java/com/github/pgasync/impl/conversion/ArrayConversions.java b/src/main/java/com/github/pgasync/impl/conversion/ArrayConversions.java
@@ -56,7 +56,7 @@ protected static Object[] buildArray(
                 if (1 < dimensionCount) {
                     o = buildArray(elementType, (PgArrayList) o, 0, -1,  parse);
                 } else {
-                    o = parse.apply(((String) o).getBytes());
+                    o = parse.apply(((String) o).getBytes(UTF_8));
                 }
             }
             ret[length] = o;
diff --git a/src/test/java/com/github/pgasync/impl/ArrayConversionsTest.java b/src/test/java/com/github/pgasync/impl/ArrayConversionsTest.java
@@ -138,6 +138,17 @@ public void roundtripInt() {
                 Arrays.asList(new Object[]{a})).row(0).getArray("INTA", Integer[].class));
     }
 
+    @Test
+    public void roundtripUTF8() {
+        String[] a = new String[]{"U&\"d\\0061t\\+000061\"", "d\u0061t\u0061\u2301" };
+        dbr.query("INSERT INTO CA_TEST (TEXTA) VALUES ($1)", Arrays.asList(new Object[]{a}));
+        assertArrayEquals(
+            a,
+            dbr.query(
+                "SELECT TEXTA FROM CA_TEST WHERE TEXTA = $1",
+                Arrays.asList(new Object[]{a})).row(0).getArray("TEXTA", String[].class));
+    }
+
     @Test
     public void insertUnboxed() {
         short[][] a = new short[][]{new short[]{0, 1}, new short[]{1, 0}};

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ protected static Object[] buildArray(`
`56`	`56`	`if (1 < dimensionCount) {`
`57`	`57`	`o = buildArray(elementType, (PgArrayList) o, 0, -1, parse);`
`58`	`58`	`} else {`
`59`		`- o = parse.apply(((String) o).getBytes());`
	`59`	`+ o = parse.apply(((String) o).getBytes(UTF_8));`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`	`ret[length] = o;`