embulk-output-redshift 0.4.1 → 0.4.2

data/src/main/java/org/embulk/output/redshift/RedshiftOutputConnection.java

@@ -1,122 +1,122 @@
-package org.embulk.output.redshift;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import org.slf4j.Logger;
-import org.embulk.spi.Exec;
-import org.embulk.output.jdbc.JdbcOutputConnection;
-import org.embulk.output.jdbc.JdbcColumn;
-import org.embulk.output.jdbc.JdbcSchema;
-
-public class RedshiftOutputConnection
-        extends JdbcOutputConnection
-{
-    private final Logger logger = Exec.getLogger(RedshiftOutputConnection.class);
-
-    public RedshiftOutputConnection(Connection connection, String schemaName, boolean autoCommit)
-            throws SQLException
-    {
-        super(connection, schemaName);
-        connection.setAutoCommit(autoCommit);
-    }
-
-    // Redshift does not support DROP TABLE IF EXISTS.
-    // Here runs DROP TABLE and ignores errors.
-    @Override
-    public void dropTableIfExists(String tableName) throws SQLException
-    {
-        Statement stmt = connection.createStatement();
-        try {
-            String sql = String.format("DROP TABLE IF EXISTS %s", quoteIdentifierString(tableName));
-            executeUpdate(stmt, sql);
-            commitIfNecessary(connection);
-        } catch (SQLException ex) {
-            // ignore errors.
-            // TODO here should ignore only 'table "XXX" does not exist' errors.
-            SQLException ignored = safeRollback(connection, ex);
-        } finally {
-            stmt.close();
-        }
-    }
-
-    // Redshift does not support DROP TABLE IF EXISTS.
-    // Dropping part runs DROP TABLE and ignores errors.
-    @Override
-    public void replaceTable(String fromTable, JdbcSchema schema, String toTable) throws SQLException
-    {
-        Statement stmt = connection.createStatement();
-        try {
-            try {
-                StringBuilder sb = new StringBuilder();
-                sb.append("DROP TABLE ");
-                quoteIdentifierString(sb, toTable);
-                String sql = sb.toString();
-                executeUpdate(stmt, sql);
-            } catch (SQLException ex) {
-                // ignore errors.
-                // TODO here should ignore only 'table "XXX" does not exist' errors.
-                // rollback or comimt is required to recover failed transaction
-                SQLException ignored = safeRollback(connection, ex);
-            }
-
-            {
-                StringBuilder sb = new StringBuilder();
-                sb.append("ALTER TABLE ");
-                quoteIdentifierString(sb, fromTable);
-                sb.append(" RENAME TO ");
-                quoteIdentifierString(sb, toTable);
-                String sql = sb.toString();
-                executeUpdate(stmt, sql);
-            }
-
-            commitIfNecessary(connection);
-        } catch (SQLException ex) {
-            throw safeRollback(connection, ex);
-        } finally {
-            stmt.close();
-        }
-    }
-
-    @Override
-    protected String buildColumnTypeName(JdbcColumn c)
-    {
-        // Redshift does not support TEXT type.
-        switch(c.getSimpleTypeName()) {
-        case "CLOB":
-            return "VARCHAR(65535)";
-        case "TEXT":
-            return "VARCHAR(65535)";
-        case "BLOB":
-            return "BYTEA";
-        default:
-            return super.buildColumnTypeName(c);
-        }
-    }
-
-    public String buildCopySQLBeforeFrom(String tableName, JdbcSchema tableSchema)
-    {
-        StringBuilder sb = new StringBuilder();
-
-        sb.append("COPY ");
-        quoteIdentifierString(sb, tableName);
-        sb.append(" (");
-        for(int i=0; i < tableSchema.getCount(); i++) {
-            if(i != 0) { sb.append(", "); }
-            quoteIdentifierString(sb, tableSchema.getColumnName(i));
-        }
-        sb.append(")");
-
-        return sb.toString();
-    }
-
-    public void runCopy(String sql) throws SQLException
-    {
-        Statement stmt = connection.createStatement();
-        try {
-            stmt.executeUpdate(sql);
-        } finally {
-            stmt.close();
-        }
-    }
-}
+package org.embulk.output.redshift;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import org.slf4j.Logger;
+import org.embulk.spi.Exec;
+import org.embulk.output.jdbc.JdbcOutputConnection;
+import org.embulk.output.jdbc.JdbcColumn;
+import org.embulk.output.jdbc.JdbcSchema;
+
+public class RedshiftOutputConnection
+        extends JdbcOutputConnection
+{
+    private final Logger logger = Exec.getLogger(RedshiftOutputConnection.class);
+
+    public RedshiftOutputConnection(Connection connection, String schemaName, boolean autoCommit)
+            throws SQLException
+    {
+        super(connection, schemaName);
+        connection.setAutoCommit(autoCommit);
+    }
+
+    // Redshift does not support DROP TABLE IF EXISTS.
+    // Here runs DROP TABLE and ignores errors.
+    @Override
+    public void dropTableIfExists(String tableName) throws SQLException
+    {
+        Statement stmt = connection.createStatement();
+        try {
+            String sql = String.format("DROP TABLE IF EXISTS %s", quoteIdentifierString(tableName));
+            executeUpdate(stmt, sql);
+            commitIfNecessary(connection);
+        } catch (SQLException ex) {
+            // ignore errors.
+            // TODO here should ignore only 'table "XXX" does not exist' errors.
+            SQLException ignored = safeRollback(connection, ex);
+        } finally {
+            stmt.close();
+        }
+    }
+
+    // Redshift does not support DROP TABLE IF EXISTS.
+    // Dropping part runs DROP TABLE and ignores errors.
+    @Override
+    public void replaceTable(String fromTable, JdbcSchema schema, String toTable) throws SQLException
+    {
+        Statement stmt = connection.createStatement();
+        try {
+            try {
+                StringBuilder sb = new StringBuilder();
+                sb.append("DROP TABLE ");
+                quoteIdentifierString(sb, toTable);
+                String sql = sb.toString();
+                executeUpdate(stmt, sql);
+            } catch (SQLException ex) {
+                // ignore errors.
+                // TODO here should ignore only 'table "XXX" does not exist' errors.
+                // rollback or comimt is required to recover failed transaction
+                SQLException ignored = safeRollback(connection, ex);
+            }
+
+            {
+                StringBuilder sb = new StringBuilder();
+                sb.append("ALTER TABLE ");
+                quoteIdentifierString(sb, fromTable);
+                sb.append(" RENAME TO ");
+                quoteIdentifierString(sb, toTable);
+                String sql = sb.toString();
+                executeUpdate(stmt, sql);
+            }
+
+            commitIfNecessary(connection);
+        } catch (SQLException ex) {
+            throw safeRollback(connection, ex);
+        } finally {
+            stmt.close();
+        }
+    }
+
+    @Override
+    protected String buildColumnTypeName(JdbcColumn c)
+    {
+        // Redshift does not support TEXT type.
+        switch(c.getSimpleTypeName()) {
+        case "CLOB":
+            return "VARCHAR(65535)";
+        case "TEXT":
+            return "VARCHAR(65535)";
+        case "BLOB":
+            return "BYTEA";
+        default:
+            return super.buildColumnTypeName(c);
+        }
+    }
+
+    public String buildCopySQLBeforeFrom(String tableName, JdbcSchema tableSchema)
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("COPY ");
+        quoteIdentifierString(sb, tableName);
+        sb.append(" (");
+        for(int i=0; i < tableSchema.getCount(); i++) {
+            if(i != 0) { sb.append(", "); }
+            quoteIdentifierString(sb, tableSchema.getColumnName(i));
+        }
+        sb.append(")");
+
+        return sb.toString();
+    }
+
+    public void runCopy(String sql) throws SQLException
+    {
+        Statement stmt = connection.createStatement();
+        try {
+            stmt.executeUpdate(sql);
+        } finally {
+            stmt.close();
+        }
+    }
+}

