embulk-output-jdbc 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b64b96b50afcce28b0a42fa8e189999b09dd62e8
-  data.tar.gz: 328a0050e7219d5bf18ee11e54b9d213ca83f309
+  metadata.gz: 55c72f27b523c6e9e8a9f4bdcc6e34238fc2ab93
+  data.tar.gz: 1d6350d92b143a0423c2b5de300853b2f92ca9e1
 SHA512:
-  metadata.gz: 380ed9ccf535efa6cd30e737b69a16d5295072c39123e701baa52fd9ab82d655ac45a6b955c985006241a1c3717587d6e77f7797ecde853bc2635ca4afd16cff
-  data.tar.gz: 80da943fa0f1db2eb216327dfffec579c5f936be58153c1ca2fee19176517f0b384ff084449fb23a5bfe7d678c9c45f229a0d9bc009b3deda42271939853c518
+  metadata.gz: d625cc29b72e815c187745ee8553761bf3e27408c98c3ce69cb7539810ad5b32dc390e3e6557cd65954c0102cbb02569b1031f85d4c6ebd50d85d27abb32ed86
+  data.tar.gz: f8adc582282ef5f15e71401da3650162cf965dd7b7ae38145b7139dfa8dcbfd49e241eb45acec9a43a122ce45371127934bed643f4edc891bf8af4c5bdcf9da0

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

@@ -91,6 +91,9 @@ public abstract class AbstractJdbcOutputPlugin
         @ConfigDefault("\"UTC\"")
         public DateTimeZone getDefaultTimeZone();
 
+        public void setActualTable(String actualTable);
+        public String getActualTable();
+
         public void setMergeKeys(Optional<List<String>> keys);
 
         public void setFeatures(Features features);
