embulk-input-jdbc 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f90e12c2fee1a30c130f033663488322ea010a9
-  data.tar.gz: 9dbae6a7d01b3bda36606b6f269f1f7d2fdcddc9
+  metadata.gz: 1c8e7bcef7a17ff17d0765398c37a01e30069d1e
+  data.tar.gz: e8da2a078d57ea323a94e4e12228ec38aa9ebff8
 SHA512:
-  metadata.gz: 3dbed8686fd882876041fe10914297a63d7cce394ef3e686abc12bba4104f0ac88e3e59b8ce100da98fffa8bbf31bc2f4f040ad77b2c310312e7da441113958a
-  data.tar.gz: e53a6be622d0ec449c946990cdaedb8a21b3fa83d3a593894dee39675adc3e793bb5c5d1718ae5eda5da8c28895a494abe5ffa0bd5b0a96e82f1b0c1582b5f82
+  metadata.gz: 31f6a9698536e5bb62c795a43a0a7215e3f6c654c3fdacf3155702903699146187953dee40c60da4cb9358fe6e6b420f53ea94511ef4e099d4bd71defee6a305
+  data.tar.gz: 6e95e49f74ac0d529486b610713d75f8372d619fd4fcc47847a2ea908263c0a1aa593a7fbaf7ddc691d4854d0506405c3d8dc83395d377f99c4e1a071e8debb6

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

@@ -10,6 +10,7 @@ import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import org.embulk.config.CommitReport;
 import org.embulk.config.Config;
+import org.embulk.config.ConfigException;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigDiff;
 import org.embulk.config.ConfigInject;
@@ -39,7 +40,12 @@ public abstract class AbstractJdbcInputPlugin
         public Properties getOptions();
 
         @Config("table")
-        public String getTable();
+        @ConfigDefault("null")
+        public Optional<String> getTable();
+
+        @Config("query")
+        @ConfigDefault("null")
+        public Optional<String> getQuery();
 
         @Config("select")
         @ConfigDefault("null")
@@ -134,7 +140,7 @@ public abstract class AbstractJdbcInputPlugin
     private Schema setupTask(JdbcInputConnection con, PluginTask task) throws SQLException
     {
         // build SELECT query and gets schema of its result
-        JdbcSchema querySchema = con.getSchemaOfQuery(task.getTable(), task.getSelect(), task.getWhere(), task.getOrderBy());
+        JdbcSchema querySchema = con.getSchemaOfQuery(getQuery(task, con));
         task.setQuerySchema(querySchema);
 
         ColumnGetterFactory factory = newColumnGetterFactory(task);
@@ -147,6 +153,22 @@ public abstract class AbstractJdbcInputPlugin
         return new Schema(columns.build());
     }
 
