Skip to content

Commit c59f5c6

Browse files
sebersolesebersole
committed
HHH-16383 - NaturalIdClass
1 parent c110496 commit c59f5c6

20 files changed

+95
-97
lines changed

‎hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import org.hibernate.sql.ast.tree.predicate.PredicateContainer;
4949
import org.hibernate.sql.ast.tree.select.QuerySpec;
5050
import org.hibernate.sql.ast.tree.select.SelectStatement;
51-
import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
51+
import org.hibernate.sql.exec.spi.JdbcSelect;
5252
import org.hibernate.sql.results.internal.SqlSelectionImpl;
5353
import org.hibernate.type.BasicType;
5454
import org.hibernate.type.SqlTypes;
@@ -458,10 +458,10 @@ private static String timestampadd(String startExpression, String stepExpression
458458
type
459459
)
460460
) );
461-
final SqlAstTranslator<JdbcOperationQuerySelect> translator =
461+
final SqlAstTranslator<JdbcSelect> translator =
462462
creationContext.getDialect().getSqlAstTranslatorFactory()
463463
.buildSelectTranslator( creationContext.getSessionFactory(), new SelectStatement( fakeQuery ) );
464-
final JdbcOperationQuerySelect operation = translator.translate( null, QueryOptions.NONE );
464+
final JdbcSelect operation = translator.translate( null, QueryOptions.NONE );
465465
final String sqlString = operation.getSqlString();
466466
assert sqlString.startsWith( "select " );
467467

‎hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl;
2626
import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
2727
import org.hibernate.sql.exec.internal.SqlTypedMappingJdbcParameter;
28-
import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
2928
import org.hibernate.sql.exec.spi.JdbcParameterBindings;
3029
import org.hibernate.sql.exec.spi.JdbcParametersList;
30+
import org.hibernate.sql.exec.spi.JdbcSelect;
3131
import org.hibernate.sql.results.internal.RowTransformerStandardImpl;
3232
import org.hibernate.sql.results.spi.ListResultsConsumer;
3333

@@ -48,7 +48,7 @@ public class CollectionBatchLoaderArrayParam
4848
private final SqlTypedMapping arraySqlTypedMapping;
4949
private final JdbcParameter jdbcParameter;
5050
private final SelectStatement sqlSelect;
51-
private final JdbcOperationQuerySelect jdbcSelectOperation;
51+
private final JdbcSelect jdbcSelectOperation;
5252

