HHH-19370 move a large number of internal classes out of org.hibernate.dialect

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java

@@ -36,6 +36,15 @@
 import org.hibernate.dialect.pagination.OffsetFetchLimitHandler;
 import org.hibernate.dialect.sequence.PostgreSQLSequenceSupport;
 import org.hibernate.dialect.sequence.SequenceSupport;
+import org.hibernate.dialect.type.PgJdbcHelper;
+import org.hibernate.dialect.type.PostgreSQLArrayJdbcTypeConstructor;
+import org.hibernate.dialect.type.PostgreSQLCastingInetJdbcType;
+import org.hibernate.dialect.type.PostgreSQLCastingIntervalSecondJdbcType;
+import org.hibernate.dialect.type.PostgreSQLCastingJsonArrayJdbcTypeConstructor;
+import org.hibernate.dialect.type.PostgreSQLCastingJsonJdbcType;
+import org.hibernate.dialect.type.PostgreSQLEnumJdbcType;
+import org.hibernate.dialect.type.PostgreSQLOrdinalEnumJdbcType;
+import org.hibernate.dialect.type.PostgreSQLUUIDJdbcType;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
 import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy;
 import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java

@@ -28,7 +28,7 @@
 import org.hibernate.community.dialect.sequence.LegacyDB2SequenceSupport;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.DB2GetObjectExtractor;
-import org.hibernate.dialect.DB2StructJdbcType;
+import org.hibernate.dialect.type.DB2StructJdbcType;
 import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.DmlTargetColumnQualifierSupport;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java

@@ -34,6 +34,9 @@
 import org.hibernate.dialect.sequence.SequenceSupport;
 import org.hibernate.dialect.temptable.TemporaryTable;
 import org.hibernate.dialect.temptable.TemporaryTableKind;
+import org.hibernate.dialect.type.H2DurationIntervalSecondJdbcType;
+import org.hibernate.dialect.type.H2JsonArrayJdbcTypeConstructor;
+import org.hibernate.dialect.type.H2JsonJdbcType;
 import org.hibernate.dialect.unique.CreateTableUniqueDelegate;
 import org.hibernate.dialect.unique.UniqueDelegate;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyDialect.java

@@ -48,7 +48,7 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
 import org.hibernate.dialect.HANAServerConfiguration;
-import org.hibernate.dialect.HANASqlAstTranslator;
+import org.hibernate.dialect.sql.ast.HANASqlAstTranslator;
 import org.hibernate.dialect.NullOrdering;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.RowLockStrategy;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacySqlAstTranslator.java

@@ -39,7 +39,7 @@
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.sql.model.internal.TableInsertStandard;
 
