[HHH-19365]!supportsIdentityColumns

Author: liubao68

hibernate-core/src/main/java/org/hibernate/dialect/GaussDBDialect.java

@@ -17,7 +17,6 @@
 import java.util.Map;
 import java.util.TimeZone;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.Length;
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
@@ -26,13 +25,12 @@
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.boot.model.TypeContributions;
 import org.hibernate.dialect.aggregate.AggregateSupport;
-import org.hibernate.dialect.aggregate.GaussDBAggregateSupport;
 import org.hibernate.dialect.function.CommonFunctionFactory;
 import org.hibernate.dialect.function.GaussDBMinMaxFunction;
 import org.hibernate.dialect.function.GaussDBTruncFunction;
 import org.hibernate.dialect.function.GaussDBTruncRoundFunction;
-import org.hibernate.dialect.identity.IdentityColumnSupport;
 import org.hibernate.dialect.identity.GaussDBIdentityColumnSupport;
+import org.hibernate.dialect.identity.IdentityColumnSupport;
 import org.hibernate.dialect.pagination.LimitHandler;
 import org.hibernate.dialect.pagination.OffsetFetchLimitHandler;
 import org.hibernate.dialect.sequence.GaussDBSequenceSupport;
@@ -58,11 +56,11 @@
 import org.hibernate.procedure.internal.GaussDBCallableStatementSupport;
 import org.hibernate.procedure.spi.CallableStatementSupport;
 import org.hibernate.query.SemanticException;
+import org.hibernate.query.common.FetchClauseType;
+import org.hibernate.query.common.TemporalUnit;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.query.sqm.CastType;
-import org.hibernate.query.common.FetchClauseType;
 import org.hibernate.query.sqm.IntervalType;
-import org.hibernate.query.common.TemporalUnit;
 import org.hibernate.query.sqm.mutation.internal.cte.CteInsertStrategy;
 import org.hibernate.query.sqm.mutation.internal.cte.CteMutationStrategy;
 import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy;
@@ -100,6 +98,7 @@
 
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.TemporalType;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate;
 import static org.hibernate.query.common.TemporalUnit.DAY;

hibernate-core/src/main/java/org/hibernate/dialect/function/json/GaussDBJsonExistsFunction.java

@@ -4,26 +4,27 @@
  */
 package org.hibernate.dialect.function.json;
 
+import java.util.Iterator;
+import java.util.Map;
+
 import org.hibernate.metamodel.model.domain.ReturnableType;
 import org.hibernate.sql.ast.SqlAstTranslator;
 import org.hibernate.sql.ast.spi.SqlAppender;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.JsonPathPassingClause;
 import org.hibernate.type.spi.TypeConfiguration;
 
-import java.util.Iterator;
-import java.util.Map;
-
 
 /**
  * PostgreSQL json_query function.
  */
 public class GaussDBJsonExistsFunction extends JsonExistsFunction {
 
-	public GaussDBJsonExistsFunction(TypeConfiguration typeConfiguration,
-									 boolean supportsJsonPathExpression,
-									 boolean supportsJsonPathPassingClause) {
-		super(typeConfiguration, supportsJsonPathExpression, supportsJsonPathPassingClause);
+	public GaussDBJsonExistsFunction(
+			TypeConfiguration typeConfiguration,
+			boolean supportsJsonPathExpression,
+			boolean supportsJsonPathPassingClause) {
+		super( typeConfiguration, supportsJsonPathExpression, supportsJsonPathPassingClause );
 	}
 
 	@Override
@@ -43,11 +44,17 @@ protected void render(
 			final Map<String, Expression> passingExpressions = passingClause.getPassingExpressions();
 			final Iterator<Map.Entry<String, Expression>> iterator = passingExpressions.entrySet().iterator();
 			Map.Entry<String, Expression> entry = iterator.next();
-			literalValue = literalValue.replace( "$"+entry.getKey(), walker.getLiteralValue( entry.getValue()).toString() );
+			literalValue = literalValue.replace(
+					"$" + entry.getKey(),
+					walker.getLiteralValue( entry.getValue() ).toString()
+			);
 			while ( iterator.hasNext() ) {
 				entry = iterator.next();
 				sqlAppender.appendSql( ',' );
-				literalValue = literalValue.replace( "$"+entry.getKey(), walker.getLiteralValue( entry.getValue()).toString() );
+				literalValue = literalValue.replace(
+						"$" + entry.getKey(),
+						walker.getLiteralValue( entry.getValue() ).toString()
+				);
 			}
 		}
 

hibernate-core/src/test/java/org/hibernate/orm/test/resource/ResultSetReleaseWithStatementDelegationTest.java

@@ -11,11 +11,11 @@
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.resource.jdbc.internal.ResourceRegistryStandardImpl;
-import org.hibernate.testing.DialectChecks;
-import org.hibernate.testing.RequiresDialectFeature;
 import org.hibernate.testing.logger.Triggerable;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -39,7 +39,7 @@
 				provider = ResultSetReleaseWithStatementDelegationTest.ConnectionProviderDelegateProvider.class)
 )
 @SessionFactory
-@RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class)
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsIdentityColumns.class)
 @JiraKey( "HHH-19280" )
 class ResultSetReleaseWithStatementDelegationTest {