Merge pull request #195 from domaframework/oracle-identity

Oracle 12c 以降でIDENTITYを使った識別子の自動生成をサポート

Author: nakamura-to

src/main/java/org/seasar/doma/internal/jdbc/util/JdbcUtil.java

@@ -72,6 +72,17 @@ public static PreparedStatement prepareStatementForAutoGeneratedKeys(
         }
     }
 
+    public static PreparedStatement prepareStatementForAutoGeneratedKeysOfFirstColumn(
+            Connection connection, Sql<?> sql) {
+        try {
+            return connection.prepareStatement(sql.getRawSql(),
+                    new int[] { 1 });
+        } catch (SQLException e) {
+            throw new JdbcException(Message.DOMA2016, e, sql.getSqlFilePath(),
+                    sql.getRawSql(), e);
+        }
+    }
+
     public static CallableStatement prepareCall(Connection connection,
             Sql<?> sql) {
         try {

src/main/java/org/seasar/doma/jdbc/command/BatchModifyCommand.java

@@ -28,6 +28,7 @@
 import org.seasar.doma.jdbc.BatchOptimisticLockException;
 import org.seasar.doma.jdbc.BatchSqlExecutionException;
 import org.seasar.doma.jdbc.BatchUniqueConstraintException;
+import org.seasar.doma.jdbc.Config;
 import org.seasar.doma.jdbc.JdbcLogger;
 import org.seasar.doma.jdbc.PreparedSql;
 import org.seasar.doma.jdbc.dialect.Dialect;
@@ -82,8 +83,17 @@ public int[] execute() {
     protected PreparedStatement prepareStatement(Connection connection,
             PreparedSql sql) {
         if (query.isAutoGeneratedKeysSupported()) {
-            return JdbcUtil.prepareStatementForAutoGeneratedKeys(connection,
-                    sql);
+            Config config = query.getConfig();
+            Dialect dialect = config.getDialect();
+            switch (dialect.getAutoGeneratedKeysType()) {
+            case FIRST_COLUMN:
+                return JdbcUtil
+                        .prepareStatementForAutoGeneratedKeysOfFirstColumn(
+                                connection, sql);
+            case DEFAULT:
+                return JdbcUtil.prepareStatementForAutoGeneratedKeys(connection,
+                        sql);
+            }
         }
         return JdbcUtil.prepareStatement(connection, sql);
     }

src/main/java/org/seasar/doma/jdbc/command/ModifyCommand.java

@@ -23,6 +23,7 @@
 
 import org.seasar.doma.internal.jdbc.command.PreparedSqlParameterBinder;
 import org.seasar.doma.internal.jdbc.util.JdbcUtil;
+import org.seasar.doma.jdbc.Config;
 import org.seasar.doma.jdbc.JdbcLogger;
 import org.seasar.doma.jdbc.OptimisticLockException;
 import org.seasar.doma.jdbc.PreparedSql;
@@ -82,8 +83,16 @@ public Integer execute() {
 
     protected PreparedStatement prepareStatement(Connection connection) {
         if (query.isAutoGeneratedKeysSupported()) {
-            return JdbcUtil.prepareStatementForAutoGeneratedKeys(connection,
-                    sql);
+            Config config = query.getConfig();
+            Dialect dialect = config.getDialect();
+            switch (dialect.getAutoGeneratedKeysType()) {
+            case FIRST_COLUMN:
+                return JdbcUtil.prepareStatementForAutoGeneratedKeysOfFirstColumn(
+                        connection, sql);
+            case DEFAULT:
+                return JdbcUtil.prepareStatementForAutoGeneratedKeys(connection,
+                        sql);
+            }
         }
         return JdbcUtil.prepareStatement(connection, sql);
     }

src/main/java/org/seasar/doma/jdbc/dialect/Dialect.java

@@ -29,6 +29,7 @@
 import org.seasar.doma.jdbc.Sql;
 import org.seasar.doma.jdbc.SqlLogFormattingVisitor;
 import org.seasar.doma.jdbc.SqlNode;
+import org.seasar.doma.jdbc.id.AutoGeneratedKeysType;
 import org.seasar.doma.jdbc.type.JdbcType;
 import org.seasar.doma.wrapper.Wrapper;
 
@@ -290,4 +291,10 @@ Sql<?> getSequenceNextValSql(String qualifiedSequenceName,
      */
     String getScriptBlockDelimiter();
 
+    /**
+     * 自動生成キーのタイプを返します。
+     * 
+     * @return 自動生成キーのタイプ
+     */
+    AutoGeneratedKeysType getAutoGeneratedKeysType();
 }