diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseDialect.java index 94ae2b48aa..a609ae0e8d 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseDialect.java @@ -38,7 +38,7 @@ import org.hibernate.exception.spi.SQLExceptionConversionDelegate; import org.hibernate.internal.util.JdbcExceptionHelper; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.TrimSpec; import org.hibernate.query.sqm.produce.function.FunctionParameterType; import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseSqlAstTranslator.java index 731bf873f3..616ea6f5bc 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseSqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseSqlAstTranslator.java @@ -9,8 +9,8 @@ import java.util.List; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.collections.Stack; import org.hibernate.query.sqm.ComparisonOperator; -import org.hibernate.query.sqm.FrameExclusion; -import org.hibernate.query.sqm.FrameKind; +import org.hibernate.query.common.FrameExclusion; +import org.hibernate.query.common.FrameKind; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java index 4f818ac8b8..bf425eefe2 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java @@ -24,7 +24,7 @@ import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.query.SemanticException; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.service.ServiceRegistry; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.SqlAstTranslatorFactory; @@ -42,11 +42,11 @@ import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry; import jakarta.persistence.TemporalType; -import static org.hibernate.query.sqm.TemporalUnit.HOUR; -import static org.hibernate.query.sqm.TemporalUnit.MINUTE; -import static org.hibernate.query.sqm.TemporalUnit.NANOSECOND; -import static org.hibernate.query.sqm.TemporalUnit.NATIVE; -import static org.hibernate.query.sqm.TemporalUnit.SECOND; +import static org.hibernate.query.common.TemporalUnit.HOUR; +import static org.hibernate.query.common.TemporalUnit.MINUTE; +import static org.hibernate.query.common.TemporalUnit.NANOSECOND; +import static org.hibernate.query.common.TemporalUnit.NATIVE; +import static org.hibernate.query.common.TemporalUnit.SECOND; import static org.hibernate.type.SqlTypes.BINARY; import static org.hibernate.type.SqlTypes.BLOB; import static org.hibernate.type.SqlTypes.BOOLEAN; 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 index 0419ab1b13..02e45053c9 100644 --- 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 @@ -40,7 +40,7 @@ import org.hibernate.exception.spi.ViolatedConstraintNameExtractor; import org.hibernate.internal.util.JdbcExceptionHelper; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java index 7f1b206645..c7b7b74464 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java @@ -51,7 +51,7 @@ import org.hibernate.internal.util.StringHelper; import org.hibernate.query.SemanticException; import org.hibernate.query.sqm.IntervalType; import org.hibernate.dialect.NullOrdering; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers; import org.hibernate.service.ServiceRegistry; import org.hibernate.sql.ast.SqlAstTranslator; @@ -80,9 +80,9 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.TemporalType; import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate; -import static org.hibernate.query.sqm.TemporalUnit.DAY; -import static org.hibernate.query.sqm.TemporalUnit.EPOCH; -import static org.hibernate.query.sqm.TemporalUnit.NATIVE; +import static org.hibernate.query.common.TemporalUnit.DAY; +import static org.hibernate.query.common.TemporalUnit.EPOCH; +import static org.hibernate.query.common.TemporalUnit.NATIVE; import static org.hibernate.type.SqlTypes.ARRAY; import static org.hibernate.type.SqlTypes.BINARY; import static org.hibernate.type.SqlTypes.BLOB; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java index e9787cf033..963e15a5ea 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java @@ -70,7 +70,7 @@ import org.hibernate.procedure.internal.DB2CallableStatementSupport; import org.hibernate.procedure.spi.CallableStatementSupport; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +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; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacySqlAstTranslator.java index 4e68ab5bfd..f06c36371c 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacySqlAstTranslator.java @@ -16,7 +16,7 @@ import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java index 4f8ad5476d..b074d94899 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java @@ -24,7 +24,7 @@ import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.mapping.Column; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.spi.StandardSqlAstTranslatorFactory; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyDialect.java index b64369d16b..f336f52ffb 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyDialect.java @@ -50,7 +50,7 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.mutation.spi.BeforeUseAction; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableMutationStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableInsertStrategy; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java index 1cb9db7f5e..6b660f8bce 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java @@ -48,7 +48,7 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.mutation.spi.BeforeUseAction; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableMutationStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableInsertStrategy; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java index 5a526a1fda..5a2b7a89c0 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java @@ -57,10 +57,10 @@ import org.hibernate.mapping.Index; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.query.sqm.CastType; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.sqm.IntervalType; import org.hibernate.dialect.NullOrdering; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.function.SqmFunctionRegistry; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableInsertStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableMutationStrategy; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java index 4303434877..56384a4bec 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java @@ -48,10 +48,10 @@ import org.hibernate.internal.util.StringHelper; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.query.sqm.CastType; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.sqm.IntervalType; import org.hibernate.dialect.NullOrdering; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.mutation.spi.BeforeUseAction; import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableInsertStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableMutationStrategy; @@ -86,7 +86,7 @@ import org.hibernate.type.spi.TypeConfiguration; import jakarta.persistence.TemporalType; -import static org.hibernate.query.sqm.TemporalUnit.SECOND; +import static org.hibernate.query.common.TemporalUnit.SECOND; import static org.hibernate.type.SqlTypes.ARRAY; import static org.hibernate.type.SqlTypes.BIGINT; import static org.hibernate.type.SqlTypes.BINARY; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyDialect.java index 3dba675015..28ab4729cb 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyDialect.java @@ -86,9 +86,9 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.procedure.internal.StandardCallableStatementSupport; import org.hibernate.procedure.spi.CallableStatementSupport; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableInsertStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableMutationStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java index de94048264..1456bb9738 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java @@ -55,7 +55,7 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; import org.hibernate.dialect.NullOrdering; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.mutation.spi.AfterUseAction; import org.hibernate.query.sqm.mutation.spi.BeforeUseAction; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableInsertStrategy; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java index 75716029cb..0cea4cac6d 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java @@ -49,7 +49,7 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.spi.QueryParameterBindings; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.internal.DomainParameterXref; import org.hibernate.query.sqm.mutation.spi.AfterUseAction; import org.hibernate.query.sqm.mutation.spi.BeforeUseAction; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java index d010ccd973..29480c21fd 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java @@ -30,9 +30,9 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.spi.QueryParameterBindings; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.internal.DomainParameterXref; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableInsertStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableMutationStrategy; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java index a154734e54..597ad5775d 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java @@ -20,7 +20,7 @@ import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.query.SemanticException; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.service.ServiceRegistry; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.SqlAstTranslatorFactory; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java index 2221704f28..cc8d6513bd 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java @@ -45,7 +45,7 @@ import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; import org.hibernate.dialect.NullOrdering; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.function.SqmFunctionRegistry; import org.hibernate.query.sqm.mutation.spi.AfterUseAction; import org.hibernate.query.sqm.mutation.spi.BeforeUseAction; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java index b8b9772f96..056f6613e8 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java @@ -62,9 +62,9 @@ import org.hibernate.procedure.spi.CallableStatementSupport; import org.hibernate.query.SemanticException; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.sqm.CastType; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableInsertStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableMutationStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; @@ -104,12 +104,12 @@ import jakarta.persistence.TemporalType; import static java.util.regex.Pattern.CASE_INSENSITIVE; import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate; -import static org.hibernate.query.sqm.TemporalUnit.DAY; -import static org.hibernate.query.sqm.TemporalUnit.HOUR; -import static org.hibernate.query.sqm.TemporalUnit.MINUTE; -import static org.hibernate.query.sqm.TemporalUnit.MONTH; -import static org.hibernate.query.sqm.TemporalUnit.SECOND; -import static org.hibernate.query.sqm.TemporalUnit.YEAR; +import static org.hibernate.query.common.TemporalUnit.DAY; +import static org.hibernate.query.common.TemporalUnit.HOUR; +import static org.hibernate.query.common.TemporalUnit.MINUTE; +import static org.hibernate.query.common.TemporalUnit.MONTH; +import static org.hibernate.query.common.TemporalUnit.SECOND; +import static org.hibernate.query.common.TemporalUnit.YEAR; import static org.hibernate.type.SqlTypes.ARRAY; import static org.hibernate.type.SqlTypes.BIGINT; import static org.hibernate.type.SqlTypes.BINARY; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacySqlAstTranslator.java index 5af48c85d5..76c2797432 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacySqlAstTranslator.java @@ -19,9 +19,9 @@ import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; -import org.hibernate.query.sqm.FetchClauseType; -import org.hibernate.query.sqm.FrameExclusion; -import org.hibernate.query.sqm.FrameKind; +import org.hibernate.query.common.FetchClauseType; +import org.hibernate.query.common.FrameExclusion; +import org.hibernate.query.common.FrameKind; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java index 655bd51af6..6c694dd4f0 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java @@ -60,9 +60,9 @@ import org.hibernate.procedure.spi.CallableStatementSupport; import org.hibernate.query.SemanticException; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.sqm.CastType; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +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; @@ -98,8 +98,8 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.TemporalType; import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate; -import static org.hibernate.query.sqm.TemporalUnit.DAY; -import static org.hibernate.query.sqm.TemporalUnit.EPOCH; +import static org.hibernate.query.common.TemporalUnit.DAY; +import static org.hibernate.query.common.TemporalUnit.EPOCH; import static org.hibernate.type.SqlTypes.ARRAY; import static org.hibernate.type.SqlTypes.BINARY; import static org.hibernate.type.SqlTypes.BLOB; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacySqlAstTranslator.java index 5ab957c5c6..42db7bf14e 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacySqlAstTranslator.java @@ -7,7 +7,7 @@ package org.hibernate.community.dialect; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.query.sqm.ComparisonOperator; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.tree.Statement; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgresPlusLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgresPlusLegacyDialect.java index 0c27cd5a0e..f4e8e38f79 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgresPlusLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgresPlusLegacyDialect.java @@ -15,7 +15,7 @@ import org.hibernate.dialect.function.CommonFunctionFactory; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.query.sqm.CastType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.SqlAstTranslatorFactory; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java index f35f50d783..8b5ea3a0d2 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java @@ -32,7 +32,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.TrimSpec; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.SqlAstTranslatorFactory; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200SqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200SqlAstTranslator.java index c067088fe3..393037a796 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200SqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200SqlAstTranslator.java @@ -8,7 +8,7 @@ import java.util.List; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.query.sqm.ComparisonOperator; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.Statement; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java index 16ab474fb8..ef46b2f803 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java @@ -53,9 +53,9 @@ import org.hibernate.internal.util.StringHelper; import org.hibernate.mapping.CheckConstraint; import org.hibernate.mapping.Column; import org.hibernate.query.sqm.CastType; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.TrimSpec; import org.hibernate.service.ServiceRegistry; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; @@ -93,7 +93,7 @@ import java.util.TimeZone; import jakarta.persistence.TemporalType; import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate; -import static org.hibernate.query.sqm.TemporalUnit.NANOSECOND; +import static org.hibernate.query.common.TemporalUnit.NANOSECOND; import static org.hibernate.query.sqm.produce.function.FunctionParameterType.INTEGER; import static org.hibernate.type.SqlTypes.*; import static org.hibernate.type.descriptor.DateTimeUtils.appendAsDate; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java index 37b7999a16..fe4b65b029 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java @@ -17,7 +17,7 @@ import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java index 486666b350..496dc0fc7e 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java @@ -40,7 +40,7 @@ import org.hibernate.mapping.UniqueKey; import org.hibernate.query.SemanticException; import org.hibernate.query.sqm.IntervalType; import org.hibernate.dialect.NullOrdering; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.TrimSpec; import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers; import org.hibernate.service.ServiceRegistry; @@ -62,11 +62,11 @@ import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; import jakarta.persistence.TemporalType; import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate; -import static org.hibernate.query.sqm.TemporalUnit.DAY; -import static org.hibernate.query.sqm.TemporalUnit.EPOCH; -import static org.hibernate.query.sqm.TemporalUnit.MONTH; -import static org.hibernate.query.sqm.TemporalUnit.QUARTER; -import static org.hibernate.query.sqm.TemporalUnit.YEAR; +import static org.hibernate.query.common.TemporalUnit.DAY; +import static org.hibernate.query.common.TemporalUnit.EPOCH; +import static org.hibernate.query.common.TemporalUnit.MONTH; +import static org.hibernate.query.common.TemporalUnit.QUARTER; +import static org.hibernate.query.common.TemporalUnit.YEAR; import static org.hibernate.query.sqm.produce.function.FunctionParameterType.INTEGER; import static org.hibernate.query.sqm.produce.function.FunctionParameterType.NUMERIC; import static org.hibernate.query.sqm.produce.function.FunctionParameterType.STRING; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java index 72561d0aae..acfd9ff0d8 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java @@ -66,7 +66,7 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.function.SqmFunctionRegistry; import org.hibernate.query.sqm.mutation.spi.AfterUseAction; import org.hibernate.query.sqm.mutation.spi.BeforeUseAction; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java index d56db0a8e1..21b4fe8c0e 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java @@ -30,7 +30,7 @@ import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor; import org.hibernate.exception.spi.ViolatedConstraintNameExtractor; import org.hibernate.internal.util.JdbcExceptionHelper; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.service.ServiceRegistry; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.SqlAstTranslatorFactory; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacyDialect.java index dbc4f8b627..e2e924a790 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacyDialect.java @@ -40,7 +40,7 @@ import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.spi.QueryParameterBindings; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.internal.DomainParameterXref; import org.hibernate.query.sqm.sql.SqmTranslator; import org.hibernate.query.sqm.sql.SqmTranslatorFactory; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java index 08e0018547..cf4edde4de 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java @@ -36,7 +36,7 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableInsertStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableMutationStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenDialect.java index 651ea147a7..80a27666c8 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenDialect.java @@ -33,7 +33,7 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableInsertStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableMutationStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java index fef9b37c56..531c76681e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java @@ -50,7 +50,7 @@ import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.query.SemanticException; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers; import org.hibernate.service.ServiceRegistry; import org.hibernate.sql.ast.SqlAstTranslator; @@ -83,9 +83,9 @@ import static java.lang.Integer.parseInt; import static org.hibernate.cfg.DialectSpecificSettings.COCKROACH_VERSION_STRING; import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate; import static org.hibernate.internal.util.JdbcExceptionHelper.extractSqlState; -import static org.hibernate.query.sqm.TemporalUnit.DAY; -import static org.hibernate.query.sqm.TemporalUnit.EPOCH; -import static org.hibernate.query.sqm.TemporalUnit.NATIVE; +import static org.hibernate.query.common.TemporalUnit.DAY; +import static org.hibernate.query.common.TemporalUnit.EPOCH; +import static org.hibernate.query.common.TemporalUnit.NATIVE; import static org.hibernate.type.SqlTypes.ARRAY; import static org.hibernate.type.SqlTypes.BINARY; import static org.hibernate.type.SqlTypes.BLOB; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java index e8e01dedf1..a6760d87ed 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java @@ -60,7 +60,7 @@ import org.hibernate.procedure.internal.DB2CallableStatementSupport; import org.hibernate.procedure.spi.CallableStatementSupport; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +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; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java index 7159024ee8..2ff3696aee 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java @@ -15,7 +15,7 @@ import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2zDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2zDialect.java index 8db74f6ce1..7bb076bad1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2zDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2zDialect.java @@ -17,7 +17,7 @@ import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.mapping.Column; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.spi.StandardSqlAstTranslatorFactory; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java index d4d2593a62..f69b7c18c5 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java @@ -124,8 +124,8 @@ import org.hibernate.persister.entity.mutation.EntityMutationTarget; import org.hibernate.procedure.internal.StandardCallableStatementSupport; import org.hibernate.procedure.spi.CallableStatementSupport; import org.hibernate.query.Query; -import org.hibernate.query.sqm.FetchClauseType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.FetchClauseType; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.hql.HqlTranslator; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.sqm.CastType; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DialectDelegateWrapper.java b/hibernate-core/src/main/java/org/hibernate/dialect/DialectDelegateWrapper.java index 3a904fd83d..15bbc515b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DialectDelegateWrapper.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DialectDelegateWrapper.java @@ -60,9 +60,9 @@ import org.hibernate.procedure.spi.CallableStatementSupport; import org.hibernate.query.hql.HqlTranslator; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.sqm.CastType; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.TrimSpec; import org.hibernate.query.sqm.mutation.spi.AfterUseAction; import org.hibernate.query.sqm.mutation.spi.BeforeUseAction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java index ab8433f0be..b815da25fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java @@ -43,9 +43,9 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.persister.entity.mutation.EntityMutationTarget; import org.hibernate.query.sqm.CastType; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableInsertStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableMutationStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; @@ -79,7 +79,7 @@ import org.hibernate.type.spi.TypeConfiguration; import jakarta.persistence.TemporalType; import static org.hibernate.internal.util.JdbcExceptionHelper.extractErrorCode; -import static org.hibernate.query.sqm.TemporalUnit.SECOND; +import static org.hibernate.query.common.TemporalUnit.SECOND; import static org.hibernate.type.SqlTypes.BIGINT; import static org.hibernate.type.SqlTypes.BINARY; import static org.hibernate.type.SqlTypes.CHAR; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HANADialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/HANADialect.java index d78d98c926..04fa0766a0 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/HANADialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/HANADialect.java @@ -49,7 +49,7 @@ import org.hibernate.procedure.internal.StandardCallableStatementSupport; import org.hibernate.procedure.spi.CallableStatementSupport; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableInsertStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableMutationStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java index 967fbdc808..eacdc3a8eb 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java @@ -35,7 +35,7 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.mutation.spi.AfterUseAction; import org.hibernate.query.sqm.mutation.spi.BeforeUseAction; import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableInsertStrategy; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java index 36917cbff2..9232a0d8d6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java @@ -49,7 +49,7 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.function.SqmFunctionRegistry; import org.hibernate.query.sqm.mutation.spi.AfterUseAction; import org.hibernate.query.sqm.mutation.spi.BeforeUseAction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java index 1d1a0d7819..0a90f5bf4d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java @@ -57,9 +57,9 @@ import org.hibernate.procedure.spi.CallableStatementSupport; import org.hibernate.query.SemanticException; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.sqm.CastType; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableInsertStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableMutationStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; @@ -113,12 +113,12 @@ import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtract import static org.hibernate.internal.util.JdbcExceptionHelper.extractErrorCode; import static org.hibernate.internal.util.StringHelper.isEmpty; import static org.hibernate.internal.util.StringHelper.isNotEmpty; -import static org.hibernate.query.sqm.TemporalUnit.DAY; -import static org.hibernate.query.sqm.TemporalUnit.HOUR; -import static org.hibernate.query.sqm.TemporalUnit.MINUTE; -import static org.hibernate.query.sqm.TemporalUnit.MONTH; -import static org.hibernate.query.sqm.TemporalUnit.SECOND; -import static org.hibernate.query.sqm.TemporalUnit.YEAR; +import static org.hibernate.query.common.TemporalUnit.DAY; +import static org.hibernate.query.common.TemporalUnit.HOUR; +import static org.hibernate.query.common.TemporalUnit.MINUTE; +import static org.hibernate.query.common.TemporalUnit.MONTH; +import static org.hibernate.query.common.TemporalUnit.SECOND; +import static org.hibernate.query.common.TemporalUnit.YEAR; import static org.hibernate.type.SqlTypes.ARRAY; import static org.hibernate.type.SqlTypes.BIGINT; import static org.hibernate.type.SqlTypes.BINARY; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java index e10d6cfb90..9ad95a4b76 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java @@ -17,9 +17,9 @@ import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; -import org.hibernate.query.sqm.FetchClauseType; -import org.hibernate.query.sqm.FrameExclusion; -import org.hibernate.query.sqm.FrameKind; +import org.hibernate.query.common.FetchClauseType; +import org.hibernate.query.common.FrameExclusion; +import org.hibernate.query.common.FrameKind; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; import org.hibernate.sql.ast.spi.SqlSelection; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java index 27ebf068ae..fd59b18ae0 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java @@ -58,9 +58,9 @@ import org.hibernate.procedure.spi.CallableStatementSupport; import org.hibernate.query.SemanticException; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.sqm.CastType; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +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,8 +100,8 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.TemporalType; import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate; -import static org.hibernate.query.sqm.TemporalUnit.DAY; -import static org.hibernate.query.sqm.TemporalUnit.EPOCH; +import static org.hibernate.query.common.TemporalUnit.DAY; +import static org.hibernate.query.common.TemporalUnit.EPOCH; import static org.hibernate.type.SqlTypes.ARRAY; import static org.hibernate.type.SqlTypes.BINARY; import static org.hibernate.type.SqlTypes.BLOB; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java index 7bf9cfa51b..00a7c36200 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java @@ -7,7 +7,7 @@ package org.hibernate.dialect; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.query.sqm.ComparisonOperator; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.tree.Statement; import org.hibernate.sql.ast.tree.cte.CteMaterialization; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java index 31dfed72be..6ff6daf2cc 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java @@ -14,7 +14,7 @@ import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.persister.entity.mutation.EntityMutationTarget; import org.hibernate.query.sqm.CastType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.SqlAstTranslatorFactory; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java index 74714a22c7..7c66281198 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java @@ -58,9 +58,9 @@ import org.hibernate.persister.entity.mutation.EntityMutationTarget; import org.hibernate.procedure.internal.SQLServerCallableStatementSupport; import org.hibernate.procedure.spi.CallableStatementSupport; import org.hibernate.query.sqm.CastType; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.TrimSpec; import org.hibernate.service.ServiceRegistry; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; @@ -93,7 +93,7 @@ import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtract import static org.hibernate.internal.util.JdbcExceptionHelper.extractErrorCode; import static org.hibernate.internal.util.JdbcExceptionHelper.extractSqlState; import static org.hibernate.internal.util.StringHelper.isNotEmpty; -import static org.hibernate.query.sqm.TemporalUnit.NANOSECOND; +import static org.hibernate.query.common.TemporalUnit.NANOSECOND; import static org.hibernate.query.sqm.produce.function.FunctionParameterType.INTEGER; import static org.hibernate.type.SqlTypes.BLOB; import static org.hibernate.type.SqlTypes.CLOB; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java index e5955ad50d..6262ab70a8 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java @@ -16,7 +16,7 @@ import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialect.java index 45613930eb..1b87e97a48 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialect.java @@ -34,7 +34,7 @@ import org.hibernate.mapping.UniqueKey; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.query.SemanticException; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java index 3248b0a5d4..23abf5b6c5 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java @@ -29,7 +29,7 @@ import org.hibernate.exception.spi.ViolatedConstraintNameExtractor; import org.hibernate.internal.util.JdbcExceptionHelper; import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.service.ServiceRegistry; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.SqlAstTranslatorFactory; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java index 03a38fa203..faf05c4c0f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java @@ -37,7 +37,7 @@ import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.spi.QueryParameterBindings; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.internal.DomainParameterXref; import org.hibernate.query.sqm.sql.SqmTranslator; import org.hibernate.query.sqm.sql.SqmTranslatorFactory; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/TiDBDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/TiDBDialect.java index dd1c2dfb28..93ed1d8e4a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/TiDBDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/TiDBDialect.java @@ -10,7 +10,7 @@ import org.hibernate.dialect.sequence.TiDBSequenceSupport; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.spi.StandardSqlAstTranslatorFactory; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/DateTruncEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/DateTruncEmulation.java index 5dafaa537f..00910f996f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/DateTruncEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/DateTruncEmulation.java @@ -9,7 +9,7 @@ import java.util.List; import org.hibernate.query.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.NodeBuilder; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.function.AbstractSqmFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionRenderer; import org.hibernate.query.sqm.function.SelfRenderingSqmFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ExtractFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ExtractFunction.java index 65f26d86f2..e33755231f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ExtractFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ExtractFunction.java @@ -7,7 +7,7 @@ package org.hibernate.dialect.function; import org.hibernate.dialect.Dialect; import org.hibernate.query.ReturnableType; import org.hibernate.query.SemanticException; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.function.AbstractSqmFunctionDescriptor; @@ -34,7 +34,7 @@ import java.util.List; import static java.util.Arrays.asList; import static org.hibernate.query.sqm.BinaryArithmeticOperator.*; -import static org.hibernate.query.sqm.TemporalUnit.*; +import static org.hibernate.query.common.TemporalUnit.*; import static org.hibernate.query.sqm.produce.function.FunctionParameterType.TEMPORAL; import static org.hibernate.query.sqm.produce.function.FunctionParameterType.TEMPORAL_UNIT; import static org.hibernate.usertype.internal.AbstractTimeZoneStorageCompositeUserType.ZONE_OFFSET_NAME; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/FormatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/FormatFunction.java index 302bd8940a..3a14a5a2fe 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/FormatFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/FormatFunction.java @@ -12,7 +12,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.MappingModelExpressible; import org.hibernate.query.ReturnableType; import org.hibernate.query.spi.QueryEngine; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.function.AbstractSqmFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionRenderer; import org.hibernate.query.sqm.function.MultipatternSqmFunctionDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/IntegralTimestampaddFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/IntegralTimestampaddFunction.java index 2b1a28ad2d..e234946560 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/IntegralTimestampaddFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/IntegralTimestampaddFunction.java @@ -7,7 +7,7 @@ package org.hibernate.dialect.function; import org.hibernate.dialect.Dialect; import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.query.ReturnableType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.function.SelfRenderingFunctionSqlAstExpression; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/OracleTruncFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/OracleTruncFunction.java index 25597474cb..4d2fd21b2b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/OracleTruncFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/OracleTruncFunction.java @@ -9,7 +9,7 @@ import java.util.List; import org.hibernate.query.ReturnableType; import org.hibernate.query.spi.QueryEngine; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.function.FunctionRenderer; import org.hibernate.query.sqm.function.SelfRenderingSqmFunction; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseTruncFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseTruncFunction.java index bbf9f7437d..ee03c58f9e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseTruncFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseTruncFunction.java @@ -10,7 +10,7 @@ import java.util.List; import org.hibernate.query.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.NodeBuilder; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.function.SelfRenderingSqmFunction; import org.hibernate.query.sqm.tree.SqmTypedNode; import org.hibernate.query.sqm.tree.expression.SqmExtractUnit; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampaddFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampaddFunction.java index 88ac74aa23..6874f846c3 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampaddFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampaddFunction.java @@ -8,7 +8,7 @@ import jakarta.persistence.TemporalType; import org.hibernate.dialect.Dialect; import org.hibernate.query.ReturnableType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.SelfRenderingFunctionSqlAstExpression; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampdiffFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampdiffFunction.java index 854720e862..f5f9407ae4 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampdiffFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampdiffFunction.java @@ -11,7 +11,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.query.ReturnableType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.SelfRenderingFunctionSqlAstExpression; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/TruncFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/TruncFunction.java index 9f328eaef8..017fd56a5e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/TruncFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/TruncFunction.java @@ -10,7 +10,7 @@ import java.util.List; import org.hibernate.query.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.NodeBuilder; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.function.AbstractSqmFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionRenderer; import org.hibernate.query.sqm.function.SelfRenderingSqmFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecuteUpdateResultCheckStyle.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecuteUpdateResultCheckStyle.java index 99c16e0cce..23ab0c4c14 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecuteUpdateResultCheckStyle.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecuteUpdateResultCheckStyle.java @@ -4,7 +4,6 @@ */ package org.hibernate.engine.spi; -import org.hibernate.AssertionFailure; import org.hibernate.annotations.ResultCheckStyle; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/hibernate-core/src/main/java/org/hibernate/query/JpaTuple.java b/hibernate-core/src/main/java/org/hibernate/query/JpaTuple.java deleted file mode 100644 index 06bfef0526..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/query/JpaTuple.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * SPDX-License-Identifier: LGPL-2.1-or-later - * Copyright Red Hat Inc. and Hibernate Authors - */ -package org.hibernate.query; - -import org.hibernate.Incubating; - -import jakarta.persistence.Tuple; - -/** - * Hibernate extension to the Jakarta Persistence {@link Tuple} - * contract - * - * @author Steve Ebersole - */ -@Incubating -public interface JpaTuple extends Tuple { -} diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java b/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java index 71c80b2e9e..924af297e9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java @@ -5,6 +5,7 @@ package org.hibernate.query; import org.hibernate.HibernateException; +import org.hibernate.Internal; import org.hibernate.internal.log.SubSystemLogging; import org.jboss.logging.BasicLogger; @@ -30,6 +31,7 @@ import static org.jboss.logging.Logger.Level.WARN; name = QueryLogging.LOGGER_NAME, description = "Logging related to Query processing" ) +@Internal public interface QueryLogging extends BasicLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".query"; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/FetchClauseType.java b/hibernate-core/src/main/java/org/hibernate/query/common/FetchClauseType.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/query/sqm/FetchClauseType.java rename to hibernate-core/src/main/java/org/hibernate/query/common/FetchClauseType.java index 3adf79c2fd..2a6a96cb05 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/FetchClauseType.java +++ b/hibernate-core/src/main/java/org/hibernate/query/common/FetchClauseType.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.sqm; +package org.hibernate.query.common; /** * The kind of fetch to use for the {@code FETCH} clause. diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/FrameExclusion.java b/hibernate-core/src/main/java/org/hibernate/query/common/FrameExclusion.java similarity index 85% rename from hibernate-core/src/main/java/org/hibernate/query/sqm/FrameExclusion.java rename to hibernate-core/src/main/java/org/hibernate/query/common/FrameExclusion.java index edc0418ecc..28e49c5621 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/FrameExclusion.java +++ b/hibernate-core/src/main/java/org/hibernate/query/common/FrameExclusion.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.sqm; +package org.hibernate.query.common; /** * @author Christian Beikov diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/FrameKind.java b/hibernate-core/src/main/java/org/hibernate/query/common/FrameKind.java similarity index 87% rename from hibernate-core/src/main/java/org/hibernate/query/sqm/FrameKind.java rename to hibernate-core/src/main/java/org/hibernate/query/common/FrameKind.java index 3a03f90598..aeb1c2279d 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/FrameKind.java +++ b/hibernate-core/src/main/java/org/hibernate/query/common/FrameKind.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.sqm; +package org.hibernate.query.common; /** * @author Christian Beikov diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/FrameMode.java b/hibernate-core/src/main/java/org/hibernate/query/common/FrameMode.java similarity index 83% rename from hibernate-core/src/main/java/org/hibernate/query/sqm/FrameMode.java rename to hibernate-core/src/main/java/org/hibernate/query/common/FrameMode.java index 7c9d3095e8..181abdfdae 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/FrameMode.java +++ b/hibernate-core/src/main/java/org/hibernate/query/common/FrameMode.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.sqm; +package org.hibernate.query.common; /** * @author Christian Beikov diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/TemporalUnit.java b/hibernate-core/src/main/java/org/hibernate/query/common/TemporalUnit.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/query/sqm/TemporalUnit.java rename to hibernate-core/src/main/java/org/hibernate/query/common/TemporalUnit.java index d08fbce6ea..c278f855c9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/TemporalUnit.java +++ b/hibernate-core/src/main/java/org/hibernate/query/common/TemporalUnit.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.sqm; +package org.hibernate.query.common; import org.hibernate.dialect.Dialect; import org.hibernate.query.SemanticException; @@ -28,6 +28,8 @@ import org.hibernate.query.SemanticException; * according to capabilities of the database platform. * * @see Dialect#extractPattern(TemporalUnit) + * @see org.hibernate.query.criteria.HibernateCriteriaBuilder#duration(long, TemporalUnit) + * @see org.hibernate.query.criteria.HibernateCriteriaBuilder#durationByUnit(TemporalUnit, jakarta.persistence.criteria.Expression) * * @author Gavin King */ diff --git a/hibernate-core/src/main/java/org/hibernate/query/common/package-info.java b/hibernate-core/src/main/java/org/hibernate/query/common/package-info.java new file mode 100644 index 0000000000..f07ac15327 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/query/common/package-info.java @@ -0,0 +1,15 @@ +/* + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors + */ + +/** + * Common APIs used internally, in the SQL tree, + * in the dialects, and in the criteria query API. + * + * @see org.hibernate.query.common.TemporalUnit + */ +@Incubating +package org.hibernate.query.common; + +import org.hibernate.Incubating; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/CriteriaDefinition.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/CriteriaDefinition.java index 292fc686ea..ee1e4b2ad1 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/CriteriaDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/CriteriaDefinition.java @@ -15,7 +15,7 @@ import org.hibernate.SharedSessionContract; import org.hibernate.query.QueryProducer; import org.hibernate.query.SelectionQuery; import org.hibernate.query.criteria.spi.HibernateCriteriaBuilderDelegate; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.sqm.tree.SqmCopyContext; import org.hibernate.query.sqm.tree.select.SqmSelectStatement; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java index adf78c5943..4b0ec85faf 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java @@ -21,8 +21,8 @@ import java.util.Set; import org.hibernate.Incubating; import org.hibernate.query.NullPrecedence; import org.hibernate.query.SortDirection; -import org.hibernate.query.sqm.FrameKind; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.FrameKind; +import org.hibernate.query.common.TemporalUnit; import jakarta.persistence.Tuple; import jakarta.persistence.criteria.AbstractQuery; @@ -525,7 +525,7 @@ public interface HibernateCriteriaBuilder extends CriteriaBuilder { * A literal {@link Duration}, for example, "five days" or "30 minutes". * @since 6.3 */ - @Incubating // layer breaker (leaks SQM type) + @Incubating JpaExpression duration(long magnitude, TemporalUnit unit); /** @@ -535,7 +535,7 @@ public interface HibernateCriteriaBuilder extends CriteriaBuilder { * @return the magnitude of the duration measured in the given units * @since 6.3 */ - @Incubating // layer breaker (leaks SQM type) + @Incubating JpaExpression durationByUnit(TemporalUnit unit, Expression duration); /** @@ -1198,7 +1198,7 @@ public interface HibernateCriteriaBuilder extends CriteriaBuilder { JpaFunction format(Expression datetime, String pattern); /** - * Extracts the {@link org.hibernate.query.sqm.TemporalUnit#YEAR} of a date, time, or datetime expression. + * Extracts the {@link TemporalUnit#YEAR} of a date, time, or datetime expression. * * @param datetime the date, time, or datetime to extract the value from * @@ -1208,7 +1208,7 @@ public interface HibernateCriteriaBuilder extends CriteriaBuilder { JpaFunction year(Expression datetime); /** - * Extracts the {@link org.hibernate.query.sqm.TemporalUnit#MONTH} of a date, time, or datetime expression. + * Extracts the {@link TemporalUnit#MONTH} of a date, time, or datetime expression. * * @param datetime the date, time, or datetime to extract the value from * @@ -1218,7 +1218,7 @@ public interface HibernateCriteriaBuilder extends CriteriaBuilder { JpaFunction month(Expression datetime); /** - * Extracts the {@link org.hibernate.query.sqm.TemporalUnit#DAY} of a date, time, or datetime expression. + * Extracts the {@link TemporalUnit#DAY} of a date, time, or datetime expression. * * @param datetime the date, time, or datetime to extract the value from * @@ -1228,7 +1228,7 @@ public interface HibernateCriteriaBuilder extends CriteriaBuilder { JpaFunction day(Expression datetime); /** - * Extracts the {@link org.hibernate.query.sqm.TemporalUnit#HOUR} of a date, time, or datetime expression. + * Extracts the {@link TemporalUnit#HOUR} of a date, time, or datetime expression. * * @param datetime the date, time, or datetime to extract the value from * @@ -1238,7 +1238,7 @@ public interface HibernateCriteriaBuilder extends CriteriaBuilder { JpaFunction hour(Expression datetime); /** - * Extracts the {@link org.hibernate.query.sqm.TemporalUnit#MINUTE} of a date, time, or datetime expression. + * Extracts the {@link TemporalUnit#MINUTE} of a date, time, or datetime expression. * * @param datetime the date, time, or datetime to extract the value from * @@ -1248,7 +1248,7 @@ public interface HibernateCriteriaBuilder extends CriteriaBuilder { JpaFunction minute(Expression datetime); /** - * Extracts the {@link org.hibernate.query.sqm.TemporalUnit#SECOND} of a date, time, or datetime expression. + * Extracts the {@link TemporalUnit#SECOND} of a date, time, or datetime expression. * * @param datetime the date, time, or datetime to extract the value from * diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java index cb73707461..f52a96b275 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java @@ -7,7 +7,7 @@ package org.hibernate.query.criteria; import java.util.List; import java.util.Set; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteContainer.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteContainer.java index cdd3d43a2a..29ea38c68a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteContainer.java @@ -8,7 +8,6 @@ import java.util.Collection; import java.util.function.Function; import org.hibernate.Incubating; -import org.hibernate.query.sqm.tree.SqmJoinType; import jakarta.persistence.criteria.AbstractQuery; import jakarta.persistence.criteria.CriteriaQuery; @@ -34,7 +33,6 @@ public interface JpaCteContainer extends JpaCriteriaNode { * which can be used for querying. * * @see JpaCriteriaQuery#from(JpaCteCriteria) - * @see JpaFrom#join(JpaCteCriteria, SqmJoinType) */ JpaCteCriteria with(AbstractQuery criteria); @@ -44,7 +42,6 @@ public interface JpaCteContainer extends JpaCriteriaNode { * so that the recursive {@link CriteriaQuery} is able to refer to the CTE again. * * @see JpaCriteriaQuery#from(JpaCteCriteria) - * @see JpaFrom#join(JpaCteCriteria, SqmJoinType) */ JpaCteCriteria withRecursiveUnionAll(AbstractQuery baseCriteria, Function, AbstractQuery> recursiveCriteriaProducer); @@ -54,7 +51,6 @@ public interface JpaCteContainer extends JpaCriteriaNode { * so that the recursive {@link CriteriaQuery} is able to refer to the CTE again. * * @see JpaCriteriaQuery#from(JpaCteCriteria) - * @see JpaFrom#join(JpaCteCriteria, SqmJoinType) */ JpaCteCriteria withRecursiveUnionDistinct(AbstractQuery baseCriteria, Function, AbstractQuery> recursiveCriteriaProducer); diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryGroup.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryGroup.java index 7b735fc1bc..cd21dc8d18 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryGroup.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryGroup.java @@ -6,8 +6,7 @@ package org.hibernate.query.criteria; import java.util.List; -import org.hibernate.query.sqm.FetchClauseType; -import org.hibernate.query.sqm.SetOperator; +import org.hibernate.query.common.FetchClauseType; /** * A query group i.e. query parts connected with a set operator. @@ -18,10 +17,6 @@ public interface JpaQueryGroup extends JpaQueryPart { List> getQueryParts(); - SetOperator getSetOperator(); - - void setSetOperator(SetOperator setOperator); - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Covariant overrides diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryPart.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryPart.java index 3302422794..e3919a0de9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryPart.java @@ -6,7 +6,7 @@ package org.hibernate.query.criteria; import java.util.List; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; /** * Models a query part i.e. the commonalities between a query group and a query specification. diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java index 9fe1b621ea..93f3aa64be 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java @@ -9,7 +9,7 @@ import java.util.Set; import jakarta.persistence.criteria.Expression; import jakarta.persistence.criteria.Predicate; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; /** * Models a {@code SELECT} query. Used as a delegate in diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSubQuery.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSubQuery.java index 023eb8d821..48ae5b0cdb 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSubQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSubQuery.java @@ -18,7 +18,7 @@ import jakarta.persistence.criteria.Selection; import jakarta.persistence.criteria.SetJoin; import jakarta.persistence.criteria.Subquery; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaWindow.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaWindow.java index c9819c84f6..fe39e79d84 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaWindow.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaWindow.java @@ -5,7 +5,7 @@ package org.hibernate.query.criteria; import org.hibernate.Incubating; -import org.hibernate.query.sqm.FrameExclusion; +import org.hibernate.query.common.FrameExclusion; import jakarta.persistence.criteria.Expression; import jakarta.persistence.criteria.Order; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaWindowFrame.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaWindowFrame.java index 8c61f7107a..21463d5b77 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaWindowFrame.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaWindowFrame.java @@ -5,7 +5,7 @@ package org.hibernate.query.criteria; import org.hibernate.Incubating; -import org.hibernate.query.sqm.FrameKind; +import org.hibernate.query.common.FrameKind; import jakarta.persistence.criteria.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/HibernateCriteriaBuilderDelegate.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/HibernateCriteriaBuilderDelegate.java index fece7b7584..3eee72e6d8 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/HibernateCriteriaBuilderDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/HibernateCriteriaBuilderDelegate.java @@ -59,7 +59,7 @@ import org.hibernate.query.criteria.JpaValues; import org.hibernate.query.criteria.JpaWindow; import org.hibernate.query.criteria.JpaWindowFrame; import org.hibernate.query.criteria.JpaXmlElementExpression; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import jakarta.persistence.Tuple; import jakarta.persistence.criteria.CollectionJoin; diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java index d7f56c28ba..414b15e49e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java @@ -75,10 +75,10 @@ import org.hibernate.query.hql.spi.SqmCreationState; import org.hibernate.query.hql.spi.SqmPathRegistry; import org.hibernate.query.sqm.BinaryArithmeticOperator; import org.hibernate.query.sqm.ComparisonOperator; -import org.hibernate.query.sqm.FetchClauseType; -import org.hibernate.query.sqm.FrameExclusion; -import org.hibernate.query.sqm.FrameKind; -import org.hibernate.query.sqm.FrameMode; +import org.hibernate.query.common.FetchClauseType; +import org.hibernate.query.common.FrameExclusion; +import org.hibernate.query.common.FrameKind; +import org.hibernate.query.common.FrameMode; import org.hibernate.query.sqm.LiteralNumberFormatException; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.ParsingException; @@ -87,7 +87,7 @@ import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.SqmPathSource; import org.hibernate.query.sqm.SqmTreeCreationLogger; import org.hibernate.query.sqm.StrictJpaComplianceViolation; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.TerminalPathException; import org.hibernate.query.sqm.TrimSpec; import org.hibernate.query.sqm.UnaryArithmeticOperator; @@ -263,17 +263,17 @@ import static org.hibernate.internal.util.QuotingHelper.unquoteIdentifier; import static org.hibernate.internal.util.QuotingHelper.unquoteJavaStringLiteral; import static org.hibernate.internal.util.QuotingHelper.unquoteStringLiteral; import static org.hibernate.query.hql.internal.SqmTreeCreationHelper.extractJpaCompliantAlias; -import static org.hibernate.query.sqm.TemporalUnit.DATE; -import static org.hibernate.query.sqm.TemporalUnit.DAY_OF_MONTH; -import static org.hibernate.query.sqm.TemporalUnit.DAY_OF_WEEK; -import static org.hibernate.query.sqm.TemporalUnit.DAY_OF_YEAR; -import static org.hibernate.query.sqm.TemporalUnit.NANOSECOND; -import static org.hibernate.query.sqm.TemporalUnit.OFFSET; -import static org.hibernate.query.sqm.TemporalUnit.TIME; -import static org.hibernate.query.sqm.TemporalUnit.TIMEZONE_HOUR; -import static org.hibernate.query.sqm.TemporalUnit.TIMEZONE_MINUTE; -import static org.hibernate.query.sqm.TemporalUnit.WEEK_OF_MONTH; -import static org.hibernate.query.sqm.TemporalUnit.WEEK_OF_YEAR; +import static org.hibernate.query.common.TemporalUnit.DATE; +import static org.hibernate.query.common.TemporalUnit.DAY_OF_MONTH; +import static org.hibernate.query.common.TemporalUnit.DAY_OF_WEEK; +import static org.hibernate.query.common.TemporalUnit.DAY_OF_YEAR; +import static org.hibernate.query.common.TemporalUnit.NANOSECOND; +import static org.hibernate.query.common.TemporalUnit.OFFSET; +import static org.hibernate.query.common.TemporalUnit.TIME; +import static org.hibernate.query.common.TemporalUnit.TIMEZONE_HOUR; +import static org.hibernate.query.common.TemporalUnit.TIMEZONE_MINUTE; +import static org.hibernate.query.common.TemporalUnit.WEEK_OF_MONTH; +import static org.hibernate.query.common.TemporalUnit.WEEK_OF_YEAR; import static org.hibernate.query.sqm.internal.SqmUtil.resolveExpressibleJavaTypeClass; import static org.hibernate.type.descriptor.DateTimeUtils.DATE_TIME; import static org.hibernate.type.spi.TypeConfiguration.isJdbcTemporalType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/IntervalType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/IntervalType.java index d2d0e7bfbe..b9f65556ef 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/IntervalType.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/IntervalType.java @@ -7,11 +7,16 @@ package org.hibernate.query.sqm; /** * The different types of intervals that SQL defines. * + * @deprecated This enum still has exactly one member, and was + * placed in a package from which it has no usages. + * It will be removed or moved. + * * @author Christian Beikov */ +@Deprecated(since="7", forRemoval = true) public enum IntervalType { /** * A second based interval. **/ - SECOND; + SECOND } diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java index e5c3da489c..f4e6a3a215 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java @@ -74,13 +74,13 @@ import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.spi.QueryEngineOptions; import org.hibernate.query.sqm.BinaryArithmeticOperator; import org.hibernate.query.sqm.ComparisonOperator; -import org.hibernate.query.sqm.FrameKind; +import org.hibernate.query.common.FrameKind; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SetOperator; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.SqmPathSource; import org.hibernate.query.sqm.SqmQuerySource; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.TrimSpec; import org.hibernate.query.sqm.UnaryArithmeticOperator; import org.hibernate.query.sqm.function.NamedSqmFunctionDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/InsertExecutionDelegate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/InsertExecutionDelegate.java index e085e627ac..149b85d1f3 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/InsertExecutionDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/InsertExecutionDelegate.java @@ -42,7 +42,7 @@ import org.hibernate.query.SortDirection; import org.hibernate.query.results.TableGroupImpl; import org.hibernate.query.spi.DomainQueryExecutionContext; import org.hibernate.query.sqm.ComparisonOperator; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.sqm.internal.DomainParameterXref; import org.hibernate.query.sqm.internal.SqmUtil; import org.hibernate.query.sqm.mutation.internal.MultiTableSqmMutationConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionParameterType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionParameterType.java index cdf9d20fde..5667c64e91 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionParameterType.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionParameterType.java @@ -4,7 +4,7 @@ */ package org.hibernate.query.sqm.produce.function; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; /** * A mini-"type system" for HQL function parameters. diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java index dd96542bfe..51ffa1b288 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java @@ -127,12 +127,12 @@ import org.hibernate.query.sqm.BinaryArithmeticOperator; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.sqm.DynamicInstantiationNature; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.sqm.InterpretationException; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.SqmPathSource; import org.hibernate.query.sqm.SqmQuerySource; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.UnaryArithmeticOperator; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.SelfRenderingAggregateFunctionSqlAstExpression; @@ -443,10 +443,10 @@ import static org.hibernate.internal.util.NullnessHelper.coalesceSuppliedValues; import static org.hibernate.query.sqm.BinaryArithmeticOperator.ADD; import static org.hibernate.query.sqm.BinaryArithmeticOperator.MULTIPLY; import static org.hibernate.query.sqm.BinaryArithmeticOperator.SUBTRACT; -import static org.hibernate.query.sqm.TemporalUnit.EPOCH; -import static org.hibernate.query.sqm.TemporalUnit.NANOSECOND; -import static org.hibernate.query.sqm.TemporalUnit.NATIVE; -import static org.hibernate.query.sqm.TemporalUnit.SECOND; +import static org.hibernate.query.common.TemporalUnit.EPOCH; +import static org.hibernate.query.common.TemporalUnit.NANOSECOND; +import static org.hibernate.query.common.TemporalUnit.NATIVE; +import static org.hibernate.query.common.TemporalUnit.SECOND; import static org.hibernate.query.sqm.UnaryArithmeticOperator.UNARY_MINUS; import static org.hibernate.query.sqm.internal.SqmUtil.isFkOptimizationAllowed; import static org.hibernate.sql.ast.spi.SqlAstTreeHelper.combinePredicates; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/Conversion.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/Conversion.java index 27a139c45b..771a9c7dc8 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/Conversion.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/Conversion.java @@ -6,7 +6,7 @@ package org.hibernate.query.sqm.tree.expression; import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.MappingModelExpressible; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.sql.internal.DomainResultProducer; import org.hibernate.sql.ast.SqlAstWalker; import org.hibernate.sql.ast.spi.SqlAstCreationState; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDurationUnit.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDurationUnit.java index eb8a1d3773..824e076b87 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDurationUnit.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDurationUnit.java @@ -5,7 +5,7 @@ package org.hibernate.query.sqm.tree.expression; import org.hibernate.query.ReturnableType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.SqmExpressible; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpressionHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpressionHelper.java index 6abea94a89..4531184059 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpressionHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpressionHelper.java @@ -21,7 +21,7 @@ import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.BinaryArithmeticOperator; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SqmExpressible; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.tree.domain.SqmPath; import org.hibernate.type.descriptor.java.JavaTypeHelper; import org.hibernate.type.descriptor.java.JdbcDateJavaType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExtractUnit.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExtractUnit.java index 4784ef4376..a72c7c8eae 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExtractUnit.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExtractUnit.java @@ -5,7 +5,7 @@ package org.hibernate.query.sqm.tree.expression; import org.hibernate.query.ReturnableType; -import org.hibernate.query.sqm.TemporalUnit; +import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.SqmExpressible; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOver.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOver.java index 5126edd72f..3e043d751f 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOver.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOver.java @@ -6,9 +6,9 @@ package org.hibernate.query.sqm.tree.expression; import java.util.List; -import org.hibernate.query.sqm.FrameExclusion; -import org.hibernate.query.sqm.FrameKind; -import org.hibernate.query.sqm.FrameMode; +import org.hibernate.query.common.FrameExclusion; +import org.hibernate.query.common.FrameKind; +import org.hibernate.query.common.FrameMode; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.tree.SqmCopyContext; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindow.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindow.java index 0ee8be5f53..62644fd80e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindow.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindow.java @@ -10,9 +10,9 @@ import java.util.List; import org.hibernate.Incubating; import org.hibernate.query.criteria.JpaWindow; import org.hibernate.query.criteria.JpaWindowFrame; -import org.hibernate.query.sqm.FrameExclusion; -import org.hibernate.query.sqm.FrameKind; -import org.hibernate.query.sqm.FrameMode; +import org.hibernate.query.common.FrameExclusion; +import org.hibernate.query.common.FrameKind; +import org.hibernate.query.common.FrameMode; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.tree.AbstractSqmNode; @@ -23,12 +23,12 @@ import org.hibernate.query.sqm.tree.select.SqmSortSpecification; import jakarta.persistence.criteria.Expression; import jakarta.persistence.criteria.Order; -import static org.hibernate.query.sqm.FrameExclusion.NO_OTHERS; -import static org.hibernate.query.sqm.FrameKind.CURRENT_ROW; -import static org.hibernate.query.sqm.FrameKind.UNBOUNDED_PRECEDING; -import static org.hibernate.query.sqm.FrameMode.GROUPS; -import static org.hibernate.query.sqm.FrameMode.RANGE; -import static org.hibernate.query.sqm.FrameMode.ROWS; +import static org.hibernate.query.common.FrameExclusion.NO_OTHERS; +import static org.hibernate.query.common.FrameKind.CURRENT_ROW; +import static org.hibernate.query.common.FrameKind.UNBOUNDED_PRECEDING; +import static org.hibernate.query.common.FrameMode.GROUPS; +import static org.hibernate.query.common.FrameMode.RANGE; +import static org.hibernate.query.common.FrameMode.ROWS; /** * @author Marco Belladelli diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindowFrame.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindowFrame.java index 7ae0783a15..f2b96f46ac 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindowFrame.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindowFrame.java @@ -6,7 +6,7 @@ package org.hibernate.query.sqm.tree.expression; import org.hibernate.Incubating; import org.hibernate.query.criteria.JpaWindowFrame; -import org.hibernate.query.sqm.FrameKind; +import org.hibernate.query.common.FrameKind; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.tree.AbstractSqmNode; import org.hibernate.query.sqm.tree.SqmCopyContext; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryGroup.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryGroup.java index 445de1cb4c..e2e7523770 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryGroup.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryGroup.java @@ -10,7 +10,7 @@ import java.util.Iterator; import java.util.List; import org.hibernate.internal.util.collections.CollectionHelper; -import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.SemanticException; import org.hibernate.query.sqm.SetOperator; import org.hibernate.query.criteria.JpaExpression; @@ -99,12 +99,10 @@ public class SqmQueryGroup extends SqmQueryPart implements JpaQueryGroup