HHH-16271 Fix generated keys issues with Sybase JConn and insert-sele…

…ct statements
hibernate · Apr 26, 2023 · 279b6ad · 279b6ad
1 parent 0170db7
commit 279b6ad
Show file tree

Hide file tree

Showing 58 changed files with 213 additions and 46 deletions.
diff --git a/...rnate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java b/...rnate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java
@@ -371,7 +371,7 @@ public LimitHandler getLimitHandler() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return new CUBRIDIdentityColumnSupport();
+		return CUBRIDIdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheDialect.java
@@ -295,7 +295,7 @@ public String getNativeIdentifierGeneratorStrategy() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return new CacheIdentityColumnSupport();
+		return CacheIdentityColumnSupport.INSTANCE;
 	}
 
 	// SEQUENCE support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/...munity-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java b/...munity-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java
@@ -103,7 +103,6 @@
 public class CockroachLegacyDialect extends Dialect {
 
 	private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, CockroachLegacyDialect.class.getName() );
-	private static final CockroachDBIdentityColumnSupport IDENTITY_COLUMN_SUPPORT = new CockroachDBIdentityColumnSupport();
 	// KNOWN LIMITATIONS:
 	// * no support for java.sql.Clob
 
@@ -513,7 +512,7 @@ public boolean qualifyIndexName() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return IDENTITY_COLUMN_SUPPORT;
+		return CockroachDBIdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/...rnate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2390Dialect.java b/...rnate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2390Dialect.java
@@ -65,6 +65,6 @@ public LimitHandler getLimitHandler() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return new DB2zIdentityColumnSupport();
+		return DB2zIdentityColumnSupport.INSTANCE;
 	}
 }
