embulk-output-oracle 0.4.1 → 0.4.2

data/src/main/java/org/embulk/output/oracle/InsertMethod.java

@@ -1,8 +1,8 @@
-package org.embulk.output.oracle;
-
-public enum InsertMethod
-{
-    normal,
-    direct,
-    oci;
-}
+package org.embulk.output.oracle;
+
+public enum InsertMethod
+{
+    normal,
+    direct,
+    oci;
+}

data/src/main/java/org/embulk/output/oracle/OracleCharset.java

@@ -1,32 +1,32 @@
-package org.embulk.output.oracle;
-
-import java.nio.charset.Charset;
-
-public class OracleCharset
-{
-    private final String name;
-    private final short id;
-    private final Charset javaCharset;
-
-    public OracleCharset(String name, short id, Charset javaCharset)
-    {
-        this.name = name;
-        this.id = id;
-        this.javaCharset = javaCharset;
-    }
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public short getId()
-    {
-        return id;
-    }
-
-    public Charset getJavaCharset()
-    {
-        return javaCharset;
-    }
-}
+package org.embulk.output.oracle;
+
+import java.nio.charset.Charset;
+
+public class OracleCharset
+{
+    private final String name;
+    private final short id;
+    private final Charset javaCharset;
+
+    public OracleCharset(String name, short id, Charset javaCharset)
+    {
+        this.name = name;
+        this.id = id;
+        this.javaCharset = javaCharset;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public short getId()
+    {
+        return id;
+    }
+
+    public Charset getJavaCharset()
+    {
+        return javaCharset;
+    }
+}

data/src/main/java/org/embulk/output/oracle/OracleOutputConnection.java

@@ -1,165 +1,179 @@
-package org.embulk.output.oracle;
-
-import java.nio.charset.Charset;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.embulk.output.jdbc.JdbcOutputConnection;
-import org.embulk.output.jdbc.JdbcColumn;
-import org.embulk.output.jdbc.JdbcSchema;
-
-public class OracleOutputConnection
-        extends JdbcOutputConnection
-{
-    private static final Map<String, String> CHARSET_NAMES = new HashMap<String, String>();
-    static {
-        CHARSET_NAMES.put("JA16SJIS", "MS932");
-        CHARSET_NAMES.put("JA16SJISTILDE", "MS932");
-        CHARSET_NAMES.put("JA16EUC", "EUC-JP");
-        CHARSET_NAMES.put("JA16EUCTILDE", "EUC-JP");
-        CHARSET_NAMES.put("AL32UTF8", "UTF-8");
-        CHARSET_NAMES.put("UTF8", "UTF-8");
-        CHARSET_NAMES.put("AL16UTF16", "UTF-16");
-    }
-
-    private final boolean direct;
-    private OracleCharset charset;
-
-    public OracleOutputConnection(Connection connection, boolean autoCommit, boolean direct)
-            throws SQLException
-    {
-        super(connection, getSchema(connection));
-        connection.setAutoCommit(autoCommit);
-
-        this.direct = direct;
-    }
-
-    @Override
-    protected String buildColumnTypeName(JdbcColumn c)
-    {
-        switch(c.getSimpleTypeName()) {
-        case "BIGINT":
-            return "NUMBER(19,0)";
-        default:
-            return super.buildColumnTypeName(c);
-        }
-    }
-
-    @Override
-    protected void setSearchPath(String schema) throws SQLException {
-        // NOP
-    }
-
-    @Override
-    public void dropTableIfExists(String tableName) throws SQLException
-    {
-        if (tableExists(tableName)) {
-            dropTable(tableName);
-        }
-    }
-
-    @Override
-    protected void dropTableIfExists(Statement stmt, String tableName) throws SQLException {
-        if (tableExists(tableName)) {
-            dropTable(stmt, tableName);
-        }
-    }
-
-    @Override
-    public void createTableIfNotExists(String tableName, JdbcSchema schema) throws SQLException
-    {
-        if (!tableExists(tableName)) {
-            createTable(tableName, schema);
-        }
-    }
-
-    public void createTable(String tableName, JdbcSchema schema) throws SQLException
-    {
-        Statement stmt = connection.createStatement();
-        try {
-            String sql = buildCreateTableSql(tableName, schema);
-            executeUpdate(stmt, sql);
-            commitIfNecessary(connection);
-        } catch (SQLException ex) {
-            throw safeRollback(connection, ex);
-        } finally {
-            stmt.close();
-        }
-    }
-
-    protected String buildCreateTableSql(String name, JdbcSchema schema)
-    {
-        StringBuilder sb = new StringBuilder();
-
-        sb.append("CREATE TABLE ");
-        quoteIdentifierString(sb, name);
-        sb.append(buildCreateTableSchemaSql(schema));
-        return sb.toString();
-    }
-
-    private static String getSchema(Connection connection) throws SQLException
-    {
-        // Because old Oracle JDBC drivers don't support Connection#getSchema method.
-        String sql = "SELECT SYS_CONTEXT('USERENV', 'CURRENT_SCHEMA') FROM DUAL";
-        try (Statement statement = connection.createStatement()) {
-            try (ResultSet resultSet = statement.executeQuery(sql)) {
-                if (resultSet.next()) {
-                    return resultSet.getString(1);
-                }
-                throw new SQLException(String.format("Cannot get schema becase \"%s\" didn't return any value.", sql));
-            }
-        }
-    }
-
-    @Override
-    protected String buildPreparedInsertSql(String toTable, JdbcSchema toTableSchema) throws SQLException
-    {
-        String sql = super.buildPreparedInsertSql(toTable, toTableSchema);
-        if (direct) {
-            sql = sql.replaceAll("^INSERT ", "INSERT /*+ APPEND_VALUES */ ");
-        }
-        return sql;
-    }
-
-    @Override
-    public Charset getTableNameCharset() throws SQLException
-    {
-        return getOracleCharset().getJavaCharset();
-    }
-
-    public synchronized OracleCharset getOracleCharset() throws SQLException
-    {
-        if (charset == null) {
-            String charsetName = "UTF8";
-            try (Statement statement = connection.createStatement()) {
-                try (ResultSet resultSet = statement.executeQuery("SELECT VALUE FROM NLS_DATABASE_PARAMETERS WHERE PARAMETER='NLS_CHARACTERSET'")) {
-                    if (resultSet.next()) {
-                        String nlsCharacterSet = resultSet.getString(1);
-                        if (CHARSET_NAMES.containsKey(nlsCharacterSet)) {
-                            charsetName = nlsCharacterSet;
-                        }
-                    }
-                }
-            }
-
-            try (PreparedStatement statement = connection.prepareStatement("SELECT NLS_CHARSET_ID(?) FROM DUAL")) {
-                statement.setString(1, charsetName);
-                try (ResultSet resultSet = statement.executeQuery()) {
-                    if (!resultSet.next()) {
-                        throw new SQLException("Unknown NLS_CHARACTERSET : " + charsetName);
-                    }
-
-                    charset = new OracleCharset(charsetName,
-                            resultSet.getShort(1),
-                            Charset.forName(CHARSET_NAMES.get(charsetName)));
-                }
-            }
-        }
-        return charset;
-    }
-}
+package org.embulk.output.oracle;
+
+import java.nio.charset.Charset;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.embulk.output.jdbc.JdbcOutputConnection;
+import org.embulk.output.jdbc.JdbcColumn;
+import org.embulk.output.jdbc.JdbcSchema;
+
+public class OracleOutputConnection
+        extends JdbcOutputConnection
+{
+    private static final Map<String, String> CHARSET_NAMES = new HashMap<String, String>();
+    static {
+        CHARSET_NAMES.put("JA16SJIS", "MS932");
+        CHARSET_NAMES.put("JA16SJISTILDE", "MS932");
+        CHARSET_NAMES.put("JA16EUC", "EUC-JP");
+        CHARSET_NAMES.put("JA16EUCTILDE", "EUC-JP");
+        CHARSET_NAMES.put("AL32UTF8", "UTF-8");
+        CHARSET_NAMES.put("UTF8", "UTF-8");
+        CHARSET_NAMES.put("AL16UTF16", "UTF-16");
+    }
+
+    private final boolean direct;
+    private OracleCharset charset;
+
+    public OracleOutputConnection(Connection connection, boolean autoCommit, boolean direct)
+            throws SQLException
+    {
+        super(connection, getSchema(connection));
+        connection.setAutoCommit(autoCommit);
+
+        this.direct = direct;
+    }
+
+    @Override
+    protected String buildColumnTypeName(JdbcColumn c)
+    {
+        switch(c.getSimpleTypeName()) {
+        case "BIGINT":
+            return "NUMBER(19,0)";
+        default:
+            return super.buildColumnTypeName(c);
+        }
+    }
+
+    @Override
+    protected void setSearchPath(String schema) throws SQLException {
+        // NOP
+    }
+
+    @Override
+    public void dropTableIfExists(String tableName) throws SQLException
+    {
+        if (tableExists(tableName)) {
+            dropTable(tableName);
+        }
+    }
+
+    @Override
+    protected void dropTableIfExists(Statement stmt, String tableName) throws SQLException {
+        if (tableExists(tableName)) {
+            dropTable(stmt, tableName);
+        }
+    }
+
+    @Override
+    public void createTableIfNotExists(String tableName, JdbcSchema schema) throws SQLException
+    {
+        if (!tableExists(tableName)) {
+            createTable(tableName, schema);
+        }
+    }
+
+    public void createTable(String tableName, JdbcSchema schema) throws SQLException
+    {
+        Statement stmt = connection.createStatement();
+        try {
+            String sql = buildCreateTableSql(tableName, schema);
+            executeUpdate(stmt, sql);
+            commitIfNecessary(connection);
+        } catch (SQLException ex) {
+            throw safeRollback(connection, ex);
+        } finally {
+            stmt.close();
+        }
+    }
+
+    protected String buildCreateTableSql(String name, JdbcSchema schema)
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("CREATE TABLE ");
+        quoteIdentifierString(sb, name);
+        sb.append(buildCreateTableSchemaSql(schema));
+        return sb.toString();
+    }
+
+    private static String getSchema(Connection connection) throws SQLException
+    {
+        // Because old Oracle JDBC drivers don't support Connection#getSchema method.
+        String sql = "SELECT SYS_CONTEXT('USERENV', 'CURRENT_SCHEMA') FROM DUAL";
+        try (Statement statement = connection.createStatement()) {
+            try (ResultSet resultSet = statement.executeQuery(sql)) {
+                if (resultSet.next()) {
+                    return resultSet.getString(1);
+                }
+                throw new SQLException(String.format("Cannot get schema becase \"%s\" didn't return any value.", sql));
+            }
+        }
+    }
+
+    @Override
+    protected String buildPreparedInsertSql(String toTable, JdbcSchema toTableSchema) throws SQLException
+    {
+        String sql = super.buildPreparedInsertSql(toTable, toTableSchema);
+        if (direct) {
+            sql = sql.replaceAll("^INSERT ", "INSERT /*+ APPEND_VALUES */ ");
+        }
+        return sql;
+    }
+
+    @Override
+    public Charset getTableNameCharset() throws SQLException
+    {
+        return getOracleCharset().getJavaCharset();
+    }
+
+    public synchronized OracleCharset getOracleCharset() throws SQLException
+    {
+        if (charset == null) {
+            String charsetName = "UTF8";
+            try (Statement statement = connection.createStatement()) {
+                try (ResultSet resultSet = statement.executeQuery("SELECT VALUE FROM NLS_DATABASE_PARAMETERS WHERE PARAMETER='NLS_CHARACTERSET'")) {
+                    if (resultSet.next()) {
+                        String nlsCharacterSet = resultSet.getString(1);
+                        if (CHARSET_NAMES.containsKey(nlsCharacterSet)) {
+                            charsetName = nlsCharacterSet;
+                        }
+                    }
+                }
+            }
+
+            try (PreparedStatement statement = connection.prepareStatement("SELECT NLS_CHARSET_ID(?) FROM DUAL")) {
+                statement.setString(1, charsetName);
+                try (ResultSet resultSet = statement.executeQuery()) {
+                    if (!resultSet.next()) {
+                        throw new SQLException("Unknown NLS_CHARACTERSET : " + charsetName);
+                    }
+
+                    charset = new OracleCharset(charsetName,
+                            resultSet.getShort(1),
+                            Charset.forName(CHARSET_NAMES.get(charsetName)));
+                }
+            }
+        }
+        return charset;
+    }
+
+    private static final String[] STANDARD_SIZE_TYPE_NAMES = {
+        "VARCHAR2", "NVARCHAR2",
+    };
+
+    @Override
+    protected ColumnDeclareType getColumnDeclareType(String convertedTypeName, JdbcColumn col)
+    {
+        if (Arrays.asList(STANDARD_SIZE_TYPE_NAMES).contains(convertedTypeName)) {
+            return ColumnDeclareType.SIZE;
+        }
+        return super.getColumnDeclareType(convertedTypeName, col);
+    }
+}