5353
public CollectionBatchLoaderArrayParam(
5454
int domainBatchSize,

‎hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderInPredicate.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import org.hibernate.metamodel.mapping.PluralAttributeMapping;
1515
import org.hibernate.query.spi.QueryOptions;
1616
import org.hibernate.sql.ast.tree.select.SelectStatement;
17-
import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
1817
import org.hibernate.sql.exec.spi.JdbcParametersList;
18+
import org.hibernate.sql.exec.spi.JdbcSelect;
1919

2020
import static org.hibernate.loader.ast.internal.MultiKeyLoadHelper.countIds;
2121
import static org.hibernate.loader.ast.internal.MultiKeyLoadLogging.MULTI_KEY_LOAD_LOGGER;
@@ -34,7 +34,7 @@ public class CollectionBatchLoaderInPredicate
3434
private final int sqlBatchSize;
3535
private final JdbcParametersList jdbcParameters;
3636
private final SelectStatement sqlAst;
37-
private final JdbcOperationQuerySelect jdbcSelect;
37+
private final JdbcSelect jdbcSelect;
3838

3939
public CollectionBatchLoaderInPredicate(
4040
int domainBatchSize,

‎hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import org.hibernate.sql.ast.tree.select.SelectStatement;
1919
import org.hibernate.sql.exec.internal.BaseExecutionContext;
2020
import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
21-
import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
2221
import org.hibernate.sql.exec.spi.JdbcParametersList;
22+
import org.hibernate.sql.exec.spi.JdbcSelect;
2323
import org.hibernate.sql.results.internal.RowTransformerStandardImpl;
2424
import org.hibernate.sql.results.spi.ListResultsConsumer;
2525

@@ -36,7 +36,7 @@ public class CollectionLoaderSingleKey implements CollectionLoader {
3636
private final int keyJdbcCount;
3737

3838
private final SelectStatement sqlAst;
39-
private final JdbcOperationQuerySelect jdbcSelect;
39+
private final JdbcSelect jdbcSelect;
4040
private final JdbcParametersList jdbcParameters;
4141

4242
public CollectionLoaderSingleKey(

‎hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
*/
55
package org.hibernate.loader.ast.internal;
66

7-
import java.util.ArrayList;
8-
import java.util.List;
9-
107
import org.hibernate.LockOptions;
118
import org.hibernate.engine.spi.LoadQueryInfluencers;
129
import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -25,14 +22,17 @@
2522
import org.hibernate.sql.exec.internal.BaseExecutionContext;
2623
import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
2724
import org.hibernate.sql.exec.internal.SqlTypedMappingJdbcParameter;
28-
import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
2925
import org.hibernate.sql.exec.spi.JdbcParametersList;
26+
import org.hibernate.sql.exec.spi.JdbcSelect;
3027
import org.hibernate.sql.results.graph.DomainResult;
3128
import org.hibernate.sql.results.graph.internal.ImmutableFetchList;
3229
import org.hibernate.sql.results.internal.RowTransformerArrayImpl;
3330
import org.hibernate.sql.results.spi.ListResultsConsumer;
3431
import org.hibernate.type.StandardBasicTypes;
3532

33+
import java.util.ArrayList;
34+
import java.util.List;
35+
3636
import static org.hibernate.internal.util.collections.ArrayHelper.EMPTY_OBJECT_ARRAY;
3737
import static org.hibernate.loader.LoaderLogging.LOADER_LOGGER;
3838
import static org.hibernate.pretty.MessageHelper.infoString;
@@ -44,7 +44,7 @@ class DatabaseSnapshotExecutor {
4444

4545
private final EntityMappingType entityDescriptor;
4646

47-
private final JdbcOperationQuerySelect jdbcSelect;
47+
private final JdbcSelect jdbcSelect;
4848
private final JdbcParametersList jdbcParameters;
4949

5050
DatabaseSnapshotExecutor(

‎hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderArrayParam.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
*/
55
package org.hibernate.loader.ast.internal;
66

7-
import java.util.Locale;
8-
97
import org.hibernate.LockOptions;
108
import org.hibernate.engine.spi.LoadQueryInfluencers;
119
import org.hibernate.engine.spi.SharedSessionContractImplementor;
@@ -21,7 +19,9 @@
2119
import org.hibernate.sql.ast.tree.expression.JdbcParameter;
2220
import org.hibernate.sql.ast.tree.select.SelectStatement;
2321
import org.hibernate.sql.exec.internal.SqlTypedMappingJdbcParameter;
24-
import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
22+
import org.hibernate.sql.exec.spi.JdbcSelect;
23+
24+
import java.util.Locale;
2525

2626
import static org.hibernate.loader.ast.internal.LoaderHelper.loadByArrayParameter;
2727
import static org.hibernate.loader.ast.internal.MultiKeyLoadHelper.trimIdBatch;
@@ -44,7 +44,7 @@ public class EntityBatchLoaderArrayParam<T>
4444
private final SqlTypedMapping arraySqlTypedMapping;
4545
private final JdbcParameter jdbcParameter;
4646
private final SelectStatement sqlAst;
47-
private final JdbcOperationQuerySelect jdbcSelectOperation;
47+
private final JdbcSelect jdbcSelectOperation;
4848

4949

5050
/**

‎hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderInPredicate.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
*/
55
package org.hibernate.loader.ast.internal;
66

7-
import java.util.Locale;
8-
97
import org.hibernate.LockOptions;
108
import org.hibernate.engine.spi.LoadQueryInfluencers;
119
import org.hibernate.engine.spi.SharedSessionContractImplementor;
@@ -16,8 +14,10 @@
1614
import org.hibernate.metamodel.mapping.EntityMappingType;
1715
import org.hibernate.query.spi.QueryOptions;
1816
import org.hibernate.sql.ast.tree.select.SelectStatement;
19-
import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
2017
import org.hibernate.sql.exec.spi.JdbcParametersList;
18+
import org.hibernate.sql.exec.spi.JdbcSelect;
19+
20+
import java.util.Locale;
2121

2222
import static org.hibernate.loader.ast.internal.MultiKeyLoadLogging.MULTI_KEY_LOAD_LOGGER;
2323
import static org.hibernate.pretty.MessageHelper.infoString;
@@ -41,7 +41,7 @@ public class EntityBatchLoaderInPredicate<T>
4141

4242
private final JdbcParametersList jdbcParameters;
4343
private final SelectStatement sqlAst;
44-
private final JdbcOperationQuerySelect jdbcSelectOperation;
44+
private final JdbcSelect jdbcSelectOperation;
4545

4646
/**
4747
* @param domainBatchSize The maximum number of entities we will initialize for each load

‎hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
*/
55
package org.hibernate.loader.ast.internal;
66

7-
import java.util.List;
8-
97
import org.hibernate.Hibernate;
108
import org.hibernate.LockMode;
119
import org.hibernate.LockOptions;
@@ -26,12 +24,14 @@
2624
import org.hibernate.sql.ast.tree.select.SelectStatement;
2725
import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl;
2826
import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
29-
import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
3027
import org.hibernate.sql.exec.spi.JdbcParametersList;
28+
import org.hibernate.sql.exec.spi.JdbcSelect;
3129
import org.hibernate.sql.results.internal.RowTransformerStandardImpl;
3230
import org.hibernate.sql.results.spi.ListResultsConsumer;
3331
import org.hibernate.type.descriptor.java.JavaType;
3432

33+
import java.util.List;
34+
3535
import static java.lang.System.arraycopy;
3636
import static java.lang.reflect.Array.newInstance;
3737
import static org.hibernate.loader.LoaderLogging.LOADER_LOGGER;
@@ -217,7 +217,7 @@ public static <X> X[] createTypedArray(Class<X> elementClass, @SuppressWarnings(
217217
public static <R,K> List<R> loadByArrayParameter(
218218
K[] idsToInitialize,
219219
SelectStatement sqlAst,
220-
JdbcOperationQuerySelect jdbcOperation,
220+
JdbcSelect jdbcOperation,
221221
JdbcParameter jdbcParameter,
222222
JdbcMapping arrayJdbcMapping,
223223
Object entityId,

‎hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadChunker.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import org.hibernate.sql.ast.tree.select.SelectStatement;
1111
import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
1212
import org.hibernate.sql.exec.spi.ExecutionContext;
13-
import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
1413
import org.hibernate.sql.exec.spi.JdbcParameterBindings;
1514
import org.hibernate.sql.exec.spi.JdbcParametersList;
15+
import org.hibernate.sql.exec.spi.JdbcSelect;
1616
import org.hibernate.sql.results.internal.RowTransformerStandardImpl;
1717
import org.hibernate.sql.results.spi.ManagedResultConsumer;
1818

@@ -52,15 +52,15 @@ interface ChunkBoundaryListener {
5252

5353
private final JdbcParametersList jdbcParameters;
5454
private final SelectStatement sqlAst;
55-
private final JdbcOperationQuerySelect jdbcSelect;
55+
private final JdbcSelect jdbcSelect;
5656

5757
public MultiKeyLoadChunker(
5858
int chunkSize,
5959
int keyColumnCount,
6060
Bindable bindable,
6161
JdbcParametersList jdbcParameters,
6262
SelectStatement sqlAst,
63-
JdbcOperationQuerySelect jdbcSelect) {
63+
JdbcSelect jdbcSelect) {
6464
this.chunkSize = chunkSize;
6565
this.keyColumnCount = keyColumnCount;
6666
this.bindable = bindable;

‎hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
*/
55
package org.hibernate.loader.ast.internal;
66

7-
import java.util.ArrayList;
8-
import java.util.List;
9-
107
import org.hibernate.LockOptions;
118
import org.hibernate.engine.spi.LoadQueryInfluencers;
129
import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -17,12 +14,15 @@
1714
import org.hibernate.query.spi.QueryOptionsAdapter;
1815
import org.hibernate.sql.ast.tree.select.SelectStatement;
1916
import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
20-
import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
2117
import org.hibernate.sql.exec.spi.JdbcParameterBindings;
2218
import org.hibernate.sql.exec.spi.JdbcParametersList;
19+
import org.hibernate.sql.exec.spi.JdbcSelect;
2320
import org.hibernate.sql.results.internal.RowTransformerStandardImpl;
2421
import org.hibernate.sql.results.spi.ListResultsConsumer;
2522

23+
import java.util.ArrayList;
24+
import java.util.List;
25+
2626
import static org.hibernate.internal.util.collections.CollectionHelper.arrayList;
2727

2828
/**
@@ -49,7 +49,7 @@ interface KeyValueResolver {
4949

5050
private final KeyValueResolver keyValueResolver;
5151

52-
private final JdbcOperationQuerySelect jdbcSelect;
52+
private final JdbcSelect jdbcSelect;
5353

5454
private final LockOptions lockOptions;
5555

0 commit comments

Comments
 (0)