serialによるシーケンス名が一定長を超えると、エラーとなるので組み込み関数経由でシーケンス名を取得する

Author: pinzolo

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

@@ -171,12 +171,12 @@ public PreparedSql getIdentitySelectSql(String catalogName,
         if (columnName == null) {
             throw new DomaNullPointerException("columnName");
         }
-        String identityTableName = createIdentityTableName(catalogName,
-                schemaName, tableName, columnName, isQuoteRequired);
+        String identitySeqFuncExpr = createIdentitySequenceFunctionExpression(
+        		catalogName, schemaName, tableName, columnName, isQuoteRequired);
         StringBuilder buf = new StringBuilder(64);
-        buf.append("select currval('");
-        buf.append(identityTableName);
-        buf.append("')");
+        buf.append("select currval(");
+        buf.append(identitySeqFuncExpr);
+        buf.append(")");
         String rawSql = buf.toString();
         return new PreparedSql(SqlKind.SELECT, rawSql, rawSql, null,
                 Collections.<InParameter<?>> emptyList(), SqlLogType.FORMATTED);
@@ -192,26 +192,27 @@ public Sql<?> getIdentityReservationSql(String catalogName,
         if (columnName == null) {
             throw new DomaNullPointerException("columnName");
         }
-        String identityTableName = createIdentityTableName(catalogName,
-                schemaName, tableName, columnName, isQuoteRequired);
+        String identitySeqFuncExpr = createIdentitySequenceFunctionExpression(
+        		catalogName, schemaName, tableName, columnName, isQuoteRequired);
         StringBuilder buf = new StringBuilder(64);
-        buf.append("select nextval('");
-        buf.append(identityTableName);
-        buf.append("') from generate_series(1, ");
+        buf.append("select nextval(");
+        buf.append(identitySeqFuncExpr);
+        buf.append(") from generate_series(1, ");
         buf.append(reservationSize);
         buf.append(")");
         String rawSql = buf.toString();
         return new PreparedSql(SqlKind.SELECT, rawSql, rawSql, null,
                 Collections.<InParameter<?>> emptyList(), SqlLogType.FORMATTED);
     }
 
-    protected String createIdentityTableName(String catalogName,
+    protected String createIdentitySequenceFunctionExpression(String catalogName,
             String schemaName, String tableName, String columnName,
             boolean isQuoteRequired) {
         String qualifiedTableName = DatabaseObjectUtil.getQualifiedName(
                 isQuoteRequired ? this::applyQuote : Function.identity(),
-                catalogName, schemaName, tableName + "_" + columnName + "_seq");
-        return qualifiedTableName;
+                catalogName, schemaName, tableName);
+        String colName = isQuoteRequired ? columnName : columnName.toLowerCase();
+        return "pg_catalog.pg_get_serial_sequence('" + qualifiedTableName + "', '" + colName + "')";
     }
 
     @Override

src/test/java/org/seasar/doma/jdbc/dialect/PostgresDialectTest.java

@@ -30,14 +30,15 @@ public void testGetIdentitySelectSql_quoteNotRequired() throws Exception {
         PostgresDialect dialect = new PostgresDialect();
         PreparedSql sql = dialect.getIdentitySelectSql("aaa", "bbb", "ccc",
                 "ddd", false);
-        assertEquals("select currval('aaa.bbb.ccc_ddd_seq')", sql.getRawSql());
+        assertEquals("select currval(pg_catalog.pg_get_serial_sequence('aaa.bbb.ccc', 'ddd'))",
+        		sql.getRawSql());
     }
 
     public void testGetIdentitySelectSql_quoteRequired() throws Exception {
         PostgresDialect dialect = new PostgresDialect();
         PreparedSql sql = dialect.getIdentitySelectSql("aaa", "bbb", "ccc",
                 "ddd", true);
-        assertEquals("select currval('\"aaa\".\"bbb\".\"ccc_ddd_seq\"')",
+        assertEquals("select currval(pg_catalog.pg_get_serial_sequence('\"aaa\".\"bbb\".\"ccc\"', 'ddd'))",
                 sql.getRawSql());
     }
 

src/test/java/org/seasar/doma/jdbc/id/BuiltinIdentityIdGeneratorTest.java

@@ -44,7 +44,7 @@ public void test_identitySelectSql() throws Exception {
         Long value = identityIdGenerator.generatePostInsert(idGenerationConfig,
                 config.dataSource.connection.preparedStatement);
         assertEquals(new Long(11), value);
-        assertEquals("select currval('\"CATA\".\"EMP_ID_seq\"')",
+        assertEquals("select currval(pg_catalog.pg_get_serial_sequence('\"CATA\".\"EMP\"', 'ID'))",
                 config.dataSource.connection.preparedStatement.sql);
     }
 
@@ -64,7 +64,7 @@ public void test_identityReservationSql() throws Exception {
         Long value = identityIdGenerator.generatePreInsert(idGenerationConfig);
         assertEquals(new Long(11), value);
         assertEquals(
-                "select nextval('\"CATA\".\"EMP_ID_seq\"') from generate_series(1, 3)",
+                "select nextval(pg_catalog.pg_get_serial_sequence('\"CATA\".\"EMP\"', 'ID')) from generate_series(1, 3)",
                 config.dataSource.connection.preparedStatement.sql);
         value = identityIdGenerator.generatePreInsert(idGenerationConfig);
         assertEquals(new Long(12), value);