-import static org.hibernate.dialect.SybaseASESqlAstTranslator.isLob;
+import static org.hibernate.dialect.sql.ast.SybaseASESqlAstTranslator.isLob;
 
 /**
  * An SQL AST translator for the Legacy HANA dialect.

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java

@@ -24,7 +24,7 @@
 import org.hibernate.dialect.NullOrdering;
 import org.hibernate.dialect.Replacer;
 import org.hibernate.dialect.SelectItemReferenceStrategy;
-import org.hibernate.dialect.VarcharUUIDJdbcType;
+import org.hibernate.type.descriptor.jdbc.VarcharUUIDJdbcType;
 import org.hibernate.dialect.function.CaseLeastGreatestEmulation;
 import org.hibernate.dialect.function.CommonFunctionFactory;
 import org.hibernate.dialect.identity.IdentityColumnSupport;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java

@@ -16,6 +16,8 @@
 import org.hibernate.dialect.function.CommonFunctionFactory;
 import org.hibernate.dialect.sequence.MariaDBSequenceSupport;
 import org.hibernate.dialect.sequence.SequenceSupport;
+import org.hibernate.dialect.type.MariaDBCastingJsonArrayJdbcTypeConstructor;
+import org.hibernate.dialect.type.MariaDBCastingJsonJdbcType;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
 import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy;
 import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
@@ -33,6 +35,7 @@
 import org.hibernate.type.SqlTypes;
 import org.hibernate.type.StandardBasicTypes;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.VarcharUUIDJdbcType;
 import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;
 import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacySqlAstTranslator.java

@@ -8,7 +8,7 @@
 import java.util.List;
 
 import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
-import org.hibernate.dialect.MySQLSqlAstTranslator;
+import org.hibernate.dialect.sql.ast.MySQLSqlAstTranslator;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.collections.Stack;
 import org.hibernate.metamodel.mapping.JdbcMappingContainer;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java

@@ -27,6 +27,8 @@
 import org.hibernate.dialect.sequence.SequenceSupport;
 import org.hibernate.dialect.temptable.TemporaryTable;
 import org.hibernate.dialect.temptable.TemporaryTableKind;
+import org.hibernate.dialect.type.MySQLCastingJsonArrayJdbcTypeConstructor;
+import org.hibernate.dialect.type.MySQLCastingJsonJdbcType;
 import org.hibernate.engine.jdbc.Size;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
 import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacySqlAstTranslator.java

@@ -7,9 +7,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.hibernate.dialect.DialectDelegateWrapper;
 import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
-import org.hibernate.dialect.MySQLSqlAstTranslator;
+import org.hibernate.dialect.sql.ast.MySQLSqlAstTranslator;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.collections.Stack;
 import org.hibernate.query.sqm.ComparisonOperator;
@@ -366,7 +365,7 @@ public void visitLikePredicate(LikePredicate likePredicate) {
 
 	@Override
 	public MySQLLegacyDialect getDialect() {
-		return (MySQLLegacyDialect) DialectDelegateWrapper.extractRealDialect( super.getDialect() );
+		return (MySQLLegacyDialect) super.getDialect();
 	}
 
 	@Override

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java

@@ -24,14 +24,14 @@
 import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
-import org.hibernate.dialect.OracleBooleanJdbcType;
-import org.hibernate.dialect.OracleJdbcHelper;
-import org.hibernate.dialect.OracleJsonArrayJdbcTypeConstructor;
-import org.hibernate.dialect.OracleJsonJdbcType;
-import org.hibernate.dialect.OracleReflectionStructJdbcType;
+import org.hibernate.dialect.type.OracleBooleanJdbcType;
+import org.hibernate.dialect.type.OracleJdbcHelper;
+import org.hibernate.dialect.type.OracleJsonArrayJdbcTypeConstructor;
+import org.hibernate.dialect.type.OracleJsonJdbcType;
+import org.hibernate.dialect.type.OracleReflectionStructJdbcType;
 import org.hibernate.dialect.OracleTypes;
-import org.hibernate.dialect.OracleUserDefinedTypeExporter;
-import org.hibernate.dialect.OracleXmlJdbcType;
+import org.hibernate.dialect.type.OracleUserDefinedTypeExporter;
+import org.hibernate.dialect.type.OracleXmlJdbcType;
 import org.hibernate.dialect.Replacer;
 import org.hibernate.dialect.RowLockStrategy;
 import org.hibernate.dialect.TimeZoneSupport;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacySqlAstTranslator.java

@@ -7,7 +7,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.hibernate.dialect.OracleArrayJdbcType;
+import org.hibernate.dialect.type.OracleArrayJdbcType;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.collections.Stack;
 import org.hibernate.metamodel.mapping.CollectionPart;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java

@@ -40,6 +40,16 @@
 import org.hibernate.dialect.pagination.OffsetFetchLimitHandler;
 import org.hibernate.dialect.sequence.PostgreSQLSequenceSupport;
 import org.hibernate.dialect.sequence.SequenceSupport;
+import org.hibernate.dialect.type.PgJdbcHelper;
+import org.hibernate.dialect.type.PostgreSQLArrayJdbcTypeConstructor;
+import org.hibernate.dialect.type.PostgreSQLCastingInetJdbcType;
+import org.hibernate.dialect.type.PostgreSQLCastingIntervalSecondJdbcType;
+import org.hibernate.dialect.type.PostgreSQLCastingJsonArrayJdbcTypeConstructor;
+import org.hibernate.dialect.type.PostgreSQLCastingJsonJdbcType;
+import org.hibernate.dialect.type.PostgreSQLEnumJdbcType;
+import org.hibernate.dialect.type.PostgreSQLOrdinalEnumJdbcType;
+import org.hibernate.dialect.type.PostgreSQLStructCastingJdbcType;
+import org.hibernate.dialect.type.PostgreSQLUUIDJdbcType;
 import org.hibernate.dialect.unique.CreateTableUniqueDelegate;
 import org.hibernate.dialect.unique.UniqueDelegate;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java

@@ -16,8 +16,8 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
 import org.hibernate.dialect.Replacer;
-import org.hibernate.dialect.SQLServerCastingXmlArrayJdbcTypeConstructor;
-import org.hibernate.dialect.SQLServerCastingXmlJdbcType;
+import org.hibernate.dialect.type.SQLServerCastingXmlArrayJdbcTypeConstructor;
+import org.hibernate.dialect.type.SQLServerCastingXmlJdbcType;
 import org.hibernate.dialect.TimeZoneSupport;
 import org.hibernate.dialect.aggregate.AggregateSupport;
 import org.hibernate.dialect.aggregate.SQLServerAggregateSupport;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreSqlAstTranslator.java

@@ -7,9 +7,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.hibernate.dialect.DialectDelegateWrapper;
 import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
-import org.hibernate.dialect.MySQLSqlAstTranslator;
+import org.hibernate.dialect.sql.ast.MySQLSqlAstTranslator;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.collections.Stack;
 import org.hibernate.query.sqm.ComparisonOperator;
@@ -54,7 +53,7 @@ public class SingleStoreSqlAstTranslator<T extends JdbcOperation> extends Abstra
 
 	public SingleStoreSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
 		super( sessionFactory, statement );
-		this.dialect = (SingleStoreDialect) DialectDelegateWrapper.extractRealDialect( super.getDialect() );
+		this.dialect = (SingleStoreDialect) super.getDialect();
 	}
 
 	@Override

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java

@@ -48,7 +48,7 @@
 import org.hibernate.sql.ast.tree.update.UpdateStatement;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 
-import static org.hibernate.dialect.SybaseASESqlAstTranslator.isLob;
+import static org.hibernate.dialect.sql.ast.SybaseASESqlAstTranslator.isLob;
 
 /**
  * A SQL AST translator for Sybase ASE.

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TiDBSqlAstTranslator.java

@@ -9,7 +9,7 @@
 
 import org.hibernate.LockOptions;
 import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
-import org.hibernate.dialect.MySQLSqlAstTranslator;
+import org.hibernate.dialect.sql.ast.MySQLSqlAstTranslator;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.collections.Stack;
 import org.hibernate.query.sqm.ComparisonOperator;

hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java

@@ -261,8 +261,8 @@ public interface MappingSettings {
 	 * @since 6.5
 	 *
 	 * @see org.hibernate.type.SqlTypes#NAMED_ENUM
-	 * @see org.hibernate.dialect.PostgreSQLEnumJdbcType
-	 * @see org.hibernate.dialect.OracleEnumJdbcType
+	 * @see org.hibernate.dialect.type.PostgreSQLEnumJdbcType
+	 * @see org.hibernate.dialect.type.OracleEnumJdbcType
 	 */
 	@Incubating
 	String PREFER_NATIVE_ENUM_TYPES = "hibernate.type.prefer_native_enum_types";

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

