From 1be4428719a16f73cf82fd8f336e0b72c8e62083 Mon Sep 17 00:00:00 2001 From: Gavin King Date: Sat, 21 Dec 2024 10:20:15 +0100 Subject: [PATCH] move the SQM tuple support into the correct package namespace this was placed in a location which it would be part of the public API of the org.hibernate.query package, which is wrong, since it is not API, nor is it even exposed on any SPIs, as far as I can discern cc @beikov --- .../dialect/DB2LegacySqlAstTranslator.java | 2 +- .../dialect/HANALegacySqlAstTranslator.java | 2 +- .../dialect/OracleLegacySqlAstTranslator.java | 2 +- .../dialect/SQLServerLegacySqlAstTranslator.java | 2 +- .../org/hibernate/dialect/DB2SqlAstTranslator.java | 2 +- .../hibernate/dialect/HANASqlAstTranslator.java | 2 +- .../hibernate/dialect/OracleSqlAstTranslator.java | 2 +- .../dialect/SQLServerSqlAstTranslator.java | 2 +- .../function/CteGenerateSeriesFunction.java | 2 +- .../dialect/function/GenerateSeriesFunction.java | 2 +- ...rateSeriesSetReturningFunctionTypeResolver.java | 2 +- .../dialect/function/H2GenerateSeriesFunction.java | 2 +- .../function/HANAGenerateSeriesFunction.java | 2 +- .../NumberSeriesGenerateSeriesFunction.java | 2 +- .../function/SQLServerGenerateSeriesFunction.java | 2 +- .../function/SybaseASEGenerateSeriesFunction.java | 2 +- .../UnnestSetReturningFunctionTypeResolver.java | 2 +- .../dialect/function/array/DB2UnnestFunction.java | 2 +- .../dialect/function/array/H2UnnestFunction.java | 2 +- .../dialect/function/array/HANAUnnestFunction.java | 2 +- .../function/array/OracleUnnestFunction.java | 2 +- .../function/array/PostgreSQLUnnestFunction.java | 2 +- .../function/array/SQLServerUnnestFunction.java | 2 +- .../function/array/SybaseASEUnnestFunction.java | 2 +- .../dialect/function/array/UnnestFunction.java | 2 +- .../json/CockroachDBJsonTableFunction.java | 2 +- .../function/json/DB2JsonTableFunction.java | 2 +- .../dialect/function/json/H2JsonTableFunction.java | 2 +- .../function/json/HANAJsonTableFunction.java | 2 +- .../dialect/function/json/JsonTableFunction.java | 2 +- .../JsonTableSetReturningFunctionTypeResolver.java | 2 +- .../function/json/MySQLJsonTableFunction.java | 2 +- .../function/json/OracleJsonTableFunction.java | 2 +- .../function/json/PostgreSQLJsonTableFunction.java | 2 +- .../function/json/SQLServerJsonTableFunction.java | 2 +- .../dialect/function/xml/DB2XmlTableFunction.java | 2 +- .../dialect/function/xml/HANAXmlTableFunction.java | 2 +- .../function/xml/SQLServerXmlTableFunction.java | 2 +- .../function/xml/SybaseASEXmlTableFunction.java | 2 +- .../dialect/function/xml/XmlTableFunction.java | 2 +- .../XmlTableSetReturningFunctionTypeResolver.java | 2 +- .../domain/internal/MappingMetamodelImpl.java | 4 ++-- .../query/hql/internal/SemanticQueryBuilder.java | 2 +- .../NamedSqmSetReturningFunctionDescriptor.java | 2 +- .../SelfRenderingSqmSetReturningFunction.java | 4 ++-- .../sqm/function/SetReturningFunctionRenderer.java | 2 +- .../function/SetReturningFunctionTypeResolver.java | 2 +- .../SetReturningFunctionTypeResolverBuilder.java | 2 +- .../query/sqm/sql/BaseSqmToSqlAstConverter.java | 6 +++--- .../internal/EntityValuedPathInterpretation.java | 2 +- .../hibernate/query/sqm/tree/cte/SqmCteTable.java | 6 +++--- .../query/sqm/tree/domain/SqmDerivedRoot.java | 2 +- .../sqm/tree/expression/SqmJsonTableFunction.java | 2 +- .../tree/expression/SqmSetReturningFunction.java | 2 +- .../sqm/tree/expression/SqmXmlTableFunction.java | 2 +- .../query/sqm/tree/from/SqmDerivedJoin.java | 2 +- ...AnonymousTupleBasicEntityIdentifierMapping.java | 2 +- .../AnonymousTupleBasicValuedModelPart.java | 2 +- .../AnonymousTupleEmbeddableValuedModelPart.java | 2 +- ...nymousTupleEmbeddedEntityIdentifierMapping.java | 2 +- .../AnonymousTupleEntityValuedModelPart.java | 2 +- ...sTupleNonAggregatedEntityIdentifierMapping.java | 2 +- .../AnonymousTupleSimpleSqmPathSource.java | 2 +- .../AnonymousTupleSqmAssociationPathSource.java | 2 +- .../AnonymousTupleSqmAssociationPathSourceNew.java | 2 +- .../internal}/AnonymousTupleSqmPathSource.java | 2 +- .../internal}/AnonymousTupleSqmPathSourceNew.java | 2 +- .../AnonymousTupleTableGroupProducer.java | 2 +- .../tuple/internal}/AnonymousTupleType.java | 2 +- .../internal}/CteTupleTableGroupProducer.java | 2 +- .../hibernate/query/sqm/tuple/package-info.java | 14 ++++++++++++++ .../org/hibernate/sql/ast/SqlAstTranslator.java | 2 +- .../sql/ast/spi/AbstractSqlAstTranslator.java | 2 +- .../org/hibernate/sql/ast/tree/cte/CteTable.java | 4 ++-- 74 files changed, 94 insertions(+), 80 deletions(-) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleBasicEntityIdentifierMapping.java (98%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleBasicValuedModelPart.java (99%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleEmbeddableValuedModelPart.java (99%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleEmbeddedEntityIdentifierMapping.java (98%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleEntityValuedModelPart.java (99%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleNonAggregatedEntityIdentifierMapping.java (98%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleSimpleSqmPathSource.java (97%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleSqmAssociationPathSource.java (98%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleSqmAssociationPathSourceNew.java (98%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleSqmPathSource.java (98%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleSqmPathSourceNew.java (98%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleTableGroupProducer.java (99%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleType.java (99%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/CteTupleTableGroupProducer.java (98%) create mode 100644 hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/package-info.java 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 f06c36371c68..4bfd9aafb01f 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 @@ -14,7 +14,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.common.FetchClauseType; import org.hibernate.sql.ast.Clause; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacySqlAstTranslator.java index 025bf8f4e8a6..cad55fa233db 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacySqlAstTranslator.java @@ -12,7 +12,7 @@ import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; 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 76c279743224..25348d756960 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 @@ -17,7 +17,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.common.FrameExclusion; 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 b3011650f534..ca0bb4b74428 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 @@ -15,7 +15,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.common.FetchClauseType; import org.hibernate.sql.ast.Clause; 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 2ff3696aeeb1..94065dda8125 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java @@ -13,7 +13,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.common.FetchClauseType; import org.hibernate.sql.ast.Clause; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HANASqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/HANASqlAstTranslator.java index 5a935a2513c3..9cedafea3019 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/HANASqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/HANASqlAstTranslator.java @@ -12,7 +12,7 @@ import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; 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 9ad95a4b7645..6a4c267bf153 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java @@ -15,7 +15,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.common.FrameExclusion; 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 4df00fa2903b..154b4a190c6d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java @@ -14,7 +14,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.common.FetchClauseType; import org.hibernate.sql.ast.Clause; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CteGenerateSeriesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CteGenerateSeriesFunction.java index 2f897c6db29a..bff57bf50abc 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CteGenerateSeriesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CteGenerateSeriesFunction.java @@ -9,7 +9,7 @@ import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.SelectableMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.BinaryArithmeticOperator; import org.hibernate.query.sqm.ComparisonOperator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesFunction.java index 53fb212a8da4..9198e8376537 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesFunction.java @@ -6,7 +6,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.metamodel.mapping.CollectionPart; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingSetReturningFunctionDescriptor; import org.hibernate.query.sqm.produce.function.SetReturningFunctionTypeResolver; import org.hibernate.sql.ast.SqlAstTranslator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesSetReturningFunctionTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesSetReturningFunctionTypeResolver.java index fad4137b1473..39107266e310 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesSetReturningFunctionTypeResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesSetReturningFunctionTypeResolver.java @@ -14,7 +14,7 @@ import org.hibernate.metamodel.mapping.SqlTypedMapping; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; import org.hibernate.metamodel.model.domain.DomainType; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.produce.function.SetReturningFunctionTypeResolver; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/H2GenerateSeriesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/H2GenerateSeriesFunction.java index 8686fa3ecde1..0f07e60f3787 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/H2GenerateSeriesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/H2GenerateSeriesFunction.java @@ -12,7 +12,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.SelectableMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/HANAGenerateSeriesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/HANAGenerateSeriesFunction.java index a80ba3297930..1e3d7704cc2d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/HANAGenerateSeriesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/HANAGenerateSeriesFunction.java @@ -8,7 +8,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.SelectableMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java index 11c5a4ad5b6d..d5070882852a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java @@ -16,7 +16,7 @@ import org.hibernate.metamodel.mapping.SqlTypedMapping; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; import org.hibernate.metamodel.model.domain.ReturnableType; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.sqm.BinaryArithmeticOperator; import org.hibernate.query.sqm.ComparisonOperator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerGenerateSeriesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerGenerateSeriesFunction.java index b6c347c105e7..c292a1ed46ab 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerGenerateSeriesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerGenerateSeriesFunction.java @@ -12,7 +12,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.SelectableMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseASEGenerateSeriesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseASEGenerateSeriesFunction.java index e9a257e9e5a6..8c9551462832 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseASEGenerateSeriesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseASEGenerateSeriesFunction.java @@ -7,7 +7,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.SelectableMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/UnnestSetReturningFunctionTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/UnnestSetReturningFunctionTypeResolver.java index f9c752a4ffa0..a1bf8acf214f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/UnnestSetReturningFunctionTypeResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/UnnestSetReturningFunctionTypeResolver.java @@ -17,7 +17,7 @@ import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.SqlTypedMapping; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.produce.function.SetReturningFunctionTypeResolver; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DB2UnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DB2UnnestFunction.java index af2af3130e92..daf39e56bb0f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DB2UnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DB2UnnestFunction.java @@ -14,7 +14,7 @@ import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.SqlTypedMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2UnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2UnnestFunction.java index b30c6af36a14..60d7c0d1c88f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2UnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2UnnestFunction.java @@ -16,7 +16,7 @@ import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.SqlTypedMapping; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HANAUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HANAUnnestFunction.java index 753a561b4f72..c8159b99b3ac 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HANAUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HANAUnnestFunction.java @@ -24,7 +24,7 @@ import org.hibernate.metamodel.mapping.SqlTypedMapping; import org.hibernate.metamodel.mapping.ValuedModelPart; import org.hibernate.metamodel.mapping.internal.EmbeddedCollectionPart; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleUnnestFunction.java index 3cd41f426937..97043e380533 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleUnnestFunction.java @@ -7,7 +7,7 @@ import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.SqlTypedMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLUnnestFunction.java index 4bb275393f88..94d6576475f6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLUnnestFunction.java @@ -9,7 +9,7 @@ import org.hibernate.dialect.aggregate.AggregateSupport; import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.SqlTypedMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SQLServerUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SQLServerUnnestFunction.java index 527dc0472bb5..73eceb90cbc7 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SQLServerUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SQLServerUnnestFunction.java @@ -8,7 +8,7 @@ import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.SqlTypedMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SybaseASEUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SybaseASEUnnestFunction.java index d549c3b5f919..e06ea4545844 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SybaseASEUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SybaseASEUnnestFunction.java @@ -7,7 +7,7 @@ import org.hibernate.dialect.XmlHelper; import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.SqlTypedMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/UnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/UnnestFunction.java index 563a1adec37b..bded48321795 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/UnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/UnnestFunction.java @@ -10,7 +10,7 @@ import org.hibernate.dialect.function.UnnestSetReturningFunctionTypeResolver; import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.SqlTypedMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingSetReturningFunctionDescriptor; import org.hibernate.query.sqm.produce.function.SetReturningFunctionTypeResolver; import org.hibernate.sql.ast.SqlAstTranslator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonTableFunction.java index e02387af8358..8c884c7e390d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonTableFunction.java @@ -5,7 +5,7 @@ package org.hibernate.dialect.function.json; import org.hibernate.QueryException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonTableFunction.java index b952aaaf0eff..52c139e590b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonTableFunction.java @@ -7,7 +7,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.QueryException; import org.hibernate.dialect.function.CteGenerateSeriesFunction; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonTableFunction.java index 315d86876135..b26fa504ba6e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonTableFunction.java @@ -14,7 +14,7 @@ import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; import org.hibernate.metamodel.model.domain.ReturnableType; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.sqm.function.FunctionRenderer; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonTableFunction.java index 8bb1b3c85e73..a8c9e50e5946 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonTableFunction.java @@ -16,7 +16,7 @@ import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.metamodel.mapping.ValuedModelPart; import org.hibernate.metamodel.mapping.internal.EmbeddedCollectionPart; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonTableFunction.java index f252e24e616f..39896a229156 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonTableFunction.java @@ -6,7 +6,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.dialect.function.array.DdlTypeHelper; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingSetReturningFunctionDescriptor; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonTableSetReturningFunctionTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonTableSetReturningFunctionTypeResolver.java index 713beca99d96..ab01adec021e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonTableSetReturningFunctionTypeResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonTableSetReturningFunctionTypeResolver.java @@ -8,7 +8,7 @@ import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.produce.function.SetReturningFunctionTypeResolver; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.query.sqm.tree.SqmTypedNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonTableFunction.java index f79867cdbf35..3a2ee08e5fa3 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonTableFunction.java @@ -6,7 +6,7 @@ import org.hibernate.QueryException; import org.hibernate.dialect.function.array.DdlTypeHelper; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonTableFunction.java index 7f4ea449b124..97f0ee785d76 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonTableFunction.java @@ -10,7 +10,7 @@ import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.sql.Template; import org.hibernate.sql.ast.SqlAstTranslator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonTableFunction.java index 4a7d5b102f32..fc775ac68b9c 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonTableFunction.java @@ -7,7 +7,7 @@ import org.hibernate.QueryException; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonTableFunction.java index 55f4c12957b3..1963915f165d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonTableFunction.java @@ -6,7 +6,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.QueryException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.JsonExistsErrorBehavior; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/DB2XmlTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/DB2XmlTableFunction.java index ca0341e899d6..0f9ed0d3304b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/DB2XmlTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/DB2XmlTableFunction.java @@ -10,7 +10,7 @@ import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.sql.Template; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/HANAXmlTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/HANAXmlTableFunction.java index 460416cd5d0d..efa77c607753 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/HANAXmlTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/HANAXmlTableFunction.java @@ -21,7 +21,7 @@ import org.hibernate.metamodel.mapping.ValuedModelPart; import org.hibernate.metamodel.mapping.internal.EmbeddedCollectionPart; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlTableFunction.java index f988febac1e6..a0f594a57c6d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlTableFunction.java @@ -4,7 +4,7 @@ */ package org.hibernate.dialect.function.xml; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; 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/xml/SybaseASEXmlTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SybaseASEXmlTableFunction.java index 7629d5d4420f..a59a4b9020e1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SybaseASEXmlTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SybaseASEXmlTableFunction.java @@ -11,7 +11,7 @@ import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.sql.Template; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlTableFunction.java index b6e386541be5..18831a358731 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlTableFunction.java @@ -6,7 +6,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.dialect.function.array.DdlTypeHelper; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingSetReturningFunctionDescriptor; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlTableSetReturningFunctionTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlTableSetReturningFunctionTypeResolver.java index 29b8191b9062..efd33f46fd79 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlTableSetReturningFunctionTypeResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlTableSetReturningFunctionTypeResolver.java @@ -8,7 +8,7 @@ import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.produce.function.SetReturningFunctionTypeResolver; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.query.sqm.tree.SqmTypedNode; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java index 37fe61f093bd..a39931ee293b 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java @@ -53,8 +53,8 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.spi.PersisterFactory; import org.hibernate.query.BindableType; -import org.hibernate.query.derived.AnonymousTupleSimpleSqmPathSource; -import org.hibernate.query.derived.AnonymousTupleSqmPathSource; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleSimpleSqmPathSource; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleSqmPathSource; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.tree.domain.SqmPath; import org.hibernate.query.sqm.tree.expression.SqmFieldLiteral; 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 fe3ea457f2ab..1c909ad51648 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 @@ -71,7 +71,7 @@ import org.hibernate.query.criteria.JpaRoot; import org.hibernate.query.criteria.JpaSearchOrder; import org.hibernate.query.criteria.JpaXmlTableColumnNode; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.hql.HqlLogging; import org.hibernate.query.hql.spi.DotIdentifierConsumer; import org.hibernate.query.hql.spi.SemanticPathPart; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/NamedSqmSetReturningFunctionDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/NamedSqmSetReturningFunctionDescriptor.java index 8eab6bc81325..aa31128d61ff 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/NamedSqmSetReturningFunctionDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/NamedSqmSetReturningFunctionDescriptor.java @@ -8,7 +8,7 @@ import java.util.Locale; import org.hibernate.Incubating; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; import org.hibernate.query.sqm.produce.function.FunctionArgumentTypeResolver; import org.hibernate.query.sqm.produce.function.SetReturningFunctionTypeResolver; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmSetReturningFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmSetReturningFunction.java index c0c269f8ca0e..099a28364854 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmSetReturningFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmSetReturningFunction.java @@ -13,8 +13,8 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.MappingModelExpressible; import org.hibernate.metamodel.mapping.SelectableMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; import org.hibernate.query.sqm.produce.function.FunctionArgumentTypeResolver; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SetReturningFunctionRenderer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SetReturningFunctionRenderer.java index b8583b4570f6..64c83928f023 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SetReturningFunctionRenderer.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SetReturningFunctionRenderer.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/SetReturningFunctionTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/SetReturningFunctionTypeResolver.java index 4c68127ddece..eeb8f2c5d11e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/SetReturningFunctionTypeResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/SetReturningFunctionTypeResolver.java @@ -7,7 +7,7 @@ import org.hibernate.Incubating; import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.SqlExpressible; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.produce.function.internal.SetReturningFunctionTypeResolverBuilder; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.query.sqm.tree.SqmTypedNode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/SetReturningFunctionTypeResolverBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/SetReturningFunctionTypeResolverBuilder.java index 1b3adec848c8..b1ebf9d57cad 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/SetReturningFunctionTypeResolverBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/SetReturningFunctionTypeResolverBuilder.java @@ -10,7 +10,7 @@ import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.produce.function.SetReturningFunctionTypeResolver; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; 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 b39035623524..eda5e0da259a 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 @@ -115,9 +115,9 @@ import org.hibernate.query.criteria.JpaCteCriteriaAttribute; import org.hibernate.query.criteria.JpaPath; import org.hibernate.query.criteria.JpaSearchOrder; -import org.hibernate.query.derived.AnonymousTupleEntityValuedModelPart; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleEntityValuedModelPart; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.spi.QueryParameterBinding; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java index 4739648165fa..d31c37c0be60 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java @@ -24,7 +24,7 @@ import org.hibernate.metamodel.mapping.internal.EntityCollectionPart; import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping; import org.hibernate.persister.entity.UnionSubclassEntityPersister; -import org.hibernate.query.derived.AnonymousTupleEntityValuedModelPart; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleEntityValuedModelPart; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.query.sqm.tree.domain.SqmEntityValuedSimplePath; import org.hibernate.query.sqm.tree.domain.SqmPath; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteTable.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteTable.java index 44947f9454ba..dbc8af7ae045 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteTable.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteTable.java @@ -11,9 +11,9 @@ import org.hibernate.metamodel.model.domain.DomainType; import org.hibernate.query.criteria.JpaCteCriteriaAttribute; import org.hibernate.query.criteria.JpaCteCriteriaType; -import org.hibernate.query.derived.AnonymousTupleSimpleSqmPathSource; -import org.hibernate.query.derived.AnonymousTupleType; -import org.hibernate.query.derived.CteTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleSimpleSqmPathSource; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.CteTupleTableGroupProducer; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.SqmPathSource; import org.hibernate.query.sqm.tree.select.SqmSelectQuery; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDerivedRoot.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDerivedRoot.java index 7188003893f2..bde152e69d05 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDerivedRoot.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDerivedRoot.java @@ -8,7 +8,7 @@ import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.query.PathException; import org.hibernate.query.criteria.JpaDerivedRoot; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.SqmPathSource; import org.hibernate.query.sqm.spi.SqmCreationHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonTableFunction.java index f01ac33bbdd4..01b5b95f3de7 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonTableFunction.java @@ -14,7 +14,7 @@ import org.hibernate.query.criteria.JpaJsonTableColumnsNode; import org.hibernate.query.criteria.JpaJsonTableFunction; import org.hibernate.query.criteria.JpaJsonValueNode; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; 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/SqmSetReturningFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSetReturningFunction.java index 15e81f878e6d..d4e98d4d335a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSetReturningFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSetReturningFunction.java @@ -8,7 +8,7 @@ import org.hibernate.Incubating; import org.hibernate.query.criteria.JpaSetReturningFunction; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.function.SqmSetReturningFunctionDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmXmlTableFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmXmlTableFunction.java index 464b4671017e..2612f56c868b 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmXmlTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmXmlTableFunction.java @@ -10,7 +10,7 @@ import org.hibernate.query.criteria.JpaCastTarget; import org.hibernate.query.criteria.JpaXmlTableColumnNode; import org.hibernate.query.criteria.JpaXmlTableFunction; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; 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/from/SqmDerivedJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmDerivedJoin.java index 46269fa000c3..9b006cd4d962 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmDerivedJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmDerivedJoin.java @@ -10,7 +10,7 @@ import org.hibernate.query.criteria.JpaDerivedJoin; import org.hibernate.query.criteria.JpaExpression; import org.hibernate.query.criteria.JpaPredicate; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.SqmPathSource; import org.hibernate.query.sqm.spi.SqmCreationHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicEntityIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleBasicEntityIdentifierMapping.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicEntityIdentifierMapping.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleBasicEntityIdentifierMapping.java index 46a69f0cedb3..70b6be6ba3c9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicEntityIdentifierMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleBasicEntityIdentifierMapping.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import org.hibernate.Incubating; import org.hibernate.engine.spi.IdentifierValue; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleBasicValuedModelPart.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleBasicValuedModelPart.java index 5953d0c51d00..80e8c26793a6 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleBasicValuedModelPart.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.util.function.BiConsumer; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddableValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEmbeddableValuedModelPart.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddableValuedModelPart.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEmbeddableValuedModelPart.java index 63541d0b0e74..5a35e2e016c6 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddableValuedModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEmbeddableValuedModelPart.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddedEntityIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEmbeddedEntityIdentifierMapping.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddedEntityIdentifierMapping.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEmbeddedEntityIdentifierMapping.java index 2c50771b7429..578da896c57f 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddedEntityIdentifierMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEmbeddedEntityIdentifierMapping.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.util.Set; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEntityValuedModelPart.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEntityValuedModelPart.java index 8f9f4b312f11..caf4cefbf2c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEntityValuedModelPart.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.util.ArrayList; import java.util.HashSet; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleNonAggregatedEntityIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleNonAggregatedEntityIdentifierMapping.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleNonAggregatedEntityIdentifierMapping.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleNonAggregatedEntityIdentifierMapping.java index c74fc7cedfe7..02bb6d7429d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleNonAggregatedEntityIdentifierMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleNonAggregatedEntityIdentifierMapping.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.util.Set; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSimpleSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSimpleSqmPathSource.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSimpleSqmPathSource.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSimpleSqmPathSource.java index e56439c7ef48..14c0d3730c57 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSimpleSqmPathSource.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSimpleSqmPathSource.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import org.hibernate.Incubating; import org.hibernate.metamodel.model.domain.DomainType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmAssociationPathSource.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmAssociationPathSource.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmAssociationPathSource.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmAssociationPathSource.java index 3fb770920bd4..97122c47404d 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmAssociationPathSource.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmAssociationPathSource.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.lang.reflect.Member; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmAssociationPathSourceNew.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmAssociationPathSourceNew.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmAssociationPathSourceNew.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmAssociationPathSourceNew.java index 6ccac5f2fead..fffcea35927f 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmAssociationPathSourceNew.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmAssociationPathSourceNew.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.lang.reflect.Member; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmPathSource.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmPathSource.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmPathSource.java index 1be701481258..08a244b26d53 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmPathSource.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmPathSource.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import org.hibernate.Incubating; import org.hibernate.metamodel.model.domain.BasicDomainType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmPathSourceNew.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmPathSourceNew.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmPathSourceNew.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmPathSourceNew.java index 0056ca0387be..9ac446d82e5e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmPathSourceNew.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmPathSourceNew.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import org.hibernate.Incubating; import org.hibernate.metamodel.model.domain.BasicDomainType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleTableGroupProducer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleTableGroupProducer.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleTableGroupProducer.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleTableGroupProducer.java index d024fe6328a1..265566362b8a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleTableGroupProducer.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleTableGroupProducer.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.util.ArrayList; import java.util.HashSet; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleType.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleType.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleType.java index 2dd1fa603714..3dbf8f21b607 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleType.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleType.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.util.ArrayList; import java.util.Arrays; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/CteTupleTableGroupProducer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/CteTupleTableGroupProducer.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/query/derived/CteTupleTableGroupProducer.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/CteTupleTableGroupProducer.java index 076f46eea957..963140529e72 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/CteTupleTableGroupProducer.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/CteTupleTableGroupProducer.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/package-info.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/package-info.java new file mode 100644 index 000000000000..a084d0a38cfd --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/package-info.java @@ -0,0 +1,14 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ + +/** + * Support for tuples in SQM. + */ +@Incubating +package org.hibernate.query.sqm.tuple; + +import org.hibernate.Incubating; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslator.java index 5f3ba57f3db8..51798ad1ad4e 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslator.java @@ -10,7 +10,7 @@ import org.hibernate.Incubating; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.collections.Stack; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryOptions; import org.hibernate.sql.ast.tree.SqlAstNode; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java index 9ed7aacd39a3..6aee9a84ee15 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java @@ -60,7 +60,7 @@ import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.SortDirection; import org.hibernate.query.common.TemporalUnit; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.internal.NullPrecedenceHelper; import org.hibernate.query.spi.Limit; import org.hibernate.query.spi.QueryOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTable.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTable.java index f5712cc7091e..f6650ba1a937 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTable.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTable.java @@ -23,8 +23,8 @@ import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.metamodel.mapping.internal.SingleAttributeIdentifierMapping; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; -import org.hibernate.query.derived.CteTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.CteTupleTableGroupProducer; /** * Describes the table definition for the CTE - its name amd its columns