embulk-input-jdbc 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdf58a6bf2822d6fc08367c222f2cd6eab203d56
-  data.tar.gz: f68be4ab3068b33d4c35b824c4fed9068bd0c4a4
+  metadata.gz: 9a672095825353519696e26638bf7b750406a720
+  data.tar.gz: f90651ce7041f7435cc07da9435dafe593b027cc
 SHA512:
-  metadata.gz: 7c52c12c901c33c8e8b1e4dfeb4a7ae68246f9257fcb7a9bf933f63dcb258e7e83e51167709c7ea21bbce92cf595095cb2efbe123cacd498b56359f75c9429f8
-  data.tar.gz: 237ab455d727b5f4831119534860448f06fb1f8ca90286c6f65d6efa232db7c975b3976f40bc8e660d294c9390636549d8d63117139f7b34906e26bc317fccdf
+  metadata.gz: 5dbd93a8b413d1ff2b3d53d61c04706a1696cc8a544805c094d9fdef05a8bd11072a98b39edf602b08af9ab679684220bd6699df2d0963ded92d514c7d6e7b2e
+  data.tar.gz: 9886411e1b6d7358669827291f53a4994b1a116123d724253c0f39ce9c5041413e8207b8b84ab02b4686c8775be6594f6e70a0e0d74a79190d013f06d0514b23

data/src/main/java/org/embulk/input/jdbc/AbstractJdbcInputPlugin.java

@@ -186,7 +186,7 @@ public abstract class AbstractJdbcInputPlugin
         return new Schema(columns.build());
     }
 
-    private String getQuery(PluginTask task, JdbcInputConnection con)
+    private String getQuery(PluginTask task, JdbcInputConnection con) throws SQLException
     {
         if (task.getQuery().isPresent()) {
             if (task.getTable().isPresent() || task.getSelect().isPresent() ||
@@ -310,8 +310,23 @@ public abstract class AbstractJdbcInputPlugin
 
     private static JdbcColumnOption columnOptionOf(Map<String, JdbcColumnOption> columnOptions, Map<String, JdbcColumnOption> defaultColumnOptions, JdbcColumn targetColumn, String targetColumnSQLType)
     {
+        JdbcColumnOption columnOption = columnOptions.get(targetColumn.getName());
+        if (columnOption == null) {
+            String foundName = null;
+            for (Map.Entry<String, JdbcColumnOption> entry : columnOptions.entrySet()) {
+                if (entry.getKey().equalsIgnoreCase(targetColumn.getName())) {
+                    if (columnOption != null) {
+                        throw new ConfigException(String.format("Cannot specify column '%s' because both '%s' and '%s' exist in column_options.",
+                                targetColumn.getName(), foundName, entry.getKey()));
+                    }
+                    foundName = entry.getKey();
+                    columnOption = entry.getValue();
+                }
+            }
+        }
+
         return Optional
-                .fromNullable(columnOptions.get(targetColumn.getName()))
+                .fromNullable(columnOption)
                 .or(Optional.fromNullable(defaultColumnOptions.get(targetColumnSQLType)))
                 .or(
                     // default column option

data/src/main/java/org/embulk/input/jdbc/JdbcInputConnection.java

@@ -5,12 +5,18 @@ import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
-import java.sql.Statement;
 import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Set;
+
+import org.embulk.config.ConfigException;
+import org.embulk.spi.Exec;
+import org.slf4j.Logger;
+
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
-import org.slf4j.Logger;
-import org.embulk.spi.Exec;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSet.Builder;
 
 public class JdbcInputConnection
         implements AutoCloseable
@@ -146,25 +152,90 @@ public class JdbcInputConnection
 
     protected String buildTableName(String tableName)
     {
-    	return quoteIdentifierString(tableName);
+        return quoteIdentifierString(tableName);
     }
 
     public String buildSelectQuery(String tableName,
             Optional<String> selectColumnList, Optional<String> whereCondition,
-            Optional<String> orderByColumn)
+            Optional<String> orderByColumn) throws SQLException
     {
+        String actualTableName;
+        if (tableExists(tableName)) {
+            actualTableName = tableName;
+        } else {
+            String upperTableName = tableName.toUpperCase();
+            String lowerTableName = tableName.toLowerCase();
+            if (tableExists(upperTableName)) {
+                if (tableExists(lowerTableName)) {
+                    throw new ConfigException(String.format("Cannot specify table '%s' because both '%s' and '%s' exist.",
+                            tableName, upperTableName, lowerTableName));
+                } else {
+                    actualTableName = upperTableName;
+                }
+            } else {
+                if (tableExists(lowerTableName)) {
+                    actualTableName = lowerTableName;
+                } else {
+                    actualTableName = tableName;
+                }
+            }
+        }
+
         StringBuilder sb = new StringBuilder();
 
         sb.append("SELECT ");
         sb.append(selectColumnList.or("*"));
-        sb.append(" FROM ").append(buildTableName(tableName));
+        sb.append(" FROM ").append(buildTableName(actualTableName));
+
         if (whereCondition.isPresent()) {
             sb.append(" WHERE ").append(whereCondition.get());
         }
+
         if (orderByColumn.isPresent()) {
-            sb.append("ORDER BY ").append(quoteIdentifierString(orderByColumn.get())).append(" ASC");
+            String actualOrderByColumn;
+            Set<String> columnNames = getColumnNames(actualTableName);
+            if (columnNames.contains(orderByColumn.get())) {
+                actualOrderByColumn = orderByColumn.get();
+            } else {
+                String upperOrderByColumn = orderByColumn.get().toUpperCase();
+                String lowerOrderByColumn = orderByColumn.get().toLowerCase();
+                if (columnNames.contains(upperOrderByColumn)) {
+                    if (columnNames.contains(lowerOrderByColumn)) {
+                        throw new ConfigException(String.format("Cannot specify order-by colum '%s' because both '%s' and '%s' exist.",
+                                orderByColumn.get(), upperOrderByColumn, lowerOrderByColumn));
+                    } else {
+                        actualOrderByColumn = upperOrderByColumn;
+                    }
+                } else {
+                    if (columnNames.contains(lowerOrderByColumn)) {
+                        actualOrderByColumn = lowerOrderByColumn;
+                    } else {
+                        actualOrderByColumn = orderByColumn.get();
+                    }
+                }
+            }
+
+            sb.append("ORDER BY ").append(quoteIdentifierString(actualOrderByColumn)).append(" ASC");
         }
 
         return sb.toString();
     }
+
+    private boolean tableExists(String tableName) throws SQLException
+    {
+        try (ResultSet rs = connection.getMetaData().getTables(null, schemaName, tableName, null)) {
+            return rs.next();
+        }
+    }
+
+    private Set<String> getColumnNames(String tableName) throws SQLException
+    {
+        Builder<String> columnNamesBuilder = ImmutableSet.builder();
+        try (ResultSet rs = connection.getMetaData().getColumns(null, schemaName, tableName, null)) {
+            while (rs.next()) {
+                columnNamesBuilder.add(rs.getString("COLUMN_NAME"));
+            }
+            return columnNamesBuilder.build();
+        }
+    }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -42,7 +42,7 @@ files:
 - src/main/java/org/embulk/input/jdbc/getter/TimeColumnGetter.java
 - src/main/java/org/embulk/input/jdbc/getter/TimestampColumnGetter.java
 - src/test/java/org/embulk/input/EmbulkPluginTester.java
-- classpath/embulk-input-jdbc-0.7.1.jar
+- classpath/embulk-input-jdbc-0.7.2.jar
 homepage: https://github.com/embulk/embulk-input-jdbc
 licenses:
 - Apache 2.0