@@ -423,16 +426,37 @@ public abstract class AbstractJdbcOutputPlugin
             PluginTask task, final Schema schema, int taskCount) throws SQLException
     {
         if (schema.getColumnCount() == 0) {
-            throw new ConfigException("task count == 0 is not supported");
+            throw new ConfigException("No column.");
         }
 
         Mode mode = task.getMode();
         logger.info("Using {} mode", mode);
 
+        if (con.tableExists(task.getTable())) {
+            task.setActualTable(task.getTable());
+        } else {
+            String upperTable = task.getTable().toUpperCase();
+            String lowerTable = task.getTable().toLowerCase();
+            if (con.tableExists(upperTable)) {
+                if (con.tableExists(lowerTable)) {
+                    throw new ConfigException(String.format("Cannot specify table '%s' because both '%s' and '%s' exist.",
+                            task.getTable(), upperTable, lowerTable));
+                } else {
+                    task.setActualTable(upperTable);
+                }
+            } else {
+                if (con.tableExists(lowerTable)) {
+                    task.setActualTable(lowerTable);
+                } else {
+                    task.setActualTable(task.getTable());
+                }
+            }
+        }
+
         Optional<JdbcSchema> initialTargetTableSchema =
             mode.ignoreTargetTableSchema() ?
                 Optional.<JdbcSchema>absent() :
-                newJdbcSchemaFromTableIfExists(con, task.getTable());
+                newJdbcSchemaFromTableIfExists(con, task.getActualTable());
 
         // TODO get CREATE TABLE statement from task if set
         JdbcSchema newTableSchema = applyColumnOptionsToNewTableSchema(
@@ -449,13 +473,13 @@ public abstract class AbstractJdbcOutputPlugin
             // direct modify mode doesn't need intermediate tables.
             ImmutableList.Builder<String> intermTableNames = ImmutableList.builder();
             if (mode.tempTablePerTask()) {
-                String namePrefix = generateIntermediateTableNamePrefix(task.getTable(), con, 3,
+                String namePrefix = generateIntermediateTableNamePrefix(task.getActualTable(), con, 3,
                         task.getFeatures().getMaxTableNameLength(), task.getFeatures().getTableNameLengthSemantics());
                 for (int i=0; i < taskCount; i++) {
                     intermTableNames.add(namePrefix + String.format("%03d", i));
                 }
             } else {
-                String name = generateIntermediateTableNamePrefix(task.getTable(), con, 0,
+                String name = generateIntermediateTableNamePrefix(task.getActualTable(), con, 0,
                         task.getFeatures().getMaxTableNameLength(), task.getFeatures().getTableNameLengthSemantics());
                 intermTableNames.add(name);
             }
@@ -483,8 +507,8 @@ public abstract class AbstractJdbcOutputPlugin
         } else {
             // also create the target table if not exists
             // CREATE TABLE IF NOT EXISTS xyz
-            con.createTableIfNotExists(task.getTable(), newTableSchema);
-            targetTableSchema = newJdbcSchemaFromTableIfExists(con, task.getTable()).get();
+            con.createTableIfNotExists(task.getActualTable(), newTableSchema);
+            targetTableSchema = newJdbcSchemaFromTableIfExists(con, task.getActualTable()).get();
             task.setNewTableSchema(Optional.<JdbcSchema>absent());
         }
         task.setTargetTableSchema(matchSchemaByColumnNames(schema, targetTableSchema));
@@ -574,7 +598,7 @@ public abstract class AbstractJdbcOutputPlugin
         return new JdbcSchema(Lists.transform(schema.getColumns(), new Function<JdbcColumn, JdbcColumn>() {
             public JdbcColumn apply(JdbcColumn c)
             {
-                JdbcColumnOption option = columnOptionOf(columnOptions, c);
+                JdbcColumnOption option = columnOptionOf(columnOptions, c.getName());
                 if (option.getType().isPresent()) {
                     return JdbcColumn.newTypeDeclaredColumn(
                             c.getName(), Types.OTHER,  // sqlType, isNotNull, and isUniqueKey are ignored
@@ -590,23 +614,22 @@ public abstract class AbstractJdbcOutputPlugin
             Map<String, JdbcColumnOption> columnOptions)
     {
         ImmutableList.Builder<ColumnSetter> builder = ImmutableList.builder();
-        int schemaColumnIndex = 0;
-        for (JdbcColumn targetColumn : targetTableSchema.getColumns()) {
+        for (int schemaColumnIndex = 0; schemaColumnIndex < targetTableSchema.getCount(); schemaColumnIndex++) {
+            JdbcColumn targetColumn = targetTableSchema.getColumn(schemaColumnIndex);
+            Column inputColumn = inputValueSchema.getColumn(schemaColumnIndex);
             if (targetColumn.isSkipColumn()) {
                 builder.add(factory.newSkipColumnSetter());
             } else {
-                //String columnOptionKey = inputValueSchema.getColumn(schemaColumnIndex).getName();
-                JdbcColumnOption option = columnOptionOf(columnOptions, targetColumn);
+                JdbcColumnOption option = columnOptionOf(columnOptions, inputColumn.getName());
                 builder.add(factory.newColumnSetter(targetColumn, option));
-                schemaColumnIndex++;
             }
         }
         return builder.build();
     }
 
-    private static JdbcColumnOption columnOptionOf(Map<String, JdbcColumnOption> columnOptions, JdbcColumn targetColumn)
+    private static JdbcColumnOption columnOptionOf(Map<String, JdbcColumnOption> columnOptions, String columnName)
     {
-        return Optional.fromNullable(columnOptions.get(targetColumn.getName())).or(
+        return Optional.fromNullable(columnOptions.get(columnName)).or(
                     // default column option
                     new Supplier<JdbcColumnOption>()
                     {
@@ -641,30 +664,30 @@ public abstract class AbstractJdbcOutputPlugin
         case INSERT:
             // aggregate insert into target
             if (task.getNewTableSchema().isPresent()) {
-                con.createTableIfNotExists(task.getTable(), task.getNewTableSchema().get());
+                con.createTableIfNotExists(task.getActualTable(), task.getNewTableSchema().get());
             }
-            con.collectInsert(task.getIntermediateTables().get(), schema, task.getTable(), false);
+            con.collectInsert(task.getIntermediateTables().get(), schema, task.getActualTable(), false);
             break;
 
         case TRUNCATE_INSERT:
             // truncate & aggregate insert into target
             if (task.getNewTableSchema().isPresent()) {
-                con.createTableIfNotExists(task.getTable(), task.getNewTableSchema().get());
+                con.createTableIfNotExists(task.getActualTable(), task.getNewTableSchema().get());
             }
-            con.collectInsert(task.getIntermediateTables().get(), schema, task.getTable(), true);
+            con.collectInsert(task.getIntermediateTables().get(), schema, task.getActualTable(), true);
             break;
 
         case MERGE:
             // aggregate merge into target
             if (task.getNewTableSchema().isPresent()) {
-                con.createTableIfNotExists(task.getTable(), task.getNewTableSchema().get());
+                con.createTableIfNotExists(task.getActualTable(), task.getNewTableSchema().get());
             }
-            con.collectMerge(task.getIntermediateTables().get(), schema, task.getTable(), task.getMergeKeys().get());
+            con.collectMerge(task.getIntermediateTables().get(), schema, task.getActualTable(), task.getMergeKeys().get());
             break;
 
         case REPLACE:
             // swap table
-            con.replaceTable(task.getIntermediateTables().get().get(0), schema, task.getTable());
+            con.replaceTable(task.getIntermediateTables().get().get(0), schema, task.getActualTable());
             break;
         }
     }
@@ -823,13 +846,16 @@ public abstract class AbstractJdbcOutputPlugin
                     task.getTargetTableSchema(), schema,
                     task.getColumnOptions());
             JdbcSchema insertIntoSchema = filterSkipColumns(task.getTargetTableSchema());
+            if (insertIntoSchema.getCount() == 0) {
+                throw new SQLException("No column to insert.");
+            }
 
             // configure BatchInsert -> an intermediate table (!isDirectModify) or the target table (isDirectModify)
             String destTable;
             if (mode.tempTablePerTask()) {
                 destTable = task.getIntermediateTables().get().get(taskIndex);
             } else if (mode.isDirectModify()) {
-                destTable = task.getTable();
+                destTable = task.getActualTable();
             } else {
                 destTable = task.getIntermediateTables().get().get(0);
             }

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

@@ -37,7 +37,9 @@ public class JdbcOutputConnection
     @Override
     public void close() throws SQLException
     {
-        connection.close();
+        if (!connection.isClosed()) {
+            connection.close();
+        }
     }
 
     public String getSchemaName()

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

@@ -1,6 +1,9 @@
 package org.embulk.output.jdbc;
 
 import java.util.List;
+
+import org.embulk.config.ConfigException;
+
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -24,11 +27,27 @@ public class JdbcSchema
 
     public Optional<JdbcColumn> findColumn(String name)
     {
+        // because both upper case column and lower case column may exist, search twice
         for (JdbcColumn column : columns) {
             if (column.getName().equals(name)) {
                 return Optional.of(column);
             }
         }
+
+        JdbcColumn foundColumn = null;
+        for (JdbcColumn column : columns) {
+            if (column.getName().equalsIgnoreCase(name)) {
+                if (foundColumn != null) {
+                    throw new ConfigException(String.format("Cannot specify column '%s' because both '%s' and '%s' exist.",
+                            name, foundColumn.getName(), column.getName()));
+                }
+                foundColumn = column;
+            }
+        }
+
+        if (foundColumn != null) {
+            return Optional.of(foundColumn);
+        }
         return Optional.absent();
     }
 

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

@@ -64,7 +64,7 @@ public class StandardBatchInsert
 
     public void close() throws IOException, SQLException
     {
-        // caller should close the connection
+        connection.close();
     }
 
     public void flush() throws IOException, SQLException

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -58,7 +58,7 @@ files:
 - src/test/java/org/embulk/output/TestJdbcOutputPlugin.java
 - src/test/java/org/embulk/output/TimestampFormatTest.java
 - src/test/java/org/embulk/output/tester/EmbulkPluginTester.java
-- classpath/embulk-output-jdbc-0.6.0.jar
+- classpath/embulk-output-jdbc-0.6.1.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0