@@ -14,93 +14,63 @@
 public final class BooleanDecoder {
 
 	public static String toInteger(CastType from) {
-		switch ( from ) {
-			case BOOLEAN:
-				return "decode(?1,false,0,true,1,null)";
-			case YN_BOOLEAN:
-				return "decode(?1,'Y',1,'N',0,null)";
-			case TF_BOOLEAN:
-				return "decode(?1,'T',1,'F',0,null)";
-		}
-		return null;
+		return switch ( from ) {
+			case BOOLEAN -> "decode(?1,false,0,true,1,null)";
+			case YN_BOOLEAN -> "decode(?1,'Y',1,'N',0,null)";
+			case TF_BOOLEAN -> "decode(?1,'T',1,'F',0,null)";
+			default -> null;
+		};
 	}
 
 	public static String toBoolean(CastType from) {
-		switch ( from ) {
-			case STRING:
-				return "decode(?1,'T',true,'F',false,'Y',true,'N',false,null)";
-			case YN_BOOLEAN:
-				return "decode(?1,'Y',true,'N',false,null)";
-			case TF_BOOLEAN:
-				return "decode(?1,'T',true,'F',false,null)";
-			case INTEGER:
-			case LONG:
-			case INTEGER_BOOLEAN:
-				return "decode(abs(sign(?1)),1,true,0,false,null)";
-		}
-		return null;
+		return switch ( from ) {
+			case STRING -> "decode(?1,'T',true,'F',false,'Y',true,'N',false,null)";
+			case YN_BOOLEAN -> "decode(?1,'Y',true,'N',false,null)";
+			case TF_BOOLEAN -> "decode(?1,'T',true,'F',false,null)";
+			case INTEGER, LONG, INTEGER_BOOLEAN -> "decode(abs(sign(?1)),1,true,0,false,null)";
+			default -> null;
+		};
 	}
 
 	public static String toIntegerBoolean(CastType from) {
-		switch ( from ) {
-			case STRING:
-				return "decode(?1,'T',1,'F',0,'Y',1,'N',0,null)";
-			case YN_BOOLEAN:
-				return "decode(?1,'Y',1,'N',0,null)";
-			case TF_BOOLEAN:
-				return "decode(?1,'T',1,'F',0,null)";
-			case INTEGER:
-			case LONG:
-				return "abs(sign(?1))";
-		}
-		return null;
+		return switch ( from ) {
+			case STRING -> "decode(?1,'T',1,'F',0,'Y',1,'N',0,null)";
+			case YN_BOOLEAN -> "decode(?1,'Y',1,'N',0,null)";
+			case TF_BOOLEAN -> "decode(?1,'T',1,'F',0,null)";
+			case INTEGER, LONG -> "abs(sign(?1))";
+			default -> null;
+		};
 	}
 
 	public static String toYesNoBoolean(CastType from) {
-		switch ( from ) {
-			case STRING:
-				return "decode(?1,'T','Y','F','N','Y','Y','N','N',null)";
-			case INTEGER_BOOLEAN:
-				return "decode(?1,1,'Y',0,'N',null)";
-			case TF_BOOLEAN:
-				return "decode(?1,'T','Y','F','N',null)";
-			case BOOLEAN:
-				return "decode(?1,true,'Y',false,'N',null)";
-			case INTEGER:
-			case LONG:
-				return "decode(abs(sign(?1)),1,'Y',0,'N',null)";
-		}
-		return null;
+		return switch ( from ) {
+			case STRING -> "decode(?1,'T','Y','F','N','Y','Y','N','N',null)";
+			case INTEGER_BOOLEAN -> "decode(?1,1,'Y',0,'N',null)";
+			case TF_BOOLEAN -> "decode(?1,'T','Y','F','N',null)";
+			case BOOLEAN -> "decode(?1,true,'Y',false,'N',null)";
+			case INTEGER, LONG -> "decode(abs(sign(?1)),1,'Y',0,'N',null)";
+			default -> null;
+		};
 	}
 
 	public static String toTrueFalseBoolean(CastType from) {
-		switch ( from ) {
-			case STRING:
-				return "decode(?1,'T','T','F','F','Y','T','N','F',null)";
-			case INTEGER_BOOLEAN:
-				return "decode(?1,1,'T',0,'F',null)";
-			case YN_BOOLEAN:
-				return "decode(?1,'Y','T','N','F',null)";
-			case BOOLEAN:
-				return "decode(?1,true,'T',false,'F',null)";
-			case INTEGER:
-			case LONG:
-				return "decode(abs(sign(?1)),1,'T',0,'F',null)";
-		}
-		return null;
+		return switch ( from ) {
+			case STRING -> "decode(?1,'T','T','F','F','Y','T','N','F',null)";
+			case INTEGER_BOOLEAN -> "decode(?1,1,'T',0,'F',null)";
+			case YN_BOOLEAN -> "decode(?1,'Y','T','N','F',null)";
+			case BOOLEAN -> "decode(?1,true,'T',false,'F',null)";
+			case INTEGER, LONG -> "decode(abs(sign(?1)),1,'T',0,'F',null)";
+			default -> null;
+		};
 	}
 
 	public static String toString(CastType from) {
-		switch ( from ) {
-			case INTEGER_BOOLEAN:
-				return "decode(?1,0,'false',1,'true',null)";
-			case TF_BOOLEAN:
-				return "decode(?1,'T','true','F','false',null)";
-			case YN_BOOLEAN:
-				return "decode(?1,'Y','true','N','false',null)";
-			case BOOLEAN:
-				return "decode(?1,true,'true',false,'false',null)";
-		}
-		return null;
+		return switch ( from ) {
+			case INTEGER_BOOLEAN -> "decode(?1,0,'false',1,'true',null)";
+			case TF_BOOLEAN -> "decode(?1,'T','true','F','false',null)";
+			case YN_BOOLEAN -> "decode(?1,'Y','true','N','false',null)";
+			case BOOLEAN -> "decode(?1,true,'true',false,'false',null)";
+			default -> null;
+		};
 	}
 }

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

