Repository: sqoop Updated Branches: refs/heads/trunk e24761706 -> f47a4fc25
SQOOP-1433: Oracle direct connector fails with Oracle 12c JDBC driver (David Robson via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/f47a4fc2 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/f47a4fc2 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/f47a4fc2 Branch: refs/heads/trunk Commit: f47a4fc25c68e5d68fe7affc0ca36089aae0142e Parents: e247617 Author: Jarek Jarcec Cecho <[email protected]> Authored: Tue Sep 2 09:36:41 2014 +0200 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Tue Sep 2 09:36:41 2014 +0200 ---------------------------------------------------------------------- .../apache/sqoop/manager/oracle/OracleConnectionFactory.java | 6 +++++- src/test/org/apache/sqoop/manager/oracle/OraOopTestCase.java | 1 + src/test/org/apache/sqoop/manager/oracle/SystemImportTest.java | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/f47a4fc2/src/java/org/apache/sqoop/manager/oracle/OracleConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/manager/oracle/OracleConnectionFactory.java b/src/java/org/apache/sqoop/manager/oracle/OracleConnectionFactory.java index 094576b..8fd385c 100644 --- a/src/java/org/apache/sqoop/manager/oracle/OracleConnectionFactory.java +++ b/src/java/org/apache/sqoop/manager/oracle/OracleConnectionFactory.java @@ -93,7 +93,9 @@ public class OracleConnectionFactory { } try { - return DriverManager.getConnection(jdbcUrl, props); + Connection result = DriverManager.getConnection(jdbcUrl, props); + result.setAutoCommit(false); + return result; } catch (SQLException ex) { String errorMsg = String.format( "Unable to obtain a JDBC connection to the URL \"%s\" as user \"%s\": ", @@ -108,6 +110,8 @@ public class OracleConnectionFactory { connection.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED); + connection.setAutoCommit(false); + OraOopOracleQueries.setConnectionTimeZone(connection, conf); setSessionClientInfo(connection, conf); http://git-wip-us.apache.org/repos/asf/sqoop/blob/f47a4fc2/src/test/org/apache/sqoop/manager/oracle/OraOopTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/oracle/OraOopTestCase.java b/src/test/org/apache/sqoop/manager/oracle/OraOopTestCase.java index 4546464..27b53ee 100644 --- a/src/test/org/apache/sqoop/manager/oracle/OraOopTestCase.java +++ b/src/test/org/apache/sqoop/manager/oracle/OraOopTestCase.java @@ -100,6 +100,7 @@ public abstract class OraOopTestCase { this.conn = DriverManager.getConnection(OracleUtils.CONNECT_STRING, OracleUtils.ORACLE_USER_NAME, OracleUtils.ORACLE_USER_PASS); + this.conn.setAutoCommit(false); } return this.conn; } http://git-wip-us.apache.org/repos/asf/sqoop/blob/f47a4fc2/src/test/org/apache/sqoop/manager/oracle/SystemImportTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/oracle/SystemImportTest.java b/src/test/org/apache/sqoop/manager/oracle/SystemImportTest.java index 0f85854..f6e5c0e 100644 --- a/src/test/org/apache/sqoop/manager/oracle/SystemImportTest.java +++ b/src/test/org/apache/sqoop/manager/oracle/SystemImportTest.java @@ -153,6 +153,7 @@ public class SystemImportTest extends OraOopTestCase { } } finally { ps.close(); + conn.commit(); } // Can't bind > 4000 bytes of data to LONG and LOB columns in the same @@ -168,6 +169,7 @@ public class SystemImportTest extends OraOopTestCase { } } finally { ps.close(); + conn.commit(); } try {