data/src/main/java/org/embulk/output/redshift/RedshiftOutputConnector.java

@@ -1,40 +1,40 @@
-package org.embulk.output.redshift;
-
-import java.util.Properties;
-import java.sql.Driver;
-import java.sql.Connection;
-import java.sql.SQLException;
-import org.embulk.output.jdbc.JdbcOutputConnector;
-import org.embulk.output.jdbc.JdbcOutputConnection;
-
-public class RedshiftOutputConnector
-        implements JdbcOutputConnector
-{
-    private static final Driver driver = new org.postgresql.Driver();
-
-    private final String url;
-    private final Properties properties;
-    private final String schemaName;
-
-    public RedshiftOutputConnector(String url, Properties properties, String schemaName)
-    {
-        this.url = url;
-        this.properties = properties;
-        this.schemaName = schemaName;
-    }
-
-    @Override
-    public RedshiftOutputConnection connect(boolean autoCommit) throws SQLException
-    {
-        Connection c = driver.connect(url, properties);
-        try {
-            RedshiftOutputConnection con = new RedshiftOutputConnection(c, schemaName, autoCommit);
-            c = null;
-            return con;
-        } finally {
-            if (c != null) {
-                c.close();
-            }
-        }
-    }
-}
+package org.embulk.output.redshift;
+
+import java.util.Properties;
+import java.sql.Driver;
+import java.sql.Connection;
+import java.sql.SQLException;
+import org.embulk.output.jdbc.JdbcOutputConnector;
+import org.embulk.output.jdbc.JdbcOutputConnection;
+
+public class RedshiftOutputConnector
+        implements JdbcOutputConnector
+{
+    private static final Driver driver = new org.postgresql.Driver();
+
+    private final String url;
+    private final Properties properties;
+    private final String schemaName;
+
+    public RedshiftOutputConnector(String url, Properties properties, String schemaName)
+    {
+        this.url = url;
+        this.properties = properties;
+        this.schemaName = schemaName;
+    }
+
+    @Override
+    public RedshiftOutputConnection connect(boolean autoCommit) throws SQLException
+    {
+        Connection c = driver.connect(url, properties);
+        try {
+            RedshiftOutputConnection con = new RedshiftOutputConnection(c, schemaName, autoCommit);
+            c = null;
+            return con;
+        } finally {
+            if (c != null) {
+                c.close();
+            }
+        }
+    }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-redshift
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -24,23 +24,18 @@ files:
 - src/main/java/org/embulk/output/redshift/RedshiftCopyBatchInsert.java
 - src/main/java/org/embulk/output/redshift/RedshiftOutputConnection.java
 - src/main/java/org/embulk/output/redshift/RedshiftOutputConnector.java
-- classpath/aws-java-sdk-core-1.9.17.jar
-- classpath/aws-java-sdk-kms-1.9.17.jar
-- classpath/aws-java-sdk-s3-1.9.17.jar
-- classpath/aws-java-sdk-sts-1.9.17.jar
+- classpath/aws-java-sdk-core-1.10.33.jar
+- classpath/aws-java-sdk-kms-1.10.33.jar
+- classpath/aws-java-sdk-s3-1.10.33.jar
+- classpath/aws-java-sdk-sts-1.10.33.jar
 - classpath/commons-codec-1.6.jar
 - classpath/commons-logging-1.1.3.jar
-- classpath/embulk-output-jdbc-0.4.1.jar
-- classpath/embulk-output-postgresql-0.4.1.jar
-- classpath/embulk-output-redshift-0.4.1.jar
-- classpath/httpclient-4.3.4.jar
-- classpath/httpcore-4.3.2.jar
-- classpath/jna-4.1.0.jar
-- classpath/jna-platform-4.1.0.jar
-- classpath/joda-time-2.8.1.jar
-- classpath/postgresql-9.4-1200-jdbc41.jar
-- classpath/slf4j-simple-1.7.7.jar
-- classpath/waffle-jna-1.7.jar
+- classpath/embulk-output-jdbc-0.4.2.jar
+- classpath/embulk-output-postgresql-0.4.2.jar
+- classpath/embulk-output-redshift-0.4.2.jar
+- classpath/httpclient-4.3.6.jar
+- classpath/httpcore-4.3.3.jar
+- classpath/postgresql-9.4-1205-jdbc41.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0