src/main/java/org/embulk/output/oracle/OracleOutputConnection.java in embulk-output-oracle-0.4.5 vs src/main/java/org/embulk/output/oracle/OracleOutputConnection.java in embulk-output-oracle-0.5.0

- old
+ new

@@ -135,28 +135,28 @@ } public synchronized OracleCharset getOracleCharset() throws SQLException { if (charset == null) { - charset = getOracleCharset("NLS_CHARACTERSET", "UTF8"); + charset = getOracleCharset("NLS_CHARACTERSET", "UTF8"); } return charset; } public synchronized OracleCharset getOracleNationalCharset() throws SQLException { if (nationalCharset == null) { - nationalCharset = getOracleCharset("NLS_NCHAR_CHARACTERSET", "AL16UTF16"); + nationalCharset = getOracleCharset("NLS_NCHAR_CHARACTERSET", "AL16UTF16"); } return nationalCharset; } private OracleCharset getOracleCharset(String parameterName, String defaultCharsetName) throws SQLException { String charsetName = defaultCharsetName; try (PreparedStatement statement = connection.prepareStatement("SELECT VALUE FROM NLS_DATABASE_PARAMETERS WHERE PARAMETER=?")) { - statement.setString(1, parameterName); + statement.setString(1, parameterName); try (ResultSet resultSet = statement.executeQuery()) { if (resultSet.next()) { String nlsCharacterSet = resultSet.getString(1); if (CHARSET_NAMES.containsKey(nlsCharacterSet)) { charsetName = nlsCharacterSet; @@ -178,17 +178,17 @@ } } } - private static final String[] STANDARD_SIZE_TYPE_NAMES = { + private static final String[] SIZE_TYPE_NAMES = { "VARCHAR2", "NVARCHAR2", }; @Override protected ColumnDeclareType getColumnDeclareType(String convertedTypeName, JdbcColumn col) { - if (Arrays.asList(STANDARD_SIZE_TYPE_NAMES).contains(convertedTypeName)) { + if (Arrays.asList(SIZE_TYPE_NAMES).contains(convertedTypeName)) { return ColumnDeclareType.SIZE; } return super.getColumnDeclareType(convertedTypeName, col); } }