embulk-output-jdbc 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad63f756531e91a61059ac0568e2b9d96b47a4fd
-  data.tar.gz: 0e2d9ccc4f4f40bd5439ba8639f462583b194f80
+  metadata.gz: b00ca29d7e5aac5ac1369fe312807937c0953336
+  data.tar.gz: 7fd2236f250fd4d24e825a3d974326e60f163b76
 SHA512:
-  metadata.gz: 629fca902b6c03d39c3a87ff7276f31d6028f1743acde07ee573a911fd8d0dac1050d793e3aaf23de4f0084d6ef4b475d819d3bc5652256f7484cd8d0fcce616
-  data.tar.gz: 6d296929dd913354ffc58f7c4cf59b1a67a5bd020f3a5a9ca00ba8c7080673d37a9c6d37df1c730fb24a6244c76556f18229d77285d2e3addd16a5a99e66d0bc
+  metadata.gz: 3f09b8a3a96a5df1fb9bb7a00619399fccaca549be880f7729ed155f146f5f6a06ac394cea4187b059b7a938115b9986e18e3ccefef5cccb6a32e1d23c9ea64d
+  data.tar.gz: 61d57fc29b2816f9809b1dbacc807b55569ec252e4ad55f442b392777738b0732fdf853da1918c7f0f14f8c0e8fd6953676ae35e312ddc3771f47232bbf243b9

data/src/main/java/org/embulk/output/jdbc/AbstractJdbcOutputPlugin.java

@@ -203,7 +203,7 @@ public abstract class AbstractJdbcOutputPlugin
         return commit(task, schema, taskCount);
     }
 
-    private String getTransactionUniqueName()
+    protected String getTransactionUniqueName()
     {
         // TODO use uuid?
         Timestamp t = Exec.session().getTransactionTime();
@@ -453,9 +453,20 @@ public abstract class AbstractJdbcOutputPlugin
 
     private JdbcSchema matchSchemaByColumnNames(Schema inputSchema, JdbcSchema targetTableSchema)
     {
-        // TODO for each inputSchema.getColumns(), search a column whose name
-        //      matches with targetTableSchema. if not match, create JdbcSchema.skipColumn().
-        return targetTableSchema;
+        ImmutableList.Builder<JdbcColumn> jdbcColumns = ImmutableList.builder();
+
+        outer : for (Column column : inputSchema.getColumns()) {
+            for (JdbcColumn jdbcColumn : targetTableSchema.getColumns()) {
+                if (jdbcColumn.getName().equals(column.getName())) {
+                    jdbcColumns.add(jdbcColumn);
+                    continue outer;
+                }
+            }
+
+            jdbcColumns.add(JdbcColumn.skipColumn());
+        }
+
+        return new JdbcSchema(jdbcColumns.build());
     }
 
     public TransactionalPageOutput open(TaskSource taskSource, Schema schema, final int taskIndex)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -39,7 +39,7 @@ files:
 - src/main/java/org/embulk/output/jdbc/setter/SqlTimestampColumnSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/StringColumnSetter.java
 - src/test/java/org/embulk/output/TestJdbcOutputPlugin.java
-- classpath/embulk-output-jdbc-0.2.1.jar
+- classpath/embulk-output-jdbc-0.2.2.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0