embulk-input-postgresql 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 739469eb1fcc5e408e409dc6fe514ff1c8711e05
-  data.tar.gz: 990cf866d6de0985e556e208a98478dae1f2f6da
+  metadata.gz: 41e2ea244907cf6cfc81009286f985a6357952fb
+  data.tar.gz: a5cc2bd510fbe49a0c8c0a0d046ad739a06aad70
 SHA512:
-  metadata.gz: 5ba714898af3c685dff95eab5d1f0d4395a3b9ece93f4923aaecaa31acdf110bb513b2691c3d2ff265fa15fbd6f607f31652458361d70da5b937debf5880b85d
-  data.tar.gz: 1e6591258b540472bf9624aaa0e92a9efaaaf2ad2d56aee67a350836c92f0692e5fa4e3b22f9ab3e8aa3061b15592e5e1215dda4eed0f7a049fe48cf8412317f
+  metadata.gz: ab0fa8e05dae0de13195383e8d3c9695d0fb78406d380b49315449fbeb5c80d83e7110ff3103bb9dc243e6415390250eaedd060f38b02848dabd87dc7f17e550
+  data.tar.gz: 16e3207bf0565ee14bf27b0a2254a702708c839db8f24ac7fea3143b014ed6f377b26bdb267aff13059e6958b0d69bb87494249e326d496d82241ddb9f981297

data/src/main/java/org/embulk/input/postgresql/getter/ArrayColumnGetter.java

@@ -10,6 +10,7 @@ import org.embulk.spi.json.JsonParser;
 import org.embulk.spi.type.Type;
 import org.msgpack.value.Value;
 
+import java.math.BigDecimal;
 import java.sql.Array;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -72,6 +73,12 @@ public class ArrayColumnGetter
                     case Types.LONGNVARCHAR:
                         arrayNode.add(jsonNodeFactory.textNode((String) v));
                         break;
+                    case Types.DECIMAL:
+                    case Types.NUMERIC:
+                        arrayNode.add(jsonNodeFactory.numberNode((BigDecimal) v));
+                        break;
+                    default:
+                        arrayNode.add(jsonNodeFactory.textNode(v.toString()));
                 }
             }
         }
@@ -96,9 +103,100 @@ public class ArrayColumnGetter
         }
     }
 
+    private void buildArrayString(StringBuilder builder, Object[] values)
+            throws SQLException
+    {
+        builder.append("{");
+        for (Object v : values) {
+            if (v == null) {
+                builder.append("");
+            }
+            else if (v.getClass().isArray()) {
+                buildArrayString(builder, (Object[]) v);
+            }
+            else {
+                switch (value.getBaseType()) {
+                    case Types.TINYINT:
+                    case Types.SMALLINT:
+                    case Types.INTEGER:
+                    case Types.BIGINT:
+                        builder.append(((Number) v).longValue());
+                        break;
+                    case Types.FLOAT:
+                    case Types.REAL:
+                    case Types.DOUBLE:
+                        builder.append(((Number) v).doubleValue());
+                        break;
+                    case Types.BOOLEAN:
+                    case Types.BIT:  // JDBC BIT is boolean, unlike SQL-92
+                        if (((Boolean) v)) {
+                            builder.append("t");
+                        }
+                        else {
+                            builder.append("f");
+                        }
+                        break;
+                    case Types.CHAR:
+                    case Types.VARCHAR:
+                    case Types.LONGVARCHAR:
+                    case Types.CLOB:
+                    case Types.NCHAR:
+                    case Types.NVARCHAR:
+                    case Types.LONGNVARCHAR:
+                        escape(builder, (String) v);
+                        break;
+                    case Types.DECIMAL:
+                    case Types.NUMERIC:
+                        builder.append(((BigDecimal) v).toPlainString());
+                        break;
+                    default:
+                        escape(builder, v.toString());
+                }
+            }
+            builder.append(",");
+        }
+        builder.deleteCharAt(builder.length() - 1);
+        builder.append("}");
+    }
+
+    /**
+     * Escaping text using information from here:
+     * https://www.postgresql.org/docs/current/static/arrays.html
+     */
+    private void escape(StringBuilder builder, String value)
+    {
+        StringBuilder s = new StringBuilder();
+        boolean escape = false;
+        for (int i = 0; i < value.length(); ++i) {
+            char c = value.charAt(i);
+            if (c == ',' || c == '{' || c == '}') {
+                escape = true;
+            }
+            if (c == '"' || c == '\\') {
+                escape = true;
+                s.append("\\");
+            }
+            s.append(c);
+        }
+        if (escape) {
+            builder.append('\"').append(s.toString()).append('\"');
+        }
+        else {
+            builder.append(value);
+        }
+    }
+
     @Override
     public void stringColumn(Column column)
     {
-        to.setString(column, value.toString());
+        StringBuilder builder = new StringBuilder();
+        try {
+            buildArrayString(builder, (Object[]) value.getArray());
+            to.setString(column, builder.toString());
+        }
+        catch (SQLException e) {
+            // Never reach here
+            to.setString(column, value.toString());
+        }
     }
 }