data/src/main/java/org/embulk/output/oracle/OracleOutputConnector.java

@@ -1,49 +1,49 @@
-package org.embulk.output.oracle;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.Properties;
-
-import org.embulk.output.jdbc.JdbcOutputConnector;
-
-public class OracleOutputConnector
-        implements JdbcOutputConnector
-{
-    private final String url;
-    private final Properties properties;
-    private final boolean direct;
-
-    public OracleOutputConnector(String url, Properties properties, boolean direct)
-    {
-        try {
-            Class.forName("oracle.jdbc.OracleDriver");
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-        this.url = url;
-        this.properties = properties;
-        this.direct = direct;
-    }
-
-    @Override
-    public OracleOutputConnection connect(boolean autoCommit) throws SQLException
-    {
-        Connection c = DriverManager.getConnection(url, properties);
-        if (c == null) {
-            // driver.connect returns null when url is "jdbc:mysql://...".
-            throw new SQLException("Invalid url : " + url);
-        }
-
-        try {
-            OracleOutputConnection con = new OracleOutputConnection(c, autoCommit, direct);
-            c = null;
-            return con;
-
-        } finally {
-            if (c != null) {
-                c.close();
-            }
-        }
-    }
-}
+package org.embulk.output.oracle;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
+
+import org.embulk.output.jdbc.JdbcOutputConnector;
+
+public class OracleOutputConnector
+        implements JdbcOutputConnector
+{
+    private final String url;
+    private final Properties properties;
+    private final boolean direct;
+
+    public OracleOutputConnector(String url, Properties properties, boolean direct)
+    {
+        try {
+            Class.forName("oracle.jdbc.OracleDriver");
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
+        this.url = url;
+        this.properties = properties;
+        this.direct = direct;
+    }
+
+    @Override
+    public OracleOutputConnection connect(boolean autoCommit) throws SQLException
+    {
+        Connection c = DriverManager.getConnection(url, properties);
+        if (c == null) {
+            // driver.connect returns null when url is "jdbc:mysql://...".
+            throw new SQLException("Invalid url : " + url);
+        }
+
+        try {
+            OracleOutputConnection con = new OracleOutputConnection(c, autoCommit, direct);
+            c = null;
+            return con;
+
+        } finally {
+            if (c != null) {
+                c.close();
+            }
+        }
+    }
+}