diff --git a/...te-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java b/...te-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java
@@ -934,7 +934,7 @@ protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return new DB2IdentityColumnSupport();
+		return DB2IdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/...e-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java b/...e-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java
@@ -128,8 +128,8 @@ public LimitHandler getLimitHandler() {
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
 		return getVersion().isSameOrAfter(7, 3)
-				? new DB2IdentityColumnSupport()
-				: new DB2390IdentityColumnSupport();
+				? DB2IdentityColumnSupport.INSTANCE
+				: DB2390IdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/...e-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java b/...e-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java
@@ -146,7 +146,7 @@ public LimitHandler getLimitHandler() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return new DB2390IdentityColumnSupport();
+		return DB2390IdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/...-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java b/...-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java
@@ -589,7 +589,7 @@ public LimitHandler getLimitHandler() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return new DB2IdentityColumnSupport();
+		return DB2IdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/...ate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java b/...ate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java
@@ -625,7 +625,7 @@ public void appendBooleanValueString(SqlAppender appender, boolean bool) {
 	public IdentityColumnSupport getIdentityColumnSupport() {
 		return getVersion().isBefore( 3, 0 )
 				? super.getIdentityColumnSupport()
-				: new FirebirdIdentityColumnSupport();
+				: FirebirdIdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/...e-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java b/...e-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java
@@ -100,9 +100,11 @@ public class HSQLLegacyDialect extends Dialect {
 			org.hibernate.community.dialect.HSQLLegacyDialect.class.getName()
 	);
 	private final UniqueDelegate uniqueDelegate = new CreateTableUniqueDelegate( this );
+	private final HSQLIdentityColumnSupport identityColumnSupport;
 
 	public HSQLLegacyDialect(DialectResolutionInfo info) {
 		super( info );
+		this.identityColumnSupport = new HSQLIdentityColumnSupport( getVersion() );
 	}
 
 	public HSQLLegacyDialect() {
@@ -111,6 +113,7 @@ public HSQLLegacyDialect() {
 
 	public HSQLLegacyDialect(DatabaseVersion version) {
 		super( version.isSame( 1, 8 ) ? reflectedVersion( version ) : version );
+		this.identityColumnSupport = new HSQLIdentityColumnSupport( getVersion() );
 	}
 
 	@Override
@@ -770,7 +773,7 @@ public boolean requiresFloatCastingOfIntegerDivision() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return new HSQLIdentityColumnSupport( this.getVersion() );
+		return identityColumnSupport;
 	}
 
 	@Override

diff --git a/...ate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java b/...ate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java
@@ -518,7 +518,7 @@ public UniqueDelegate getUniqueDelegate() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return new InformixIdentityColumnSupport();
+		return InformixIdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/...rnate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java b/...rnate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java
@@ -399,10 +399,10 @@ public LimitHandler getLimitHandler() {
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
 		if ( getVersion().isSameOrAfter( 10 ) ) {
-			return new Ingres10IdentityColumnSupport();
+			return Ingres10IdentityColumnSupport.INSTANCE;
 		}
 		else if ( getVersion().isSameOrAfter( 9, 3 ) ) {
-			return new Ingres9IdentityColumnSupport();
+			return Ingres9IdentityColumnSupport.INSTANCE;
 		}
 		else {
 			return super.getIdentityColumnSupport();

diff --git a/...ate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java b/...ate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java
@@ -328,6 +328,6 @@ public boolean useInputStreamToInsertBlob() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return new MimerSQLIdentityColumnSupport();
+		return MimerSQLIdentityColumnSupport.INSTANCE;
 	}
 }
diff --git a/...-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java b/...-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java
@@ -1117,7 +1117,7 @@ public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, D
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return new MySQLIdentityColumnSupport();
+		return MySQLIdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/...community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java b/...community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java
@@ -840,7 +840,7 @@ public String getNativeIdentifierGeneratorStrategy() {
 	public IdentityColumnSupport getIdentityColumnSupport() {
 		return getVersion().isBefore( 12 )
 				? super.getIdentityColumnSupport()
-				: new Oracle12cIdentityColumnSupport();
+				: Oracle12cIdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/...unity-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java b/...unity-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java
@@ -148,8 +148,6 @@
  */
 public class PostgreSQLLegacyDialect extends Dialect {
 
-	private static final PostgreSQLIdentityColumnSupport IDENTITY_COLUMN_SUPPORT = new PostgreSQLIdentityColumnSupport();
-
 	protected final PostgreSQLDriverKind driverKind;
 	private final UniqueDelegate uniqueDelegate = new CreateTableUniqueDelegate(this);
 
@@ -1007,7 +1005,7 @@ public boolean qualifyIndexName() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return IDENTITY_COLUMN_SUPPORT;
+		return PostgreSQLIdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/...munity-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java b/...munity-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java
@@ -623,7 +623,7 @@ public int getInExpressionCountLimit() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return new SQLServerIdentityColumnSupport();
+		return SQLServerIdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/...rnate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java b/...rnate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java
@@ -94,8 +94,6 @@
  */
 public class SQLiteDialect extends Dialect {
 
-	private static final SQLiteIdentityColumnSupport IDENTITY_COLUMN_SUPPORT = new SQLiteIdentityColumnSupport();
-
 	private final UniqueDelegate uniqueDelegate;
 
 	public SQLiteDialect(DialectResolutionInfo info) {
@@ -545,7 +543,7 @@ public boolean supportsWindowFunctions() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return IDENTITY_COLUMN_SUPPORT;
+		return SQLiteIdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/...mmunity-dialects/src/main/java/org/hibernate/community/dialect/SybaseAnywhereDialect.java b/...mmunity-dialects/src/main/java/org/hibernate/community/dialect/SybaseAnywhereDialect.java
@@ -173,7 +173,7 @@ public boolean supportsLateral() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return new SybaseAnywhereIdentityColumnSupport();
+		return SybaseAnywhereIdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/...ate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java b/...ate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java
@@ -618,7 +618,7 @@ public String[] getSqlCreateStrings(Index index, Metadata metadata, SqlStringGen
 	public IdentityColumnSupport getIdentityColumnSupport() {
 		return getVersion().isBefore( 14 )
 				? super.getIdentityColumnSupport()
-				: new Teradata14IdentityColumnSupport();
+				: Teradata14IdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/...s/src/main/java/org/hibernate/community/dialect/identity/CUBRIDIdentityColumnSupport.java b/...s/src/main/java/org/hibernate/community/dialect/identity/CUBRIDIdentityColumnSupport.java
@@ -12,6 +12,9 @@
  * @author Andrea Boriero
  */
 public class CUBRIDIdentityColumnSupport extends IdentityColumnSupportImpl {
+
+	public static final CUBRIDIdentityColumnSupport INSTANCE = new CUBRIDIdentityColumnSupport();
+
 	@Override
 	public boolean supportsIdentityColumns() {
 		return true;

diff --git a/...ts/src/main/java/org/hibernate/community/dialect/identity/CacheIdentityColumnSupport.java b/...ts/src/main/java/org/hibernate/community/dialect/identity/CacheIdentityColumnSupport.java
@@ -13,6 +13,9 @@
  * @author Andrea Boriero
  */
 public class CacheIdentityColumnSupport extends IdentityColumnSupportImpl {
+
+	public static final CacheIdentityColumnSupport INSTANCE = new CacheIdentityColumnSupport();
+
 	@Override
 	public boolean supportsIdentityColumns() {
 		return true;

diff --git a/...src/main/java/org/hibernate/community/dialect/identity/FirebirdIdentityColumnSupport.java b/...src/main/java/org/hibernate/community/dialect/identity/FirebirdIdentityColumnSupport.java
@@ -13,6 +13,8 @@
  */
 public class FirebirdIdentityColumnSupport extends IdentityColumnSupportImpl {
 
+	public static final FirebirdIdentityColumnSupport INSTANCE = new FirebirdIdentityColumnSupport();
+
 	@Override
 	public boolean supportsIdentityColumns() {
 		return true;

diff --git a/...src/main/java/org/hibernate/community/dialect/identity/InformixIdentityColumnSupport.java b/...src/main/java/org/hibernate/community/dialect/identity/InformixIdentityColumnSupport.java
@@ -15,6 +15,9 @@
  * @author Andrea Boriero
  */
 public class InformixIdentityColumnSupport extends IdentityColumnSupportImpl {
+
+	public static final InformixIdentityColumnSupport INSTANCE = new InformixIdentityColumnSupport();
+
 	@Override
 	public boolean supportsIdentityColumns() {
 		return true;

diff --git a/...src/main/java/org/hibernate/community/dialect/identity/Ingres10IdentityColumnSupport.java b/...src/main/java/org/hibernate/community/dialect/identity/Ingres10IdentityColumnSupport.java
@@ -10,6 +10,9 @@
  * @author Andrea Boriero
  */
 public class Ingres10IdentityColumnSupport extends Ingres9IdentityColumnSupport {
+
+	public static final Ingres10IdentityColumnSupport INSTANCE = new Ingres10IdentityColumnSupport();
+
 	@Override
 	public boolean supportsIdentityColumns() {
 		return true;

diff --git a/.../src/main/java/org/hibernate/community/dialect/identity/Ingres9IdentityColumnSupport.java b/.../src/main/java/org/hibernate/community/dialect/identity/Ingres9IdentityColumnSupport.java
@@ -12,6 +12,9 @@
  * @author Andrea Boriero
  */
 public class Ingres9IdentityColumnSupport extends IdentityColumnSupportImpl {
+
+	public static final Ingres9IdentityColumnSupport INSTANCE = new Ingres9IdentityColumnSupport();
+
 	@Override
 	public String getIdentitySelectString(String table, String column, int type) {
 		return "select last_identity()";

diff --git a/...src/main/java/org/hibernate/community/dialect/identity/MimerSQLIdentityColumnSupport.java b/...src/main/java/org/hibernate/community/dialect/identity/MimerSQLIdentityColumnSupport.java
@@ -12,6 +12,9 @@
  * @author Andrea Boriero
  */
 public class MimerSQLIdentityColumnSupport extends IdentityColumnSupportImpl {
+
+	public static final MimerSQLIdentityColumnSupport INSTANCE = new MimerSQLIdentityColumnSupport();
+
 	@Override
 	public boolean supportsIdentityColumns() {
 		return false;

diff --git a/...s/src/main/java/org/hibernate/community/dialect/identity/SQLiteIdentityColumnSupport.java b/...s/src/main/java/org/hibernate/community/dialect/identity/SQLiteIdentityColumnSupport.java
@@ -16,6 +16,8 @@
  */
 public class SQLiteIdentityColumnSupport extends IdentityColumnSupportImpl {
 
+	public static final SQLiteIdentityColumnSupport INSTANCE = new SQLiteIdentityColumnSupport();
+
 	@Override
 	public boolean supportsIdentityColumns() {
 		return true;

diff --git a/...in/java/org/hibernate/community/dialect/identity/SybaseAnywhereIdentityColumnSupport.java b/...in/java/org/hibernate/community/dialect/identity/SybaseAnywhereIdentityColumnSupport.java
@@ -12,6 +12,9 @@
  * @author Andrea Boriero
  */
 public class SybaseAnywhereIdentityColumnSupport extends AbstractTransactSQLIdentityColumnSupport {
+
+	public static final SybaseAnywhereIdentityColumnSupport INSTANCE = new SybaseAnywhereIdentityColumnSupport();
+
 	@Override
 	public boolean supportsInsertSelectIdentity() {
 		return false;

diff --git a/...c/main/java/org/hibernate/community/dialect/identity/Teradata14IdentityColumnSupport.java b/...c/main/java/org/hibernate/community/dialect/identity/Teradata14IdentityColumnSupport.java
@@ -12,6 +12,9 @@
  * @author Andrea Boriero
  */
 public class Teradata14IdentityColumnSupport extends IdentityColumnSupportImpl {
+
+	public static Teradata14IdentityColumnSupport INSTANCE = new Teradata14IdentityColumnSupport();
+
 	@Override
 	public boolean supportsIdentityColumns() {
 		return true;

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java
@@ -1075,7 +1075,7 @@ public void appendBooleanValueString(SqlAppender appender, boolean bool) {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return new HANAIdentityColumnSupport();
+		return HANAIdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java
@@ -375,7 +375,7 @@ public boolean supportsTupleDistinctCounts() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return new AbstractTransactSQLIdentityColumnSupport();
+		return AbstractTransactSQLIdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java
@@ -118,7 +118,6 @@
 public class CockroachDialect extends Dialect {
 
 	private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, CockroachDialect.class.getName() );
-	private static final CockroachDBIdentityColumnSupport IDENTITY_COLUMN_SUPPORT = new CockroachDBIdentityColumnSupport();
 	// KNOWN LIMITATIONS:
 	// * no support for java.sql.Clob
 
@@ -516,7 +515,7 @@ public boolean qualifyIndexName() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return IDENTITY_COLUMN_SUPPORT;
+		return CockroachDBIdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2400Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2400Dialect.java
@@ -48,6 +48,6 @@ public LimitHandler getLimitHandler() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return new DB2zIdentityColumnSupport();
+		return DB2zIdentityColumnSupport.INSTANCE;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2400V7R3Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2400V7R3Dialect.java
@@ -50,6 +50,6 @@ public String getQuerySequencesString() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return new DB2IdentityColumnSupport();
+		return DB2IdentityColumnSupport.INSTANCE;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
@@ -1010,7 +1010,7 @@ protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return new DB2IdentityColumnSupport();
+		return DB2IdentityColumnSupport.INSTANCE;
 	}
 
 	/**

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java
@@ -122,8 +122,8 @@ public LimitHandler getLimitHandler() {
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
 		return getVersion().isSameOrAfter(7, 3)
-				? new DB2IdentityColumnSupport()
-				: new DB2zIdentityColumnSupport();
+				? DB2IdentityColumnSupport.INSTANCE
+				: DB2zIdentityColumnSupport.INSTANCE;
 	}
 
 	@Override