data/src/test/java/org/embulk/input/postgresql/ArrayTest.java

@@ -5,7 +5,6 @@ import org.embulk.input.PostgreSQLInputPlugin;
 import org.embulk.spi.InputPlugin;
 import org.embulk.test.EmbulkTests;
 import org.embulk.test.TestingEmbulk;
-import org.embulk.test.TestingEmbulk.RunResult;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

data/src/test/java/org/embulk/input/postgresql/PostgreSQLTests.java

@@ -42,8 +42,8 @@ public class PostgreSQLTests
     private static String convert(String sql)
     {
         if (Platform.getNativePlatform().getOS().equals(OS.WINDOWS)) {
-            // '"' should be '\"' is Windows
-            return sql.replace("\"", "\\\"");
+            // '"' should be '\"' and '\' should be '\\' in Windows
+            return sql.replace("\\\\", "\\").replace("\\", "\\\\").replace("\"", "\\\"");
         }
         return sql;
     }

data/src/test/resources/org/embulk/input/postgresql/test/expect/array/as_json.yml

@@ -3,3 +3,4 @@ column_options:
   c1: {type: json}
   c2: {type: json}
   c3: {type: json}
+  c4: {type: json}

data/src/test/resources/org/embulk/input/postgresql/test/expect/array/expected_json.csv

@@ -1,2 +1,3 @@
-"[1000,2000,3000,4000]","[[""red"",""green""],[""blue"",""cyan""]]",[[[true]]]
-"[5000,6000,7000,8000]","[[""yellow"",""magenta""],[""purple"",""light,dark""]]","[[[true,true],[false,false]],[[true,false],[false,true]]]"
+"[1000,2000,3000,4000]","[[""red"",""green""],[""blue"",""cyan""]]",[[[true]]],[1.23456789E9]
+"[5000,6000,7000,8000]","[[""yellow"",""magenta""],[""purple"",""light,dark""]]","[[[true,true],[false,false]],[[true,false],[false,true]]]",[1.2345678901234567E19]
+[1000],"[[""\"""",""{\\}"",""{a,b}""]]",[true],[1.2345678901234567E19]

data/src/test/resources/org/embulk/input/postgresql/test/expect/array/expected_string.csv

@@ -1,2 +1,3 @@
-"{1000,2000,3000,4000}","{{red,green},{blue,cyan}}",{{{t}}}
-"{5000,6000,7000,8000}","{{yellow,magenta},{purple,""light,dark""}}","{{{t,t},{f,f}},{{t,f},{f,t}}}"
+"{1000,2000,3000,4000}","{{red,green},{blue,cyan}}",{{{t}}},{1234567890}
+"{5000,6000,7000,8000}","{{yellow,magenta},{purple,""light,dark""}}","{{{t,t},{f,f}},{{t,f},{f,t}}}",{12345678901234567890}
+{1000},"{{""\"""",""{\\}"",""{a,b}""}}",{t},{12345678901234567890.1234567890}

data/src/test/resources/org/embulk/input/postgresql/test/expect/array/setup.sql

@@ -3,9 +3,12 @@ drop table if exists input_array;
 create table input_array (
     c1 integer[],
     c2 text[][],
-    c3 bool[][][]
+    c3 bool[][][],
+    c4 decimal[]
 );
 
-insert into input_array (c1, c2, c3) values ('{1000, 2000, 3000, 4000}', '{{"red", "green"}, {"blue", "cyan"}}', '{{{true}}}');
+insert into input_array (c1, c2, c3, c4) values ('{1000, 2000, 3000, 4000}', '{{"red", "green"}, {"blue", "cyan"}}', '{{{true}}}', '{1234567890}');
 
-insert into input_array (c1, c2, c3) values ('{5000, 6000, 7000, 8000}', '{{"yellow", "magenta"}, {"purple", "light,dark"}}', '{{{t,t},{f,f}},{{t,f},{f,t}}}');
+insert into input_array (c1, c2, c3, c4) values ('{5000, 6000, 7000, 8000}', '{{"yellow", "magenta"}, {"purple", "light,dark"}}', '{{{t,t},{f,f}},{{t,f},{f,t}}}', '{12345678901234567890}');
+
+insert into input_array (c1, c2, c3, c4) values ('{1000}', '{{"\"", "{\\}", "{a,b}"}}', '{true}', '{12345678901234567890.1234567890}');

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-postgresql
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-27 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -19,8 +19,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-input-jdbc-0.9.0.jar
-- classpath/embulk-input-postgresql-0.9.0.jar
+- classpath/embulk-input-jdbc-0.9.1.jar
+- classpath/embulk-input-postgresql-0.9.1.jar
 - default_jdbc_driver/postgresql-9.4-1205-jdbc41.jar
 - lib/embulk/input/postgresql.rb
 - src/main/java/org/embulk/input/PostgreSQLInputPlugin.java