@@ -35,6 +35,16 @@
 import org.hibernate.dialect.pagination.OffsetFetchLimitHandler;
 import org.hibernate.dialect.sequence.PostgreSQLSequenceSupport;
 import org.hibernate.dialect.sequence.SequenceSupport;
+import org.hibernate.dialect.sql.ast.CockroachSqlAstTranslator;
+import org.hibernate.dialect.type.PgJdbcHelper;
+import org.hibernate.dialect.type.PostgreSQLArrayJdbcTypeConstructor;
+import org.hibernate.dialect.type.PostgreSQLCastingInetJdbcType;
+import org.hibernate.dialect.type.PostgreSQLCastingIntervalSecondJdbcType;
+import org.hibernate.dialect.type.PostgreSQLCastingJsonArrayJdbcTypeConstructor;
+import org.hibernate.dialect.type.PostgreSQLCastingJsonJdbcType;
+import org.hibernate.dialect.type.PostgreSQLEnumJdbcType;
+import org.hibernate.dialect.type.PostgreSQLOrdinalEnumJdbcType;
+import org.hibernate.dialect.type.PostgreSQLUUIDJdbcType;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
 import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy;
 import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;

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

@@ -41,6 +41,8 @@
 import org.hibernate.dialect.pagination.LimitHandler;
 import org.hibernate.dialect.sequence.DB2SequenceSupport;
 import org.hibernate.dialect.sequence.SequenceSupport;
+import org.hibernate.dialect.sql.ast.DB2SqlAstTranslator;
+import org.hibernate.dialect.type.DB2StructJdbcType;
 import org.hibernate.dialect.unique.AlterTableUniqueIndexDelegate;
 import org.hibernate.dialect.unique.UniqueDelegate;
 import org.hibernate.engine.jdbc.Size;