embulk-input-postgresql 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41e2ea244907cf6cfc81009286f985a6357952fb
-  data.tar.gz: a5cc2bd510fbe49a0c8c0a0d046ad739a06aad70
+  metadata.gz: 87724534f3076d4264cc4728fff2744c321c7982
+  data.tar.gz: 9914d0dfe4ef6d469de2da431e26b61c03c566e6
 SHA512:
-  metadata.gz: ab0fa8e05dae0de13195383e8d3c9695d0fb78406d380b49315449fbeb5c80d83e7110ff3103bb9dc243e6415390250eaedd060f38b02848dabd87dc7f17e550
-  data.tar.gz: 16e3207bf0565ee14bf27b0a2254a702708c839db8f24ac7fea3143b014ed6f377b26bdb267aff13059e6958b0d69bb87494249e326d496d82241ddb9f981297
+  metadata.gz: 031259689b5a0f86e7a530f2ebdce24255b65d7da54b9e55cf56f2d9d4c65f62087bc6189cb887147db24f95c45d437e42e9923c5be607fd173b7af80c05ca5c
+  data.tar.gz: 607b8e8e01d553badbeb7a4b881db6997ea721b2242bb373454785957fb188bbcbe2d416d5579e4f7dbe932de0bd5dcea6ad54e9c2c7f3f32a88c48608fbb088

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

@@ -6,6 +6,7 @@ import org.embulk.input.jdbc.JdbcColumnOption;
 import org.embulk.input.jdbc.JdbcInputConnection;
 import org.embulk.input.jdbc.getter.ColumnGetter;
 import org.embulk.input.jdbc.getter.ColumnGetterFactory;
+import org.embulk.input.jdbc.getter.StringColumnGetter;
 import org.embulk.input.jdbc.getter.TimestampWithTimeZoneIncrementalHandler;
 import org.embulk.input.jdbc.getter.TimestampWithoutTimeZoneIncrementalHandler;
 import org.embulk.spi.PageBuilder;
@@ -31,6 +32,10 @@ public class PostgreSQLColumnGetterFactory extends ColumnGetterFactory
             return new ArrayColumnGetter(to, getToType(option));
         }
 
+        if ("uuid".equals(column.getTypeName())) {
+            return new StringColumnGetter(to, getToType(option));
+        }
+
         ColumnGetter getter = super.newColumnGetter(con, task, column, option);
 
         // incremental loading wrapper

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

@@ -0,0 +1,60 @@
+package org.embulk.input.postgresql;
+
+import static org.embulk.input.postgresql.PostgreSQLTests.execute;
+import static org.embulk.test.EmbulkTests.readSortedFile;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.nio.file.Path;
+
+import org.embulk.config.ConfigSource;
+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;
+
+public class UUIDTest
+{
+    private static final String BASIC_RESOURCE_PATH = "org/embulk/input/postgresql/test/expect/uuid/";
+
+    private static ConfigSource loadYamlResource(TestingEmbulk embulk, String fileName)
+    {
+        return embulk.loadYamlResource(BASIC_RESOURCE_PATH + fileName);
+    }
+
+    private static String readResource(String fileName)
+    {
+        return EmbulkTests.readResource(BASIC_RESOURCE_PATH + fileName);
+    }
+
+    @Rule
+    public TestingEmbulk embulk = TestingEmbulk.builder()
+        .registerPlugin(InputPlugin.class, "postgresql", PostgreSQLInputPlugin.class)
+        .build();
+
+    private ConfigSource baseConfig;
+
+    @Before
+    public void setup()
+    {
+        baseConfig = PostgreSQLTests.baseConfig();
+    }
+
+    @Test
+    public void loadAsStringByDefault() throws Exception
+    {
+        execute(readResource("setup.sql"));
+
+        Path out1 = embulk.createTempFile("csv");
+        RunResult result1 = embulk.runInput(
+                baseConfig.merge(loadYamlResource(embulk, "as_string.yml")),
+                out1);
+        assertThat(
+                readSortedFile(out1),
+                is(readResource("expected_string.csv")));
+    }
+}

data/src/test/resources/org/embulk/input/postgresql/test/expect/uuid/as_string.yml

@@ -0,0 +1 @@
+table: input_uuid

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

@@ -0,0 +1 @@
+d29977bb-55fb-4a9d-9e3b-97f52b191f49

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

@@ -0,0 +1,9 @@
+drop table if exists input_uuid;
+
+create table input_uuid (
+    c1 uuid
+);
+
+insert into input_uuid (c1) values
+('d29977bb-55fb-4a9d-9e3b-97f52b191f49')
+;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-postgresql
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-07-03 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.1.jar
-- classpath/embulk-input-postgresql-0.9.1.jar
+- classpath/embulk-input-jdbc-0.9.2.jar
+- classpath/embulk-input-postgresql-0.9.2.jar
 - default_jdbc_driver/postgresql-9.4-1205-jdbc41.jar
 - lib/embulk/input/postgresql.rb
 - src/main/java/org/embulk/input/PostgreSQLInputPlugin.java
@@ -32,6 +32,7 @@ files:
 - src/test/java/org/embulk/input/postgresql/HstoreTest.java
 - src/test/java/org/embulk/input/postgresql/IncrementalTest.java
 - src/test/java/org/embulk/input/postgresql/PostgreSQLTests.java
+- src/test/java/org/embulk/input/postgresql/UUIDTest.java
 - src/test/resources/org/embulk/input/postgresql/test/expect/array/as_json.yml
 - src/test/resources/org/embulk/input/postgresql/test/expect/array/as_string.yml
 - src/test/resources/org/embulk/input/postgresql/test/expect/array/expected_json.csv
@@ -66,6 +67,9 @@ files:
 - src/test/resources/org/embulk/input/postgresql/test/expect/incremental/timestamptz/expected_2.diff
 - src/test/resources/org/embulk/input/postgresql/test/expect/incremental/timestamptz/insert_more.sql
 - src/test/resources/org/embulk/input/postgresql/test/expect/incremental/timestamptz/setup.sql
+- src/test/resources/org/embulk/input/postgresql/test/expect/uuid/as_string.yml
+- src/test/resources/org/embulk/input/postgresql/test/expect/uuid/expected_string.csv
+- src/test/resources/org/embulk/input/postgresql/test/expect/uuid/setup.sql
 homepage: https://github.com/embulk/embulk-input-jdbc
 licenses:
 - Apache 2.0