+    private String getQuery(PluginTask task, JdbcInputConnection con)
+    {
+        if (task.getQuery().isPresent()) {
+            if (task.getTable().isPresent() || task.getSelect().isPresent() ||
+                    task.getWhere().isPresent() || task.getOrderBy().isPresent()) {
+                throw new ConfigException("'table', 'select', 'where' and 'order_by' parameters are unnecessary if 'query' parameter is set.");
+            }
+            return task.getQuery().get();
+        } else if (task.getTable().isPresent()) {
+            return con.buildSelectQuery(task.getTable().get(), task.getSelect(),
+                    task.getWhere(), task.getOrderBy());
+        } else {
+            throw new ConfigException("'table' parameter is required (if 'query' parameter is not set)");
+        }
+    }
+
     @Override
     public ConfigDiff resume(TaskSource taskSource,
             Schema schema, int taskCount,
@@ -201,9 +223,7 @@ public abstract class AbstractJdbcInputPlugin
             List<ColumnGetter> getters = newColumnGetters(task, querySchema);
 
             try (JdbcInputConnection con = newConnection(task)) {
-                try (BatchSelect cursor = con.newSelectCursor(
-                            task.getTable(), task.getSelect(), task.getWhere(),
-                            task.getOrderBy(), task.getFetchRows())) {
+                try (BatchSelect cursor = con.newSelectCursor(getQuery(task, con), task.getFetchRows())) {
                     while (true) {
                         // TODO run fetch() in another thread asynchronously
                         // TODO retry fetch() if it failed (maybe order_by is required and unique_column(s) option is also required)

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

@@ -41,31 +41,8 @@ public class JdbcInputConnection
         executeUpdate(sql);
     }
 
-    protected String buildSelectQuery(String tableName,
-            Optional<String> selectColumnList, Optional<String> whereCondition,
-            Optional<String> orderByColumn)
-    {
-        StringBuilder sb = new StringBuilder();
-
-        sb.append("SELECT ");
-        sb.append(selectColumnList.or("*"));
-        sb.append(" FROM ").append(quoteIdentifierString(tableName));
-        if (whereCondition.isPresent()) {
-            sb.append(" WHERE ").append(whereCondition.get());
-        }
-        if (orderByColumn.isPresent()) {
-            sb.append("ORDER BY ").append(quoteIdentifierString(orderByColumn.get())).append(" ASC");
-        }
-
-        return sb.toString();
-    }
-
-    public JdbcSchema getSchemaOfQuery(String tableName,
-            Optional<String> selectColumnList, Optional<String> whereCondition,
-            Optional<String> orderByColumn) throws SQLException
+    public JdbcSchema getSchemaOfQuery(String query) throws SQLException
     {
-        String query = buildSelectQuery(tableName, selectColumnList, whereCondition,
-                orderByColumn);
         PreparedStatement stmt = connection.prepareStatement(query);
         try {
             return getSchemaOfResultMetadata(stmt.getMetaData());
@@ -89,18 +66,15 @@ public class JdbcInputConnection
         return new JdbcSchema(columns.build());
     }
 
-    public BatchSelect newSelectCursor(String tableName,
-            Optional<String> selectColumnList, Optional<String> whereCondition,
-            Optional<String> orderByColumn, int fetchRows) throws SQLException
+    public BatchSelect newSelectCursor(String query, int fetchRows) throws SQLException
     {
-        String select = buildSelectQuery(tableName, selectColumnList, whereCondition, orderByColumn);
-        return newBatchSelect(select, fetchRows);
+        return newBatchSelect(query, fetchRows);
     }
 
-    protected BatchSelect newBatchSelect(String select, int fetchRows) throws SQLException
+    protected BatchSelect newBatchSelect(String query, int fetchRows) throws SQLException
     {
-        logger.info("SQL: " + select);
-        PreparedStatement stmt = connection.prepareStatement(select);
+        logger.info("SQL: " + query);
+        PreparedStatement stmt = connection.prepareStatement(query);
         stmt.setFetchSize(fetchRows);
         return new SingleSelect(stmt);
     }
@@ -169,4 +143,23 @@ public class JdbcInputConnection
     {
         return identifierQuoteString + str + identifierQuoteString;
     }
+
+    public String buildSelectQuery(String tableName,
+            Optional<String> selectColumnList, Optional<String> whereCondition,
+            Optional<String> orderByColumn)
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("SELECT ");
+        sb.append(selectColumnList.or("*"));
+        sb.append(" FROM ").append(quoteIdentifierString(tableName));
+        if (whereCondition.isPresent()) {
+            sb.append(" WHERE ").append(whereCondition.get());
+        }
+        if (orderByColumn.isPresent()) {
+            sb.append("ORDER BY ").append(quoteIdentifierString(orderByColumn.get())).append(" ASC");
+        }
+
+        return sb.toString();
+    }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -27,7 +27,7 @@ files:
 - src/main/java/org/embulk/input/jdbc/getter/ColumnGetter.java
 - src/main/java/org/embulk/input/jdbc/getter/ColumnGetterFactory.java
 - src/main/java/org/embulk/input/jdbc/getter/ColumnGetters.java
-- classpath/embulk-input-jdbc-0.3.0.jar
+- classpath/embulk-input-jdbc-0.4.0.jar
 homepage: https://github.com/embulk/embulk-input-jdbc
 licenses:
 - Apache 2.0