From a9ac98b364ccf52bb9cb2be5324c9c983e8bd8b3 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Fri, 25 Nov 2022 12:03:56 -0600 Subject: [PATCH] HHH-15393 - Improve write-paths to use mapping model HHH-15723 - Fix foreign-key modeling --- .../src/test/resources/log4j2.properties | 19 + .../community/dialect/CUBRIDDialect.java | 4 +- .../community/dialect/CacheDialect.java | 25 +- .../dialect/DB2LegacySqlAstTranslator.java | 17 +- .../community/dialect/DB2iLegacyDialect.java | 1 + .../community/dialect/FirebirdDialect.java | 6 +- .../dialect/FirebirdSqlAstTranslator.java | 5 - .../community/dialect/H2LegacyDialect.java | 3 +- .../community/dialect/InformixDialect.java | 20 +- .../dialect/InformixSqmToSqlAstConverter.java | 3 +- .../community/dialect/IngresDialect.java | 10 +- .../dialect/IngresSqmToSqlAstConverter.java | 3 +- .../dialect/MariaDBLegacyDialect.java | 1 + .../community/dialect/MaxDBDialect.java | 2 +- .../community/dialect/MimerSQLDialect.java | 4 +- .../community/dialect/MySQLLegacyDialect.java | 34 +- .../community/dialect/RDMSOS2200Dialect.java | 2 +- .../dialect/RDMSOS2200SqlAstTranslator.java | 3 +- .../community/dialect/SQLiteDialect.java | 4 +- .../dialect/SybaseAnywhereDialect.java | 9 +- .../SybaseLegacySqmToSqlAstConverter.java | 7 +- .../community/dialect/TeradataDialect.java | 22 +- .../community/dialect/TimesTenDialect.java | 24 +- .../dialect/TimesTenSqlAstTranslator.java | 3 +- .../src/main/java/org/hibernate/Remove.java | 2 + .../internal/BulkOperationCleanupAction.java | 6 +- .../action/internal/CollectionAction.java | 5 +- .../java/org/hibernate/annotations/Table.java | 3 +- .../cache/spi/entry/CacheEntryHelper.java | 6 +- .../org/hibernate/cfg/AvailableSettings.java | 3 +- .../collection/spi/PersistentCollection.java | 50 + .../dialect/AbstractHANADialect.java | 71 +- .../hibernate/dialect/CockroachDialect.java | 4 +- .../org/hibernate/dialect/DB2Dialect.java | 38 +- .../dialect/DB2SqlAstTranslator.java | 8 +- .../org/hibernate/dialect/DB2iDialect.java | 2 +- .../org/hibernate/dialect/DB2zDialect.java | 4 +- .../org/hibernate/dialect/DerbyDialect.java | 34 +- .../java/org/hibernate/dialect/Dialect.java | 12 + .../java/org/hibernate/dialect/H2Dialect.java | 6 +- .../hibernate/dialect/H2SqlAstTranslator.java | 37 +- .../org/hibernate/dialect/HSQLDialect.java | 2 +- .../org/hibernate/dialect/MySQLDialect.java | 34 +- .../org/hibernate/dialect/OracleDialect.java | 40 +- .../dialect/OracleSqlAstTranslator.java | 9 +- .../hibernate/dialect/PostgreSQLDialect.java | 5 +- .../dialect/PostgreSQLSqlAstTranslator.java | 2 +- .../hibernate/dialect/SQLServerDialect.java | 43 +- .../dialect/SQLServerSqlAstTranslator.java | 4 +- .../org/hibernate/dialect/SpannerDialect.java | 30 +- .../hibernate/dialect/SybaseASEDialect.java | 6 +- .../org/hibernate/dialect/SybaseDialect.java | 14 +- .../dialect/SybaseSqmToSqlAstConverter.java | 3 +- .../identity/GetGeneratedKeysDelegate.java | 74 - .../H2FinalTableIdentityColumnSupport.java | 31 + .../identity/H2IdentityColumnSupport.java | 21 + .../identity/IdentityColumnSupport.java | 1 + .../identity/IdentityColumnSupportImpl.java | 1 + .../Oracle12cGetGeneratedKeysDelegate.java | 15 +- .../Oracle12cIdentityColumnSupport.java | 1 + .../hibernate/engine/internal/Versioning.java | 10 +- .../hibernate/engine/jdbc/JdbcLogging.java | 46 + .../engine/jdbc/batch/JdbcBatchLogging.java | 52 + .../batch/internal/AbstractBatchImpl.java | 218 -- .../jdbc/batch/internal/BasicBatchKey.java | 17 + .../jdbc/batch/internal/BatchBuilderImpl.java | 131 +- .../batch/internal/BatchBuilderInitiator.java | 17 +- .../engine/jdbc/batch/internal/BatchImpl.java | 347 +++ .../jdbc/batch/internal/BatchingBatch.java | 156 - .../jdbc/batch/internal/NonBatchingBatch.java | 66 - .../internal/SharedBatchBuildingCode.java | 28 - .../UnmodifiableBatchBuilderImpl.java | 33 - .../UnmodifiableBatchBuilderInitiator.java | 51 - .../engine/jdbc/batch/spi/Batch.java | 27 +- .../engine/jdbc/batch/spi/BatchBuilder.java | 18 +- .../engine/jdbc/batch/spi/BatchKey.java | 10 + .../jdbc/internal/JdbcCoordinatorImpl.java | 33 +- .../MutationStatementPreparerImpl.java | 145 + .../jdbc/mutation/JdbcValueBindings.java | 58 + .../jdbc/mutation/MutationExecutor.java | 53 + .../jdbc/mutation/OperationResultChecker.java | 32 + .../engine/jdbc/mutation/ParameterUsage.java | 24 + .../jdbc/mutation/TableInclusionChecker.java | 25 + .../group/PreparedStatementDetails.java | 61 + .../group/PreparedStatementGroup.java | 61 + .../group/UnknownParameterException.java | 65 + .../internal/AbstractMutationExecutor.java | 124 + .../AbstractSingleMutationExecutor.java | 56 + .../internal/JdbcValueBindingsImpl.java | 127 + .../internal/JdbcValueDescriptorImpl.java | 56 + .../internal/ModelMutationHelper.java | 149 + .../internal/MutationExecutorPostInsert.java | 315 ++ ...MutationExecutorPostInsertSingleTable.java | 121 + .../MutationExecutorServiceInitiator.java | 74 + .../MutationExecutorSingleBatched.java | 67 + .../MutationExecutorSingleNonBatched.java | 53 + .../MutationExecutorSingleSelfExecuting.java | 60 + .../internal/MutationExecutorStandard.java | 246 ++ .../internal/MutationQueryOptions.java | 124 + .../PreparedStatementDetailsStandard.java | 117 + .../internal/PreparedStatementGroupNone.java | 61 + .../PreparedStatementGroupSingleTable.java | 89 + .../PreparedStatementGroupStandard.java | 206 ++ .../StandardMutationExecutorService.java | 92 + .../engine/jdbc/mutation/package-info.java | 14 + .../engine/jdbc/mutation/spi/Binding.java | 83 + .../jdbc/mutation/spi/BindingGroup.java | 68 + .../mutation/spi/MutationExecutorService.java | 28 + .../engine/jdbc/spi/JdbcCoordinator.java | 23 +- .../engine/jdbc/spi/JdbcServices.java | 3 +- .../jdbc/spi/MutationStatementPreparer.java | 56 + .../engine/jdbc/spi/SqlExceptionHelper.java | 14 + .../org/hibernate/id/ExportableColumn.java | 10 + .../id/IdentifierGeneratorHelper.java | 55 +- .../org/hibernate/id/IdentityGenerator.java | 127 +- .../id/PostInsertIdentityPersister.java | 3 +- .../org/hibernate/id/SelectGenerator.java | 50 +- .../id/insert/AbstractReturningDelegate.java | 37 +- .../id/insert/AbstractSelectingDelegate.java | 125 +- .../id/insert/BasicSelectingDelegate.java | 81 + .../id/insert/GetGeneratedKeysDelegate.java | 190 ++ .../InsertGeneratedIdentifierDelegate.java | 33 + .../id/insert/InsertReturningDelegate.java | 106 + .../insert/TableInsertReturningBuilder.java | 46 + .../hibernate/internal/CoreMessageLogger.java | 21 +- .../hibernate/internal/util/LazyValue.java | 13 +- .../internal/util/NullnessHelper.java | 36 + .../hibernate/internal/util/StringHelper.java | 13 + .../util/collections/ArrayHelper.java | 19 + .../util/collections/CollectionHelper.java | 19 + .../internal/util/collections/LazySet.java | 47 + .../java/org/hibernate/jdbc/Expectation.java | 24 +- .../java/org/hibernate/jdbc/Expectations.java | 5 + .../ast/internal/AbstractNaturalIdLoader.java | 9 +- .../CollectionElementLoaderByIndex.java | 4 +- .../internal/CollectionLoaderBatchKey.java | 4 +- .../internal/CollectionLoaderSingleKey.java | 4 +- .../CollectionLoaderSubSelectFetch.java | 4 +- .../internal/DatabaseSnapshotExecutor.java | 8 +- .../loader/ast/internal/LoadPlan.java | 5 +- .../ast/internal/MultiIdLoaderStandard.java | 4 +- .../MultiNaturalIdLoadingBatcher.java | 4 +- .../SingleIdEntityLoaderDynamicBatch.java | 4 +- .../loader/ast/internal/SingleIdLoadPlan.java | 6 +- .../SingleUniqueKeyEntityLoaderStandard.java | 6 +- .../org/hibernate/mapping/Collection.java | 10 + .../java/org/hibernate/mapping/Component.java | 1 + .../java/org/hibernate/mapping/OneToMany.java | 15 +- .../org/hibernate/mapping/SimpleValue.java | 19 +- .../java/org/hibernate/mapping/Value.java | 4 + .../metamodel/CollectionClassification.java | 5 + .../metamodel/mapping/AttributeMapping.java | 6 + .../metamodel/mapping/CollectionPart.java | 13 + .../mapping/EmbeddableMappingType.java | 14 + .../mapping/EntityIdentifierMapping.java | 2 - .../metamodel/mapping/EntityMappingType.java | 6 +- .../metamodel/mapping/EntityRowIdMapping.java | 2 +- .../mapping/ForeignKeyDescriptor.java | 14 +- .../metamodel/mapping/ModelPart.java | 11 +- .../metamodel/mapping/SelectableConsumer.java | 138 + .../metamodel/mapping/SelectableMapping.java | 42 + .../metamodel/mapping/ValueMapping.java | 2 +- .../internal/AbstractEmbeddableMapping.java | 20 +- .../AbstractEntityCollectionPart.java | 433 +++ .../internal/AnyDiscriminatorPart.java | 27 +- .../mapping/internal/AnyKeyPart.java | 41 +- .../internal/BasicAttributeMapping.java | 32 +- .../BasicEntityIdentifierMappingImpl.java | 28 +- .../internal/BasicValuedCollectionPart.java | 27 +- ...CaseStatementDiscriminatorMappingImpl.java | 15 + .../CollectionIdentifierDescriptorImpl.java | 23 +- ...criminatedAssociationAttributeMapping.java | 27 +- .../DiscriminatedAssociationMapping.java | 61 +- .../internal/DiscriminatedCollectionPart.java | 15 +- .../internal/EmbeddableMappingTypeImpl.java | 58 +- .../internal/EmbeddedAttributeMapping.java | 14 +- .../internal/EmbeddedCollectionPart.java | 11 +- .../EmbeddedForeignKeyDescriptor.java | 50 +- .../internal/EntityCollectionPart.java | 815 +----- .../internal/EntityRowIdMappingImpl.java | 18 +- .../internal/EntityVersionMappingImpl.java | 18 +- ...xplicitColumnDiscriminatorMappingImpl.java | 18 +- .../internal/GeneratedValuesProcessor.java | 4 +- ...InverseNonAggregatedIdentifierMapping.java | 2 - .../internal/ManyToManyCollectionPart.java | 510 ++++ .../internal/MappingModelCreationHelper.java | 303 +- .../internal/MappingModelCreationProcess.java | 41 + .../NonAggregatedIdentifierMappingImpl.java | 2 - .../internal/OneToManyCollectionPart.java | 232 ++ .../internal/PluralAttributeMappingImpl.java | 8 +- .../internal/SelectableMappingImpl.java | 47 +- .../internal/SelectableMappingsImpl.java | 45 + .../internal/SimpleForeignKeyDescriptor.java | 108 +- .../internal/ToOneAttributeMapping.java | 156 +- .../mapping/internal/VirtualIdEmbeddable.java | 22 +- .../convert/spi/ConvertibleValueMapping.java | 22 - .../model/convert/spi/EnumValueConverter.java | 4 +- .../AbstractCollectionPersister.java | 1104 ++----- .../collection/BasicCollectionPersister.java | 848 ++++-- .../collection/CollectionPersister.java | 123 +- .../collection/OneToManyPersister.java | 1012 ++++--- .../collection/QueryableCollection.java | 6 + .../collection/SQLLoadableCollection.java | 1 + .../AbstractUpdateRowsCoordinator.java | 52 + .../mutation/CollectionMutationTarget.java | 30 + .../CollectionOperationCoordinator.java | 19 + .../mutation/CollectionTableMapping.java | 100 + .../mutation/DeleteRowsCoordinator.java | 35 + .../mutation/DeleteRowsCoordinatorNoOp.java | 38 + .../DeleteRowsCoordinatorStandard.java | 136 + .../mutation/InsertRowsCoordinator.java | 65 + .../mutation/InsertRowsCoordinatorNoOp.java | 36 + .../InsertRowsCoordinatorStandard.java | 143 + .../mutation/OperationProducer.java | 25 + .../mutation/RemoveCoordinator.java | 37 + .../mutation/RemoveCoordinatorNoOp.java | 40 + .../mutation/RemoveCoordinatorStandard.java | 143 + .../mutation/RowMutationOperations.java | 196 ++ .../mutation/UpdateRowsCoordinator.java | 17 + .../mutation/UpdateRowsCoordinatorNoOp.java | 37 + .../UpdateRowsCoordinatorOneToMany.java | 185 ++ .../UpdateRowsCoordinatorStandard.java | 168 ++ .../collection/mutation/package-info.java | 18 + .../entity/AbstractEntityPersister.java | 2588 ++++++----------- .../entity/JoinedSubclassEntityPersister.java | 124 +- .../persister/entity/OuterJoinLoadable.java | 9 + .../entity/SingleTableEntityPersister.java | 206 +- .../entity/UnionSubclassEntityPersister.java | 36 +- .../mutation/AbstractMutationCoordinator.java | 88 + .../entity/mutation/AttributeAnalysis.java | 51 + .../entity/mutation/DeleteCoordinator.java | 462 +++ .../entity/mutation/EntityMutationTarget.java | 52 + .../entity/mutation/EntityTableMapping.java | 337 +++ .../entity/mutation/InsertCoordinator.java | 470 +++ .../entity/mutation/UpdateCoordinator.java | 34 + .../mutation/UpdateCoordinatorNoOp.java | 34 + .../mutation/UpdateCoordinatorStandard.java | 1470 ++++++++++ .../entity/mutation/UpdateValuesAnalysis.java | 48 + ...tractStandardCallableStatementSupport.java | 4 +- .../PostgresCallableStatementSupport.java | 10 +- .../procedure/internal/ProcedureCallImpl.java | 7 +- .../StandardCallableStatementSupport.java | 10 +- .../spi/CallableStatementSupport.java | 6 +- ...mousTupleBasicEntityIdentifierMapping.java | 3 +- .../AnonymousTupleBasicValuedModelPart.java | 18 +- .../AnonymousTupleEntityValuedModelPart.java | 71 +- .../DynamicResultBuilderEntityStandard.java | 53 +- .../query/spi/SqlOmittingQueryOptions.java | 4 +- .../NativeNonSelectQueryPlanImpl.java | 6 +- .../internal/NativeSelectQueryPlanImpl.java | 6 +- .../internal/ConcreteSqmSelectQueryPlan.java | 14 +- .../sqm/internal/SimpleDeleteQueryPlan.java | 16 +- .../sqm/internal/SimpleInsertQueryPlan.java | 8 +- .../sqm/internal/SimpleUpdateQueryPlan.java | 8 +- .../SqmJdbcExecutionContextAdapter.java | 4 +- .../sqm/internal/SqmMappingModelHelper.java | 4 +- .../internal/MatchingIdSelectionHelper.java | 6 +- .../internal/SqmMutationStrategyHelper.java | 3 +- .../cte/AbstractCteMutationHandler.java | 43 +- .../internal/cte/CteDeleteHandler.java | 19 +- .../internal/cte/CteInsertHandler.java | 63 +- .../internal/cte/CteUpdateHandler.java | 7 +- .../internal/inline/InlineDeleteHandler.java | 10 +- .../internal/inline/InlineUpdateHandler.java | 17 +- .../ExecuteWithTemporaryTableHelper.java | 20 +- .../temptable/InsertExecutionDelegate.java | 46 +- .../RestrictedDeleteExecutionDelegate.java | 19 +- .../temptable/TableBasedInsertHandler.java | 48 +- .../temptable/UpdateExecutionDelegate.java | 18 +- .../sqm/sql/BaseSqmToSqlAstConverter.java | 177 +- .../EntityValuedPathInterpretation.java | 6 +- .../service/StandardServiceInitiators.java | 2 + .../main/java/org/hibernate/sql/Insert.java | 84 +- .../main/java/org/hibernate/sql/Update.java | 10 + .../hibernate/sql/ast/SqlAstTranslator.java | 1 - .../sql/ast/SqlAstTranslatorFactory.java | 24 +- .../org/hibernate/sql/ast/SqlAstWalker.java | 29 +- .../org/hibernate/sql/ast/SqlTreePrinter.java | 5 +- .../sql/ast/spi/AbstractSqlAstTranslator.java | 303 +- .../sql/ast/spi/AbstractSqlAstWalker.java | 57 +- .../sql/ast/spi/AggregateFunctionChecker.java | 5 +- .../ast/spi/ExpressionReplacementWalker.java | 46 +- .../sql/ast/spi/StandardSqlAstTranslator.java | 4 +- .../spi/StandardSqlAstTranslatorFactory.java | 29 +- .../org/hibernate/sql/ast/tree/Statement.java | 3 + .../ast/tree/from/NamedTableReference.java | 4 +- .../ast/tree/from/UnionTableReference.java | 6 +- .../tree/insert/InsertSelectStatement.java | 114 + .../sql/ast/tree/insert/InsertStatement.java | 101 +- .../AbstractJdbcOperationQueryInsert.java | 29 + .../sql/exec/internal/JdbcCallImpl.java | 75 +- .../JdbcOperationQueryInsertImpl.java | 29 + .../JdbcSelectExecutorStandardImpl.java | 27 +- .../StandardJdbcMutationExecutor.java | 9 +- .../org/hibernate/sql/exec/package-info.java | 2 +- ...n.java => AbstractJdbcOperationQuery.java} | 13 +- .../sql/exec/spi/JdbcCallFunctionReturn.java | 2 +- .../sql/exec/spi/JdbcLockStrategy.java | 2 +- .../sql/exec/spi/JdbcMutationExecutor.java | 4 +- .../hibernate/sql/exec/spi/JdbcOperation.java | 35 +- .../sql/exec/spi/JdbcOperationQuery.java | 49 + ....java => JdbcOperationQueryAnonBlock.java} | 2 +- ...cCall.java => JdbcOperationQueryCall.java} | 2 +- ...ete.java => JdbcOperationQueryDelete.java} | 5 +- ...ion.java => JdbcOperationQueryInsert.java} | 9 +- .../exec/spi/JdbcOperationQueryMutation.java | 23 + ... => JdbcOperationQueryMutationNative.java} | 6 +- ...ect.java => JdbcOperationQuerySelect.java} | 6 +- ...ert.java => JdbcOperationQueryUpdate.java} | 7 +- .../sql/exec/spi/JdbcSelectExecutor.java | 8 +- .../hibernate/sql/exec/spi/JdbcUpdate.java | 30 - .../sql/model/ModelMutationLogging.java | 30 + .../sql/model/MutationOperation.java | 95 + .../sql/model/MutationOperationGroup.java | 58 + .../hibernate/sql/model/MutationTarget.java | 60 + .../org/hibernate/sql/model/MutationType.java | 28 + .../model/PreparableMutationOperation.java | 77 + .../model/SelfExecutingUpdateOperation.java | 24 + .../org/hibernate/sql/model/TableMapping.java | 118 + .../hibernate/sql/model/ValuesAnalysis.java | 20 + .../ast/AbstractRestrictedTableMutation.java | 59 + .../sql/model/ast/AbstractTableDelete.java | 67 + .../sql/model/ast/AbstractTableInsert.java | 77 + .../sql/model/ast/AbstractTableMutation.java | 105 + .../sql/model/ast/AbstractTableUpdate.java | 84 + .../sql/model/ast/ColumnValueBinding.java | 41 + .../sql/model/ast/ColumnValueParameter.java | 36 + .../sql/model/ast/ColumnWriteFragment.java | 63 + .../sql/model/ast/CustomSqlMutation.java | 24 + .../sql/model/ast/MutatingTableReference.java | 105 + .../sql/model/ast/MutationGroup.java | 33 + .../model/ast/RestrictedTableMutation.java | 38 + .../hibernate/sql/model/ast/TableDelete.java | 18 + .../hibernate/sql/model/ast/TableInsert.java | 67 + .../sql/model/ast/TableMutation.java | 67 + .../hibernate/sql/model/ast/TableUpdate.java | 47 + ...bstractRestrictedTableMutationBuilder.java | 105 + .../builder/AbstractTableInsertBuilder.java | 84 + .../builder/AbstractTableMutationBuilder.java | 150 + .../builder/AbstractTableUpdateBuilder.java | 83 + .../ast/builder/MutationGroupBuilder.java | 120 + .../RestrictedTableMutationBuilder.java | 83 + .../model/ast/builder/TableDeleteBuilder.java | 17 + .../builder/TableDeleteBuilderSkipped.java | 54 + .../builder/TableDeleteBuilderStandard.java | 87 + .../model/ast/builder/TableInsertBuilder.java | 50 + .../builder/TableInsertBuilderStandard.java | 95 + .../ast/builder/TableMutationBuilder.java | 32 + .../model/ast/builder/TableUpdateBuilder.java | 67 + .../builder/TableUpdateBuilderSkipped.java | 76 + .../builder/TableUpdateBuilderStandard.java | 80 + .../sql/model/ast/builder/package-info.java | 17 + .../model/ast/package-info.java} | 11 +- .../AbstractMutationOperationGroup.java | 34 + .../sql/model/internal/MutationGroupNone.java | 71 + .../model/internal/MutationGroupSingle.java | 81 + .../model/internal/MutationGroupStandard.java | 78 + .../internal/MutationOperationGroupNone.java | 56 + .../MutationOperationGroupSingle.java | 73 + .../MutationOperationGroupStandard.java | 87 + .../model/internal/TableDeleteCustomSql.java | 52 + .../model/internal/TableDeleteStandard.java | 40 + .../model/internal/TableInsertCustomSql.java | 64 + .../model/internal/TableInsertStandard.java | 58 + .../model/internal/TableUpdateCustomSql.java | 54 + .../sql/model/internal/TableUpdateNoSet.java | 77 + .../model/internal/TableUpdateStandard.java | 60 + .../sql/model/internal/TableUpsert.java | 113 + .../sql/model/internal/package-info.java | 14 + .../sql/model/jdbc/AbstractJdbcMutation.java | 100 + .../sql/model/jdbc/JdbcDeleteMutation.java | 54 + .../sql/model/jdbc/JdbcInsertMutation.java | 42 + .../sql/model/jdbc/JdbcMutationOperation.java | 19 + .../sql/model/jdbc/JdbcUpdateMutation.java | 42 + .../sql/model/jdbc/JdbcValueDescriptor.java | 45 + .../jdbc/OptionalTableUpdateOperation.java | 466 +++ .../sql/model/jdbc/package-info.java | 14 + .../org/hibernate/sql/model/package-info.java | 18 + ...StandardEntityGraphTraversalStateImpl.java | 3 +- .../internal/DeferredResultSetAccess.java | 12 +- .../type/descriptor/jdbc/JdbcType.java | 15 + .../entity/PhoneNumberConverter.java | 3 + .../orm/test/annotations/entity/Topic.java | 11 +- .../annotations/inheritance/joined/Alarm.java | 21 +- .../inheritance/joined/EventInformation.java | 21 +- .../joined/JoinedSubclassTest.java | 5 +- ...ParentChildWithSameSecondaryTableTest.java | 7 +- .../batch/BatchOptimisticLockingTest.java | 16 +- .../test/batch/BatchingBatchFailureTest.java | 40 +- .../batch/NonBatchingBatchFailureTest.java | 23 +- .../OptionalSecondaryTableBatchTest.java | 225 +- .../DefaultCatalogAndSchemaTest.java | 39 +- ...NestedEmbeddableAttributeOverrideTest.java | 2 - .../idbag/IdBagElementNullBasicTest.java | 7 +- .../collection/original/CollectionTest.java | 12 +- .../CompositeElementTest.java | 12 +- .../JdbcBatchingAgressiveReleaseTest.java | 118 - .../customsql/CustomSqlGeneratedTest.java | 20 +- .../orm/test/customsql/CustomSqlTest.java | 18 +- .../AbstractEntityWithOneToManyTest.java | 59 +- .../BaseInsertOrderingTest.java | 16 +- .../insertordering/InsertOrderingTest.java | 70 +- ...ertOrderingWithJoinedTableInheritance.java | 97 +- ...gWithJoinedTableMultiLevelInheritance.java | 64 +- ...ertOrderingWithSingleTableInheritance.java | 20 +- ...tOrderingWithTablePerClassInheritance.java | 121 +- .../orm/test/jdbc/JdbcCoordinatorTest.java | 2 +- .../orm/test/jdbc/internal/BatchingTest.java | 460 +-- .../orm/test/jpa/exception/ExceptionTest.java | 16 +- .../batch/AbstractBatchingTest.java | 154 + .../batch/AbstractJtaBatchTest.java | 41 +- .../batch/FailingAddToBatchTest.java | 194 +- .../batch/JtaWithFailingBatchTest.java | 112 +- .../batch/JtaWithStatementsBatchTest.java | 72 +- .../batchload/BatchedManyToManyTest.java | 2 +- .../batchload/TestingBatchBuilder.java | 27 - .../ManyToManyListBidirectionalTest.java | 68 +- .../CustomSqlSchemaResolvingIdentityTest.java | 22 +- .../entity/CustomSqlSchemaResolvingTest.java | 7 +- .../orm/test/query/hhh12225/HQLTypeTest.java | 21 + .../orm/test/sql/ast/SmokeTests.java | 15 +- .../orm/test/write/CustomSqlTests.java | 84 + .../orm/test/write/DynamicUpdateTests.java | 363 +++ .../orm/test/write/StaticDeleteTests.java | 83 + .../staticinsert/SimpleStaticInsertTests.java | 93 + .../SingleTableStaticInsertTests.java | 120 + ...leWithSecondaryTableStaticInsertTests.java | 113 + .../src/test/resources/log4j2.properties | 3 + .../hashcode/ListHashcodeChangeTest.java | 19 +- .../hashcode/SetHashcodeChangeTest.java | 19 +- .../unidirectional/JoinTableDetachedTest.java | 6 +- .../gambit/EntityWithManyToOneJoinTable.java | 15 +- .../orm/domain/retail/CardPayment.java | 14 + .../orm/domain/retail/DomesticVendor.java | 4 + .../orm/domain/retail/ForeignVendor.java | 4 + .../testing/orm/domain/retail/Vendor.java | 18 + 436 files changed, 22797 insertions(+), 7244 deletions(-) delete mode 100644 hibernate-core/src/main/java/org/hibernate/dialect/identity/GetGeneratedKeysDelegate.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/JdbcBatchLogging.java delete mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/AbstractBatchImpl.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java delete mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java delete mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/NonBatchingBatch.java delete mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/SharedBatchBuildingCode.java delete mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/UnmodifiableBatchBuilderImpl.java delete mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/UnmodifiableBatchBuilderInitiator.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/MutationStatementPreparerImpl.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/JdbcValueBindings.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/MutationExecutor.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/OperationResultChecker.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/ParameterUsage.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/TableInclusionChecker.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/PreparedStatementDetails.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/PreparedStatementGroup.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/UnknownParameterException.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractMutationExecutor.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractSingleMutationExecutor.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueBindingsImpl.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueDescriptorImpl.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/ModelMutationHelper.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorPostInsert.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorPostInsertSingleTable.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorServiceInitiator.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleBatched.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleNonBatched.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleSelfExecuting.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorStandard.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationQueryOptions.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementDetailsStandard.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupNone.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupSingleTable.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupStandard.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/StandardMutationExecutorService.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/package-info.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/Binding.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/BindingGroup.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/MutationExecutorService.java create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/MutationStatementPreparer.java create mode 100644 hibernate-core/src/main/java/org/hibernate/id/insert/BasicSelectingDelegate.java create mode 100644 hibernate-core/src/main/java/org/hibernate/id/insert/GetGeneratedKeysDelegate.java create mode 100644 hibernate-core/src/main/java/org/hibernate/id/insert/InsertReturningDelegate.java create mode 100644 hibernate-core/src/main/java/org/hibernate/id/insert/TableInsertReturningBuilder.java create mode 100644 hibernate-core/src/main/java/org/hibernate/internal/util/collections/LazySet.java create mode 100644 hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java create mode 100644 hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ManyToManyCollectionPart.java create mode 100644 hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java delete mode 100644 hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/ConvertibleValueMapping.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/AbstractUpdateRowsCoordinator.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionMutationTarget.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionOperationCoordinator.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionTableMapping.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinator.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorNoOp.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorStandard.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinator.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorNoOp.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorStandard.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/OperationProducer.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinator.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorNoOp.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorStandard.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RowMutationOperations.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinator.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorNoOp.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorOneToMany.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorStandard.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/package-info.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractMutationCoordinator.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AttributeAnalysis.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinator.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityMutationTarget.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityTableMapping.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinator.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinator.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorNoOp.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java create mode 100644 hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateValuesAnalysis.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertSelectStatement.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQueryInsert.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQueryInsertImpl.java rename hibernate-core/src/main/java/org/hibernate/sql/exec/spi/{AbstractJdbcOperation.java => AbstractJdbcOperationQuery.java} (91%) create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQuery.java rename hibernate-core/src/main/java/org/hibernate/sql/exec/spi/{JdbcAnonBlock.java => JdbcOperationQueryAnonBlock.java} (93%) rename hibernate-core/src/main/java/org/hibernate/sql/exec/spi/{JdbcCall.java => JdbcOperationQueryCall.java} (92%) rename hibernate-core/src/main/java/org/hibernate/sql/exec/spi/{JdbcDelete.java => JdbcOperationQueryDelete.java} (84%) rename hibernate-core/src/main/java/org/hibernate/sql/exec/spi/{JdbcMutation.java => JdbcOperationQueryInsert.java} (62%) create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryMutation.java rename hibernate-core/src/main/java/org/hibernate/sql/exec/spi/{NativeJdbcMutation.java => JdbcOperationQueryMutationNative.java} (89%) rename hibernate-core/src/main/java/org/hibernate/sql/exec/spi/{JdbcSelect.java => JdbcOperationQuerySelect.java} (97%) rename hibernate-core/src/main/java/org/hibernate/sql/exec/spi/{JdbcInsert.java => JdbcOperationQueryUpdate.java} (84%) delete mode 100644 hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcUpdate.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/MutationOperation.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/MutationOperationGroup.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/MutationTarget.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/MutationType.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/PreparableMutationOperation.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/SelfExecutingUpdateOperation.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/TableMapping.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ValuesAnalysis.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractRestrictedTableMutation.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableDelete.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableInsert.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableMutation.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableUpdate.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueBinding.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueParameter.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnWriteFragment.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/CustomSqlMutation.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/MutatingTableReference.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/MutationGroup.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/RestrictedTableMutation.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableDelete.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableInsert.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableMutation.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableUpdate.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractRestrictedTableMutationBuilder.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableInsertBuilder.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableMutationBuilder.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableUpdateBuilder.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/MutationGroupBuilder.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/RestrictedTableMutationBuilder.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilder.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilderSkipped.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilderStandard.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableInsertBuilder.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableInsertBuilderStandard.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableMutationBuilder.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilder.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilderSkipped.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilderStandard.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/package-info.java rename hibernate-core/src/main/java/org/hibernate/{metamodel/mapping/MappingTypedModelPart.java => sql/model/ast/package-info.java} (57%) create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/internal/AbstractMutationOperationGroup.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupNone.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupSingle.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupStandard.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupNone.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupSingle.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupStandard.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableDeleteCustomSql.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableDeleteStandard.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableInsertCustomSql.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableInsertStandard.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateCustomSql.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateNoSet.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateStandard.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpsert.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/internal/package-info.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/AbstractJdbcMutation.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcDeleteMutation.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcInsertMutation.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcMutationOperation.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcUpdateMutation.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcValueDescriptor.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateOperation.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/package-info.java create mode 100644 hibernate-core/src/main/java/org/hibernate/sql/model/package-info.java delete mode 100644 hibernate-core/src/test/java/org/hibernate/orm/test/connections/JdbcBatchingAgressiveReleaseTest.java create mode 100644 hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractBatchingTest.java delete mode 100644 hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/TestingBatchBuilder.java create mode 100644 hibernate-core/src/test/java/org/hibernate/orm/test/write/CustomSqlTests.java create mode 100644 hibernate-core/src/test/java/org/hibernate/orm/test/write/DynamicUpdateTests.java create mode 100644 hibernate-core/src/test/java/org/hibernate/orm/test/write/StaticDeleteTests.java create mode 100644 hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SimpleStaticInsertTests.java create mode 100644 hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableStaticInsertTests.java create mode 100644 hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableWithSecondaryTableStaticInsertTests.java diff --git a/documentation/src/test/resources/log4j2.properties b/documentation/src/test/resources/log4j2.properties index 5103dae52a..589c854e62 100644 --- a/documentation/src/test/resources/log4j2.properties +++ b/documentation/src/test/resources/log4j2.properties @@ -9,6 +9,25 @@ appender.stdout.name=STDOUT appender.stdout.layout.type=PatternLayout appender.stdout.layout.pattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n + +appender.subsystem.name=subsystem +appender.subsystem.type=Console +appender.subsystem.layout.type=PatternLayout +appender.subsystem.layout.pattern=[subsystem] %5p %15.25c{5} %C{1}:%L - %m%n + +logger.subsystem-root.name=org.hibernate.orm +logger.subsystem-root.level=info +logger.subsystem-root.additivity=false +logger.subsystem-root.appenderRef.subsystem.ref=subsystem + +logger.jdbc-bind.name=org.hibernate.orm.jdbc.bind +logger.jdbc-bind.level=trace + +logger.jdbc-extract.name=org.hibernate.orm.jdbc.extract +logger.jdbc-extract.level=trace + + + rootLogger.level=info rootLogger.appenderRef.stdout.ref=STDOUT 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 2e6b0f513f..3c506bbe85 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 @@ -23,10 +23,10 @@ import org.hibernate.dialect.pagination.LimitLimitHandler; import org.hibernate.dialect.sequence.SequenceSupport; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.query.sqm.IntervalType; import org.hibernate.query.SemanticException; -import org.hibernate.query.sqm.TemporalUnit; import org.hibernate.query.spi.QueryEngine; +import org.hibernate.query.sqm.IntervalType; +import org.hibernate.query.sqm.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/CacheDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheDialect.java index 6ee5a0fc9b..8c7655c2ce 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 @@ -6,18 +6,30 @@ */ package org.hibernate.community.dialect; +import java.sql.CallableStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Types; + import org.hibernate.LockMode; import org.hibernate.cfg.Environment; +import org.hibernate.community.dialect.identity.CacheIdentityColumnSupport; +import org.hibernate.community.dialect.sequence.CacheSequenceSupport; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.OracleDialect; import org.hibernate.dialect.SimpleDatabaseVersion; import org.hibernate.dialect.function.CommonFunctionFactory; -import org.hibernate.community.dialect.identity.CacheIdentityColumnSupport; import org.hibernate.dialect.identity.IdentityColumnSupport; -import org.hibernate.dialect.lock.*; +import org.hibernate.dialect.lock.LockingStrategy; +import org.hibernate.dialect.lock.OptimisticForceIncrementLockingStrategy; +import org.hibernate.dialect.lock.OptimisticLockingStrategy; +import org.hibernate.dialect.lock.PessimisticForceIncrementLockingStrategy; +import org.hibernate.dialect.lock.PessimisticReadUpdateLockingStrategy; +import org.hibernate.dialect.lock.PessimisticWriteUpdateLockingStrategy; +import org.hibernate.dialect.lock.SelectLockingStrategy; +import org.hibernate.dialect.lock.UpdateLockingStrategy; import org.hibernate.dialect.pagination.LimitHandler; import org.hibernate.dialect.pagination.TopLimitHandler; -import org.hibernate.community.dialect.sequence.CacheSequenceSupport; import org.hibernate.dialect.sequence.SequenceSupport; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.spi.SessionFactoryImplementor; @@ -28,9 +40,9 @@ import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor; import org.hibernate.exception.spi.ViolatedConstraintNameExtractor; import org.hibernate.internal.util.JdbcExceptionHelper; import org.hibernate.persister.entity.Lockable; +import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.IntervalType; import org.hibernate.query.sqm.TemporalUnit; -import org.hibernate.query.spi.QueryEngine; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.spi.SqlAppender; @@ -41,11 +53,6 @@ import org.hibernate.type.StandardBasicTypes; import org.hibernate.type.descriptor.jdbc.JdbcType; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; -import java.sql.CallableStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Types; - import jakarta.persistence.TemporalType; import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate; 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 6514d46f1d..65fe63f1bc 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 @@ -27,11 +27,10 @@ import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.Literal; import org.hibernate.sql.ast.tree.expression.SqlTuple; import org.hibernate.sql.ast.tree.expression.Summarization; +import org.hibernate.sql.ast.tree.from.QueryPartTableReference; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableGroupJoin; import org.hibernate.sql.ast.tree.from.TableReferenceJoin; -import org.hibernate.sql.ast.tree.from.QueryPartTableReference; -import org.hibernate.sql.ast.tree.insert.InsertStatement; import org.hibernate.sql.ast.tree.predicate.BooleanExpressionPredicate; import org.hibernate.sql.ast.tree.select.QueryGroup; import org.hibernate.sql.ast.tree.select.QueryPart; @@ -333,15 +332,6 @@ public class DB2LegacySqlAstTranslator extends Abstract } } - @Override - protected void visitInsertStatementOnly(InsertStatement statement) { - final boolean closeWrapper = renderReturningClause( statement ); - super.visitInsertStatementOnly( statement ); - if ( closeWrapper ) { - appendSql( ')' ); - } - } - protected boolean renderReturningClause(MutationStatement statement) { final List returningColumns = statement.getReturningColumns(); final int size = returningColumns.size(); @@ -429,11 +419,6 @@ public class DB2LegacySqlAstTranslator extends Abstract return getFromDual(); } - @Override - protected void visitReturningColumns(MutationStatement mutationStatement) { - // For DB2 we use #renderReturningClause to render a wrapper around the DML statement - } - public DatabaseVersion getDB2Version() { return this.getDialect().getVersion(); } diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java index 7aa24423b0..f41cd9f88f 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java @@ -150,6 +150,7 @@ public class DB2iLegacyDialect extends DB2LegacyDialect { @Override public SqlAstTranslatorFactory getSqlAstTranslatorFactory() { return new StandardSqlAstTranslatorFactory() { + @Override protected SqlAstTranslator buildTranslator( SessionFactoryImplementor sessionFactory, Statement statement) { 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 723dd9db01..6ab1a2e565 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 @@ -32,6 +32,8 @@ import org.hibernate.dialect.identity.IdentityColumnSupport; import org.hibernate.dialect.pagination.LimitHandler; import org.hibernate.dialect.pagination.OffsetFetchLimitHandler; import org.hibernate.dialect.sequence.SequenceSupport; +import org.hibernate.dialect.temptable.TemporaryTable; +import org.hibernate.dialect.temptable.TemporaryTableKind; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.jdbc.env.spi.IdentifierHelper; import org.hibernate.engine.jdbc.env.spi.IdentifierHelperBuilder; @@ -44,16 +46,14 @@ import org.hibernate.exception.spi.ViolatedConstraintNameExtractor; import org.hibernate.internal.util.JdbcExceptionHelper; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; +import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; import org.hibernate.query.sqm.NullOrdering; import org.hibernate.query.sqm.TemporalUnit; -import org.hibernate.query.spi.QueryEngine; 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; -import org.hibernate.dialect.temptable.TemporaryTable; -import org.hibernate.dialect.temptable.TemporaryTableKind; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy; import org.hibernate.service.ServiceRegistry; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdSqlAstTranslator.java index bf0457b325..87f698792f 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdSqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdSqlAstTranslator.java @@ -6,21 +6,16 @@ */ package org.hibernate.community.dialect; -import java.util.ArrayList; import java.util.List; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.collections.Stack; -import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.spi.SqlSelection; -import org.hibernate.sql.ast.tree.SqlAstNode; import org.hibernate.sql.ast.tree.Statement; -import org.hibernate.sql.ast.tree.cte.CteStatement; -import org.hibernate.sql.ast.tree.expression.CastTarget; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.FunctionExpression; import org.hibernate.sql.ast.tree.expression.JdbcLiteral; 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 fb19840c78..b09b4c03a9 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 @@ -414,8 +414,7 @@ public class H2LegacyDialect extends Dialect { public SqlAstTranslatorFactory getSqlAstTranslatorFactory() { return new StandardSqlAstTranslatorFactory() { @Override - protected SqlAstTranslator buildTranslator( - SessionFactoryImplementor sessionFactory, Statement statement) { + protected SqlAstTranslator buildTranslator(SessionFactoryImplementor sessionFactory, Statement statement) { return new H2LegacySqlAstTranslator<>( sessionFactory, statement ); } }; 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 bec10f8d03..b5f91ec621 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 @@ -7,19 +7,22 @@ package org.hibernate.community.dialect; import org.hibernate.boot.model.TypeContributions; +import org.hibernate.community.dialect.identity.InformixIdentityColumnSupport; +import org.hibernate.community.dialect.pagination.FirstLimitHandler; +import org.hibernate.community.dialect.pagination.SkipFirstLimitHandler; +import org.hibernate.community.dialect.sequence.InformixSequenceSupport; +import org.hibernate.community.dialect.sequence.SequenceInformationExtractorInformixDatabaseImpl; +import org.hibernate.community.dialect.unique.InformixUniqueDelegate; import org.hibernate.dialect.DatabaseVersion; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.Replacer; -import org.hibernate.dialect.function.CommonFunctionFactory; import org.hibernate.dialect.function.CaseLeastGreatestEmulation; +import org.hibernate.dialect.function.CommonFunctionFactory; import org.hibernate.dialect.identity.IdentityColumnSupport; -import org.hibernate.community.dialect.identity.InformixIdentityColumnSupport; -import org.hibernate.community.dialect.pagination.FirstLimitHandler; import org.hibernate.dialect.pagination.LimitHandler; -import org.hibernate.community.dialect.pagination.SkipFirstLimitHandler; -import org.hibernate.community.dialect.sequence.InformixSequenceSupport; import org.hibernate.dialect.sequence.SequenceSupport; -import org.hibernate.community.dialect.unique.InformixUniqueDelegate; +import org.hibernate.dialect.temptable.TemporaryTable; +import org.hibernate.dialect.temptable.TemporaryTableKind; import org.hibernate.dialect.unique.UniqueDelegate; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.spi.LoadQueryInfluencers; @@ -29,17 +32,15 @@ import org.hibernate.exception.spi.ViolatedConstraintNameExtractor; import org.hibernate.internal.util.JdbcExceptionHelper; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; -import org.hibernate.query.sqm.TemporalUnit; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.spi.QueryParameterBindings; +import org.hibernate.query.sqm.TemporalUnit; import org.hibernate.query.sqm.internal.DomainParameterXref; import org.hibernate.query.sqm.mutation.internal.temptable.AfterUseAction; -import org.hibernate.dialect.temptable.TemporaryTable; import org.hibernate.query.sqm.mutation.internal.temptable.BeforeUseAction; import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableInsertStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableMutationStrategy; -import org.hibernate.dialect.temptable.TemporaryTableKind; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy; import org.hibernate.query.sqm.sql.SqmTranslator; @@ -55,7 +56,6 @@ import org.hibernate.sql.ast.spi.StandardSqlAstTranslatorFactory; import org.hibernate.sql.ast.tree.Statement; import org.hibernate.sql.ast.tree.select.SelectStatement; import org.hibernate.sql.exec.spi.JdbcOperation; -import org.hibernate.community.dialect.sequence.SequenceInformationExtractorInformixDatabaseImpl; import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; import org.hibernate.type.descriptor.sql.internal.CapacityDependentDdlType; import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqmToSqlAstConverter.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqmToSqlAstConverter.java index de89fe0fa8..243e5ce5b4 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqmToSqlAstConverter.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqmToSqlAstConverter.java @@ -66,8 +66,7 @@ public class InformixSqmToSqlAstConverter extends BaseSqmTo new NamedTableReference( "(select 1)", "dummy_(x)", - false, - getCreationContext().getSessionFactory() + false ), null, getCreationContext().getSessionFactory() 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 3128719c15..1843cc97f3 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 @@ -22,22 +22,22 @@ import org.hibernate.dialect.identity.IdentityColumnSupport; import org.hibernate.dialect.pagination.LimitHandler; import org.hibernate.dialect.sequence.ANSISequenceSupport; import org.hibernate.dialect.sequence.SequenceSupport; +import org.hibernate.dialect.temptable.TemporaryTable; +import org.hibernate.dialect.temptable.TemporaryTableKind; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.spi.LoadQueryInfluencers; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; -import org.hibernate.query.sqm.FetchClauseType; -import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.spi.QueryParameterBindings; +import org.hibernate.query.sqm.FetchClauseType; +import org.hibernate.query.sqm.IntervalType; +import org.hibernate.query.sqm.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; -import org.hibernate.dialect.temptable.TemporaryTable; -import org.hibernate.dialect.temptable.TemporaryTableKind; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy; import org.hibernate.query.sqm.sql.SqmTranslator; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresSqmToSqlAstConverter.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresSqmToSqlAstConverter.java index ff472769c5..6441ad73e5 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresSqmToSqlAstConverter.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresSqmToSqlAstConverter.java @@ -66,8 +66,7 @@ public class IngresSqmToSqlAstConverter extends BaseSqmToSq new NamedTableReference( "(select 1)", "dummy_(x)", - false, - getCreationContext().getSessionFactory() + false ), null, getCreationContext().getSessionFactory() diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java index 161c68b035..a8b825e505 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java @@ -10,6 +10,7 @@ import java.sql.DatabaseMetaData; import java.sql.SQLException; import org.hibernate.dialect.DatabaseVersion; +import org.hibernate.dialect.Dialect; import org.hibernate.dialect.InnoDBStorageEngine; import org.hibernate.dialect.MySQLStorageEngine; import org.hibernate.dialect.NationalizationSupport; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MaxDBDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MaxDBDialect.java index 260274462f..2d7f761b36 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MaxDBDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MaxDBDialect.java @@ -23,8 +23,8 @@ import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; -import org.hibernate.query.sqm.TrimSpec; import org.hibernate.query.spi.QueryEngine; +import org.hibernate.query.sqm.TrimSpec; import org.hibernate.query.sqm.mutation.internal.temptable.AfterUseAction; import org.hibernate.query.sqm.mutation.internal.temptable.BeforeUseAction; import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableInsertStrategy; 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 1f7b023b10..2af33ff91f 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 @@ -19,10 +19,10 @@ import org.hibernate.dialect.pagination.OffsetFetchLimitHandler; import org.hibernate.dialect.sequence.SequenceSupport; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.query.sqm.IntervalType; import org.hibernate.query.SemanticException; -import org.hibernate.query.sqm.TemporalUnit; import org.hibernate.query.spi.QueryEngine; +import org.hibernate.query.sqm.IntervalType; +import org.hibernate.query.sqm.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 ff6b881646..6e1631a09c 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 @@ -32,6 +32,8 @@ import org.hibernate.dialect.pagination.LimitHandler; import org.hibernate.dialect.pagination.LimitLimitHandler; import org.hibernate.dialect.sequence.NoSequenceSupport; import org.hibernate.dialect.sequence.SequenceSupport; +import org.hibernate.dialect.temptable.TemporaryTable; +import org.hibernate.dialect.temptable.TemporaryTableKind; import org.hibernate.engine.jdbc.Size; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy; @@ -47,17 +49,15 @@ import org.hibernate.exception.spi.ViolatedConstraintNameExtractor; import org.hibernate.internal.util.JdbcExceptionHelper; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; +import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; import org.hibernate.query.sqm.NullOrdering; import org.hibernate.query.sqm.TemporalUnit; -import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.mutation.internal.temptable.AfterUseAction; -import org.hibernate.dialect.temptable.TemporaryTable; import org.hibernate.query.sqm.mutation.internal.temptable.BeforeUseAction; import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableInsertStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableMutationStrategy; -import org.hibernate.dialect.temptable.TemporaryTableKind; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy; import org.hibernate.service.ServiceRegistry; @@ -83,7 +83,33 @@ import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry; import jakarta.persistence.TemporalType; import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate; -import static org.hibernate.type.SqlTypes.*; +import static org.hibernate.type.SqlTypes.BIGINT; +import static org.hibernate.type.SqlTypes.BINARY; +import static org.hibernate.type.SqlTypes.BIT; +import static org.hibernate.type.SqlTypes.BLOB; +import static org.hibernate.type.SqlTypes.BOOLEAN; +import static org.hibernate.type.SqlTypes.CHAR; +import static org.hibernate.type.SqlTypes.CLOB; +import static org.hibernate.type.SqlTypes.DECIMAL; +import static org.hibernate.type.SqlTypes.DOUBLE; +import static org.hibernate.type.SqlTypes.FLOAT; +import static org.hibernate.type.SqlTypes.GEOMETRY; +import static org.hibernate.type.SqlTypes.INTEGER; +import static org.hibernate.type.SqlTypes.JSON; +import static org.hibernate.type.SqlTypes.LONG32NVARCHAR; +import static org.hibernate.type.SqlTypes.LONG32VARBINARY; +import static org.hibernate.type.SqlTypes.LONG32VARCHAR; +import static org.hibernate.type.SqlTypes.NCHAR; +import static org.hibernate.type.SqlTypes.NCLOB; +import static org.hibernate.type.SqlTypes.NUMERIC; +import static org.hibernate.type.SqlTypes.NVARCHAR; +import static org.hibernate.type.SqlTypes.REAL; +import static org.hibernate.type.SqlTypes.SMALLINT; +import static org.hibernate.type.SqlTypes.TIMESTAMP; +import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE; +import static org.hibernate.type.SqlTypes.TINYINT; +import static org.hibernate.type.SqlTypes.VARBINARY; +import static org.hibernate.type.SqlTypes.VARCHAR; /** * A {@linkplain Dialect SQL dialect} for MySQL 5 and above. 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 2d412971e3..b48ad073c6 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 @@ -31,10 +31,10 @@ import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.persister.entity.Lockable; +import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.IntervalType; import org.hibernate.query.sqm.TemporalUnit; import org.hibernate.query.sqm.TrimSpec; -import org.hibernate.query.spi.QueryEngine; 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/RDMSOS2200SqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200SqlAstTranslator.java index 307a2f1918..c755f71542 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,13 +8,12 @@ package org.hibernate.community.dialect; import java.util.List; -import org.hibernate.query.sqm.FetchClauseType; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.query.sqm.ComparisonOperator; +import org.hibernate.query.sqm.FetchClauseType; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.Statement; -import org.hibernate.sql.ast.tree.cte.CteStatement; import org.hibernate.sql.ast.tree.expression.CaseSearchedExpression; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.Literal; 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 a7d6c777c1..2d0b23adf7 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 @@ -36,12 +36,12 @@ import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor; import org.hibernate.exception.spi.ViolatedConstraintNameExtractor; import org.hibernate.internal.util.JdbcExceptionHelper; import org.hibernate.mapping.Column; +import org.hibernate.query.SemanticException; +import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.IntervalType; import org.hibernate.query.sqm.NullOrdering; -import org.hibernate.query.SemanticException; import org.hibernate.query.sqm.TemporalUnit; import org.hibernate.query.sqm.TrimSpec; -import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers; import org.hibernate.service.ServiceRegistry; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseAnywhereDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseAnywhereDialect.java index cb2184b559..a2a2902e8c 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseAnywhereDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseAnywhereDialect.java @@ -29,7 +29,14 @@ import org.hibernate.sql.ast.spi.StandardSqlAstTranslatorFactory; import org.hibernate.sql.ast.tree.Statement; import org.hibernate.sql.exec.spi.JdbcOperation; -import static org.hibernate.type.SqlTypes.*; +import static org.hibernate.type.SqlTypes.DATE; +import static org.hibernate.type.SqlTypes.LONG32NVARCHAR; +import static org.hibernate.type.SqlTypes.LONG32VARBINARY; +import static org.hibernate.type.SqlTypes.LONG32VARCHAR; +import static org.hibernate.type.SqlTypes.NCLOB; +import static org.hibernate.type.SqlTypes.TIME; +import static org.hibernate.type.SqlTypes.TIMESTAMP; +import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE; /** * SQL Dialect for Sybase/SQL Anywhere diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacySqmToSqlAstConverter.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacySqmToSqlAstConverter.java index 315ddc6d4a..1b27ddc9e3 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacySqmToSqlAstConverter.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacySqmToSqlAstConverter.java @@ -63,12 +63,7 @@ public class SybaseLegacySqmToSqlAstConverter extends BaseS null, null, null, - new NamedTableReference( - "(select 1)", - "dummy_(x)", - false, - getCreationContext().getSessionFactory() - ), + new NamedTableReference( "(select 1)", "dummy_(x)", false ), null, getCreationContext().getSessionFactory() ) 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 6322e414cb..e33b948a20 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 @@ -6,19 +6,27 @@ */ package org.hibernate.community.dialect; +import java.sql.CallableStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Types; +import java.util.Map; + import org.hibernate.LockOptions; import org.hibernate.boot.Metadata; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.relational.QualifiedNameImpl; import org.hibernate.boot.model.relational.QualifiedTableName; import org.hibernate.boot.model.relational.SqlStringGenerationContext; +import org.hibernate.community.dialect.identity.Teradata14IdentityColumnSupport; import org.hibernate.dialect.DatabaseVersion; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.function.CommonFunctionFactory; import org.hibernate.dialect.identity.IdentityColumnSupport; -import org.hibernate.community.dialect.identity.Teradata14IdentityColumnSupport; import org.hibernate.dialect.pagination.LimitHandler; import org.hibernate.dialect.pagination.TopLimitHandler; +import org.hibernate.dialect.temptable.TemporaryTable; +import org.hibernate.dialect.temptable.TemporaryTableKind; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor; @@ -27,14 +35,12 @@ import org.hibernate.mapping.Column; import org.hibernate.mapping.Index; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; -import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.sqm.TemporalUnit; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.spi.QueryOptions; +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.dialect.temptable.TemporaryTable; -import org.hibernate.dialect.temptable.TemporaryTableKind; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy; import org.hibernate.sql.ForUpdateFragment; @@ -52,12 +58,6 @@ import org.hibernate.type.descriptor.jdbc.JdbcType; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; import org.hibernate.type.spi.TypeConfiguration; -import java.sql.CallableStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Types; -import java.util.Map; - import jakarta.persistence.TemporalType; import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate; 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 e9d88e7aad..b8ca7e8b3c 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 @@ -6,28 +6,38 @@ */ package org.hibernate.community.dialect; +import java.sql.Types; + import org.hibernate.LockMode; import org.hibernate.LockOptions; +import org.hibernate.community.dialect.pagination.TimesTenLimitHandler; +import org.hibernate.community.dialect.sequence.SequenceInformationExtractorTimesTenDatabaseImpl; +import org.hibernate.community.dialect.sequence.TimesTenSequenceSupport; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.RowLockStrategy; import org.hibernate.dialect.function.CommonFunctionFactory; -import org.hibernate.dialect.lock.*; +import org.hibernate.dialect.lock.LockingStrategy; +import org.hibernate.dialect.lock.OptimisticForceIncrementLockingStrategy; +import org.hibernate.dialect.lock.OptimisticLockingStrategy; +import org.hibernate.dialect.lock.PessimisticForceIncrementLockingStrategy; +import org.hibernate.dialect.lock.PessimisticReadUpdateLockingStrategy; +import org.hibernate.dialect.lock.PessimisticWriteUpdateLockingStrategy; +import org.hibernate.dialect.lock.SelectLockingStrategy; +import org.hibernate.dialect.lock.UpdateLockingStrategy; import org.hibernate.dialect.pagination.LimitHandler; -import org.hibernate.community.dialect.pagination.TimesTenLimitHandler; import org.hibernate.dialect.sequence.SequenceSupport; -import org.hibernate.community.dialect.sequence.TimesTenSequenceSupport; +import org.hibernate.dialect.temptable.TemporaryTable; +import org.hibernate.dialect.temptable.TemporaryTableKind; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.persister.entity.Lockable; +import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.IntervalType; import org.hibernate.query.sqm.TemporalUnit; -import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableInsertStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableMutationStrategy; -import org.hibernate.dialect.temptable.TemporaryTable; -import org.hibernate.dialect.temptable.TemporaryTableKind; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy; import org.hibernate.sql.ast.SqlAstTranslator; @@ -35,7 +45,6 @@ import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.spi.StandardSqlAstTranslatorFactory; import org.hibernate.sql.ast.tree.Statement; import org.hibernate.sql.exec.spi.JdbcOperation; -import org.hibernate.community.dialect.sequence.SequenceInformationExtractorTimesTenDatabaseImpl; import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; import org.hibernate.type.SqlTypes; import org.hibernate.type.StandardBasicTypes; @@ -43,7 +52,6 @@ import org.hibernate.type.descriptor.jdbc.JdbcType; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; import org.hibernate.type.spi.TypeConfiguration; -import java.sql.Types; import jakarta.persistence.TemporalType; import static org.hibernate.dialect.SimpleDatabaseVersion.ZERO_VERSION; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenSqlAstTranslator.java index 41fc922c81..8db1d5399e 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenSqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenSqlAstTranslator.java @@ -9,13 +9,12 @@ package org.hibernate.community.dialect; import java.util.List; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.IllegalQueryOperationException; +import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.Statement; -import org.hibernate.sql.ast.tree.cte.CteStatement; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.Literal; import org.hibernate.sql.ast.tree.expression.QueryLiteral; diff --git a/hibernate-core/src/main/java/org/hibernate/Remove.java b/hibernate-core/src/main/java/org/hibernate/Remove.java index 832987a7c4..76b462d696 100644 --- a/hibernate-core/src/main/java/org/hibernate/Remove.java +++ b/hibernate-core/src/main/java/org/hibernate/Remove.java @@ -25,6 +25,8 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * @apiNote Intended for use at development-time for developers to better understand * the lifecycle of the annotated element. * + * @see Deprecated#forRemoval() + * * @author Steve Ebersole */ @Target({METHOD, FIELD, TYPE, PACKAGE, CONSTRUCTOR, TYPE_PARAMETER, TYPE_USE}) diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java index a27ce31774..391661771c 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java @@ -22,7 +22,6 @@ import org.hibernate.cache.spi.access.CollectionDataAccess; import org.hibernate.cache.spi.access.EntityDataAccess; import org.hibernate.cache.spi.access.NaturalIdDataAccess; import org.hibernate.cache.spi.access.SoftLock; -import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.event.spi.EventSource; import org.hibernate.metamodel.spi.MappingMetamodelImplementor; @@ -30,9 +29,8 @@ import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.query.sqm.tree.SqmDmlStatement; import org.hibernate.query.sqm.tree.SqmQuery; -import org.hibernate.query.sqm.tree.SqmStatement; import org.hibernate.query.sqm.tree.cte.SqmCteStatement; -import org.hibernate.sql.ast.tree.insert.InsertStatement; +import org.hibernate.sql.ast.tree.insert.InsertSelectStatement; /** * An {@link org.hibernate.engine.spi.ActionQueue} {@link Executable} for @@ -148,7 +146,7 @@ public class BulkOperationCleanupAction implements Executable, Serializable { public static void schedule(SharedSessionContractImplementor session, SqmDmlStatement statement) { final List entityPersisters = new ArrayList<>( 1 ); final MappingMetamodelImplementor metamodel = session.getFactory().getRuntimeMetamodels().getMappingMetamodel(); - if ( !( statement instanceof InsertStatement ) ) { + if ( !( statement instanceof InsertSelectStatement ) ) { entityPersisters.add( metamodel.getEntityDescriptor( statement.getTarget().getEntityName() ) ); } for ( SqmCteStatement cteStatement : statement.getCteStatements() ) { diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionAction.java index d11522a790..c3165f9979 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionAction.java @@ -153,7 +153,10 @@ public abstract class CollectionAction implements Executable, Serializable, Comp } else { //then by fk - return persister.getKeyType().compare( key, action.key ); + return persister.getAttributeMapping().getKeyDescriptor().compare( key, action.key ); +// //noinspection unchecked +// final JavaType javaType = (JavaType) persister.getAttributeMapping().getKeyDescriptor().getJavaType(); +// return javaType.getComparator().compare( key, action.key ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Table.java b/hibernate-core/src/main/java/org/hibernate/annotations/Table.java index e3985bc2c8..3fc9054279 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Table.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Table.java @@ -87,9 +87,8 @@ public @interface Table { * If enabled, Hibernate will insert a row only if the columns of the secondary table * would not all be null, and will always use an outer join to read the columns. Thus, * by default, Hibernate avoids creating a row of null values. - *

- * Only applies to secondary tables. * + * @apiNote Only relevant for secondary tables * @deprecated use {@link SecondaryRow#optional()} */ @Deprecated(since = "6.2") diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntryHelper.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntryHelper.java index 79734b6337..e8628d58b5 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntryHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntryHelper.java @@ -6,13 +6,13 @@ */ package org.hibernate.cache.spi.entry; +import java.io.Serializable; + import org.hibernate.bytecode.enhance.spi.LazyPropertyInitializer; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.property.access.internal.PropertyAccessStrategyBackRefImpl; import org.hibernate.type.Type; -import java.io.Serializable; - /** * Operations for assembly and disassembly of an array of property values. */ @@ -35,7 +35,7 @@ class CacheEntryHelper { final boolean[] nonCacheable, final SharedSessionContractImplementor session, final Object owner) { - Serializable[] disassembled = new Serializable[row.length]; + Serializable[] disassembled = new Serializable[types.length]; for ( int i = 0; i < row.length; i++ ) { if ( nonCacheable!=null && nonCacheable[i] ) { disassembled[i] = LazyPropertyInitializer.UNFETCHED_PROPERTY; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java index 50957e3477..87829d7eb8 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java @@ -15,6 +15,7 @@ import org.hibernate.SessionFactoryObserver; import org.hibernate.boot.registry.selector.spi.StrategySelector; import org.hibernate.cache.spi.TimestampsCacheFactory; import org.hibernate.context.spi.CurrentTenantIdentifierResolver; +import org.hibernate.engine.jdbc.batch.spi.BatchBuilder; import org.hibernate.id.enhanced.ImplicitDatabaseObjectNamingStrategy; import org.hibernate.jpa.LegacySpecHints; import org.hibernate.jpa.SpecHints; @@ -1011,7 +1012,7 @@ public interface AvailableSettings { String STATEMENT_BATCH_SIZE = "hibernate.jdbc.batch_size"; /** - * Specifies a custom {@link org.hibernate.engine.jdbc.batch.spi.BatchBuilder}. + * Specifies a custom {@link BatchBuilder}. */ String BATCH_STRATEGY = "hibernate.jdbc.factory_class"; diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentCollection.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentCollection.java index 82ef38487a..590ff3f761 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentCollection.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentCollection.java @@ -16,6 +16,7 @@ import org.hibernate.Incubating; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.persister.collection.CollectionPersister; +import org.hibernate.persister.collection.mutation.InsertRowsCoordinator; import org.hibernate.type.Type; /** @@ -221,6 +222,22 @@ public interface PersistentCollection extends LazyInitializable { */ boolean entryExists(Object entry, int i); + /** + * Whether the given entry should be included in recreation events + * + * @apiNote Defined to match signature of {@link InsertRowsCoordinator.EntryFilter#include} + */ + default boolean includeInRecreate( + Object entry, + int i, + PersistentCollection collection, + PluralAttributeMapping attributeDescriptor) { + assert collection == this; + assert attributeDescriptor != null; + + return entryExists( entry, i ); + } + /** * Do we need to insert this element? * @@ -232,6 +249,39 @@ public interface PersistentCollection extends LazyInitializable { */ boolean needsInserting(Object entry, int i, Type elemType); + /** + * Whether to include the entry for insertion operations + * + * @apiNote Defined to match signature of {@link InsertRowsCoordinator.EntryFilter#include} + */ + default boolean includeInInsert( + Object entry, + int entryPosition, + PersistentCollection collection, + PluralAttributeMapping attributeDescriptor) { + assert collection == this; + assert attributeDescriptor != null; + + return needsInserting( entry, entryPosition, attributeDescriptor.getCollectionDescriptor().getElementType() ); + } + + /** + * Do we need to update this element? + * + * @param entry The collection element to check + * @param entryPosition The index (for indexed collections) + * @param attributeDescriptor The type for the element + * @return {@code true} if the element needs updating + */ + default boolean needsUpdating( + Object entry, + int entryPosition, + PluralAttributeMapping attributeDescriptor) { + assert attributeDescriptor != null; + + return needsUpdating( entry, entryPosition, attributeDescriptor.getCollectionDescriptor().getElementType() ); + } + /** * Do we need to update this element? * diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java index 767a2f7ea1..cdd48ce1f7 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java @@ -6,6 +6,36 @@ */ package org.hibernate.dialect; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FilterInputStream; +import java.io.FilterReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.Reader; +import java.io.StringReader; +import java.io.Writer; +import java.nio.charset.StandardCharsets; +import java.sql.Blob; +import java.sql.CallableStatement; +import java.sql.Clob; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.NClob; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import java.sql.Statement; +import java.sql.Types; +import java.time.Duration; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import org.hibernate.LockMode; import org.hibernate.LockOptions; import org.hibernate.ScrollMode; @@ -23,10 +53,17 @@ import org.hibernate.dialect.sequence.HANASequenceSupport; import org.hibernate.dialect.sequence.SequenceSupport; import org.hibernate.engine.config.spi.ConfigurationService; import org.hibernate.engine.config.spi.StandardConverters; -import org.hibernate.engine.jdbc.*; +import org.hibernate.engine.jdbc.BinaryStream; +import org.hibernate.engine.jdbc.BlobImplementer; +import org.hibernate.engine.jdbc.CharacterStream; +import org.hibernate.engine.jdbc.ClobImplementer; +import org.hibernate.engine.jdbc.NClobImplementer; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; -import org.hibernate.engine.jdbc.env.spi.*; +import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy; +import org.hibernate.engine.jdbc.env.spi.IdentifierHelper; +import org.hibernate.engine.jdbc.env.spi.IdentifierHelperBuilder; +import org.hibernate.engine.jdbc.env.spi.NameQualifierSupport; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.exception.ConstraintViolationException; import org.hibernate.exception.LockAcquisitionException; @@ -39,11 +76,12 @@ import org.hibernate.internal.util.JdbcExceptionHelper; import org.hibernate.mapping.Table; import org.hibernate.procedure.internal.StandardCallableStatementSupport; import org.hibernate.procedure.spi.CallableStatementSupport; +import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; import org.hibernate.query.sqm.NullOrdering; import org.hibernate.query.sqm.TemporalUnit; -import org.hibernate.query.spi.QueryEngine; +import org.hibernate.query.sqm.produce.function.FunctionParameterType; import org.hibernate.service.ServiceRegistry; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; import org.hibernate.sql.ast.SqlAstTranslator; @@ -62,27 +100,26 @@ import org.hibernate.type.descriptor.WrapperOptions; import org.hibernate.type.descriptor.java.DataHelper; import org.hibernate.type.descriptor.java.DoubleJavaType; import org.hibernate.type.descriptor.java.JavaType; -import org.hibernate.type.descriptor.jdbc.*; +import org.hibernate.type.descriptor.jdbc.BasicBinder; +import org.hibernate.type.descriptor.jdbc.BasicExtractor; +import org.hibernate.type.descriptor.jdbc.BlobJdbcType; +import org.hibernate.type.descriptor.jdbc.ClobJdbcType; +import org.hibernate.type.descriptor.jdbc.DecimalJdbcType; +import org.hibernate.type.descriptor.jdbc.JdbcType; +import org.hibernate.type.descriptor.jdbc.NCharJdbcType; +import org.hibernate.type.descriptor.jdbc.NClobJdbcType; +import org.hibernate.type.descriptor.jdbc.NVarcharJdbcType; +import org.hibernate.type.descriptor.jdbc.NumericJdbcType; +import org.hibernate.type.descriptor.jdbc.SmallIntJdbcType; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; import org.hibernate.type.descriptor.sql.internal.CapacityDependentDdlType; import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl; import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry; import org.hibernate.type.internal.BasicTypeImpl; - -import java.io.*; -import java.nio.charset.StandardCharsets; -import java.sql.*; -import java.time.Duration; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import jakarta.persistence.TemporalType; - -import org.hibernate.query.sqm.produce.function.FunctionParameterType; import org.hibernate.type.spi.TypeConfiguration; +import jakarta.persistence.TemporalType; + import static org.hibernate.type.SqlTypes.BINARY; import static org.hibernate.type.SqlTypes.BOOLEAN; import static org.hibernate.type.SqlTypes.CHAR; 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 1e518c591b..3cd81c3108 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java @@ -19,8 +19,6 @@ import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; -import jakarta.persistence.TemporalType; - import org.hibernate.LockMode; import org.hibernate.LockOptions; import org.hibernate.PessimisticLockException; @@ -73,6 +71,8 @@ import org.hibernate.type.spi.TypeConfiguration; import org.jboss.logging.Logger; +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.NATIVE; 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 42c6de07f3..396fc7e41d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java @@ -6,6 +6,13 @@ */ package org.hibernate.dialect; +import java.sql.CallableStatement; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Types; +import java.util.List; + import org.hibernate.LockOptions; import org.hibernate.boot.model.TypeContributions; import org.hibernate.dialect.function.CastingConcatFunction; @@ -33,9 +40,9 @@ import org.hibernate.internal.util.JdbcExceptionHelper; import org.hibernate.mapping.Column; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; +import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.IntervalType; import org.hibernate.query.sqm.TemporalUnit; -import org.hibernate.query.spi.QueryEngine; 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; @@ -55,23 +62,34 @@ import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; import org.hibernate.type.JavaObjectType; import org.hibernate.type.StandardBasicTypes; import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType; -import org.hibernate.type.descriptor.jdbc.*; +import org.hibernate.type.descriptor.jdbc.CharJdbcType; +import org.hibernate.type.descriptor.jdbc.ClobJdbcType; +import org.hibernate.type.descriptor.jdbc.DecimalJdbcType; +import org.hibernate.type.descriptor.jdbc.ObjectNullResolvingJdbcType; +import org.hibernate.type.descriptor.jdbc.SmallIntJdbcType; +import org.hibernate.type.descriptor.jdbc.VarbinaryJdbcType; +import org.hibernate.type.descriptor.jdbc.VarcharJdbcType; +import org.hibernate.type.descriptor.jdbc.XmlJdbcType; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; import org.hibernate.type.descriptor.sql.internal.CapacityDependentDdlType; import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl; import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry; import org.hibernate.type.spi.TypeConfiguration; -import java.sql.CallableStatement; -import java.sql.DatabaseMetaData; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Types; -import java.util.List; - import jakarta.persistence.TemporalType; -import static org.hibernate.type.SqlTypes.*; +import static org.hibernate.type.SqlTypes.BINARY; +import static org.hibernate.type.SqlTypes.BLOB; +import static org.hibernate.type.SqlTypes.BOOLEAN; +import static org.hibernate.type.SqlTypes.CLOB; +import static org.hibernate.type.SqlTypes.DECIMAL; +import static org.hibernate.type.SqlTypes.NUMERIC; +import static org.hibernate.type.SqlTypes.SQLXML; +import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE; +import static org.hibernate.type.SqlTypes.TIME_WITH_TIMEZONE; +import static org.hibernate.type.SqlTypes.TINYINT; +import static org.hibernate.type.SqlTypes.VARBINARY; +import static org.hibernate.type.SqlTypes.VARCHAR; /** * A {@linkplain Dialect SQL dialect} for DB2. 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 c2ba8b908e..76a613a480 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java @@ -26,11 +26,11 @@ import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.Literal; import org.hibernate.sql.ast.tree.expression.SqlTuple; import org.hibernate.sql.ast.tree.expression.Summarization; +import org.hibernate.sql.ast.tree.from.QueryPartTableReference; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableGroupJoin; import org.hibernate.sql.ast.tree.from.TableReferenceJoin; -import org.hibernate.sql.ast.tree.from.QueryPartTableReference; -import org.hibernate.sql.ast.tree.insert.InsertStatement; +import org.hibernate.sql.ast.tree.insert.InsertSelectStatement; import org.hibernate.sql.ast.tree.predicate.BooleanExpressionPredicate; import org.hibernate.sql.ast.tree.predicate.Predicate; import org.hibernate.sql.ast.tree.select.QueryGroup; @@ -339,7 +339,7 @@ public class DB2SqlAstTranslator extends AbstractSqlAst } @Override - protected void visitInsertStatementOnly(InsertStatement statement) { + protected void visitInsertStatementOnly(InsertSelectStatement statement) { final boolean closeWrapper = renderReturningClause( statement ); super.visitInsertStatementOnly( statement ); if ( closeWrapper ) { @@ -435,7 +435,7 @@ public class DB2SqlAstTranslator extends AbstractSqlAst } @Override - protected void visitReturningColumns(MutationStatement mutationStatement) { + protected void visitReturningColumns(List returningColumns) { // For DB2 we use #renderReturningClause to render a wrapper around the DML statement } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java index 55d230116a..0bf30d7019 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java @@ -7,8 +7,8 @@ package org.hibernate.dialect; import org.hibernate.dialect.function.CommonFunctionFactory; -import org.hibernate.dialect.identity.DB2zIdentityColumnSupport; import org.hibernate.dialect.identity.DB2IdentityColumnSupport; +import org.hibernate.dialect.identity.DB2zIdentityColumnSupport; import org.hibernate.dialect.identity.IdentityColumnSupport; import org.hibernate.dialect.pagination.FetchLimitHandler; import org.hibernate.dialect.pagination.LegacyDB2LimitHandler; 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 3cad2ea861..facfcf7ff4 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2zDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2zDialect.java @@ -7,8 +7,6 @@ package org.hibernate.dialect; -import jakarta.persistence.TemporalType; - import org.hibernate.dialect.function.CommonFunctionFactory; import org.hibernate.dialect.identity.DB2zIdentityColumnSupport; import org.hibernate.dialect.identity.IdentityColumnSupport; @@ -28,6 +26,8 @@ import org.hibernate.sql.ast.spi.StandardSqlAstTranslatorFactory; import org.hibernate.sql.ast.tree.Statement; import org.hibernate.sql.exec.spi.JdbcOperation; +import jakarta.persistence.TemporalType; + import java.util.List; import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java index 935a9ecf8d..784da29c57 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java @@ -6,14 +6,18 @@ */ package org.hibernate.dialect; +import java.sql.DatabaseMetaData; +import java.sql.SQLException; +import java.sql.Types; + import org.hibernate.boot.model.TypeContributions; +import org.hibernate.dialect.function.CaseLeastGreatestEmulation; import org.hibernate.dialect.function.CastingConcatFunction; import org.hibernate.dialect.function.ChrLiteralEmulation; import org.hibernate.dialect.function.CommonFunctionFactory; import org.hibernate.dialect.function.CountFunction; import org.hibernate.dialect.function.DerbyLpadEmulation; import org.hibernate.dialect.function.DerbyRpadEmulation; -import org.hibernate.dialect.function.CaseLeastGreatestEmulation; import org.hibernate.dialect.function.InsertSubstringOverlayEmulation; import org.hibernate.dialect.identity.DB2IdentityColumnSupport; import org.hibernate.dialect.identity.IdentityColumnSupport; @@ -21,6 +25,8 @@ import org.hibernate.dialect.pagination.DerbyLimitHandler; import org.hibernate.dialect.pagination.LimitHandler; import org.hibernate.dialect.sequence.DerbySequenceSupport; import org.hibernate.dialect.sequence.SequenceSupport; +import org.hibernate.dialect.temptable.TemporaryTable; +import org.hibernate.dialect.temptable.TemporaryTableKind; import org.hibernate.dialect.unique.CreateTableUniqueDelegate; import org.hibernate.dialect.unique.UniqueDelegate; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; @@ -32,16 +38,14 @@ import org.hibernate.exception.spi.SQLExceptionConversionDelegate; import org.hibernate.internal.util.JdbcExceptionHelper; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; +import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; import org.hibernate.query.sqm.TemporalUnit; -import org.hibernate.query.spi.QueryEngine; -import org.hibernate.dialect.temptable.TemporaryTable; import org.hibernate.query.sqm.mutation.internal.temptable.BeforeUseAction; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableMutationStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableInsertStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableMutationStrategy; -import org.hibernate.dialect.temptable.TemporaryTableKind; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy; import org.hibernate.service.ServiceRegistry; @@ -67,13 +71,25 @@ import org.hibernate.type.descriptor.sql.internal.CapacityDependentDdlType; import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry; import org.hibernate.type.spi.TypeConfiguration; -import java.sql.DatabaseMetaData; -import java.sql.SQLException; -import java.sql.Types; - import jakarta.persistence.TemporalType; -import static org.hibernate.type.SqlTypes.*; +import static org.hibernate.type.SqlTypes.BINARY; +import static org.hibernate.type.SqlTypes.BLOB; +import static org.hibernate.type.SqlTypes.CHAR; +import static org.hibernate.type.SqlTypes.CLOB; +import static org.hibernate.type.SqlTypes.DECIMAL; +import static org.hibernate.type.SqlTypes.LONG32NVARCHAR; +import static org.hibernate.type.SqlTypes.LONG32VARBINARY; +import static org.hibernate.type.SqlTypes.LONG32VARCHAR; +import static org.hibernate.type.SqlTypes.NCHAR; +import static org.hibernate.type.SqlTypes.NCLOB; +import static org.hibernate.type.SqlTypes.NUMERIC; +import static org.hibernate.type.SqlTypes.NVARCHAR; +import static org.hibernate.type.SqlTypes.TIMESTAMP; +import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE; +import static org.hibernate.type.SqlTypes.TINYINT; +import static org.hibernate.type.SqlTypes.VARBINARY; +import static org.hibernate.type.SqlTypes.VARCHAR; /** * A {@linkplain Dialect SQL dialect} for Apache Derby. 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 ba55b3b901..0de739323c 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java @@ -91,6 +91,7 @@ import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.engine.jdbc.env.spi.NameQualifierSupport; import org.hibernate.engine.jdbc.env.spi.SchemaNameResolver; import org.hibernate.engine.jdbc.spi.JdbcServices; +import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.exception.spi.ConversionContext; import org.hibernate.exception.spi.SQLExceptionConversionDelegate; @@ -110,6 +111,7 @@ import org.hibernate.mapping.Table; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.persister.entity.Lockable; +import org.hibernate.persister.entity.mutation.EntityMutationTarget; import org.hibernate.procedure.internal.StandardCallableStatementSupport; import org.hibernate.procedure.spi.CallableStatementSupport; import org.hibernate.query.Query; @@ -137,6 +139,9 @@ import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.spi.StandardSqlAstTranslatorFactory; import org.hibernate.sql.ast.spi.StringBuilderSqlAppender; +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.internal.TableUpsert; +import org.hibernate.sql.model.jdbc.OptionalTableUpdateOperation; import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorLegacyImpl; import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorNoOpImpl; import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; @@ -3972,6 +3977,13 @@ public abstract class Dialect implements ConversionContext { return true; } + public MutationOperation createUpsertOperation( + EntityMutationTarget mutationTarget, + TableUpsert tableUpsert, + SessionFactoryImplementor factory) { + return new OptionalTableUpdateOperation( mutationTarget, tableUpsert, factory ); + } + /** * Is there some way to disable foreign key constraint checking while * truncating tables? (If there's no way to do it, and if we can't 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 d93eceaf81..9a419e05bd 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java @@ -88,10 +88,10 @@ import static org.hibernate.type.SqlTypes.LONG32VARCHAR; import static org.hibernate.type.SqlTypes.NCHAR; import static org.hibernate.type.SqlTypes.NUMERIC; import static org.hibernate.type.SqlTypes.NVARCHAR; +import static org.hibernate.type.SqlTypes.TIMESTAMP_UTC; import static org.hibernate.type.SqlTypes.UUID; import static org.hibernate.type.SqlTypes.VARBINARY; import static org.hibernate.type.SqlTypes.VARCHAR; -import static org.hibernate.type.SqlTypes.TIMESTAMP_UTC; import static org.hibernate.type.descriptor.DateTimeUtils.appendAsDate; import static org.hibernate.type.descriptor.DateTimeUtils.appendAsLocalTime; import static org.hibernate.type.descriptor.DateTimeUtils.appendAsTime; @@ -758,7 +758,9 @@ public class H2Dialect extends Dialect { @Override public IdentityColumnSupport getIdentityColumnSupport() { - return getVersion().isSameOrAfter( 2 ) ? H2FinalTableIdentityColumnSupport.INSTANCE : H2IdentityColumnSupport.INSTANCE; + return getVersion().isSameOrAfter( 2 ) + ? H2FinalTableIdentityColumnSupport.INSTANCE + : H2IdentityColumnSupport.INSTANCE; } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/H2SqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/H2SqlAstTranslator.java index 98516b9f1c..8d38ace00b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/H2SqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/H2SqlAstTranslator.java @@ -9,6 +9,7 @@ package org.hibernate.dialect; import java.util.List; import org.hibernate.LockMode; +import org.hibernate.dialect.identity.H2IdentityColumnSupport; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.collections.CollectionHelper; import org.hibernate.query.sqm.ComparisonOperator; @@ -18,9 +19,9 @@ import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.Statement; import org.hibernate.sql.ast.tree.cte.CteContainer; -import org.hibernate.sql.ast.tree.cte.CteStatement; import org.hibernate.sql.ast.tree.cte.CteTableGroup; import org.hibernate.sql.ast.tree.expression.BinaryArithmeticExpression; +import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.Literal; import org.hibernate.sql.ast.tree.expression.SqlTuple; @@ -34,6 +35,7 @@ import org.hibernate.sql.ast.tree.predicate.InSubQueryPredicate; import org.hibernate.sql.ast.tree.select.QueryPart; import org.hibernate.sql.ast.tree.select.SelectClause; import org.hibernate.sql.exec.spi.JdbcOperation; +import org.hibernate.sql.model.internal.TableInsertStandard; /** * A SQL AST translator for H2. @@ -48,6 +50,39 @@ public class H2SqlAstTranslator extends AbstractSqlAstT super( sessionFactory, statement ); } + @Override + public void visitStandardTableInsert(TableInsertStandard tableInsert) { + if ( CollectionHelper.isNotEmpty( tableInsert.getReturningColumns() ) ) { + visitReturningInsertStatement( tableInsert ); + } + else { + super.visitStandardTableInsert( tableInsert ); + } + } + + public void visitReturningInsertStatement(TableInsertStandard tableInsert) { + assert tableInsert.getReturningColumns() != null + && !tableInsert.getReturningColumns().isEmpty(); + + final H2IdentityColumnSupport identitySupport = (H2IdentityColumnSupport) getSessionFactory() + .getJdbcServices() + .getDialect() + .getIdentityColumnSupport(); + + identitySupport.render( + tableInsert, + this::appendSql, + (columnReference) -> columnReference.accept( this ), + () -> super.visitStandardTableInsert( tableInsert ), + getSessionFactory() + ); + } + + @Override + protected void visitReturningColumns(List returningColumns) { + // do nothing - this is handled via `#visitReturningInsertStatement` + } + @Override public void visitCteContainer(CteContainer cteContainer) { // H2 has various bugs in different versions that make it impossible to use CTEs with parameters reliably 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 6d442c52f6..8d5792a089 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java @@ -41,11 +41,11 @@ import org.hibernate.internal.util.JdbcExceptionHelper; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.persister.entity.Lockable; +import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; import org.hibernate.query.sqm.NullOrdering; import org.hibernate.query.sqm.TemporalUnit; -import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.mutation.internal.temptable.AfterUseAction; import org.hibernate.query.sqm.mutation.internal.temptable.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 5a2d2373dc..24d02aa046 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java @@ -24,6 +24,8 @@ import org.hibernate.dialect.pagination.LimitHandler; import org.hibernate.dialect.pagination.LimitLimitHandler; import org.hibernate.dialect.sequence.NoSequenceSupport; import org.hibernate.dialect.sequence.SequenceSupport; +import org.hibernate.dialect.temptable.TemporaryTable; +import org.hibernate.dialect.temptable.TemporaryTableKind; import org.hibernate.engine.jdbc.Size; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy; @@ -39,18 +41,16 @@ import org.hibernate.exception.spi.ViolatedConstraintNameExtractor; import org.hibernate.internal.util.JdbcExceptionHelper; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; +import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; import org.hibernate.query.sqm.NullOrdering; import org.hibernate.query.sqm.TemporalUnit; -import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.SqmFunctionRegistry; import org.hibernate.query.sqm.mutation.internal.temptable.AfterUseAction; -import org.hibernate.dialect.temptable.TemporaryTable; import org.hibernate.query.sqm.mutation.internal.temptable.BeforeUseAction; import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableInsertStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableMutationStrategy; -import org.hibernate.dialect.temptable.TemporaryTableKind; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy; import org.hibernate.query.sqm.produce.function.FunctionParameterType; @@ -77,7 +77,33 @@ import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry; import jakarta.persistence.TemporalType; import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate; -import static org.hibernate.type.SqlTypes.*; +import static org.hibernate.type.SqlTypes.BIGINT; +import static org.hibernate.type.SqlTypes.BINARY; +import static org.hibernate.type.SqlTypes.BIT; +import static org.hibernate.type.SqlTypes.BLOB; +import static org.hibernate.type.SqlTypes.BOOLEAN; +import static org.hibernate.type.SqlTypes.CHAR; +import static org.hibernate.type.SqlTypes.CLOB; +import static org.hibernate.type.SqlTypes.DECIMAL; +import static org.hibernate.type.SqlTypes.DOUBLE; +import static org.hibernate.type.SqlTypes.FLOAT; +import static org.hibernate.type.SqlTypes.GEOMETRY; +import static org.hibernate.type.SqlTypes.INTEGER; +import static org.hibernate.type.SqlTypes.JSON; +import static org.hibernate.type.SqlTypes.LONG32NVARCHAR; +import static org.hibernate.type.SqlTypes.LONG32VARBINARY; +import static org.hibernate.type.SqlTypes.LONG32VARCHAR; +import static org.hibernate.type.SqlTypes.NCHAR; +import static org.hibernate.type.SqlTypes.NCLOB; +import static org.hibernate.type.SqlTypes.NUMERIC; +import static org.hibernate.type.SqlTypes.NVARCHAR; +import static org.hibernate.type.SqlTypes.REAL; +import static org.hibernate.type.SqlTypes.SMALLINT; +import static org.hibernate.type.SqlTypes.TIMESTAMP; +import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE; +import static org.hibernate.type.SqlTypes.TINYINT; +import static org.hibernate.type.SqlTypes.VARBINARY; +import static org.hibernate.type.SqlTypes.VARCHAR; /** * A {@linkplain Dialect SQL dialect} for MySQL 5.7 and above. 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 f1e0776f16..d6a1740d20 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java @@ -28,6 +28,8 @@ import org.hibernate.dialect.pagination.LimitHandler; import org.hibernate.dialect.pagination.Oracle12LimitHandler; import org.hibernate.dialect.sequence.OracleSequenceSupport; import org.hibernate.dialect.sequence.SequenceSupport; +import org.hibernate.dialect.temptable.TemporaryTable; +import org.hibernate.dialect.temptable.TemporaryTableKind; import org.hibernate.dialect.unique.CreateTableUniqueDelegate; import org.hibernate.dialect.unique.UniqueDelegate; import org.hibernate.engine.config.spi.ConfigurationService; @@ -48,19 +50,18 @@ 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.SemanticException; +import org.hibernate.query.spi.QueryEngine; +import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.FetchClauseType; import org.hibernate.query.sqm.IntervalType; -import org.hibernate.query.SemanticException; import org.hibernate.query.sqm.TemporalUnit; -import org.hibernate.query.spi.QueryEngine; -import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableInsertStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableMutationStrategy; -import org.hibernate.dialect.temptable.TemporaryTable; -import org.hibernate.dialect.temptable.TemporaryTableKind; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy; +import org.hibernate.query.sqm.produce.function.FunctionParameterType; import org.hibernate.service.ServiceRegistry; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.SqlAstTranslatorFactory; @@ -80,6 +81,9 @@ import org.hibernate.type.descriptor.jdbc.JsonBlobJdbcType; import org.hibernate.type.descriptor.jdbc.NullJdbcType; import org.hibernate.type.descriptor.jdbc.ObjectNullAsNullTypeJdbcType; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; +import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl; +import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry; +import org.hibernate.type.spi.TypeConfiguration; import jakarta.persistence.TemporalType; @@ -90,13 +94,25 @@ 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 org.hibernate.query.sqm.produce.function.FunctionParameterType; -import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl; -import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry; -import org.hibernate.type.spi.TypeConfiguration; - -import static org.hibernate.type.SqlTypes.*; +import static org.hibernate.type.SqlTypes.ARRAY; +import static org.hibernate.type.SqlTypes.BIGINT; +import static org.hibernate.type.SqlTypes.BINARY; +import static org.hibernate.type.SqlTypes.BOOLEAN; +import static org.hibernate.type.SqlTypes.DATE; +import static org.hibernate.type.SqlTypes.DECIMAL; +import static org.hibernate.type.SqlTypes.GEOMETRY; +import static org.hibernate.type.SqlTypes.INTEGER; +import static org.hibernate.type.SqlTypes.JSON; +import static org.hibernate.type.SqlTypes.NUMERIC; +import static org.hibernate.type.SqlTypes.NVARCHAR; +import static org.hibernate.type.SqlTypes.REAL; +import static org.hibernate.type.SqlTypes.SMALLINT; +import static org.hibernate.type.SqlTypes.SQLXML; +import static org.hibernate.type.SqlTypes.TIME; +import static org.hibernate.type.SqlTypes.TIME_WITH_TIMEZONE; +import static org.hibernate.type.SqlTypes.TINYINT; +import static org.hibernate.type.SqlTypes.VARBINARY; +import static org.hibernate.type.SqlTypes.VARCHAR; /** * A {@linkplain Dialect SQL dialect} for Oracle 8i and above. 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 90c87fb8d6..30f6fa7d19 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java @@ -11,10 +11,9 @@ import java.util.List; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.collections.Stack; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.sqm.BinaryArithmeticOperator; +import org.hibernate.query.IllegalQueryOperationException; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.sqm.FetchClauseType; -import org.hibernate.query.IllegalQueryOperationException; import org.hibernate.query.sqm.FrameExclusion; import org.hibernate.query.sqm.FrameKind; import org.hibernate.sql.ast.Clause; @@ -22,8 +21,6 @@ import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.Statement; import org.hibernate.sql.ast.tree.cte.CteMaterialization; -import org.hibernate.sql.ast.tree.expression.BinaryArithmeticExpression; -import org.hibernate.sql.ast.tree.expression.CaseSearchedExpression; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.FunctionExpression; import org.hibernate.sql.ast.tree.expression.Literal; @@ -34,7 +31,7 @@ import org.hibernate.sql.ast.tree.from.FunctionTableReference; import org.hibernate.sql.ast.tree.from.QueryPartTableReference; import org.hibernate.sql.ast.tree.from.UnionTableGroup; import org.hibernate.sql.ast.tree.from.ValuesTableReference; -import org.hibernate.sql.ast.tree.insert.InsertStatement; +import org.hibernate.sql.ast.tree.insert.InsertSelectStatement; import org.hibernate.sql.ast.tree.insert.Values; import org.hibernate.sql.ast.tree.select.QueryGroup; import org.hibernate.sql.ast.tree.select.QueryPart; @@ -175,7 +172,7 @@ public class OracleSqlAstTranslator extends AbstractSql // When the query has no sort specifications and offset, we want to use the ROWNUM pagination as that is a special locking case return !queryPart.hasSortSpecifications() && !hasOffset( queryPart ) // Workaround an Oracle bug, segmentation fault for insert queries with a plain query group and fetch clause - || queryPart instanceof QueryGroup && getClauseStack().isEmpty() && getStatement() instanceof InsertStatement; + || queryPart instanceof QueryGroup && getClauseStack().isEmpty() && getStatement() instanceof InsertSelectStatement; } return true; } 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 b48dad4608..528af7311a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java @@ -18,7 +18,6 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.TimeZone; -import jakarta.persistence.TemporalType; import org.hibernate.LockMode; import org.hibernate.LockOptions; @@ -83,6 +82,8 @@ import org.hibernate.type.descriptor.sql.internal.Scale6IntervalSecondDdlType; import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry; import org.hibernate.type.spi.TypeConfiguration; +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; @@ -94,8 +95,8 @@ import static org.hibernate.type.SqlTypes.BINARY; import static org.hibernate.type.SqlTypes.BLOB; import static org.hibernate.type.SqlTypes.CHAR; import static org.hibernate.type.SqlTypes.CLOB; -import static org.hibernate.type.SqlTypes.GEOGRAPHY; import static org.hibernate.type.SqlTypes.FLOAT; +import static org.hibernate.type.SqlTypes.GEOGRAPHY; import static org.hibernate.type.SqlTypes.GEOMETRY; import static org.hibernate.type.SqlTypes.INET; import static org.hibernate.type.SqlTypes.JSON; 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 6f9945694d..6898efd8a1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java @@ -6,8 +6,8 @@ */ package org.hibernate.dialect; -import org.hibernate.query.sqm.FetchClauseType; import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.query.sqm.FetchClauseType; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; 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/SQLServerDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java index 0634da4af0..f475078cd9 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java @@ -6,7 +6,18 @@ */ package org.hibernate.dialect; -import org.hibernate.*; +import java.sql.DatabaseMetaData; +import java.sql.SQLException; +import java.sql.Types; +import java.time.temporal.ChronoField; +import java.time.temporal.TemporalAccessor; +import java.util.Calendar; +import java.util.Date; +import java.util.TimeZone; + +import org.hibernate.LockMode; +import org.hibernate.LockOptions; +import org.hibernate.QueryTimeoutException; import org.hibernate.boot.Metadata; import org.hibernate.boot.model.TypeContributions; import org.hibernate.boot.model.relational.QualifiedSequenceName; @@ -35,12 +46,12 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.exception.LockTimeoutException; import org.hibernate.exception.spi.SQLExceptionConversionDelegate; import org.hibernate.internal.util.JdbcExceptionHelper; +import org.hibernate.query.spi.QueryEngine; import org.hibernate.mapping.Column; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.FetchClauseType; import org.hibernate.query.sqm.IntervalType; import org.hibernate.query.sqm.TemporalUnit; -import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.TrimSpec; import org.hibernate.service.ServiceRegistry; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; @@ -64,21 +75,31 @@ import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl; import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry; -import java.sql.DatabaseMetaData; -import java.sql.SQLException; -import java.sql.Types; -import java.time.temporal.ChronoField; -import java.time.temporal.TemporalAccessor; -import java.util.Calendar; -import java.util.Date; import java.util.List; -import java.util.TimeZone; import jakarta.persistence.TemporalType; import static org.hibernate.query.sqm.TemporalUnit.NANOSECOND; import static org.hibernate.query.sqm.produce.function.FunctionParameterType.INTEGER; -import static org.hibernate.type.SqlTypes.*; +import static org.hibernate.type.SqlTypes.BLOB; +import static org.hibernate.type.SqlTypes.CLOB; +import static org.hibernate.type.SqlTypes.DATE; +import static org.hibernate.type.SqlTypes.DOUBLE; +import static org.hibernate.type.SqlTypes.GEOGRAPHY; +import static org.hibernate.type.SqlTypes.GEOMETRY; +import static org.hibernate.type.SqlTypes.LONG32NVARCHAR; +import static org.hibernate.type.SqlTypes.LONG32VARBINARY; +import static org.hibernate.type.SqlTypes.LONG32VARCHAR; +import static org.hibernate.type.SqlTypes.NCLOB; +import static org.hibernate.type.SqlTypes.NVARCHAR; +import static org.hibernate.type.SqlTypes.OTHER; +import static org.hibernate.type.SqlTypes.SQLXML; +import static org.hibernate.type.SqlTypes.TIME; +import static org.hibernate.type.SqlTypes.TIMESTAMP; +import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE; +import static org.hibernate.type.SqlTypes.UUID; +import static org.hibernate.type.SqlTypes.VARBINARY; +import static org.hibernate.type.SqlTypes.VARCHAR; import static org.hibernate.type.descriptor.DateTimeUtils.appendAsDate; import static org.hibernate.type.descriptor.DateTimeUtils.appendAsTime; import static org.hibernate.type.descriptor.DateTimeUtils.appendAsTimestampWithMicros; 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 fa94a2fa72..1e2c424e04 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java @@ -10,16 +10,14 @@ import java.util.List; import org.hibernate.LockMode; import org.hibernate.LockOptions; -import org.hibernate.query.sqm.BinaryArithmeticOperator; -import org.hibernate.query.sqm.FetchClauseType; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.query.sqm.ComparisonOperator; +import org.hibernate.query.sqm.FetchClauseType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.Statement; -import org.hibernate.sql.ast.tree.cte.CteStatement; import org.hibernate.sql.ast.tree.expression.BinaryArithmeticExpression; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.Literal; 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 17f81e2a26..940886af22 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialect.java @@ -34,10 +34,10 @@ import org.hibernate.mapping.ForeignKey; import org.hibernate.mapping.Table; import org.hibernate.mapping.UniqueKey; import org.hibernate.persister.entity.Lockable; -import org.hibernate.query.sqm.IntervalType; import org.hibernate.query.SemanticException; -import org.hibernate.query.sqm.TemporalUnit; import org.hibernate.query.spi.QueryEngine; +import org.hibernate.query.sqm.IntervalType; +import org.hibernate.query.sqm.TemporalUnit; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.spi.SqlAppender; @@ -52,7 +52,31 @@ import org.hibernate.type.StandardBasicTypes; import jakarta.persistence.TemporalType; import static org.hibernate.dialect.SimpleDatabaseVersion.ZERO_VERSION; -import static org.hibernate.type.SqlTypes.*; +import static org.hibernate.type.SqlTypes.BIGINT; +import static org.hibernate.type.SqlTypes.BINARY; +import static org.hibernate.type.SqlTypes.BLOB; +import static org.hibernate.type.SqlTypes.BOOLEAN; +import static org.hibernate.type.SqlTypes.CHAR; +import static org.hibernate.type.SqlTypes.CLOB; +import static org.hibernate.type.SqlTypes.DECIMAL; +import static org.hibernate.type.SqlTypes.DOUBLE; +import static org.hibernate.type.SqlTypes.FLOAT; +import static org.hibernate.type.SqlTypes.INTEGER; +import static org.hibernate.type.SqlTypes.LONG32NVARCHAR; +import static org.hibernate.type.SqlTypes.LONG32VARBINARY; +import static org.hibernate.type.SqlTypes.LONG32VARCHAR; +import static org.hibernate.type.SqlTypes.NCHAR; +import static org.hibernate.type.SqlTypes.NCLOB; +import static org.hibernate.type.SqlTypes.NUMERIC; +import static org.hibernate.type.SqlTypes.NVARCHAR; +import static org.hibernate.type.SqlTypes.REAL; +import static org.hibernate.type.SqlTypes.SMALLINT; +import static org.hibernate.type.SqlTypes.TIME; +import static org.hibernate.type.SqlTypes.TIMESTAMP; +import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE; +import static org.hibernate.type.SqlTypes.TINYINT; +import static org.hibernate.type.SqlTypes.VARBINARY; +import static org.hibernate.type.SqlTypes.VARCHAR; /** * A {@linkplain Dialect SQL dialect} for Cloud Spanner. 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 2cfd3eca7b..a88e875fa1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java @@ -45,7 +45,11 @@ import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry; import jakarta.persistence.TemporalType; import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate; -import static org.hibernate.type.SqlTypes.*; +import static org.hibernate.type.SqlTypes.BOOLEAN; +import static org.hibernate.type.SqlTypes.DATE; +import static org.hibernate.type.SqlTypes.TIME; +import static org.hibernate.type.SqlTypes.TIMESTAMP; +import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE; /** * A {@linkplain Dialect SQL dialect} for Sybase Adaptive Server Enterprise 16 and above. 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 a2c9fb8af2..170176bf1a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java @@ -6,6 +6,10 @@ */ package org.hibernate.dialect; +import java.sql.DatabaseMetaData; +import java.sql.SQLException; +import java.sql.Types; + import org.hibernate.boot.model.TypeContributions; import org.hibernate.dialect.function.CommonFunctionFactory; import org.hibernate.dialect.function.CountFunction; @@ -19,13 +23,13 @@ import org.hibernate.engine.jdbc.env.spi.IdentifierHelperBuilder; import org.hibernate.engine.jdbc.env.spi.NameQualifierSupport; import org.hibernate.engine.spi.LoadQueryInfluencers; import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.query.spi.QueryEngine; +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.sqm.TrimSpec; -import org.hibernate.query.spi.QueryEngine; -import org.hibernate.query.spi.QueryOptions; -import org.hibernate.query.spi.QueryParameterBindings; import org.hibernate.query.sqm.internal.DomainParameterXref; import org.hibernate.query.sqm.sql.SqmTranslator; import org.hibernate.query.sqm.sql.SqmTranslatorFactory; @@ -49,10 +53,6 @@ import org.hibernate.type.descriptor.jdbc.ObjectNullAsNullTypeJdbcType; import org.hibernate.type.descriptor.jdbc.SmallIntJdbcType; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; -import java.sql.DatabaseMetaData; -import java.sql.SQLException; -import java.sql.Types; - import jakarta.persistence.TemporalType; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqmToSqlAstConverter.java index 4acee8e666..f96174a922 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqmToSqlAstConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqmToSqlAstConverter.java @@ -66,8 +66,7 @@ public class SybaseSqmToSqlAstConverter extends BaseSqmToSq new NamedTableReference( "(select 1)", "dummy_(x)", - false, - getCreationContext().getSessionFactory() + false ), null, getCreationContext().getSessionFactory() diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/GetGeneratedKeysDelegate.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/GetGeneratedKeysDelegate.java deleted file mode 100644 index 41aff6aaea..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/GetGeneratedKeysDelegate.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * 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 . - */ -package org.hibernate.dialect.identity; - -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import org.hibernate.boot.model.relational.SqlStringGenerationContext; -import org.hibernate.dialect.Dialect; -import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.id.IdentifierGeneratorHelper; -import org.hibernate.id.PostInsertIdentityPersister; -import org.hibernate.id.insert.AbstractReturningDelegate; -import org.hibernate.id.insert.IdentifierGeneratingInsert; -import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; - -/** - * Delegate for dealing with IDENTITY columns using JDBC3 getGeneratedKeys - * - * @author Andrea Boriero - */ -public class GetGeneratedKeysDelegate - extends AbstractReturningDelegate - implements InsertGeneratedIdentifierDelegate { - private final PostInsertIdentityPersister persister; - private final Dialect dialect; - - public GetGeneratedKeysDelegate(PostInsertIdentityPersister persister, Dialect dialect) { - super( persister ); - this.persister = persister; - this.dialect = dialect; - } - - @Override - public IdentifierGeneratingInsert prepareIdentifierGeneratingInsert(SqlStringGenerationContext context) { - IdentifierGeneratingInsert insert = new IdentifierGeneratingInsert( dialect ); - insert.addIdentityColumn( persister.getRootTableKeyColumnNames()[0] ); - return insert; - } - - @Override - protected PreparedStatement prepare(String insertSQL, SharedSessionContractImplementor session) throws SQLException { - return session - .getJdbcCoordinator() - .getStatementPreparer() - .prepareStatement( insertSQL, PreparedStatement.RETURN_GENERATED_KEYS ); - } - - @Override - public Object executeAndExtract(PreparedStatement insert, SharedSessionContractImplementor session) - throws SQLException { - session.getJdbcCoordinator().getResultSetReturn().executeUpdate( insert ); - ResultSet rs = null; - try { - rs = insert.getGeneratedKeys(); - return IdentifierGeneratorHelper.getGeneratedIdentity( - rs, - persister.getRootTableKeyColumnNames()[0], - persister.getIdentifierType(), - session.getJdbcServices().getJdbcEnvironment().getDialect() - ); - } - finally { - if ( rs != null ) { - session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( rs, insert ); - } - } - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/H2FinalTableIdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/H2FinalTableIdentityColumnSupport.java index 3f93ae7386..1543fce0ab 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/H2FinalTableIdentityColumnSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/H2FinalTableIdentityColumnSupport.java @@ -6,6 +6,13 @@ */ package org.hibernate.dialect.identity; +import java.util.List; +import java.util.function.Consumer; + +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.sql.ast.tree.expression.ColumnReference; +import org.hibernate.sql.model.ast.TableInsert; + /** * Identity column support for H2 2+ versions * @author Jan Schatteman @@ -26,4 +33,28 @@ public class H2FinalTableIdentityColumnSupport extends H2IdentityColumnSupport { public String appendIdentitySelectToInsert(String identityColumnName, String insertString) { return "select " + identityColumnName + " from final table ( " + insertString + " )"; } + + public void render( + TableInsert tableInsert, + Consumer sqlAppender, + Consumer returnColumnHandler, + InsertValuesHandler insertValuesHandler, + SessionFactoryImplementor sessionFactory) { + // select col(, col)* from final table ( ) + + sqlAppender.accept( "select " ); + + final List returningColumns = tableInsert.getReturningColumns(); + for ( int i = 0; i < returningColumns.size(); i++ ) { + if ( i > 0 ) { + sqlAppender.accept( ", " ); + } + + returnColumnHandler.accept( returningColumns.get( i ) ); + } + + sqlAppender.accept( " from final table ( " ); + insertValuesHandler.renderInsertValues(); + sqlAppender.accept( ")" ); + } } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/H2IdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/H2IdentityColumnSupport.java index 35bcf5d32b..bc5127b0fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/H2IdentityColumnSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/H2IdentityColumnSupport.java @@ -6,6 +6,12 @@ */ package org.hibernate.dialect.identity; +import java.util.function.Consumer; + +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.sql.ast.tree.expression.ColumnReference; +import org.hibernate.sql.model.ast.TableInsert; + /** * @author Andrea Boriero */ @@ -36,4 +42,19 @@ public class H2IdentityColumnSupport extends IdentityColumnSupportImpl { public String getIdentityInsertString() { return "default"; } + + @FunctionalInterface + public interface InsertValuesHandler { + void renderInsertValues(); + } + + public void render( + TableInsert tableInsert, + Consumer sqlAppender, + Consumer returnColumnHandler, + InsertValuesHandler insertValuesHandler, + SessionFactoryImplementor sessionFactory) { + insertValuesHandler.renderInsertValues(); + sqlAppender.accept( " call identity();" ); + } } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupport.java index 0c32a429be..d5ec3034e1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupport.java @@ -9,6 +9,7 @@ package org.hibernate.dialect.identity; import org.hibernate.MappingException; import org.hibernate.dialect.Dialect; import org.hibernate.id.PostInsertIdentityPersister; +import org.hibernate.id.insert.GetGeneratedKeysDelegate; /** * A set of operations providing support for identity columns diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupportImpl.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupportImpl.java index ba27a1151e..8111bcdfd0 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupportImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupportImpl.java @@ -9,6 +9,7 @@ package org.hibernate.dialect.identity; import org.hibernate.MappingException; import org.hibernate.dialect.Dialect; import org.hibernate.id.PostInsertIdentityPersister; +import org.hibernate.id.insert.GetGeneratedKeysDelegate; /** * @author Andrea Boriero diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/Oracle12cGetGeneratedKeysDelegate.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/Oracle12cGetGeneratedKeysDelegate.java index e17d761fc8..79c3674aba 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/Oracle12cGetGeneratedKeysDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/Oracle12cGetGeneratedKeysDelegate.java @@ -7,18 +7,20 @@ package org.hibernate.dialect.identity; import java.sql.PreparedStatement; -import java.sql.SQLException; import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; +import org.hibernate.engine.jdbc.spi.JdbcCoordinator; +import org.hibernate.engine.jdbc.spi.MutationStatementPreparer; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.id.PostInsertIdentityPersister; +import org.hibernate.id.insert.GetGeneratedKeysDelegate; /** * @author Andrea Boriero */ public class Oracle12cGetGeneratedKeysDelegate extends GetGeneratedKeysDelegate { - private String[] keyColumns; + private final String[] keyColumns; public Oracle12cGetGeneratedKeysDelegate(PostInsertIdentityPersister persister, Dialect dialect) { super( persister, dialect ); @@ -30,10 +32,9 @@ public class Oracle12cGetGeneratedKeysDelegate extends GetGeneratedKeysDelegate } @Override - protected PreparedStatement prepare(String insertSQL, SharedSessionContractImplementor session) throws SQLException { - return session - .getJdbcCoordinator() - .getStatementPreparer() - .prepareStatement( insertSQL, keyColumns ); + public PreparedStatement prepareStatement(String insertSql, SharedSessionContractImplementor session) { + final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator(); + final MutationStatementPreparer statementPreparer = jdbcCoordinator.getMutationStatementPreparer(); + return statementPreparer.prepareStatement( insertSql, keyColumns ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/Oracle12cIdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/Oracle12cIdentityColumnSupport.java index c0990d68b7..c75480c82f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/Oracle12cIdentityColumnSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/Oracle12cIdentityColumnSupport.java @@ -8,6 +8,7 @@ package org.hibernate.dialect.identity; import org.hibernate.dialect.Dialect; import org.hibernate.id.PostInsertIdentityPersister; +import org.hibernate.id.insert.GetGeneratedKeysDelegate; /** * @author Andrea Boriero diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/Versioning.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/Versioning.java index 92a450ee40..9594317b12 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/Versioning.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/Versioning.java @@ -156,11 +156,15 @@ public final class Versioning { if ( hasDirtyCollections ) { return true; } - for ( int dirtyProperty : dirtyProperties ) { - if ( propertyVersionability[dirtyProperty] ) { - return true; + + if ( dirtyProperties != null ) { + for ( int dirtyProperty : dirtyProperties ) { + if ( propertyVersionability[dirtyProperty] ) { + return true; + } } } + return false; } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java new file mode 100644 index 0000000000..2c56550bd6 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java @@ -0,0 +1,46 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc; + +import org.hibernate.internal.log.SubSystemLogging; + +import org.jboss.logging.BasicLogger; +import org.jboss.logging.Logger; +import org.jboss.logging.annotations.LogMessage; +import org.jboss.logging.annotations.Message; +import org.jboss.logging.annotations.MessageLogger; +import org.jboss.logging.annotations.ValidIdRange; + +import static org.jboss.logging.Logger.Level.WARN; + +/** + * Sub-system logging related to JDBC interactions + * + * @author Steve Ebersole + */ +@SubSystemLogging( + name = JdbcLogging.NAME, + description = "Logging related to JDBC interactions" +) +@MessageLogger(projectCode = "HHH") +@ValidIdRange(min = 100001, max = 100500) +public interface JdbcLogging extends BasicLogger { + String NAME = "org.hibernate.orm.jdbc"; + + Logger JDBC_LOGGER = Logger.getLogger( NAME ); + JdbcLogging JDBC_MESSAGE_LOGGER = Logger.getMessageLogger( JdbcLogging.class, NAME ); + + boolean JDBC_TRACE_ENABLED = JDBC_LOGGER.isTraceEnabled(); + boolean JDBC_DEBUG_ENABLED = JDBC_LOGGER.isDebugEnabled(); + + @LogMessage(level = WARN) + @Message( + id=100001, + value = "JDBC driver did not return the expected number of row counts (%s) - expected %s, but received %s" + ) + void unexpectedRowCounts(String tableName, int expected, int actual); +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/JdbcBatchLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/JdbcBatchLogging.java new file mode 100644 index 0000000000..05191e347e --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/JdbcBatchLogging.java @@ -0,0 +1,52 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.batch; + +import org.hibernate.internal.log.SubSystemLogging; + +import org.jboss.logging.BasicLogger; +import org.jboss.logging.Logger; +import org.jboss.logging.annotations.LogMessage; +import org.jboss.logging.annotations.Message; +import org.jboss.logging.annotations.MessageLogger; +import org.jboss.logging.annotations.ValidIdRange; + +import static org.jboss.logging.Logger.Level.ERROR; +import static org.jboss.logging.Logger.Level.INFO; + +/** + * Sub-system logging related to JDBC batch execution + * + * @author Steve Ebersole + */ +@SubSystemLogging( + name = JdbcBatchLogging.NAME, + description = "Logging related to JDBC batch execution" +) +@MessageLogger(projectCode = "HHH") +@ValidIdRange(min = 100501, max = 101000) +public interface JdbcBatchLogging extends BasicLogger { + String NAME = "org.hibernate.orm.jdbc.batch"; + + Logger BATCH_LOGGER = Logger.getLogger( NAME ); + JdbcBatchLogging BATCH_MESSAGE_LOGGER = Logger.getMessageLogger( JdbcBatchLogging.class, NAME ); + + boolean BATCH_TRACE_ENABLED = BATCH_LOGGER.isTraceEnabled(); + boolean BATCH_DEBUG_ENABLED = BATCH_LOGGER.isDebugEnabled(); + + @LogMessage(level = ERROR) + @Message(id = 100501, value = "Exception executing batch [%s], SQL: %s") + void unableToExecuteBatch(Exception e, String sql ); + + @LogMessage(level = ERROR) + @Message(id = 100502, value = "Unable to release batch statement...") + void unableToReleaseBatchStatement(); + + @LogMessage(level = INFO) + @Message(id=100503, value = "On release of batch it still contained JDBC statements") + void batchContainedStatementsOnRelease(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/AbstractBatchImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/AbstractBatchImpl.java deleted file mode 100644 index 32e6747eb3..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/AbstractBatchImpl.java +++ /dev/null @@ -1,218 +0,0 @@ -/* - * 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 . - */ -package org.hibernate.engine.jdbc.batch.internal; - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; - -import org.jboss.logging.Logger; - -import org.hibernate.engine.jdbc.batch.spi.Batch; -import org.hibernate.engine.jdbc.batch.spi.BatchKey; -import org.hibernate.engine.jdbc.batch.spi.BatchObserver; -import org.hibernate.engine.jdbc.spi.JdbcCoordinator; -import org.hibernate.engine.jdbc.spi.JdbcServices; -import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; -import org.hibernate.engine.jdbc.spi.SqlStatementLogger; -import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.resource.jdbc.ResourceRegistry; - -/** - * Convenience base class for implementers of the Batch interface. - * - * @author Steve Ebersole - * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) - */ -public abstract class AbstractBatchImpl implements Batch { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - CoreMessageLogger.class, - AbstractBatchImpl.class.getName() - ); - - private final BatchKey key; - private final JdbcCoordinator jdbcCoordinator; - - private final SqlStatementLogger sqlStatementLogger; - private final SqlExceptionHelper sqlExceptionHelper; - - private final LinkedHashMap statements = new LinkedHashMap<>(); - private final LinkedHashSet observers = new LinkedHashSet<>(); - - protected AbstractBatchImpl(BatchKey key, JdbcCoordinator jdbcCoordinator) { - if ( key == null ) { - throw new IllegalArgumentException( "batch key cannot be null" ); - } - if ( jdbcCoordinator == null ) { - throw new IllegalArgumentException( "JDBC coordinator cannot be null" ); - } - this.key = key; - this.jdbcCoordinator = jdbcCoordinator; - - final JdbcServices jdbcServices = jdbcCoordinator.getJdbcSessionOwner() - .getJdbcSessionContext() - .getServiceRegistry() - .getService( JdbcServices.class ); - - this.sqlStatementLogger = jdbcServices.getSqlStatementLogger(); - this.sqlExceptionHelper = jdbcServices.getSqlExceptionHelper(); - } - - protected JdbcCoordinator getJdbcCoordinator(){ - return this.jdbcCoordinator; - } - - /** - * Perform batch execution.. - *

- * This is called from the explicit {@linkplain #execute() execution}, but may also be called from elsewhere - * depending on the exact implementation. - */ - protected abstract void doExecuteBatch(); - - /** - * Convenience access to the SQLException helper. - * - * @return The underlying SQLException helper. - */ - protected SqlExceptionHelper sqlExceptionHelper() { - return sqlExceptionHelper; - } - - /** - * Convenience access to the SQL statement logger. - * - * @return The underlying JDBC services. - */ - protected SqlStatementLogger sqlStatementLogger() { - return sqlStatementLogger; - } - - protected void abortBatch(Exception cause) { - try { - jdbcCoordinator.abortBatch(); - } - catch (RuntimeException e) { - cause.addSuppressed( e ); - } - } - - /** - * Access to the batch's map of statements (keyed by SQL statement string). - * - * @return This batch's statements. - */ - protected LinkedHashMap getStatements() { - return statements; - } - - @Override - public final BatchKey getKey() { - return key; - } - - @Override - public void addObserver(BatchObserver observer) { - observers.add( observer ); - } - - @Override - public PreparedStatement getBatchStatement(String sql, boolean callable) { - if ( sql == null ) { - throw new IllegalArgumentException( "sql must be non-null." ); - } - PreparedStatement statement = statements.get( sql ); - if ( statement == null ) { - statement = buildBatchStatement( sql, callable ); - statements.put( sql, statement ); - } - else { - LOG.debug( "Reusing batch statement" ); - sqlStatementLogger().logStatement( sql ); - } - return statement; - } - - private PreparedStatement buildBatchStatement(String sql, boolean callable) { - return jdbcCoordinator.getStatementPreparer().prepareStatement( sql, callable ); - } - - @Override - public final void execute() { - notifyObserversExplicitExecution(); - if ( getStatements().isEmpty() ) { - return; - } - - try { - doExecuteBatch(); - } - finally { - releaseStatements(); - } - } - - protected void releaseStatements() { - final LinkedHashMap statements = getStatements(); - final ResourceRegistry resourceRegistry = jdbcCoordinator.getLogicalConnection().getResourceRegistry(); - for ( PreparedStatement statement : statements.values() ) { - clearBatch( statement ); - resourceRegistry.release( statement ); - } - // IMPL NOTE: If the statements are not cleared and JTA is being used, then - // jdbcCoordinator.afterStatementExecution() will abort the batch and a - // warning will be logged. To avoid the warning, clear statements first, - // before calling jdbcCoordinator.afterStatementExecution(). - statements.clear(); - jdbcCoordinator.afterStatementExecution(); - } - - protected void clearBatch(PreparedStatement statement) { - try { - // This code can be called after the connection is released - // and the statement is closed. If the statement is closed, - // then SQLException will be thrown when PreparedStatement#clearBatch - // is called. - // Ensure the statement is not closed before - // calling PreparedStatement#clearBatch. - if ( !statement.isClosed() ) { - statement.clearBatch(); - } - } - catch ( SQLException e ) { - LOG.unableToReleaseBatchStatement(); - } - } - - /** - * Convenience method to notify registered observers of an explicit execution of this batch. - */ - protected final void notifyObserversExplicitExecution() { - for ( BatchObserver observer : observers ) { - observer.batchExplicitlyExecuted(); - } - } - - /** - * Convenience method to notify registered observers of an implicit execution of this batch. - */ - protected final void notifyObserversImplicitExecution() { - for ( BatchObserver observer : observers ) { - observer.batchImplicitlyExecuted(); - } - } - - @Override - public void release() { - if ( getStatements() != null && !getStatements().isEmpty() ) { - LOG.batchContainedStatementsOnRelease(); - } - releaseStatements(); - observers.clear(); - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BasicBatchKey.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BasicBatchKey.java index ea7958955a..8d397e00f0 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BasicBatchKey.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BasicBatchKey.java @@ -8,6 +8,7 @@ package org.hibernate.engine.jdbc.batch.internal; import org.hibernate.engine.jdbc.batch.spi.BatchKey; import org.hibernate.jdbc.Expectation; +import org.hibernate.jdbc.Expectations; /** * Normal implementation of BatchKey @@ -19,6 +20,13 @@ public class BasicBatchKey implements BatchKey { private final int statementCount; private final Expectation expectation; + /** + * Constructs a BasicBatchKey with {@link Expectations#NONE} + */ + public BasicBatchKey(String comparison) { + this( comparison, Expectations.NONE ); + } + /** * Constructs a BasicBatchKey * @@ -59,4 +67,13 @@ public class BasicBatchKey implements BatchKey { return comparison.hashCode(); } + @Override + public String toLoggableString() { + return comparison; + } + + @Override + public String toString() { + return "BasicBatchKey(" + comparison + ")"; + } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderImpl.java index 7c3b854868..4e9ad09fb4 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderImpl.java @@ -2,14 +2,27 @@ * 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 . + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ package org.hibernate.engine.jdbc.batch.internal; +import java.util.Collections; +import java.util.function.Supplier; + +import org.hibernate.Internal; import org.hibernate.engine.jdbc.batch.spi.Batch; import org.hibernate.engine.jdbc.batch.spi.BatchBuilder; import org.hibernate.engine.jdbc.batch.spi.BatchKey; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup; +import org.hibernate.engine.jdbc.mutation.internal.PreparedStatementGroupSingleTable; import org.hibernate.engine.jdbc.spi.JdbcCoordinator; +import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.jdbc.JdbcInsertMutation; + +import static org.hibernate.engine.jdbc.batch.JdbcBatchLogging.BATCH_LOGGER; +import static org.hibernate.engine.jdbc.batch.JdbcBatchLogging.BATCH_TRACE_ENABLED; +import static org.hibernate.jdbc.Expectations.NONE; /** * A builder for {@link Batch} instances. @@ -17,35 +30,115 @@ import org.hibernate.engine.jdbc.spi.JdbcCoordinator; * @author Steve Ebersole */ public class BatchBuilderImpl implements BatchBuilder { - - private volatile int jdbcBatchSize; - - /** - * Constructs a BatchBuilderImpl - */ - public BatchBuilderImpl() { - } + private final int globalBatchSize; /** * Constructs a BatchBuilderImpl * - * @param jdbcBatchSize The batch jdbcBatchSize to use. + * @param globalBatchSize The batch size to use. Can be overridden + * on {@link #buildBatch} */ - public BatchBuilderImpl(int jdbcBatchSize) { - this.jdbcBatchSize = jdbcBatchSize; + public BatchBuilderImpl(int globalBatchSize) { + if ( BATCH_TRACE_ENABLED ) { + BATCH_LOGGER.tracef( + "Using standard BatchBuilder (%s)", + globalBatchSize + ); + } + + this.globalBatchSize = globalBatchSize; } public int getJdbcBatchSize() { - return jdbcBatchSize; - } - - public void setJdbcBatchSize(int jdbcBatchSize) { - this.jdbcBatchSize = jdbcBatchSize; + return globalBatchSize; } @Override - public Batch buildBatch(BatchKey key, JdbcCoordinator jdbcCoordinator) { - return SharedBatchBuildingCode.buildBatch( jdbcBatchSize, key, jdbcCoordinator ); + public Batch buildBatch( + BatchKey key, + Integer explicitBatchSize, + Supplier statementGroupSupplier, + JdbcCoordinator jdbcCoordinator) { + final int batchSize = explicitBatchSize == null + ? globalBatchSize + : explicitBatchSize; + assert batchSize > 1; + + return new BatchImpl( key, statementGroupSupplier.get(), batchSize, jdbcCoordinator ); } + + /** + * Intended for use from tests + */ + @Internal + public BatchImpl buildBatch(BatchKey batchKey, Integer sizeOverride, String table, SessionImplementor session, String sql) { + final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator(); + + final int batchSize = sizeOverride == null + ? globalBatchSize + : sizeOverride; + + return new BatchImpl( + batchKey, + new PreparedStatementGroupSingleTable( + new JdbcInsertMutation( + new TableMapping() { + @Override + public String getTableName() { + return table; + } + + @Override + public int getRelativePosition() { + return 0; + } + + @Override + public boolean isOptional() { + return false; + } + + @Override + public boolean isInverse() { + return false; + } + + @Override + public boolean isIdentifierTable() { + return true; + } + + @Override + public MutationDetails getInsertDetails() { + return null; + } + + @Override + public MutationDetails getUpdateDetails() { + return null; + } + + @Override + public boolean isCascadeDeleteEnabled() { + return false; + } + + @Override + public MutationDetails getDeleteDetails() { + return null; + } + }, + null, + sql, + false, + NONE, + Collections.emptyList() + ), + session + ), + batchSize, + jdbcCoordinator + ); + } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderInitiator.java index 85774384a2..0feaf008bd 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderInitiator.java @@ -2,7 +2,7 @@ * 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 . + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ package org.hibernate.engine.jdbc.batch.internal; @@ -10,6 +10,7 @@ import java.util.Map; import org.hibernate.boot.registry.StandardServiceInitiator; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; +import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; import org.hibernate.engine.jdbc.batch.spi.BatchBuilder; import org.hibernate.internal.util.config.ConfigurationHelper; @@ -29,6 +30,8 @@ public class BatchBuilderInitiator implements StandardServiceInitiator configurationValues, ServiceRegistryImplementor registry) { - final Object builder = configurationValues.get( BUILDER ); + Object builder = configurationValues.get( BUILDER ); + + if ( builder == null ) { + builder = configurationValues.get( AvailableSettings.BATCH_STRATEGY ); + } + if ( builder == null ) { return new BatchBuilderImpl( ConfigurationHelper.getInt( Environment.STATEMENT_BATCH_SIZE, configurationValues, 1 ) @@ -52,7 +60,10 @@ public class BatchBuilderInitiator implements StandardServiceInitiator observers = new LinkedHashSet<>(); + + private int batchPosition; + private boolean batchExecuted; + + public BatchImpl( + BatchKey key, + PreparedStatementGroup statementGroup, + int batchSizeToUse, + JdbcCoordinator jdbcCoordinator) { + if ( key == null ) { + throw new IllegalArgumentException( "Batch key cannot be null" ); + } + if ( jdbcCoordinator == null ) { + throw new IllegalArgumentException( "JDBC coordinator cannot be null" ); + } + + this.key = key; + this.jdbcCoordinator = jdbcCoordinator; + this.statementGroup = statementGroup; + + final JdbcServices jdbcServices = jdbcCoordinator.getJdbcSessionOwner() + .getJdbcSessionContext() + .getServiceRegistry() + .getService( JdbcServices.class ); + + this.sqlStatementLogger = jdbcServices.getSqlStatementLogger(); + this.sqlExceptionHelper = jdbcServices.getSqlExceptionHelper(); + + this.batchSizeToUse = batchSizeToUse; + + if ( BATCH_TRACE_ENABLED ) { + BATCH_LOGGER.tracef( + "Created Batch (%s) - `%s`", + batchSizeToUse, + key.toLoggableString() + ); + } + } + + @Override + public final BatchKey getKey() { + return key; + } + + @Override + public PreparedStatementGroup getStatementGroup() { + return statementGroup; + } + + @Override + public void addObserver(BatchObserver observer) { + observers.add( observer ); + } + + @Override + public void addToBatch(JdbcValueBindings jdbcValueBindings, TableInclusionChecker inclusionChecker) { + if ( BATCH_TRACE_ENABLED ) { + BATCH_LOGGER.tracef( + "Adding to JDBC batch (%s) - `%s`", + batchPosition + 1, + getKey().toLoggableString() + ); + } + + final SharedSessionContractImplementor session = (SharedSessionContractImplementor) jdbcCoordinator.getJdbcSessionOwner(); + + try { + getStatementGroup().forEachStatement( (tableName, statementDetails) -> { + if ( inclusionChecker != null && !inclusionChecker.include( statementDetails.getMutatingTableDetails() ) ) { + if ( MODEL_MUTATION_LOGGER_TRACE_ENABLED ) { + MODEL_MUTATION_LOGGER.tracef( + "Skipping addBatch for table : %s (batch-position=%s)", + statementDetails.getMutatingTableDetails().getTableName(), + batchPosition+1 + ); + } + return; + } + + //noinspection resource + final PreparedStatement statement = statementDetails.resolveStatement(); + sqlStatementLogger.logStatement( statementDetails.getSqlString() ); + jdbcValueBindings.beforeStatement( statementDetails, session ); + + try { + statement.addBatch(); + } + catch (SQLException e) { + BATCH_LOGGER.debug( "SQLException escaped proxy", e ); + throw sqlExceptionHelper.convert( + e, + "Could not perform addBatch", + statementDetails.getSqlString() + ); + } + finally { + // todo (mutation) : is this needed? + jdbcValueBindings.afterStatement( statementDetails.getMutatingTableDetails(), session ); + } + } ); + } + catch (RuntimeException e) { + abortBatch( e ); + throw e; + } + + batchPosition++; + if ( batchPosition == batchSizeToUse ) { + notifyObserversImplicitExecution(); + performExecution(); + batchPosition = 0; + batchExecuted = true; + } + } + + protected void releaseStatements() { + statementGroup.forEachStatement( (tableName, statementDetails) -> { + if ( statementDetails.getStatement() == null ) { + BATCH_LOGGER.debugf( + "PreparedStatementDetails did not contain PreparedStatement on #releaseStatements : %s", + statementDetails.getSqlString() + ); + return; + } + + clearBatch( statementDetails ); + } ); + + statementGroup.release(); + jdbcCoordinator.afterStatementExecution(); + } + + protected void clearBatch(PreparedStatementDetails statementDetails) { + final PreparedStatement statement = statementDetails.getStatement(); + assert statement != null; + + try { + // This code can be called after the connection is released + // and the statement is closed. If the statement is closed, + // then SQLException will be thrown when PreparedStatement#clearBatch + // is called. + // Ensure the statement is not closed before + // calling PreparedStatement#clearBatch. + if ( !statement.isClosed() ) { + statement.clearBatch(); + } + } + catch ( SQLException e ) { + BATCH_MESSAGE_LOGGER.unableToReleaseBatchStatement(); + } + } + + /** + * Convenience method to notify registered observers of an explicit execution of this batch. + */ + protected final void notifyObserversExplicitExecution() { + for ( BatchObserver observer : observers ) { + observer.batchExplicitlyExecuted(); + } + } + + /** + * Convenience method to notify registered observers of an implicit execution of this batch. + */ + protected final void notifyObserversImplicitExecution() { + for ( BatchObserver observer : observers ) { + observer.batchImplicitlyExecuted(); + } + } + + protected void abortBatch(Exception cause) { + try { + jdbcCoordinator.abortBatch(); + } + catch (RuntimeException e) { + cause.addSuppressed( e ); + } + } + + @Override + public void execute() { + notifyObserversExplicitExecution(); + if ( getStatementGroup().getNumberOfStatements() == 0 ) { + return; + } + + try { + if ( batchPosition == 0 ) { + if( !batchExecuted) { + if ( BATCH_DEBUG_ENABLED ) { + BATCH_LOGGER.debugf( + "No batched statements to execute - %s", + getKey().toLoggableString() + ); + } + } + } + else { + performExecution(); + } + } + finally { + releaseStatements(); + } + } + + protected void performExecution() { + if ( BATCH_TRACE_ENABLED ) { + BATCH_LOGGER.tracef( + "Executing JDBC batch (%s / %s) - `%s`", + batchPosition, + batchSizeToUse, + getKey().toLoggableString() + ); + } + + //noinspection deprecation + final JdbcObserver observer = jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getObserver(); + try { + getStatementGroup().forEachStatement( (tableName, statementDetails) -> { + final String sql = statementDetails.getSqlString(); + final PreparedStatement statement = statementDetails.getStatement(); + + if ( statement == null ) { + return; + } + + try { + if ( statementDetails.getMutatingTableDetails().isIdentifierTable() ) { + final int[] rowCounts; + try { + observer.jdbcExecuteBatchStart(); + rowCounts = statement.executeBatch(); + } + finally { + observer.jdbcExecuteBatchEnd(); + } + checkRowCounts( rowCounts, statementDetails ); + } + else { + statement.executeBatch(); + } + } + catch (SQLException e) { + abortBatch( e ); + BATCH_MESSAGE_LOGGER.unableToExecuteBatch( e, sql ); + throw sqlExceptionHelper.convert( e, "could not execute batch", sql ); + } + catch (RuntimeException re) { + abortBatch( re ); + BATCH_MESSAGE_LOGGER.unableToExecuteBatch( re, sql ); + throw re; + } + } ); + } + finally { + batchPosition = 0; + } + } + + private void checkRowCounts(int[] rowCounts, PreparedStatementDetails statementDetails) throws SQLException, HibernateException { + final int numberOfRowCounts = rowCounts.length; + if ( batchPosition != 0 ) { + final int expectedNumberOfCounts = batchPosition / getStatementGroup().getNumberOfStatements(); + if ( numberOfRowCounts != expectedNumberOfCounts ) { + JDBC_MESSAGE_LOGGER.unexpectedRowCounts( + statementDetails.getMutatingTableDetails().getTableName(), + numberOfRowCounts, + expectedNumberOfCounts + ); + } + } + + for ( int i = 0; i < numberOfRowCounts; i++ ) { + statementDetails.getExpectation().verifyOutcome( rowCounts[i], statementDetails.getStatement(), i, statementDetails.getSqlString() ); + } + } + + @Override + public void release() { + if ( BATCH_MESSAGE_LOGGER.isInfoEnabled() ) { + final PreparedStatementGroup statementGroup = getStatementGroup(); + if ( statementGroup.getNumberOfStatements() != 0 ) { + if ( statementGroup.hasMatching( (statementDetails) -> statementDetails.getStatement() != null ) ) { + BATCH_MESSAGE_LOGGER.batchContainedStatementsOnRelease(); + } + } + } + releaseStatements(); + observers.clear(); + } + + @Override + public String toString() { + return "BatchImpl(" + getKey().toLoggableString() + ")"; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java deleted file mode 100644 index ab3868509d..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * 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 . - */ -package org.hibernate.engine.jdbc.batch.internal; - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.Map; - -import org.hibernate.HibernateException; -import org.hibernate.engine.jdbc.batch.spi.BatchKey; -import org.hibernate.engine.jdbc.spi.JdbcCoordinator; -import org.hibernate.internal.CoreMessageLogger; - -import org.hibernate.resource.jdbc.spi.JdbcObserver; -import org.jboss.logging.Logger; - -/** - * A {@link org.hibernate.engine.jdbc.batch.spi.Batch} implementation which does bathing based on a given size. Once - * the batch size is reached for a statement in the batch, the entire batch is implicitly executed. - * - * @author Steve Ebersole - */ -public class BatchingBatch extends AbstractBatchImpl { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - CoreMessageLogger.class, - BatchingBatch.class.getName() - ); - - private int batchSize; - private final int configuredBatchSize; - private int batchPosition; - private boolean batchExecuted; - private int statementPosition; - - /** - * Constructs a BatchingBatch - * - * @param key The batch key - * @param jdbcCoordinator The JDBC jdbcCoordinator - * @param batchSize The batch size. - */ - public BatchingBatch( - BatchKey key, - JdbcCoordinator jdbcCoordinator, - int batchSize) { - super( key, jdbcCoordinator ); - if ( ! key.getExpectation().canBeBatched() ) { - throw new HibernateException( "attempting to batch an operation which cannot be batched" ); - } - this.batchSize = batchSize; - this.configuredBatchSize = batchSize; - } - - private String currentStatementSql; - private PreparedStatement currentStatement; - - @Override - public PreparedStatement getBatchStatement(String sql, boolean callable) { - currentStatementSql = sql; - int previousBatchSize = getStatements().size(); - currentStatement = super.getBatchStatement( sql, callable ); - int currentBatchSize = getStatements().size(); - if ( currentBatchSize > previousBatchSize ) { - this.batchSize = this.configuredBatchSize * currentBatchSize; - } - return currentStatement; - } - - @Override - public void addToBatch() { - try { - currentStatement.addBatch(); - } - catch ( SQLException e ) { - abortBatch( e ); - LOG.debug( "SQLException escaped proxy", e ); - throw sqlExceptionHelper().convert( e, "could not perform addBatch", currentStatementSql ); - } - catch (RuntimeException e) { - abortBatch( e ); - throw e; - } - statementPosition++; - if ( statementPosition >= getKey().getBatchedStatementCount() ) { - batchPosition++; - if ( batchPosition == batchSize ) { - notifyObserversImplicitExecution(); - performExecution(); - batchPosition = 0; - batchExecuted = true; - } - statementPosition = 0; - } - } - - @Override - protected void doExecuteBatch() { - if (batchPosition == 0 ) { - if(! batchExecuted) { - LOG.debug( "No batched statements to execute" ); - } - } - else { - performExecution(); - } - } - - private void performExecution() { - LOG.debugf( "Executing batch size: %s", batchPosition ); - final JdbcObserver observer = getJdbcCoordinator().getJdbcSessionOwner().getJdbcSessionContext().getObserver(); - try { - for ( Map.Entry entry : getStatements().entrySet() ) { - final String sql = entry.getKey(); - try { - final PreparedStatement statement = entry.getValue(); - final int[] rowCounts; - try { - observer.jdbcExecuteBatchStart(); - rowCounts = statement.executeBatch(); - } - finally { - observer.jdbcExecuteBatchEnd(); - } - checkRowCounts( rowCounts, statement, sql ); - } - catch ( SQLException e ) { - abortBatch( e ); - LOG.unableToExecuteBatch( e, sql ); - throw sqlExceptionHelper().convert( e, "could not execute batch", sql ); - } - catch ( RuntimeException re ) { - abortBatch( re ); - LOG.unableToExecuteBatch( re, sql ); - throw re; - } - } - } - finally { - batchPosition = 0; - } - } - - private void checkRowCounts(int[] rowCounts, PreparedStatement ps, String statementSQL) throws SQLException, HibernateException { - final int numberOfRowCounts = rowCounts.length; - if ( batchPosition != 0 && numberOfRowCounts != batchPosition / getStatements().size() ) { - LOG.unexpectedRowCounts(); - } - for ( int i = 0; i < numberOfRowCounts; i++ ) { - getKey().getExpectation().verifyOutcome( rowCounts[i], ps, i, statementSQL ); - } - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/NonBatchingBatch.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/NonBatchingBatch.java deleted file mode 100644 index 81fafc8b95..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/NonBatchingBatch.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * 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 . - */ -package org.hibernate.engine.jdbc.batch.internal; - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.Map; - -import org.hibernate.JDBCException; -import org.hibernate.engine.jdbc.batch.spi.BatchKey; -import org.hibernate.engine.jdbc.spi.JdbcCoordinator; - -/** - * An implementation of {@link org.hibernate.engine.jdbc.batch.spi.Batch} which does not perform batching. It simply - * executes each statement as it is encountered. - * - * @author Steve Ebersole - */ -public class NonBatchingBatch extends AbstractBatchImpl { - - private final JdbcCoordinator jdbcCoordinator; - - protected NonBatchingBatch(BatchKey key, JdbcCoordinator jdbcCoordinator) { - super( key, jdbcCoordinator ); - this.jdbcCoordinator = jdbcCoordinator; - } - - @Override - public void addToBatch() { - notifyObserversImplicitExecution(); - for ( Map.Entry entry : getStatements().entrySet() ) { - final String statementSQL = entry.getKey(); - try { - final PreparedStatement statement = entry.getValue(); - final int rowCount = jdbcCoordinator.getResultSetReturn().executeUpdate( statement ); - getKey().getExpectation().verifyOutcome( rowCount, statement, 0, statementSQL ); - jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( statement ); - jdbcCoordinator.afterStatementExecution(); - } - catch ( SQLException e ) { - abortBatch( e ); - throw sqlExceptionHelper().convert( e, "could not execute non-batched batch statement", statementSQL ); - } - catch (RuntimeException e) { - abortBatch( e ); - throw e; - } - } - - getStatements().clear(); - } - - @Override - protected void clearBatch(PreparedStatement statement) { - // no need to call PreparedStatement#clearBatch here... - } - - @Override - protected void doExecuteBatch() { - // nothing to do - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/SharedBatchBuildingCode.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/SharedBatchBuildingCode.java deleted file mode 100644 index d122128c88..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/SharedBatchBuildingCode.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 . - */ -package org.hibernate.engine.jdbc.batch.internal; - -import org.hibernate.engine.jdbc.batch.spi.Batch; -import org.hibernate.engine.jdbc.batch.spi.BatchKey; -import org.hibernate.engine.jdbc.spi.JdbcCoordinator; - -/** - * Common code across BatchBuilder service implementors - */ -final class SharedBatchBuildingCode { - - static Batch buildBatch(final int defaultJdbcBatchSize, final BatchKey key, final JdbcCoordinator jdbcCoordinator) { - final Integer sessionJdbcBatchSize = jdbcCoordinator.getJdbcSessionOwner() - .getJdbcBatchSize(); - final int jdbcBatchSizeToUse = sessionJdbcBatchSize == null ? - defaultJdbcBatchSize : - sessionJdbcBatchSize; - return jdbcBatchSizeToUse > 1 - ? new BatchingBatch( key, jdbcCoordinator, jdbcBatchSizeToUse ) - : new NonBatchingBatch( key, jdbcCoordinator ); - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/UnmodifiableBatchBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/UnmodifiableBatchBuilderImpl.java deleted file mode 100644 index dd3553f5ca..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/UnmodifiableBatchBuilderImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 . - */ -package org.hibernate.engine.jdbc.batch.internal; - -import org.hibernate.engine.jdbc.batch.spi.Batch; -import org.hibernate.engine.jdbc.batch.spi.BatchBuilder; -import org.hibernate.engine.jdbc.batch.spi.BatchKey; -import org.hibernate.engine.jdbc.spi.JdbcCoordinator; - -/** - * Simplified version of BatchBuilderImpl which does not support - * changing the configured jdbc Batch size at runtime and is - * not exposed via JMX. - * @author Sanne Grinovero - */ -final class UnmodifiableBatchBuilderImpl implements BatchBuilder { - - private final int jdbcBatchSize; - - public UnmodifiableBatchBuilderImpl(int jdbcBatchSize) { - this.jdbcBatchSize = jdbcBatchSize; - } - - @Override - public Batch buildBatch(BatchKey key, JdbcCoordinator jdbcCoordinator) { - return SharedBatchBuildingCode.buildBatch( jdbcBatchSize, key, jdbcCoordinator ); - } - -} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/UnmodifiableBatchBuilderInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/UnmodifiableBatchBuilderInitiator.java deleted file mode 100644 index fd9d92db39..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/UnmodifiableBatchBuilderInitiator.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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 . - */ -package org.hibernate.engine.jdbc.batch.internal; - -import java.util.Map; - -import org.hibernate.boot.registry.StandardServiceInitiator; -import org.hibernate.cfg.Environment; -import org.hibernate.engine.jdbc.batch.spi.BatchBuilder; -import org.hibernate.internal.util.config.ConfigurationHelper; -import org.hibernate.service.spi.ServiceException; -import org.hibernate.service.spi.ServiceRegistryImplementor; - -/** - * Initiator for the {@link UnmodifiableBatchBuilderImpl} service using - * {@link UnmodifiableBatchBuilderImpl}. - * This is not the default implementation, but it's a useful alternative to have - * in some environments. - * - * @author Sanne Grinovero - */ -public final class UnmodifiableBatchBuilderInitiator implements StandardServiceInitiator { - /** - * Singleton access - */ - public static final UnmodifiableBatchBuilderInitiator INSTANCE = new UnmodifiableBatchBuilderInitiator(); - - @Override - public Class getServiceInitiated() { - return BatchBuilder.class; - } - - @Override - public BatchBuilder initiateService(Map configurationValues, ServiceRegistryImplementor registry) { - final Object builder = configurationValues.get( BatchBuilderInitiator.BUILDER ); - if ( builder == null ) { - return new UnmodifiableBatchBuilderImpl( - ConfigurationHelper.getInt( Environment.STATEMENT_BATCH_SIZE, configurationValues, 1 ) - ); - } - else { - throw new ServiceException( "This Hibernate ORM serviceregistry has been configured explicitly to use " + this.getClass() + - " to create BatchBuilder instances; the property '" + BatchBuilderInitiator.BUILDER - + "' is not supported." ); - } - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java index 661f4c3a08..fc1106c4f4 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java @@ -2,20 +2,27 @@ * 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 . + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ package org.hibernate.engine.jdbc.batch.spi; + import java.sql.PreparedStatement; +import org.hibernate.Incubating; +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.TableInclusionChecker; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup; + /** * Conceptually models a batch. - *

- * Unlike directly in JDBC, here we add the ability to batch together multiple statements at a time. In the underlying + *

+ * Unlike in JDBC, here we add the ability to batch together multiple statements at a time. In the underlying * JDBC this correlates to multiple {@link PreparedStatement} objects (one for each DML string) maintained within the * batch. * * @author Steve Ebersole */ +@Incubating public interface Batch { /** * Retrieves the object being used to key (uniquely identify) this batch. @@ -31,20 +38,14 @@ public interface Batch { */ void addObserver(BatchObserver observer); - /** - * Get a statement which is part of the batch, creating if necessary (and storing for next time). - * - * @param sql The SQL statement. - * @param callable Is the SQL statement callable? - * - * @return The prepared statement instance, representing the SQL statement. - */ - PreparedStatement getBatchStatement(String sql, boolean callable); + PreparedStatementGroup getStatementGroup(); /** + * Apply the value bindings to the batch JDBC statements + * and * Indicates completion of the current part of the batch. */ - void addToBatch(); + void addToBatch(JdbcValueBindings jdbcValueBindings, TableInclusionChecker inclusionChecker); /** * Execute this batch. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchBuilder.java index 9466d6837e..e61f7da118 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchBuilder.java @@ -2,10 +2,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 . + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ package org.hibernate.engine.jdbc.batch.spi; +import java.util.function.Supplier; + +import org.hibernate.Incubating; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup; import org.hibernate.engine.jdbc.spi.JdbcCoordinator; import org.hibernate.service.Service; @@ -17,14 +21,14 @@ import org.hibernate.service.Service; * * @author Steve Ebersole */ +@Incubating public interface BatchBuilder extends Service { /** * Build a batch. - * - * @param key Value to uniquely identify a batch - * @param jdbcCoordinator The JDBC coordinator with which to coordinate efforts - * - * @return The built batch */ - Batch buildBatch(BatchKey key, JdbcCoordinator jdbcCoordinator); + Batch buildBatch( + BatchKey key, + Integer batchSize, + Supplier statementGroupSupplier, + JdbcCoordinator jdbcCoordinator); } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchKey.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchKey.java index b4902233a6..1faa0a559a 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchKey.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchKey.java @@ -20,13 +20,23 @@ public interface BatchKey { * Note that this is distinctly different than the size of the batch. * * @return The number of statements. + * + * @deprecated With no replacement. No longer used */ + @Deprecated int getBatchedStatementCount(); /** * Get the expectation pertaining to the outcome of the {@link Batch} associated with this key. * * @return The expectations + * + * @deprecated With no replacement. No longer used */ + @Deprecated Expectation getExpectation(); + + default String toLoggableString() { + return toString(); + } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java index 14ad306624..6c2afd858d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java @@ -13,6 +13,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import java.util.function.Supplier; import org.hibernate.ConnectionReleaseMode; import org.hibernate.HibernateException; @@ -21,10 +22,12 @@ import org.hibernate.engine.jdbc.batch.spi.Batch; import org.hibernate.engine.jdbc.batch.spi.BatchBuilder; import org.hibernate.engine.jdbc.batch.spi.BatchKey; import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup; import org.hibernate.engine.jdbc.spi.InvalidatableWrapper; import org.hibernate.engine.jdbc.spi.JdbcCoordinator; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.jdbc.spi.JdbcWrapper; +import org.hibernate.engine.jdbc.spi.MutationStatementPreparer; import org.hibernate.engine.jdbc.spi.ResultSetReturn; import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.engine.jdbc.spi.StatementPreparer; @@ -120,10 +123,6 @@ public class JdbcCoordinatorImpl implements JdbcCoordinator { return this.owner.getJdbcSessionContext().getSessionFactory(); } - protected BatchBuilder batchBuilder() { - return sessionFactory().getServiceRegistry().getService( BatchBuilder.class ); - } - /** * Access to the SqlExceptionHelper * @@ -173,7 +172,7 @@ public class JdbcCoordinatorImpl implements JdbcCoordinator { } @Override - public Batch getBatch(BatchKey key) { + public Batch getBatch2(BatchKey key, Integer batchSize, Supplier statementGroupSupplier) { if ( currentBatch != null ) { if ( currentBatch.getKey().equals( key ) ) { return currentBatch; @@ -183,16 +182,22 @@ public class JdbcCoordinatorImpl implements JdbcCoordinator { currentBatch.release(); } } - currentBatch = batchBuilder().buildBatch( key, this ); + + final BatchBuilder batchBuilder = sessionFactory().getServiceRegistry().getService( BatchBuilder.class ); + currentBatch = batchBuilder.buildBatch( key, batchSize, statementGroupSupplier, this ); + return currentBatch; } @Override public void executeBatch() { if ( currentBatch != null ) { - currentBatch.execute(); - // needed? - currentBatch.release(); + try { + currentBatch.execute(); + } + finally { + currentBatch.release(); + } } } @@ -213,6 +218,16 @@ public class JdbcCoordinatorImpl implements JdbcCoordinator { return statementPreparer; } + private transient MutationStatementPreparer mutationStatementPreparer; + + @Override + public MutationStatementPreparer getMutationStatementPreparer() { + if ( mutationStatementPreparer == null ) { + mutationStatementPreparer = new MutationStatementPreparerImpl( this, jdbcServices ); + } + return mutationStatementPreparer; + } + private transient ResultSetReturn resultSetExtractor; @Override diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/MutationStatementPreparerImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/MutationStatementPreparerImpl.java new file mode 100644 index 0000000000..25cd2fbb1d --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/MutationStatementPreparerImpl.java @@ -0,0 +1,145 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.internal; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; + +import org.hibernate.AssertionFailure; +import org.hibernate.boot.spi.SessionFactoryOptions; +import org.hibernate.engine.jdbc.spi.JdbcServices; +import org.hibernate.engine.jdbc.spi.MutationStatementPreparer; +import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; +import org.hibernate.resource.jdbc.spi.JdbcObserver; +import org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor; + +/** + * @author Steve Ebersole + */ +public class MutationStatementPreparerImpl implements MutationStatementPreparer { + private final JdbcCoordinatorImpl jdbcCoordinator; + private final JdbcServices jdbcServices; + + public MutationStatementPreparerImpl(JdbcCoordinatorImpl jdbcCoordinator, JdbcServices jdbcServices) { + this.jdbcCoordinator = jdbcCoordinator; + this.jdbcServices = jdbcServices; + } + + @Override + public PreparedStatement prepareStatement(String sql, boolean isCallable) { + return buildPreparedStatementPreparationTemplate( sql, isCallable ).prepareStatement(); + } + + private StatementPreparationTemplate buildPreparedStatementPreparationTemplate(String sql, final boolean isCallable) { + return new StatementPreparationTemplate( sql ) { + @Override + protected PreparedStatement doPrepare() throws SQLException { + //noinspection resource + return isCallable + ? connection().prepareCall( sql ) + : connection().prepareStatement( sql ); + } + }; + } + + @Override + public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) { + if ( autoGeneratedKeys == PreparedStatement.RETURN_GENERATED_KEYS ) { + checkAutoGeneratedKeysSupportEnabled(); + } + return new StatementPreparationTemplate( sql ) { + public PreparedStatement doPrepare() throws SQLException { + //noinspection resource + return connection().prepareStatement( sql, autoGeneratedKeys ); + } + }.prepareStatement(); + } + + private void checkAutoGeneratedKeysSupportEnabled() { + if ( ! settings().isGetGeneratedKeysEnabled() ) { + throw new AssertionFailure( "getGeneratedKeys() support is not enabled" ); + } + } + + @Override + public PreparedStatement prepareStatement(String sql, String[] columnNames) { + checkAutoGeneratedKeysSupportEnabled(); + return new StatementPreparationTemplate( sql ) { + public PreparedStatement doPrepare() throws SQLException { + //noinspection resource + return connection().prepareStatement( sql, columnNames ); + } + }.prepareStatement(); + } + + private abstract class StatementPreparationTemplate { + protected final String sql; + + protected StatementPreparationTemplate(String incomingSql) { + final String inspectedSql = jdbcCoordinator.getJdbcSessionOwner() + .getJdbcSessionContext() + .getStatementInspector() + .inspect( incomingSql ); + this.sql = inspectedSql == null ? incomingSql : inspectedSql; + } + + public PreparedStatement prepareStatement() { + try { + final PreparedStatement preparedStatement; + //noinspection deprecation + final JdbcObserver observer = jdbcCoordinator.getJdbcSessionOwner() + .getJdbcSessionContext() + .getObserver(); + try { + observer.jdbcPrepareStatementStart(); + preparedStatement = doPrepare(); + setStatementTimeout( preparedStatement ); + } + finally { + observer.jdbcPrepareStatementEnd(); + } + postProcess( preparedStatement ); + return preparedStatement; + } + catch (SQLException e) { + throw sqlExceptionHelper().convert( e, "could not prepare statement", sql ); + } + } + + protected abstract PreparedStatement doPrepare() throws SQLException; + + public void postProcess(PreparedStatement preparedStatement) throws SQLException { + jdbcCoordinator.getLogicalConnection().getResourceRegistry().register( preparedStatement, true ); +// logicalConnection().notifyObserversStatementPrepared(); + } + + private void setStatementTimeout(PreparedStatement preparedStatement) throws SQLException { + final int remainingTransactionTimeOutPeriod = jdbcCoordinator.determineRemainingTransactionTimeOutPeriod(); + if ( remainingTransactionTimeOutPeriod > 0 ) { + preparedStatement.setQueryTimeout( remainingTransactionTimeOutPeriod ); + } + } + } + + protected final Connection connection() { + return logicalConnection().getPhysicalConnection(); + } + + protected final LogicalConnectionImplementor logicalConnection() { + return jdbcCoordinator.getLogicalConnection(); + } + + protected final SqlExceptionHelper sqlExceptionHelper() { + return jdbcServices.getSqlExceptionHelper(); + } + + protected final SessionFactoryOptions settings() { + //noinspection resource + return jdbcCoordinator.sessionFactory().getSessionFactoryOptions(); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/JdbcValueBindings.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/JdbcValueBindings.java new file mode 100644 index 0000000000..fcb1d784e4 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/JdbcValueBindings.java @@ -0,0 +1,58 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation; + +import org.hibernate.Incubating; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.jdbc.mutation.spi.BindingGroup; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.metamodel.mapping.SelectableMapping; +import org.hibernate.sql.model.TableMapping; + +/** + * The JDBC values for a mutation + * + * @author Steve Ebersole + */ +@Incubating +public interface JdbcValueBindings { + /** + * Get the bindings for the specific table, or {@code null} + */ + BindingGroup getBindingGroup(String tableName); + + /** + * Binds a value for a specific column+usage + */ + void bindValue( + Object value, + String tableName, + String columnName, + ParameterUsage usage, + SharedSessionContractImplementor session); + + /** + * Binds a value for a specific column+usage + */ + default void bindValue( + Object value, + SelectableMapping selectableMapping, + ParameterUsage usage, + SharedSessionContractImplementor session) { + bindValue( value, selectableMapping.getContainingTableExpression(), selectableMapping.getSelectionExpression(), usage, session ); + } + + /** + * Called before the execution of the operation for the specified table + */ + void beforeStatement(PreparedStatementDetails statementDetails, SharedSessionContractImplementor session); + + /** + * Called after the execution of the operation for the specified table + */ + void afterStatement(TableMapping mutatingTable, SharedSessionContractImplementor session); +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/MutationExecutor.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/MutationExecutor.java new file mode 100644 index 0000000000..036318655c --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/MutationExecutor.java @@ -0,0 +1,53 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation; + +import org.hibernate.Incubating; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.sql.model.ValuesAnalysis; + +/** + * Main contract for performing the mutation. Accounts for various + * moving parts such as:

    + *
  • Should the statements be batched or not?
    • + *
  • Should we "logically" group logging of the parameter bindings?
    • + *
  • ...
    • + *
+ * + * @author Steve Ebersole + */ +@Incubating +public interface MutationExecutor { + /** + * Get the delegate to be used to coordinate JDBC parameter binding. + */ + JdbcValueBindings getJdbcValueBindings(); + + /** + * Details about the {@link java.sql.PreparedStatement} for mutating + * the given table. + */ + PreparedStatementDetails getPreparedStatementDetails(String tableName); + + /** + * Perform the execution, returning any generated value. + * + * @param inclusionChecker The ability to skip the execution for a + * specific table; passing {@code null} indicates no filtering + * @param resultChecker Custom result checking; pass {@code null} to perform + * the standard check using the statement's {@linkplain org.hibernate.jdbc.Expectation expectation} + */ + Object execute( + Object modelReference, + ValuesAnalysis valuesAnalysis, + TableInclusionChecker inclusionChecker, + OperationResultChecker resultChecker, + SharedSessionContractImplementor session); + + void release(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/OperationResultChecker.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/OperationResultChecker.java new file mode 100644 index 0000000000..58c8e4eadf --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/OperationResultChecker.java @@ -0,0 +1,32 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation; + +import java.sql.SQLException; + +import org.hibernate.Incubating; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; + +/** + * Used to check the results of a statement execution + * + * @author Steve Ebersole + */ +@Incubating +@FunctionalInterface +public interface OperationResultChecker { + /** + * Check the result of a JDBC operation + * + * @param statementDetails Details for the SQL statement executed + * @param affectedRowCount The number of rows affected by the operation, as reported by the JDBC driver + * @param batchPosition The execution's position within the active batch, if one; if not batching, -1 will be passed + * + * @return {@code true} indicates an execution that is considered successful; {@code false} indicates unsuccessful + */ + boolean checkResult(PreparedStatementDetails statementDetails, int affectedRowCount, int batchPosition) throws SQLException; +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/ParameterUsage.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/ParameterUsage.java new file mode 100644 index 0000000000..301989a2cb --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/ParameterUsage.java @@ -0,0 +1,24 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation; + +/** + * Describes how a parameter is used in a mutation statement + * + * @author Steve Ebersole + */ +public enum ParameterUsage { + /** + * The parameter is used in the update set clause or insert values clause + */ + SET, + + /** + * The parameter is used in the where clause + */ + RESTRICT +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/TableInclusionChecker.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/TableInclusionChecker.java new file mode 100644 index 0000000000..5b09d43239 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/TableInclusionChecker.java @@ -0,0 +1,25 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation; + +import org.hibernate.sql.model.TableMapping; + +/** + * Used to check if a table should be included in the current execution + * + * @author Steve Ebersole + */ +@FunctionalInterface +public interface TableInclusionChecker { + /** + * Perform the check + * + * @return {@code true} indicates the table should be included; + * {@code false} indicates it should not + */ + boolean include(TableMapping tableMapping); +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/PreparedStatementDetails.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/PreparedStatementDetails.java new file mode 100644 index 0000000000..6e7b80ee71 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/PreparedStatementDetails.java @@ -0,0 +1,61 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.group; + +import java.sql.CallableStatement; +import java.sql.PreparedStatement; + +import org.hibernate.Incubating; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.jdbc.Expectation; +import org.hibernate.sql.model.TableMapping; + +/** + * Descriptor for details about a {@link PreparedStatement} + * + * @author Steve Ebersole + */ +@Incubating +public interface PreparedStatementDetails { + /** + * The name of the mutating table + */ + TableMapping getMutatingTableDetails(); + + /** + * The SQL used to mutate the table + */ + String getSqlString(); + + /** + * The {@link PreparedStatement} generated from the SQL. May return null. + * + * @see #resolveStatement() + */ + PreparedStatement getStatement(); + + /** + * The {@link PreparedStatement} generated from the SQL. + *

+ * Unlike {@link #getStatement()}, this method will attempt to create the PreparedStatement + */ + PreparedStatement resolveStatement(); + + /** + * The expectation used to validate the outcome of the execution + */ + Expectation getExpectation(); + + /** + * Whether the statement is callable + */ + default boolean isCallable() { + return getStatement() instanceof CallableStatement; + } + + void releaseStatement(SharedSessionContractImplementor session); +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/PreparedStatementGroup.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/PreparedStatementGroup.java new file mode 100644 index 0000000000..237f7548e5 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/PreparedStatementGroup.java @@ -0,0 +1,61 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.group; + +import java.util.function.BiConsumer; +import java.util.function.Predicate; + +import org.hibernate.Incubating; + +/** + * Grouping of {@link java.sql.PreparedStatement} references + * + * @author Steve Ebersole + */ +@Incubating +public interface PreparedStatementGroup { + /** + * The number of statements in this group + */ + int getNumberOfStatements(); + + int getNumberOfActiveStatements(); + + /** + * Get the single statement details. + * + * @throws IllegalStateException if there is more than one statement + * associated with this group. + */ + PreparedStatementDetails getSingleStatementDetails(); + + /** + * Visit the details for each table mutation + */ + void forEachStatement(BiConsumer action); + + /** + * Get the PreparedStatement in this group related to the given table-name. + * If the descriptor does not already exist, this method will create it. + * + * @see #getPreparedStatementDetails + */ + PreparedStatementDetails resolvePreparedStatementDetails(String tableName); + + /** + * Get the PreparedStatement in this group related to the given table-name. + * Will return null if no descriptor (yet) exists + */ + PreparedStatementDetails getPreparedStatementDetails(String tableName); + + /** + * Release resources held by this group. + */ + void release(); + + boolean hasMatching(Predicate filter); +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/UnknownParameterException.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/UnknownParameterException.java new file mode 100644 index 0000000000..984269f43e --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/UnknownParameterException.java @@ -0,0 +1,65 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.group; + +import java.util.Locale; + +import org.hibernate.HibernateException; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.internal.util.StringHelper; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; + +/** + * Indicates an attempt to access the parameter for an unknown column + * + * @see org.hibernate.sql.model.MutationOperation#getJdbcValueDescriptor(String, ParameterUsage) + * + * @author Steve Ebersole + */ +public class UnknownParameterException extends HibernateException { + private final MutationType mutationType; + private final MutationTarget mutationTarget; + private final String tableName; + private final String columnName; + private final ParameterUsage usage; + + public UnknownParameterException( + MutationType mutationType, + MutationTarget mutationTarget, + String tableName, + String columnName, + ParameterUsage usage) { + super( String.format( + Locale.ROOT, + "Unable to locate parameter `%s.%s` for %s - %s : %s", + tableName, + columnName, + usage, + mutationType.name(), + mutationTarget.getRolePath() + ) ); + this.mutationType = mutationType; + this.mutationTarget = mutationTarget; + this.tableName = tableName; + this.columnName = columnName; + this.usage = usage; + } + + @Override + public String toString() { + return String.format( + Locale.ROOT, + "UnknownParameterException(`%s.%s` for %s - %s : %s)", + tableName, + columnName, + usage, + mutationType.name(), + StringHelper.collapse( mutationTarget.getRolePath() ) + ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractMutationExecutor.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractMutationExecutor.java new file mode 100644 index 0000000000..0ec105f6da --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractMutationExecutor.java @@ -0,0 +1,124 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.internal; + +import java.sql.SQLException; + +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.MutationExecutor; +import org.hibernate.engine.jdbc.mutation.OperationResultChecker; +import org.hibernate.engine.jdbc.mutation.TableInclusionChecker; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.ValuesAnalysis; + +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER; +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER_TRACE_ENABLED; + +/** + * Base support for MutationExecutor implementations + * + * @author Steve Ebersole + */ +public abstract class AbstractMutationExecutor implements MutationExecutor { + /** + * Templated implementation of execution as

    + *
  1. {@link #performNonBatchedOperations}
    2. + *
  2. {@link #performSelfExecutingOperations}
    3. + *
  3. {@link #performBatchedOperations}
    4. + *
+ */ + @Override + public final Object execute( + Object modelReference, + ValuesAnalysis valuesAnalysis, + TableInclusionChecker inclusionChecker, + OperationResultChecker resultChecker, + SharedSessionContractImplementor session) { + performNonBatchedOperations( valuesAnalysis, inclusionChecker, resultChecker, session ); + performSelfExecutingOperations( valuesAnalysis, inclusionChecker, session ); + performBatchedOperations( valuesAnalysis, inclusionChecker ); + return null; + } + + protected void performNonBatchedOperations( + ValuesAnalysis valuesAnalysis, + TableInclusionChecker inclusionChecker, + OperationResultChecker resultChecker, + SharedSessionContractImplementor session) { + } + + protected void performSelfExecutingOperations( + ValuesAnalysis valuesAnalysis, + TableInclusionChecker inclusionChecker, + SharedSessionContractImplementor session) { + } + + protected void performBatchedOperations( + ValuesAnalysis valuesAnalysis, + TableInclusionChecker inclusionChecker) { + } + + /** + * Perform a non-batched mutation + */ + protected void performNonBatchedMutation( + PreparedStatementDetails statementDetails, + JdbcValueBindings valueBindings, + TableInclusionChecker inclusionChecker, + OperationResultChecker resultChecker, + SharedSessionContractImplementor session) { + if ( statementDetails == null ) { + return; + } + + final TableMapping tableDetails = statementDetails.getMutatingTableDetails(); + if ( inclusionChecker != null && !inclusionChecker.include( tableDetails ) ) { + if ( MODEL_MUTATION_LOGGER_TRACE_ENABLED ) { + MODEL_MUTATION_LOGGER.tracef( + "Skipping execution of secondary insert : %s", + tableDetails.getTableName() + ); + } + return; + } + + // If we get here the statement is needed - make sure it is resolved + session.getJdbcServices().getSqlStatementLogger().logStatement( statementDetails.getSqlString() ); + valueBindings.beforeStatement( statementDetails, session ); + + try { + final int affectedRowCount = session.getJdbcCoordinator() + .getResultSetReturn() + .executeUpdate( statementDetails.getStatement() ); + + if ( affectedRowCount == 0 && tableDetails.isOptional() ) { + // the optional table did not have a row + return; + } + + ModelMutationHelper.checkResults( resultChecker, statementDetails, affectedRowCount, -1 ); + } + catch (SQLException e) { + throw session.getJdbcServices().getSqlExceptionHelper().convert( + e, + String.format( + "Unable to execute mutation PreparedStatement against table `%s`", + tableDetails.getTableName() + ), + statementDetails.getSqlString() + ); + } + finally { + if ( statementDetails.getStatement() != null ) { + statementDetails.releaseStatement( session ); + } + valueBindings.afterStatement( tableDetails, session ); + } + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractSingleMutationExecutor.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractSingleMutationExecutor.java new file mode 100644 index 0000000000..98e71d0331 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractSingleMutationExecutor.java @@ -0,0 +1,56 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.internal; + +import java.util.Locale; + +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.sql.model.PreparableMutationOperation; +import org.hibernate.sql.model.jdbc.JdbcValueDescriptor; + +/** + * @author Steve Ebersole + */ +public abstract class AbstractSingleMutationExecutor extends AbstractMutationExecutor { + private final PreparableMutationOperation mutationOperation; + private final JdbcValueBindingsImpl valueBindings; + + public AbstractSingleMutationExecutor(PreparableMutationOperation mutationOperation) { + this.mutationOperation = mutationOperation; + this.valueBindings = new JdbcValueBindingsImpl( + mutationOperation.getMutationType(), + mutationOperation.getMutationTarget(), + this::findJdbcValueDescriptor + ); + } + + protected PreparableMutationOperation getMutationOperation() { + return mutationOperation; + } + + protected abstract PreparedStatementGroupSingleTable getStatementGroup(); + + @Override + public PreparedStatementDetails getPreparedStatementDetails(String tableName) { + final PreparedStatementDetails statementDetails = getStatementGroup().getSingleStatementDetails(); + assert statementDetails.getMutatingTableDetails().getTableName().equals( tableName ); + return statementDetails; + } + + private JdbcValueDescriptor findJdbcValueDescriptor(String tableName, String columnName, ParameterUsage usage) { + assert mutationOperation.getTableDetails().getTableName().equals( tableName ) + : String.format( Locale.ROOT, "table names did not match : `%s` & `%s`", tableName, mutationOperation.getTableDetails().getTableName() ); + return mutationOperation.findValueDescriptor( columnName, usage ); + } + + @Override + public JdbcValueBindings getJdbcValueBindings() { + return valueBindings; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueBindingsImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueBindingsImpl.java new file mode 100644 index 0000000000..7ca9cb47fc --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueBindingsImpl.java @@ -0,0 +1,127 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.internal; + +import java.sql.SQLException; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.jdbc.mutation.group.UnknownParameterException; +import org.hibernate.engine.jdbc.mutation.spi.BindingGroup; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.jdbc.JdbcValueDescriptor; + +/** + * @author Steve Ebersole + */ +public class JdbcValueBindingsImpl implements JdbcValueBindings { + private final MutationType mutationType; + private final MutationTarget mutationTarget; + private final JdbcValueDescriptorAccess jdbcValueDescriptorAccess; + + private final Map bindingGroupMap = new HashMap<>(); + + public JdbcValueBindingsImpl( + MutationType mutationType, + MutationTarget mutationTarget, + JdbcValueDescriptorAccess jdbcValueDescriptorAccess) { + this.mutationType = mutationType; + this.mutationTarget = mutationTarget; + this.jdbcValueDescriptorAccess = jdbcValueDescriptorAccess; + } + + @Override + public BindingGroup getBindingGroup(String tableName) { + return bindingGroupMap.get( tableName ); + } + + @Override + public void bindValue( + Object value, + String tableName, + String columnName, + ParameterUsage usage, + SharedSessionContractImplementor session) { + final JdbcValueDescriptor jdbcValueDescriptor = jdbcValueDescriptorAccess.resolveValueDescriptor( tableName, columnName, usage ); + if ( jdbcValueDescriptor == null ) { + throw new UnknownParameterException( mutationType, mutationTarget, tableName, columnName, usage ); + } + + resolveBindingGroup( tableName ).bindValue( columnName, value, jdbcValueDescriptor ); + } + + private BindingGroup resolveBindingGroup(String tableName) { + final BindingGroup existing = bindingGroupMap.get( tableName ); + if ( existing != null ) { + assert tableName.equals( existing.getTableName() ); + return existing; + } + + final BindingGroup created = new BindingGroup( tableName ); + bindingGroupMap.put( tableName, created ); + return created; + } + + @Override + public void beforeStatement( + PreparedStatementDetails statementDetails, + SharedSessionContractImplementor session) { + final BindingGroup bindingGroup = bindingGroupMap.get( statementDetails.getMutatingTableDetails().getTableName() ); + if ( bindingGroup == null ) { + return; + } + + bindingGroup.forEachBinding( (binding) -> { + try { + binding.getValueBinder().bind( + statementDetails.resolveStatement(), + binding.getValue(), + binding.getPosition(), + session + ); + } + catch (SQLException e) { + throw session.getJdbcServices().getSqlExceptionHelper().convert( + e, + String.format( + Locale.ROOT, + "Unable to bind parameter #%s - %s", + binding.getPosition(), + binding.getValue() + ) + ); + } + } ); + } + + @Override + public void afterStatement( + TableMapping mutatingTable, + SharedSessionContractImplementor session) { + final BindingGroup bindingGroup = bindingGroupMap.remove( mutatingTable.getTableName() ); + if ( bindingGroup == null ) { + return; + } + + bindingGroup.clear(); + } + + /** + * Access to {@link JdbcValueDescriptor} values + */ + @FunctionalInterface + public interface JdbcValueDescriptorAccess { + JdbcValueDescriptor resolveValueDescriptor(String tableName, String columnName, ParameterUsage usage); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueDescriptorImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueDescriptorImpl.java new file mode 100644 index 0000000000..d01282aa04 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueDescriptorImpl.java @@ -0,0 +1,56 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.internal; + +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.metamodel.mapping.JdbcMapping; +import org.hibernate.sql.exec.spi.JdbcParameterBinder; +import org.hibernate.sql.model.ast.ColumnValueParameter; +import org.hibernate.sql.model.jdbc.JdbcValueDescriptor; + +/** + * Standard JdbcValueDescriptor implementation + * + * @author Steve Ebersole + */ +public class JdbcValueDescriptorImpl implements JdbcValueDescriptor { + private final String columnName; + private final ParameterUsage usage; + private final JdbcMapping jdbcMapping; + private final int jdbcPosition; + + public JdbcValueDescriptorImpl(JdbcParameterBinder jdbcParameterBinder, int jdbcPosition) { + this( (ColumnValueParameter) jdbcParameterBinder, jdbcPosition ); + } + + public JdbcValueDescriptorImpl(ColumnValueParameter columnValueParameter, int jdbcPosition) { + this.columnName = columnValueParameter.getColumnReference().getColumnExpression(); + this.usage = columnValueParameter.getUsage(); + this.jdbcMapping = columnValueParameter.getJdbcMapping(); + this.jdbcPosition = jdbcPosition; + } + + @Override + public String getColumnName() { + return columnName; + } + + @Override + public ParameterUsage getUsage() { + return usage; + } + + @Override + public int getJdbcPosition() { + return jdbcPosition; + } + + @Override + public JdbcMapping getJdbcMapping() { + return jdbcMapping; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/ModelMutationHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/ModelMutationHelper.java new file mode 100644 index 0000000000..67ea3a9a17 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/ModelMutationHelper.java @@ -0,0 +1,149 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.internal; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.List; +import java.util.Locale; + +import org.hibernate.HibernateException; +import org.hibernate.StaleObjectStateException; +import org.hibernate.StaleStateException; +import org.hibernate.engine.jdbc.mutation.OperationResultChecker; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup; +import org.hibernate.engine.jdbc.spi.JdbcCoordinator; +import org.hibernate.engine.jdbc.spi.MutationStatementPreparer; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.jdbc.TooManyRowsAffectedException; +import org.hibernate.persister.entity.mutation.EntityMutationTarget; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.PreparableMutationOperation; +import org.hibernate.stat.spi.StatisticsImplementor; + +import static org.hibernate.engine.jdbc.mutation.internal.PreparedStatementGroupNone.GROUP_OF_NONE; + +/** + * Helper functionality related to model mutations + * + * @author Steve Ebersole + */ +public class ModelMutationHelper { + + private ModelMutationHelper() { + // disallow direct instantiation + } + + public static void checkResults( + OperationResultChecker resultChecker, + PreparedStatementDetails statementDetails, + int affectedRowCount, + int batchPosition) throws SQLException { + if ( resultChecker != null ) { + resultChecker.checkResult( statementDetails, affectedRowCount, batchPosition ); + } + } + + public static boolean identifiedResultsCheck( + PreparedStatementDetails statementDetails, + int affectedRowCount, + int batchPosition, + MutationTarget mutationTarget, + Object id, + SessionFactoryImplementor sessionFactory) { + try { + statementDetails.getExpectation().verifyOutcome( + affectedRowCount, + statementDetails.getStatement(), + batchPosition, + statementDetails.getSqlString() + ); + } + catch (StaleStateException e) { + if ( !statementDetails.getMutatingTableDetails().isOptional() && affectedRowCount == 0 ) { + final StatisticsImplementor statistics = sessionFactory.getStatistics(); + if ( statistics.isStatisticsEnabled() ) { + statistics.optimisticFailure( mutationTarget.getNavigableRole().getFullPath() ); + } + throw new StaleObjectStateException( mutationTarget.getNavigableRole().getFullPath(), id ); + } + return false; + } + catch (TooManyRowsAffectedException e) { + throw new HibernateException( + String.format( + Locale.ROOT, + "Duplicate identifier in table (%s) - %s#%s", + statementDetails.getMutatingTableDetails().getTableName(), + mutationTarget.getNavigableRole().getFullPath(), + id + ) + ); + } + catch (Throwable t) { + return false; + } + + return true; + } + + public static PreparedStatementGroup toPreparedStatementGroup( + MutationType mutationType, + MutationTarget mutationTarget, + List mutations, + SharedSessionContractImplementor session) { + if ( mutations == null || mutations.isEmpty() ) { + return GROUP_OF_NONE; + } + + if ( mutations.size() == 1 ) { + return new PreparedStatementGroupSingleTable( mutations.get( 0 ), session ); + } + + return new PreparedStatementGroupStandard( mutationType, mutationTarget, mutations, session ); + } + + public static PreparedStatementDetails standardPreparation( + PreparableMutationOperation jdbcMutation, + SharedSessionContractImplementor session) { + return new PreparedStatementDetailsStandard( + jdbcMutation, + () -> standardStatementPreparation( jdbcMutation, session ), + session.getJdbcServices() + ); + } + + public static PreparedStatementDetails identityPreparation( + PreparableMutationOperation jdbcMutation, + SharedSessionContractImplementor session) { + return new PreparedStatementDetailsStandard( + jdbcMutation, + () -> { + final EntityMutationTarget target = (EntityMutationTarget) jdbcMutation.getMutationTarget(); + final PreparedStatement statement = target + .getIdentityInsertDelegate() + .prepareStatement( jdbcMutation.getSqlString(), session ); + session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().register( null, statement ); + return statement; + }, + session.getJdbcServices() + ); + } + + public static PreparedStatement standardStatementPreparation( + PreparableMutationOperation jdbcMutation, + SharedSessionContractImplementor session) { + final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator(); + final MutationStatementPreparer statementPreparer = jdbcCoordinator.getMutationStatementPreparer(); + final PreparedStatement statement = statementPreparer.prepareStatement( jdbcMutation.getSqlString(), jdbcMutation.isCallable() ); + session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().register( null, statement ); + return statement; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorPostInsert.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorPostInsert.java new file mode 100644 index 0000000000..c3e95d46ab --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorPostInsert.java @@ -0,0 +1,315 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.internal; + +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.function.Supplier; + +import org.hibernate.engine.jdbc.batch.spi.Batch; +import org.hibernate.engine.jdbc.batch.spi.BatchKey; +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.MutationExecutor; +import org.hibernate.engine.jdbc.mutation.OperationResultChecker; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.TableInclusionChecker; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; +import org.hibernate.persister.entity.mutation.EntityMutationTarget; +import org.hibernate.persister.entity.mutation.EntityTableMapping; +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationOperationGroup; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.PreparableMutationOperation; +import org.hibernate.sql.model.SelfExecutingUpdateOperation; +import org.hibernate.sql.model.ValuesAnalysis; +import org.hibernate.sql.model.jdbc.JdbcValueDescriptor; + +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER; +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER_TRACE_ENABLED; + +/** + * Specialized executor for the case of more than one table operation, with the + * root table defining a post-insert id-generation strategy. + * + * @todo (mutation) : look to consolidate this into/with MutationExecutorStandard + * - aside from the special handling for the IDENTITY table insert, + * the code below is the same as MutationExecutorStandard. + * - consolidating this into MutationExecutorStandard would simplify + * creating "single table" variations - i.e. MutationExecutorStandard and + * StandardSingleTableExecutor. Otherwise we'd have MutationExecutorStandard, + * StandardSingleTableExecutor, MutationExecutorPostInsert and + * MutationExecutorPostInsertSingleTable variants + * + * @author Steve Ebersole + */ +public class MutationExecutorPostInsert implements MutationExecutor { + private final EntityMutationTarget mutationTarget; + private final MutationOperationGroup mutationOperationGroup; + + private final PreparedStatementDetails identityInsertStatementDetails; + + /** + * The batched statements + */ + private final Batch batch; + + /** + * Any non-batched JDBC statements + */ + private final PreparedStatementGroup nonBatchedStatementGroup; + + private final JdbcValueBindingsImpl valueBindings; + + private enum StatementLocation { IDENTITY, BATCHED, NON_BATCHED } + private final Map statementLocationMap = new HashMap<>(); + + public MutationExecutorPostInsert( + MutationOperationGroup mutationOperationGroup, + Supplier batchKeySupplier, + int batchSize, + SharedSessionContractImplementor session) { + this.mutationTarget = (EntityMutationTarget) mutationOperationGroup.getMutationTarget(); + this.valueBindings = new JdbcValueBindingsImpl( + MutationType.INSERT, + mutationTarget, + this::findJdbcValueDescriptor + ); + this.mutationOperationGroup = mutationOperationGroup; + + final PreparableMutationOperation identityInsertOperation = mutationOperationGroup.getOperation( mutationTarget.getIdentifierTableName() ); + this.identityInsertStatementDetails = ModelMutationHelper.identityPreparation( + identityInsertOperation, + session + ); + statementLocationMap.put( mutationTarget.getIdentifierTableName(), StatementLocation.IDENTITY ); + + final BatchKey batchKey = batchKeySupplier.get(); + + List batchedJdbcMutations = null; + List nonBatchedJdbcMutations = null; + + final List operations = mutationOperationGroup.getOperations(); + for ( int i = 0; i < operations.size(); i++ ) { + final MutationOperation operation = operations.get( i ); + + if ( operation.getTableDetails().isIdentifierTable() ) { + // the identifier table is handled via `identityInsertStatementDetails` + continue; + } + + // SelfExecutingUpdateOperation are not legal for inserts... + assert ! (operation instanceof SelfExecutingUpdateOperation ); + + final PreparableMutationOperation preparableMutationOperation = (PreparableMutationOperation) operation; + if ( preparableMutationOperation.canBeBatched( batchKey, batchSize ) ) { + if ( batchedJdbcMutations == null ) { + batchedJdbcMutations = new ArrayList<>(); + } + batchedJdbcMutations.add( preparableMutationOperation ); + statementLocationMap.put( operation.getTableDetails().getTableName(), StatementLocation.BATCHED ); + } + else { + if ( nonBatchedJdbcMutations == null ) { + nonBatchedJdbcMutations = new ArrayList<>(); + } + nonBatchedJdbcMutations.add( preparableMutationOperation ); + statementLocationMap.put( operation.getTableDetails().getTableName(), StatementLocation.NON_BATCHED ); + } + } + + // todo (mutation) : consider creating single PreparedStatementGroup for all + // batched and non-batched statements. we then need a way to know whether a + // statement is batched or not. `PreparedStatementDetails#isBatched`? + + if ( batchedJdbcMutations == null || batchedJdbcMutations.isEmpty() ) { + this.batch = null; + } + else { + final List batchedMutationsRef = batchedJdbcMutations; + this.batch = session.getJdbcCoordinator().getBatch2( + batchKey, + batchSize, + () -> ModelMutationHelper.toPreparedStatementGroup( + MutationType.INSERT, + mutationTarget, + batchedMutationsRef, + session + ) + ); + assert batch != null; + } + + this.nonBatchedStatementGroup = ModelMutationHelper.toPreparedStatementGroup( + MutationType.INSERT, + mutationTarget, + nonBatchedJdbcMutations, + session + ); + } + + @Override + public JdbcValueBindings getJdbcValueBindings() { + return valueBindings; + } + + private JdbcValueDescriptor findJdbcValueDescriptor(String tableName, String columnName, ParameterUsage usage) { + final MutationOperation operation = mutationOperationGroup.getOperation( tableName ); + if ( operation == null ) { + return null; + } + + return operation.getJdbcValueDescriptor( columnName, usage ); + } + + @Override + public PreparedStatementDetails getPreparedStatementDetails(String tableName) { + final StatementLocation statementLocation = statementLocationMap.get( tableName ); + if ( statementLocation == null ) { + return null; + } + + if ( statementLocation == StatementLocation.IDENTITY ) { + assert mutationTarget.getIdentifierTableName().equals( tableName ); + return identityInsertStatementDetails; + } + + if ( statementLocation == StatementLocation.BATCHED ) { + assert batch != null; + return batch.getStatementGroup().getPreparedStatementDetails( tableName ); + } + + if ( statementLocation == StatementLocation.NON_BATCHED ) { + assert nonBatchedStatementGroup != null; + return nonBatchedStatementGroup.getPreparedStatementDetails( tableName ); + } + + return null; + } + + @Override + public Object execute( + Object modelReference, + ValuesAnalysis valuesAnalysis, + TableInclusionChecker inclusionChecker, + OperationResultChecker resultChecker, + SharedSessionContractImplementor session) { + final InsertGeneratedIdentifierDelegate identityHandler = mutationTarget.getIdentityInsertDelegate(); + final Object id = identityHandler.performInsert( identityInsertStatementDetails, valueBindings, modelReference, session ); + + if ( MODEL_MUTATION_LOGGER_TRACE_ENABLED ) { + MODEL_MUTATION_LOGGER.tracef( + "Post-insert generated value : `%s` (%s)", + id, + mutationTarget.getNavigableRole().getFullPath() + ); + } + + if ( nonBatchedStatementGroup != null ) { + nonBatchedStatementGroup.forEachStatement( (tableName, statementDetails) -> executeWithId( + id, + tableName, + statementDetails, + inclusionChecker, + resultChecker, + session + ) ); + } + + if ( batch != null ) { + batch.getStatementGroup().forEachStatement( (tableName, statementDetails) -> executeWithId( + id, + tableName, + statementDetails, + inclusionChecker, + resultChecker, + session + ) ); + } + + return id; + } + + private void executeWithId( + Object id, + String tableName, + PreparedStatementDetails statementDetails, + TableInclusionChecker inclusionChecker, + OperationResultChecker resultChecker, + SharedSessionContractImplementor session) { + if ( statementDetails == null ) { + return; + } + + final EntityTableMapping tableDetails = (EntityTableMapping) statementDetails.getMutatingTableDetails(); + assert !tableDetails.isIdentifierTable(); + + if ( inclusionChecker != null && !inclusionChecker.include( tableDetails ) ) { + if ( MODEL_MUTATION_LOGGER_TRACE_ENABLED ) { + MODEL_MUTATION_LOGGER.tracef( + "Skipping execution of secondary insert : %s", + tableDetails.getTableName() + ); + } + return; + } + + // If we get here the statement is needed - make sure it is resolved + //noinspection resource + statementDetails.resolveStatement(); + + tableDetails.getKeyMapping().breakDownKeyJdbcValues( + id, + (jdbcValue, columnMapping) -> valueBindings.bindValue( + jdbcValue, + tableName, + columnMapping.getColumnName(), + ParameterUsage.SET, + session + ), + session + ); + + session.getJdbcServices().getSqlStatementLogger().logStatement( statementDetails.getSqlString() ); + valueBindings.beforeStatement( statementDetails, session ); + + try { + final int affectedRowCount = session.getJdbcCoordinator() + .getResultSetReturn() + .executeUpdate( statementDetails.getStatement() ); + + ModelMutationHelper.checkResults( resultChecker, statementDetails, affectedRowCount, -1 ); + } + catch (SQLException e) { + throw session.getJdbcServices().getSqlExceptionHelper().convert( + e, + "Unable to execute mutation PreparedStatement against table `" + tableName + "`", + statementDetails.getSqlString() + ); + } + } + + @Override + public void release() { + nonBatchedStatementGroup.release(); + } + + @Override + public String toString() { + return String.format( + Locale.ROOT, + "MutationExecutorPostInsert(`%s`)", + mutationTarget.getNavigableRole().getFullPath() + ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorPostInsertSingleTable.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorPostInsertSingleTable.java new file mode 100644 index 0000000000..6ea35307bb --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorPostInsertSingleTable.java @@ -0,0 +1,121 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.internal; + +import java.util.Locale; + +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.MutationExecutor; +import org.hibernate.engine.jdbc.mutation.OperationResultChecker; +import org.hibernate.engine.jdbc.mutation.TableInclusionChecker; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; +import org.hibernate.persister.entity.mutation.EntityMutationTarget; +import org.hibernate.sql.model.MutationOperationGroup; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.PreparableMutationOperation; +import org.hibernate.sql.model.ValuesAnalysis; + +import static org.hibernate.engine.jdbc.mutation.internal.ModelMutationHelper.identityPreparation; +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER; +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER_TRACE_ENABLED; + +/** + * Specialized form of {@link MutationExecutorPostInsert} for cases where there + * is only the single identity table. Allows us to skip references to things + * we won't need (Batch, etc) + * + * @todo (mutation) : look to consolidate this into/with MutationExecutorStandard + * - aside from the special handling for the IDENTITY table insert, + * the code below is the same as MutationExecutorStandard. + * - consolidating this into MutationExecutorStandard would simplify + * creating "single table" variations - i.e. MutationExecutorStandard and + * StandardSingleTableExecutor. Otherwise we'd have MutationExecutorStandard, + * StandardSingleTableExecutor, MutationExecutorPostInsert and + * MutationExecutorPostInsertSingleTable variants + * + * @author Steve Ebersole + */ +public class MutationExecutorPostInsertSingleTable implements MutationExecutor { + private final EntityMutationTarget mutationTarget; + private final SharedSessionContractImplementor session; + + private final PreparedStatementDetails identityInsertStatementDetails; + + private final JdbcValueBindingsImpl valueBindings; + + public MutationExecutorPostInsertSingleTable( + MutationOperationGroup mutationOperationGroup, + SharedSessionContractImplementor session) { + this.mutationTarget = (EntityMutationTarget) mutationOperationGroup.getMutationTarget(); + this.session = session; + + assert mutationOperationGroup.getNumberOfOperations() == 1; + + final PreparableMutationOperation operation = mutationOperationGroup.getOperation( mutationTarget.getIdentifierTableName() ); + this.identityInsertStatementDetails = identityPreparation( operation, session ); + + this.valueBindings = new JdbcValueBindingsImpl( + MutationType.INSERT, + mutationTarget, + (tableName, columnName, usage) -> { + assert identityInsertStatementDetails.getMutatingTableDetails().getTableName().equals( tableName ); + return operation.findValueDescriptor( columnName, usage ); + } + ); + } + + @Override + public JdbcValueBindings getJdbcValueBindings() { + return valueBindings; + } + + @Override + public PreparedStatementDetails getPreparedStatementDetails(String tableName) { + if ( mutationTarget.getIdentifierTableName().equals( tableName ) ) { + return identityInsertStatementDetails; + } + + return null; + } + + @Override + public Object execute( + Object modelReference, + ValuesAnalysis valuesAnalysis, + TableInclusionChecker inclusionChecker, + OperationResultChecker resultChecker, + SharedSessionContractImplementor session) { + final InsertGeneratedIdentifierDelegate identityHandler = mutationTarget.getIdentityInsertDelegate(); + final Object id = identityHandler.performInsert( identityInsertStatementDetails, valueBindings, modelReference, session ); + + if ( MODEL_MUTATION_LOGGER_TRACE_ENABLED ) { + MODEL_MUTATION_LOGGER.tracef( + "Post-insert generated value : `%s` (%s)", + id, + mutationTarget.getNavigableRole().getFullPath() + ); + } + + return id; + } + + @Override + public void release() { + identityInsertStatementDetails.releaseStatement( session ); + } + + @Override + public String toString() { + return String.format( + Locale.ROOT, + "MutationExecutorPostInsertSingleTable(`%s`)", + mutationTarget.getNavigableRole().getFullPath() + ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorServiceInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorServiceInitiator.java new file mode 100644 index 0000000000..712f7e0c00 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorServiceInitiator.java @@ -0,0 +1,74 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.internal; + +import java.util.Map; + +import org.hibernate.HibernateException; +import org.hibernate.boot.registry.StandardServiceInitiator; +import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; +import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService; +import org.hibernate.service.spi.ServiceRegistryImplementor; + +/** + * Initiator for the {@link MutationExecutorService} service + * + * @author Steve Ebersole + */ +public class MutationExecutorServiceInitiator implements StandardServiceInitiator { + /** + * Singleton access + */ + public static final MutationExecutorServiceInitiator INSTANCE = new MutationExecutorServiceInitiator(); + + /** + * Names the BatchBuilder implementation to use. + */ + public static final String EXECUTOR_KEY = "hibernate.jdbc.mutation.executor"; + + @Override + public Class getServiceInitiated() { + return MutationExecutorService.class; + } + + @Override + public MutationExecutorService initiateService(Map configurationValues, ServiceRegistryImplementor registry) { + final Object custom = configurationValues.get( EXECUTOR_KEY ); + + if ( custom == null ) { + return createStandardService( configurationValues, registry ); + } + + if ( custom instanceof MutationExecutorService ) { + return (MutationExecutorService) custom; + } + + final Class customImplClass; + if ( custom instanceof Class ) { + //noinspection unchecked + customImplClass = (Class) custom; + } + else { + final ClassLoaderService classLoaderService = registry.getService( ClassLoaderService.class ); + customImplClass = classLoaderService.classForName( custom.toString() ); + } + + try { + return customImplClass.getConstructor().newInstance(); + } + catch (NoSuchMethodException e) { + throw new HibernateException( "Could not locate appropriate MutationExecutorService constructor : " + customImplClass.getName(), e ); + } + catch (Exception e) { + throw new HibernateException( "Unable to instantiate custom MutationExecutorService : " + customImplClass.getName(), e ); + } + } + + private MutationExecutorService createStandardService(Map configurationValues, ServiceRegistryImplementor registry) { + return new StandardMutationExecutorService( configurationValues, registry ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleBatched.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleBatched.java new file mode 100644 index 0000000000..a7bf22d729 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleBatched.java @@ -0,0 +1,67 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.internal; + +import org.hibernate.engine.jdbc.batch.spi.Batch; +import org.hibernate.engine.jdbc.batch.spi.BatchKey; +import org.hibernate.engine.jdbc.mutation.TableInclusionChecker; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.sql.model.PreparableMutationOperation; +import org.hibernate.sql.model.ValuesAnalysis; + +/** + * @author Steve Ebersole + */ +public class MutationExecutorSingleBatched extends AbstractSingleMutationExecutor { + private final int batchSize; + private final SharedSessionContractImplementor session; + + private final BatchKey batchKey; + + public MutationExecutorSingleBatched( + PreparableMutationOperation mutationOperation, + BatchKey batchKey, + int batchSize, + SharedSessionContractImplementor session) { + super( mutationOperation ); + + this.batchSize = batchSize; + this.session = session; + + this.batchKey = batchKey; + } + + @Override + protected PreparedStatementGroupSingleTable getStatementGroup() { + return (PreparedStatementGroupSingleTable) resolveBatch().getStatementGroup(); + } + + private Batch batch; + + private Batch resolveBatch() { + if ( batch == null ) { + batch = session.getJdbcCoordinator().getBatch2( + batchKey, + batchSize, + () -> new PreparedStatementGroupSingleTable( getMutationOperation(), session ) + ); + assert batch != null; + } + + return batch; + } + + @Override + protected void performBatchedOperations(ValuesAnalysis valuesAnalysis, TableInclusionChecker inclusionChecker) { + resolveBatch().addToBatch( getJdbcValueBindings(), inclusionChecker ); + } + + @Override + public void release() { + // nothing to do + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleNonBatched.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleNonBatched.java new file mode 100644 index 0000000000..fee4390c89 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleNonBatched.java @@ -0,0 +1,53 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.internal; + +import org.hibernate.engine.jdbc.mutation.OperationResultChecker; +import org.hibernate.engine.jdbc.mutation.TableInclusionChecker; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.sql.model.PreparableMutationOperation; +import org.hibernate.sql.model.ValuesAnalysis; + +/** + * @author Steve Ebersole + */ +public class MutationExecutorSingleNonBatched extends AbstractSingleMutationExecutor { + private final PreparedStatementGroupSingleTable statementGroup; + + public MutationExecutorSingleNonBatched( + PreparableMutationOperation mutationOperation, + SharedSessionContractImplementor session) { + super( mutationOperation ); + + this.statementGroup = new PreparedStatementGroupSingleTable( mutationOperation, session ); + } + + @Override + protected PreparedStatementGroupSingleTable getStatementGroup() { + return statementGroup; + } + + @Override + protected void performNonBatchedOperations( + ValuesAnalysis valuesAnalysis, + TableInclusionChecker inclusionChecker, + OperationResultChecker resultChecker, + SharedSessionContractImplementor session) { + performNonBatchedMutation( + statementGroup.getSingleStatementDetails(), + getJdbcValueBindings(), + inclusionChecker, + resultChecker, + session + ); + } + + @Override + public void release() { + // nothing to do - `#performNonBatchedMutation` already releases the statement + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleSelfExecuting.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleSelfExecuting.java new file mode 100644 index 0000000000..69a39bf243 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleSelfExecuting.java @@ -0,0 +1,60 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.internal; + +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.TableInclusionChecker; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.sql.model.SelfExecutingUpdateOperation; +import org.hibernate.sql.model.ValuesAnalysis; +import org.hibernate.sql.model.jdbc.JdbcValueDescriptor; + +/** + * @author Steve Ebersole + */ +public class MutationExecutorSingleSelfExecuting extends AbstractMutationExecutor { + private final SelfExecutingUpdateOperation operation; + private final JdbcValueBindingsImpl valueBindings; + + public MutationExecutorSingleSelfExecuting(SelfExecutingUpdateOperation operation) { + this.operation = operation; + + this.valueBindings = new JdbcValueBindingsImpl( + operation.getMutationType(), + operation.getMutationTarget(), + this::findJdbcValueDescriptor + ); + } + + private JdbcValueDescriptor findJdbcValueDescriptor(String tableName, String columnName, ParameterUsage usage) { + return operation.findValueDescriptor( columnName, usage ); + } + + @Override + public JdbcValueBindings getJdbcValueBindings() { + return valueBindings; + } + + @Override + public PreparedStatementDetails getPreparedStatementDetails(String tableName) { + throw new UnsupportedOperationException(); + } + + @Override + protected void performSelfExecutingOperations(ValuesAnalysis valuesAnalysis, TableInclusionChecker inclusionChecker, SharedSessionContractImplementor session) { + if ( inclusionChecker.include( operation.getTableDetails() ) ) { + operation.performMutation( valueBindings, valuesAnalysis, session ); + } + } + + @Override + public void release() { + // todo (mutation) :implement + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorStandard.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorStandard.java new file mode 100644 index 0000000000..4d5b8b6773 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorStandard.java @@ -0,0 +1,246 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.internal; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.function.Supplier; + +import org.hibernate.engine.jdbc.batch.spi.Batch; +import org.hibernate.engine.jdbc.batch.spi.BatchKey; +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.OperationResultChecker; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.TableInclusionChecker; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationOperationGroup; +import org.hibernate.sql.model.PreparableMutationOperation; +import org.hibernate.sql.model.SelfExecutingUpdateOperation; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.ValuesAnalysis; +import org.hibernate.sql.model.jdbc.JdbcValueDescriptor; + +/** + * Standard MutationExecutor implementation + * + * @author Steve Ebersole + */ +public class MutationExecutorStandard extends AbstractMutationExecutor { + private final MutationOperationGroup mutationOperationGroup; + + /** + * The batched statements + */ + private final Batch batch; + + /** + * Any non-batched JDBC statements + */ + private final PreparedStatementGroup nonBatchedStatementGroup; + + /** + * Operations which handle their own execution + */ + private final List selfExecutingMutations; + + private final JdbcValueBindingsImpl valueBindings; + + private enum StatementLocation { BATCHED, NON_BATCHED } + private final Map statementLocationMap = new HashMap<>(); + + public MutationExecutorStandard( + MutationOperationGroup mutationOperationGroup, + Supplier batchKeySupplier, + int batchSize, + SharedSessionContractImplementor session) { + this.mutationOperationGroup = mutationOperationGroup; + + final BatchKey batchKey = batchKeySupplier.get(); + + // split the table operations into batchable and non-batchable - + // 1. batchable statements are handle via Batch + // 2. non-batchable statements are handled locally + + List batchedJdbcMutations = null; + List nonBatchedJdbcMutations = null; + List selfExecutingMutations = null; + + final List operations = mutationOperationGroup.getOperations(); + + boolean hasAnyNonBatchedJdbcOperations = false; + + for ( int i = operations.size() - 1; i >= 0; i-- ) { + final MutationOperation operation = operations.get( i ); + if ( operation instanceof SelfExecutingUpdateOperation ) { + final SelfExecutingUpdateOperation selfExecutingMutation = (SelfExecutingUpdateOperation) operation; + if ( selfExecutingMutations == null ) { + selfExecutingMutations = new ArrayList<>(); + } + selfExecutingMutations.add( 0, selfExecutingMutation ); + } + else { + final PreparableMutationOperation preparableMutationOperation = (PreparableMutationOperation) operation; + final TableMapping tableDetails = operation.getTableDetails(); + final boolean canBeBatched; + + if ( tableDetails.isIdentifierTable() && hasAnyNonBatchedJdbcOperations ) { + canBeBatched = false; + } + else { + canBeBatched = preparableMutationOperation.canBeBatched( batchKey, batchSize ); + } + + if ( canBeBatched ) { + if ( batchedJdbcMutations == null ) { + batchedJdbcMutations = new ArrayList<>(); + } + batchedJdbcMutations.add( 0, preparableMutationOperation ); + statementLocationMap.put( tableDetails.getTableName(), StatementLocation.BATCHED ); + } + else { + hasAnyNonBatchedJdbcOperations = true; + if ( nonBatchedJdbcMutations == null ) { + nonBatchedJdbcMutations = new ArrayList<>(); + } + nonBatchedJdbcMutations.add( 0, preparableMutationOperation ); + statementLocationMap.put( tableDetails.getTableName(), StatementLocation.NON_BATCHED ); + } + } + } + + // todo (mutation) : consider creating single PreparedStatementGroup for all + // batched and non-batched statements. we then need a way to know whether a + // statement is batched or not. `PreparedStatementDetails#isBatched`? + + if ( batchedJdbcMutations == null || batchedJdbcMutations.isEmpty() ) { + this.batch = null; + } + else { + final List batchedMutationsRef = batchedJdbcMutations; + this.batch = session.getJdbcCoordinator().getBatch2( + batchKey, + batchSize, + () -> ModelMutationHelper.toPreparedStatementGroup( + mutationOperationGroup.getMutationType(), + mutationOperationGroup.getMutationTarget(), + batchedMutationsRef, + session + ) + ); + assert batch != null; + } + + this.nonBatchedStatementGroup = ModelMutationHelper.toPreparedStatementGroup( + mutationOperationGroup.getMutationType(), + mutationOperationGroup.getMutationTarget(), + nonBatchedJdbcMutations, + session + ); + + this.selfExecutingMutations = selfExecutingMutations; + + this.valueBindings = new JdbcValueBindingsImpl( + mutationOperationGroup.getMutationType(), + mutationOperationGroup.getMutationTarget(), + this::findJdbcValueDescriptor + ); + } + + @Override + public JdbcValueBindings getJdbcValueBindings() { + return valueBindings; + } + + private JdbcValueDescriptor findJdbcValueDescriptor(String tableName, String columnName, ParameterUsage usage) { + return mutationOperationGroup.getOperation( tableName ).findValueDescriptor( columnName, usage ); + } + + @Override + public PreparedStatementDetails getPreparedStatementDetails(String tableName) { + final StatementLocation statementLocation = statementLocationMap.get( tableName ); + if ( statementLocation == null ) { + return null; + } + + if ( statementLocation == StatementLocation.BATCHED ) { + assert batch != null; + return batch.getStatementGroup().getPreparedStatementDetails( tableName ); + } + + if ( statementLocation == StatementLocation.NON_BATCHED ) { + assert nonBatchedStatementGroup != null; + return nonBatchedStatementGroup.getPreparedStatementDetails( tableName ); + } + + return null; + } + + @Override + public void release() { + nonBatchedStatementGroup.release(); + // todo (mutation) :implement + } + + @Override + protected void performNonBatchedOperations( + ValuesAnalysis valuesAnalysis, + TableInclusionChecker inclusionChecker, + OperationResultChecker resultChecker, + SharedSessionContractImplementor session) { + if ( nonBatchedStatementGroup == null || nonBatchedStatementGroup.getNumberOfStatements() <= 0 ) { + return; + } + + nonBatchedStatementGroup.forEachStatement( (tableName, statementDetails) -> performNonBatchedMutation( + statementDetails, + valueBindings, + inclusionChecker, + resultChecker, + session + ) ); + } + + @Override + protected void performSelfExecutingOperations(ValuesAnalysis valuesAnalysis, TableInclusionChecker inclusionChecker, SharedSessionContractImplementor session) { + if ( selfExecutingMutations == null || selfExecutingMutations.isEmpty() ) { + return; + } + + for ( int i = 0; i < selfExecutingMutations.size(); i++ ) { + final SelfExecutingUpdateOperation operation = selfExecutingMutations.get( i ); + if ( inclusionChecker.include( operation.getTableDetails() ) ) { + operation.performMutation( valueBindings, valuesAnalysis, session ); + } + } + } + + @Override + protected void performBatchedOperations( + ValuesAnalysis valuesAnalysis, + TableInclusionChecker inclusionChecker) { + if ( batch == null ) { + return; + } + batch.addToBatch( valueBindings, inclusionChecker ); + } + + @Override + public String toString() { + return String.format( + Locale.ROOT, + "MutationExecutorStandard(`%s:%s`)", + mutationOperationGroup.getMutationType().name(), + mutationOperationGroup.getMutationTarget().getRolePath() + ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationQueryOptions.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationQueryOptions.java new file mode 100644 index 0000000000..19fc21d83b --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationQueryOptions.java @@ -0,0 +1,124 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.internal; + +import java.util.Collections; +import java.util.List; + +import org.hibernate.FlushMode; +import org.hibernate.LockOptions; +import org.hibernate.graph.spi.AppliedGraph; +import org.hibernate.query.ResultListTransformer; +import org.hibernate.query.TupleTransformer; +import org.hibernate.query.spi.Limit; +import org.hibernate.query.spi.QueryOptions; + +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; + +/** + * @author Steve Ebersole + */ +public class MutationQueryOptions implements QueryOptions { + public static final MutationQueryOptions INSTANCE = new MutationQueryOptions(); + + @Override + public Integer getTimeout() { + return null; + } + + @Override + public FlushMode getFlushMode() { + return null; + } + + @Override + public Boolean isReadOnly() { + return null; + } + + @Override + public AppliedGraph getAppliedGraph() { + return null; + } + + @Override + public TupleTransformer getTupleTransformer() { + return null; + } + + @Override + public ResultListTransformer getResultListTransformer() { + return null; + } + + @Override + public Boolean isResultCachingEnabled() { + return null; + } + + @Override + public CacheRetrieveMode getCacheRetrieveMode() { + return null; + } + + @Override + public CacheStoreMode getCacheStoreMode() { + return null; + } + + @Override + public String getResultCacheRegionName() { + return null; + } + + @Override + public LockOptions getLockOptions() { + return LockOptions.NONE; + } + + @Override + public String getComment() { + return null; + } + + @Override + public List getDatabaseHints() { + return Collections.emptyList(); + } + + @Override + public Integer getFetchSize() { + return null; + } + + @Override + public Limit getLimit() { + return LimitImpl.INSTANCE; + } + + private static class LimitImpl extends Limit { + public static final LimitImpl INSTANCE = new LimitImpl(); + + @Override + public void setFirstRow(Integer firstRow) { + } + + @Override + public void setMaxRows(int maxRows) { + } + + @Override + public void setMaxRows(Integer maxRows) { + } + + @Override + public Limit makeCopy() { + return this; + } + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementDetailsStandard.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementDetailsStandard.java new file mode 100644 index 0000000000..987615c22a --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementDetailsStandard.java @@ -0,0 +1,117 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.internal; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.function.Supplier; + +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup; +import org.hibernate.engine.jdbc.spi.JdbcServices; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.jdbc.Expectation; +import org.hibernate.sql.model.PreparableMutationOperation; +import org.hibernate.sql.model.TableMapping; + +/** + * Describes a particular PreparedStatement within a {@linkplain PreparedStatementGroup group} + * + * @author Steve Ebersole + */ +public class PreparedStatementDetailsStandard implements PreparedStatementDetails { + private final TableMapping mutatingTableDetails; + private final String sql; + private final Supplier jdbcStatementCreator; + private final Expectation expectation; + private final JdbcServices jdbcServices; + + private PreparedStatement statement; + + public PreparedStatementDetailsStandard( + PreparableMutationOperation tableMutation, + Supplier jdbcStatementCreator, + JdbcServices jdbcServices) { + this( + tableMutation, + tableMutation.getSqlString(), + jdbcStatementCreator, + tableMutation.getExpectation(), + jdbcServices + ); + } + + public PreparedStatementDetailsStandard( + PreparableMutationOperation tableMutation, + String sql, + Supplier jdbcStatementCreator, + Expectation expectation, + JdbcServices jdbcServices) { + + // todo (mutation) : have `parameterDescriptors` be passed in. + // - these descriptors being only available relative solely + // to a preparable operation, rather than more widely scoped to + // the `MutationOperation`, causes problems for self-executing operations + + this.mutatingTableDetails = tableMutation.getTableDetails(); + this.sql = sql; + this.jdbcStatementCreator = jdbcStatementCreator; + this.expectation = expectation; + this.jdbcServices = jdbcServices; + } + + @Override + public TableMapping getMutatingTableDetails() { + return mutatingTableDetails; + } + + @Override + public void releaseStatement(SharedSessionContractImplementor session) { + if ( statement != null ) { + session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( statement ); + statement = null; + } + } + + @Override + public String getSqlString() { + return sql; + } + + @Override + public PreparedStatement getStatement() { + return statement; + } + + @Override + public PreparedStatement resolveStatement() { + if ( statement == null ) { + statement = jdbcStatementCreator.get(); + try { + expectation.prepare( statement ); + } + catch (SQLException e) { + throw jdbcServices.getSqlExceptionHelper().convert( + e, + "Unable to prepare for expectation", + sql + ); + } + } + return statement; + } + + @Override + public Expectation getExpectation() { + return expectation; + } + + @Override + public String toString() { + return "PreparedStatementDetails(" + sql + ")"; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupNone.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupNone.java new file mode 100644 index 0000000000..a70e49ac0c --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupNone.java @@ -0,0 +1,61 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.internal; + +import java.util.function.BiConsumer; +import java.util.function.Predicate; + +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup; + +/** + * @author Steve Ebersole + */ +public class PreparedStatementGroupNone implements PreparedStatementGroup { + /** + * Singleton access + */ + public static final PreparedStatementGroupNone GROUP_OF_NONE = new PreparedStatementGroupNone(); + + @Override + public int getNumberOfStatements() { + return 0; + } + + @Override + public int getNumberOfActiveStatements() { + return 0; + } + + @Override + public PreparedStatementDetails getSingleStatementDetails() { + return null; + } + + @Override + public void forEachStatement(BiConsumer action) { + } + + @Override + public PreparedStatementDetails resolvePreparedStatementDetails(String tableName) { + return null; + } + + @Override + public PreparedStatementDetails getPreparedStatementDetails(String tableName) { + return null; + } + + @Override + public boolean hasMatching(Predicate filter) { + return false; + } + + @Override + public void release() { + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupSingleTable.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupSingleTable.java new file mode 100644 index 0000000000..01691d6d4a --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupSingleTable.java @@ -0,0 +1,89 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.internal; + +import java.util.function.BiConsumer; +import java.util.function.Predicate; + +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.sql.model.PreparableMutationOperation; +import org.hibernate.sql.model.TableMapping; + +/** + * PreparedStatementGroup implementation for cases where we + * have just a single operation + * + * @author Steve Ebersole + */ +public class PreparedStatementGroupSingleTable implements PreparedStatementGroup { + private final PreparableMutationOperation jdbcMutation; + private final SharedSessionContractImplementor session; + + private final PreparedStatementDetails statementDetails; + + public PreparedStatementGroupSingleTable( + PreparableMutationOperation jdbcMutation, + SharedSessionContractImplementor session) { + this.jdbcMutation = jdbcMutation; + this.statementDetails = ModelMutationHelper.standardPreparation( jdbcMutation, session ); + this.session = session; + } + + protected TableMapping getMutatingTableDetails() { + return jdbcMutation.getTableDetails(); + } + + @Override + public int getNumberOfStatements() { + return 1; + } + + @Override + public int getNumberOfActiveStatements() { + return statementDetails.getStatement() == null ? 0 : 1; + } + + @Override + public PreparedStatementDetails getSingleStatementDetails() { + return statementDetails; + } + + @Override + public void forEachStatement(BiConsumer action) { + action.accept( getMutatingTableDetails().getTableName(), statementDetails ); + } + + @Override + public PreparedStatementDetails getPreparedStatementDetails(String tableName) { + if ( statementDetails == null ) { + return null; + } + + assert getMutatingTableDetails().getTableName().equals( tableName ); + return statementDetails; + } + + @Override + public PreparedStatementDetails resolvePreparedStatementDetails(String tableName) { + assert getMutatingTableDetails().getTableName().equals( tableName ); + return statementDetails; + } + + @Override + public boolean hasMatching(Predicate filter) { + return filter.test( statementDetails ); + } + + @Override + public void release() { + if ( statementDetails != null ) { + statementDetails.releaseStatement( session ); + } + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupStandard.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupStandard.java new file mode 100644 index 0000000000..f89a1f71fd --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupStandard.java @@ -0,0 +1,206 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.internal; + +import java.sql.PreparedStatement; +import java.util.Comparator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; +import java.util.function.BiConsumer; +import java.util.function.Predicate; +import java.util.function.Supplier; + +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup; +import org.hibernate.engine.jdbc.spi.JdbcCoordinator; +import org.hibernate.engine.jdbc.spi.MutationStatementPreparer; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.persister.entity.mutation.EntityMutationTarget; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.PreparableMutationOperation; +import org.hibernate.sql.model.TableMapping; + +/** + * A group of {@link PreparedStatementDetails} references related to multi-table + * entity mappings. The statements are keyed by each table-names. + * + * @author Steve Ebersole + */ +public class PreparedStatementGroupStandard implements PreparedStatementGroup { + private final MutationType mutationType; + private final MutationTarget mutationTarget; + private final List jdbcMutations; + private final SharedSessionContractImplementor session; + + private final SortedMap statementMap; + + + public PreparedStatementGroupStandard( + MutationType mutationType, + MutationTarget mutationTarget, + List jdbcMutations, + SharedSessionContractImplementor session) { + this.mutationType = mutationType; + this.mutationTarget = mutationTarget; + this.jdbcMutations = jdbcMutations; + + this.session = session; + + this.statementMap = createStatementDetailsMap( jdbcMutations, mutationType, mutationTarget, session ); + } + + @Override + public int getNumberOfStatements() { + return jdbcMutations.size(); + } + + @Override + public int getNumberOfActiveStatements() { + int count = 0; + for ( Map.Entry entry : statementMap.entrySet() ) { + if ( entry.getValue().getStatement() != null ) { + count++; + } + } + return count; + } + + @Override + public PreparedStatementDetails getSingleStatementDetails() { + throw new IllegalStateException( + String.format( + Locale.ROOT, + "Statement group contained more than one statement - %s : %s", + mutationType.name(), + mutationTarget.getNavigableRole().getFullPath() + ) + ); + } + + @Override + public void forEachStatement(BiConsumer action) { + statementMap.forEach( action ); + } + + @Override + public PreparedStatementDetails getPreparedStatementDetails(String tableName) { + return statementMap.get( tableName ); + } + + @Override + public PreparedStatementDetails resolvePreparedStatementDetails(String tableName) { + return statementMap.get( tableName ); + } + + @Override + public boolean hasMatching(Predicate filter) { + for ( Map.Entry entry : statementMap.entrySet() ) { + if ( filter.test( entry.getValue() ) ) { + return true; + } + } + return false; + } + + private static PreparedStatementDetails createPreparedStatementDetails( + PreparableMutationOperation jdbcMutation, + MutationType mutationType, + MutationTarget mutationTarget, + SharedSessionContractImplementor session) { + final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator(); + final MutationStatementPreparer statementPreparer = jdbcCoordinator.getMutationStatementPreparer(); + + final TableMapping tableDetails = jdbcMutation.getTableDetails(); + + final Supplier jdbcStatementCreator; + if ( mutationType == MutationType.INSERT + && mutationTarget instanceof EntityMutationTarget + && ( (EntityMutationTarget) mutationTarget ).getIdentityInsertDelegate() != null + && tableDetails.getTableName().equals( mutationTarget.getIdentifierTableName() ) ) { + jdbcStatementCreator = () -> ( (EntityMutationTarget) mutationTarget ).getIdentityInsertDelegate().prepareStatement( + jdbcMutation.getSqlString(), + session + ); + } + else { + jdbcStatementCreator = () -> statementPreparer.prepareStatement( + jdbcMutation.getSqlString(), + jdbcMutation.isCallable() + ); + } + + return new PreparedStatementDetailsStandard( + jdbcMutation, + jdbcMutation.getSqlString(), + jdbcStatementCreator, + jdbcMutation.getExpectation(), + session.getJdbcServices() + ); + } + + @Override + public void release() { + statementMap.forEach( (tableName, statementDetails) -> statementDetails.releaseStatement( session ) ); + statementMap.clear(); + } + + + private SortedMap createStatementDetailsMap( + List jdbcMutations, + MutationType mutationType, + MutationTarget mutationTarget, + SharedSessionContractImplementor session) { + final Comparator comparator; + + if ( mutationType == MutationType.DELETE ) { + // reverse order + comparator = Comparator.comparingInt( (tableName) -> { + final TableMapping tableMapping = locateTableMapping( tableName ); + if ( tableMapping == null ) { + return -1; + } + return this.jdbcMutations.size() - tableMapping.getRelativePosition(); + } ); + } + else { + comparator = Comparator.comparingInt( (tableName) -> { + final TableMapping tableMapping = locateTableMapping( tableName ); + if ( tableMapping == null ) { + return -1; + } + return tableMapping.getRelativePosition(); + } ); + } + + final TreeMap map = new TreeMap<>( comparator ); + + for ( int i = 0; i < jdbcMutations.size(); i++ ) { + final PreparableMutationOperation jdbcMutation = jdbcMutations.get( i ); + map.put( + jdbcMutation.getTableDetails().getTableName(), + createPreparedStatementDetails( jdbcMutation, mutationType, mutationTarget, session ) + ); + } + + return map; + } + + private TableMapping locateTableMapping(String name) { + for ( int i = 0; i < jdbcMutations.size(); i++ ) { + final TableMapping tableMapping = jdbcMutations.get( i ).getTableDetails(); + if ( tableMapping.getTableName().equals( name ) ) { + return tableMapping; + } + } + return null; + } + +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/StandardMutationExecutorService.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/StandardMutationExecutorService.java new file mode 100644 index 0000000000..fbe2d0745a --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/StandardMutationExecutorService.java @@ -0,0 +1,92 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.internal; + +import java.util.Map; +import java.util.function.Supplier; + +import org.hibernate.cfg.Environment; +import org.hibernate.engine.jdbc.batch.spi.BatchKey; +import org.hibernate.engine.jdbc.mutation.MutationExecutor; +import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.internal.util.config.ConfigurationHelper; +import org.hibernate.metamodel.mapping.EntityMappingType; +import org.hibernate.persister.entity.mutation.EntityMutationTarget; +import org.hibernate.service.spi.ServiceRegistryImplementor; +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationOperationGroup; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.PreparableMutationOperation; +import org.hibernate.sql.model.SelfExecutingUpdateOperation; + +/** + * Standard MutationExecutorService implementation + * + * @see MutationExecutorServiceInitiator + * + * @author Steve Ebersole + */ +public class StandardMutationExecutorService implements MutationExecutorService { + private final int globalBatchSize; + + public StandardMutationExecutorService(Map configurationValues, ServiceRegistryImplementor registry) { + this( ConfigurationHelper.getInt( Environment.STATEMENT_BATCH_SIZE, configurationValues, 1 ) ); + } + + public StandardMutationExecutorService(int globalBatchSize) { + this.globalBatchSize = globalBatchSize; + } + + @Override + public MutationExecutor createExecutor( + Supplier batchKeySupplier, + MutationOperationGroup operationGroup, + SharedSessionContractImplementor session) { + // decide whether to use batching - any number > one means to batch + final Integer sessionBatchSize = session.getJdbcCoordinator() + .getJdbcSessionOwner() + .getJdbcBatchSize(); + final int batchSizeToUse = sessionBatchSize == null + ? globalBatchSize + : sessionBatchSize; + + final int numberOfOperations = operationGroup.getNumberOfOperations(); + final MutationType mutationType = operationGroup.getMutationType(); + final MutationTarget mutationTarget = operationGroup.getMutationTarget(); + + if ( mutationType == MutationType.INSERT + && mutationTarget instanceof EntityMutationTarget + && ( (EntityMutationTarget) mutationTarget ).getIdentityInsertDelegate() != null ) { + assert mutationTarget instanceof EntityMappingType; + + if ( numberOfOperations > 1 ) { + return new MutationExecutorPostInsert( operationGroup, batchKeySupplier, batchSizeToUse, session ); + } + + return new MutationExecutorPostInsertSingleTable( operationGroup, session ); + } + + if ( numberOfOperations == 1 ) { + final MutationOperation singleOperation = operationGroup.getSingleOperation(); + if ( singleOperation instanceof SelfExecutingUpdateOperation ) { + return new MutationExecutorSingleSelfExecuting( (SelfExecutingUpdateOperation) singleOperation ); + } + + final PreparableMutationOperation jdbcOperation = (PreparableMutationOperation) singleOperation; + final BatchKey batchKey = batchKeySupplier.get(); + if ( jdbcOperation.canBeBatched( batchKey, batchSizeToUse ) ) { + return new MutationExecutorSingleBatched( jdbcOperation, batchKey, batchSizeToUse, session ); + } + + return new MutationExecutorSingleNonBatched( jdbcOperation, session ); + } + + return new MutationExecutorStandard( operationGroup, batchKeySupplier, batchSizeToUse, session ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/package-info.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/package-info.java new file mode 100644 index 0000000000..f0dcd78f26 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ + +/** + * Package defining support for performing mutation SQL (INSERT, UPDATE, + * DELETE) against an entity or collection + * + * @author Steve Ebersole + */ +package org.hibernate.engine.jdbc.mutation; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/Binding.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/Binding.java new file mode 100644 index 0000000000..d5da8649cb --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/Binding.java @@ -0,0 +1,83 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.spi; + +import org.hibernate.sql.model.jdbc.JdbcValueDescriptor; +import org.hibernate.type.descriptor.ValueBinder; + +/** + * Binding of a {@linkplain #getValue() value} for a {@link java.sql.PreparedStatement} parameter + * by {@linkplain #getPosition() position}. + * + * @author Steve Ebersole + */ +public class Binding { + private final String columnName; + private final Object value; + private final JdbcValueDescriptor valueDescriptor; + + public Binding(String columnName, Object value, JdbcValueDescriptor valueDescriptor) { + this.columnName = columnName; + this.value = value; + this.valueDescriptor = valueDescriptor; + } + + /** + * The name of the column to which this value is "bound" + */ + public String getColumnName() { + return columnName; + } + + /** + * The value to be bound to the parameter + */ + public Object getValue() { + return value; + } + + public JdbcValueDescriptor getValueDescriptor() { + return valueDescriptor; + } + + /** + * The binder to be used in binding this value + */ + @SuppressWarnings("unchecked") + public ValueBinder getValueBinder() { + return getValueDescriptor().getJdbcMapping().getJdbcValueBinder(); + } + + /** + * The JDBC parameter position + */ + public int getPosition() { + return getValueDescriptor().getJdbcPosition(); + } + + @Override + public int hashCode() { + return getPosition(); + } + + @Override + public boolean equals(Object o) { + if ( this == o ) { + return true; + } + if ( o == null || getClass() != o.getClass() ) { + return false; + } + final Binding other = (Binding) o; + return getPosition() == other.getPosition(); + } + + @Override + public String toString() { + return "Binding(" + columnName + ")"; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/BindingGroup.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/BindingGroup.java new file mode 100644 index 0000000000..ab5d293215 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/BindingGroup.java @@ -0,0 +1,68 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.spi; + +import java.util.Comparator; +import java.util.Objects; +import java.util.Set; +import java.util.TreeSet; +import java.util.function.Consumer; + +import org.hibernate.sql.model.jdbc.JdbcValueDescriptor; + +/** + * Group of all parameter {@linkplain #getBindings() bindings} for a table. + * + * @author Steve Ebersole + */ +public class BindingGroup { + private final String tableName; + private final Set bindings; + + public BindingGroup(String tableName) { + this.tableName = tableName; + // todo (6.2) : TreeSet to log the parameter binding sequentially + // - if we don't care, this can be another type of Set for perf + this.bindings = new TreeSet<>( Comparator.comparing( Binding::getPosition ) ); + } + + /** + * The table for which we are grouping parameter bindings + */ + public String getTableName() { + return tableName; + } + + /** + * The parameter bindings + */ + public Set getBindings() { + return bindings; + } + + /** + * Visit each parameter binding + */ + public void forEachBinding(Consumer action) { + bindings.forEach( action ); + } + + /** + * Create a binding + */ + public void bindValue(String columnName, Object value, JdbcValueDescriptor valueDescriptor) { + assert Objects.equals( columnName, valueDescriptor.getColumnName() ); + bindings.add( new Binding( columnName, value, valueDescriptor ) ); + } + + /** + * Clear the {@linkplain #getBindings() bindings} + */ + public void clear() { + bindings.clear(); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/MutationExecutorService.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/MutationExecutorService.java new file mode 100644 index 0000000000..b7d2a443a6 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/MutationExecutorService.java @@ -0,0 +1,28 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.engine.jdbc.mutation.spi; + +import java.util.function.Supplier; + +import org.hibernate.engine.jdbc.batch.spi.BatchKey; +import org.hibernate.engine.jdbc.mutation.MutationExecutor; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.service.Service; +import org.hibernate.sql.model.MutationOperationGroup; + +/** + * Service for creating executors for model mutation operations + * + * @author Steve Ebersole + */ +public interface MutationExecutorService extends Service { + + MutationExecutor createExecutor( + Supplier batchKeySupplier, + MutationOperationGroup operationGroup, + SharedSessionContractImplementor session); +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java index 8616f0d095..c49b746b8e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java @@ -11,9 +11,11 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.sql.Connection; import java.sql.Statement; +import java.util.function.Supplier; import org.hibernate.engine.jdbc.batch.spi.Batch; import org.hibernate.engine.jdbc.batch.spi.BatchKey; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup; import org.hibernate.jdbc.WorkExecutorVisitable; import org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor; import org.hibernate.resource.transaction.backend.jdbc.spi.JdbcResourceTransactionAccess; @@ -35,13 +37,22 @@ public interface JdbcCoordinator extends Serializable, TransactionCoordinatorOwn LogicalConnectionImplementor getLogicalConnection(); /** - * Get a batch instance. - * - * @param key The unique batch key. - * - * @return The batch + * The builder of prepared and callable JDBC statements for + * mutation operations (insert, update and delete) originating + * from persistent context events, as opposed to Query handling */ - Batch getBatch(BatchKey key); + MutationStatementPreparer getMutationStatementPreparer(); + + /** + * Get the {@linkplain Batch batch} for the supplied key, creating one + * if needed using the supplied {@linkplain PreparedStatementGroup statementGroupSupplier}. + * + * @implNote Any previous Batch is executed and released prior to returning + */ + Batch getBatch2( + BatchKey key, + Integer batchSize, + Supplier statementGroupSupplier); /** * Execute the currently managed batch (if any) diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java index 93bf21ebb6..e178911c2d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java @@ -16,6 +16,7 @@ import org.hibernate.service.Service; import org.hibernate.sql.exec.internal.JdbcSelectExecutorStandardImpl; import org.hibernate.sql.exec.internal.StandardJdbcMutationExecutor; import org.hibernate.sql.exec.spi.JdbcMutationExecutor; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcSelectExecutor; /** @@ -75,7 +76,7 @@ public interface JdbcServices extends Service { LobCreator getLobCreator(LobCreationContext lobCreationContext); /** - * Access the executor for {@link org.hibernate.sql.exec.spi.JdbcSelect} operations + * Access the executor for {@link JdbcOperationQuerySelect} operations */ default JdbcSelectExecutor getJdbcSelectExecutor() { return JdbcSelectExecutorStandardImpl.INSTANCE; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/MutationStatementPreparer.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/MutationStatementPreparer.java new file mode 100644 index 0000000000..d2e72e7472 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/MutationStatementPreparer.java @@ -0,0 +1,56 @@ +/* + * 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 . + */ +package org.hibernate.engine.jdbc.spi; + +import java.sql.PreparedStatement; + +/** + * Contracting for creating {@link PreparedStatement} instances related to mutations + * + * @author Steve Ebersole + */ +public interface MutationStatementPreparer { + /** + * Prepare a statement. + * + * @param sql The SQL the statement to be prepared + * @param isCallable Whether to prepare as a callable statement. + * + * @return the prepared statement + */ + PreparedStatement prepareStatement(String sql, boolean isCallable); + + /** + * Prepare an INSERT statement, specifying how auto-generated (by the database) keys should be handled. Really this + * is a boolean, but JDBC opted to define it instead using 2 int constants:
    + *
  • {@link PreparedStatement#RETURN_GENERATED_KEYS}
    • + *
  • {@link PreparedStatement#NO_GENERATED_KEYS}
    • + *
+ * Generated keys are accessed afterwards via {@link PreparedStatement#getGeneratedKeys} + * + * @param sql The INSERT SQL + * @param autoGeneratedKeys The autoGeneratedKeys flag + * + * @return the prepared statement + * + * @see java.sql.Connection#prepareStatement(String, int) + */ + PreparedStatement prepareStatement(String sql, int autoGeneratedKeys); + + /** + * Prepare an INSERT statement, specifying columns which are auto-generated values to be returned. + * Generated keys are accessed afterwards via {@link PreparedStatement#getGeneratedKeys} + * + * @param sql - the SQL for the statement to be prepared + * @param columnNames The name of the columns to be returned in the generated keys result set. + * + * @return the prepared statement + * + * @see java.sql.Connection#prepareStatement(String, String[]) + */ + PreparedStatement prepareStatement(String sql, String[] columnNames); +} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java index d27d421149..f6c2dde309 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java @@ -12,6 +12,7 @@ import java.sql.SQLWarning; import java.sql.Statement; import java.util.ArrayList; import java.util.List; +import java.util.function.Supplier; import org.hibernate.JDBCException; import org.hibernate.exception.internal.SQLStateConversionDelegate; @@ -109,6 +110,19 @@ public class SqlExceptionHelper { return sqlExceptionConverter.convert( sqlException, message + " [" + sqlException.getMessage() + "]", sql ); } + /** + * Convert an SQLException using the current converter, doing some logging first. + * + * @param sqlException The exception to convert + * @param messageSupplier An error message supplier. + * @param sql The SQL being executed when the exception occurred + * + * @return The converted exception + */ + public JDBCException convert(SQLException sqlException, Supplier messageSupplier, String sql) { + return convert( sqlException, messageSupplier.get(), sql ); + } + /** * Log the given (and any nested) exception. * diff --git a/hibernate-core/src/main/java/org/hibernate/id/ExportableColumn.java b/hibernate-core/src/main/java/org/hibernate/id/ExportableColumn.java index 50298664f2..6248cb1888 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/ExportableColumn.java +++ b/hibernate-core/src/main/java/org/hibernate/id/ExportableColumn.java @@ -176,6 +176,16 @@ public class ExportableColumn extends Column { public ServiceRegistry getServiceRegistry() { return database.getServiceRegistry(); } + + @Override + public boolean isColumnInsertable(int index) { + return true; + } + + @Override + public boolean isColumnUpdateable(int index) { + return true; + } } public static class ColumnIterator implements Iterator { diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java index 2f9078dece..e39a304f45 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java @@ -14,6 +14,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; +import java.util.Locale; import java.util.Objects; import org.hibernate.HibernateException; @@ -21,6 +22,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.StringHelper; +import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.type.CustomType; import org.hibernate.type.Type; @@ -62,7 +64,7 @@ public final class IdentifierGeneratorHelper { * Get the generated identifier when using identity columns * * @param rs The result set from which to extract the generated identity. - * @param identifier The name of the identifier column + * @param identityColumn The name of the identifier column * @param type The expected type mapping for the identity value. * @param dialect The current database dialect. * @@ -71,13 +73,18 @@ public final class IdentifierGeneratorHelper { * @throws SQLException Can be thrown while accessing the result set * @throws HibernateException Indicates a problem reading back a generated identity value. */ - public static Object getGeneratedIdentity(ResultSet rs, String identifier, Type type, Dialect dialect) - throws SQLException, HibernateException { + public static Object getGeneratedIdentity( + ResultSet rs, + NavigableRole insertionTargetRole, + String identityColumn, + Type type, + Dialect dialect) throws SQLException { if ( !rs.next() ) { - throw new HibernateException( "The database returned no natively generated identity value" ); + throw new HibernateException( "The database returned no natively generated identity value : " + insertionTargetRole.getFullPath() ); } - final Object id = get( rs, identifier, type, dialect ); - LOG.debugf( "Natively generated identity: %s", id ); + + final Object id = get( rs, insertionTargetRole, identityColumn, type, dialect ); + LOG.debugf( "Natively generated identity (%s) : %s", insertionTargetRole.getFullPath(), id ); return id; } @@ -95,7 +102,12 @@ public final class IdentifierGeneratorHelper { * @throws SQLException Indicates problems access the result set * @throws IdentifierGenerationException Indicates an unknown type. */ - public static Object get(ResultSet rs, String identifier, Type type, Dialect dialect) + public static Object get( + ResultSet rs, + NavigableRole insertionTargetRole, + String identifier, + Type type, + Dialect dialect) throws SQLException, IdentifierGenerationException { if ( type instanceof ResultSetIdentifierConsumer ) { return ( (ResultSetIdentifierConsumer) type ).consumeIdentifier( rs ); @@ -116,7 +128,7 @@ public final class IdentifierGeneratorHelper { //Oracle driver will throw NPE } - Class clazz = type.getReturnedClass(); + final Class clazz = type.getReturnedClass(); if ( columnCount == 1 ) { if ( clazz == Long.class ) { return rs.getLong( 1 ); @@ -131,14 +143,23 @@ public final class IdentifierGeneratorHelper { return rs.getString( 1 ); } else if ( clazz == BigInteger.class ) { - return rs.getBigDecimal( 1 ).setScale( 0, RoundingMode.UNNECESSARY ).toBigInteger(); + return rs.getBigDecimal( 1 ) + .setScale( 0, RoundingMode.UNNECESSARY ) + .toBigInteger(); } else if ( clazz == BigDecimal.class ) { - return rs.getBigDecimal( 1 ).setScale( 0, RoundingMode.UNNECESSARY ); + return rs.getBigDecimal( 1 ) + .setScale( 0, RoundingMode.UNNECESSARY ); } else { throw new IdentifierGenerationException( - "unrecognized id type : " + type.getName() + " -> " + clazz.getName() + String.format( + Locale.ROOT, + "Unrecognized id type (%s - %s) for extraction - %s", + type.getName(), + clazz.getName(), + insertionTargetRole.getFullPath() + ) ); } } @@ -155,6 +176,18 @@ public final class IdentifierGeneratorHelper { } } + private static int getColumnCount(ResultSet rs) { + try { + final ResultSetMetaData resultSetMetaData = rs.getMetaData(); + return resultSetMetaData.getColumnCount(); + } + catch (Exception e) { + //Oracle driver will throw NPE + } + + return 1; + } + private static Object extractIdentifier(ResultSet rs, String identifier, Type type, Class clazz) throws SQLException { if ( clazz == Long.class ) { diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java index e104d140a2..5b648110e2 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java @@ -6,20 +6,11 @@ */ package org.hibernate.id; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; -import org.hibernate.boot.model.relational.SqlStringGenerationContext; import org.hibernate.dialect.Dialect; -import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.id.insert.AbstractReturningDelegate; -import org.hibernate.id.insert.AbstractSelectingDelegate; -import org.hibernate.id.insert.IdentifierGeneratingInsert; +import org.hibernate.id.insert.BasicSelectingDelegate; import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; -import org.hibernate.id.insert.InsertSelectIdentityInsert; +import org.hibernate.id.insert.InsertReturningDelegate; /** * A generator for use with ANSI-SQL IDENTITY columns used as the primary key. @@ -28,6 +19,10 @@ import org.hibernate.id.insert.InsertSelectIdentityInsert; * Indicates to the {@code Session} that identity (ie. identity/autoincrement * column) key generation should be used. * + * @implNote Most of the functionality of this generator is delegated to + * {@link InsertGeneratedIdentifierDelegate} (see + * {@link #getInsertGeneratedIdentifierDelegate}). + * * @author Christoph Sturm */ public class IdentityGenerator extends AbstractPostInsertGenerator { @@ -36,117 +31,15 @@ public class IdentityGenerator extends AbstractPostInsertGenerator { public InsertGeneratedIdentifierDelegate getInsertGeneratedIdentifierDelegate( PostInsertIdentityPersister persister, Dialect dialect, - boolean isGetGeneratedKeysEnabled) throws HibernateException { - if ( isGetGeneratedKeysEnabled ) { + boolean useGetGeneratedKeys) throws HibernateException { + if ( useGetGeneratedKeys ) { return dialect.getIdentityColumnSupport().buildGetGeneratedKeysDelegate( persister, dialect ); } else if ( dialect.getIdentityColumnSupport().supportsInsertSelectIdentity() ) { - return new InsertSelectDelegate( persister, dialect ); + return new InsertReturningDelegate( persister, dialect ); } else { - return new BasicDelegate( persister, dialect ); - } - } - - - - /** - * Delegate for dealing with IDENTITY columns where the dialect supports returning - * the generated IDENTITY value directly from the insert statement. - */ - public static class InsertSelectDelegate - extends AbstractReturningDelegate - implements InsertGeneratedIdentifierDelegate { - private final PostInsertIdentityPersister persister; - private final Dialect dialect; - - public InsertSelectDelegate(PostInsertIdentityPersister persister, Dialect dialect) { - super( persister ); - this.persister = persister; - this.dialect = dialect; - } - - @Override - public IdentifierGeneratingInsert prepareIdentifierGeneratingInsert(SqlStringGenerationContext context) { - InsertSelectIdentityInsert insert = new InsertSelectIdentityInsert( dialect ); - insert.addIdentityColumn( persister.getRootTableKeyColumnNames()[0] ); - return insert; - } - - @Override - public String prepareIdentifierGeneratingInsert(String insertSQL) { - return dialect.getIdentityColumnSupport().appendIdentitySelectToInsert( insertSQL ); - } - - @Override - protected PreparedStatement prepare(String insertSQL, SharedSessionContractImplementor session) throws SQLException { - return session - .getJdbcCoordinator() - .getStatementPreparer() - .prepareStatement( insertSQL, PreparedStatement.NO_GENERATED_KEYS ); - } - - @Override - public Object executeAndExtract(PreparedStatement insert, SharedSessionContractImplementor session) - throws SQLException { - ResultSet rs = session.getJdbcCoordinator().getResultSetReturn().execute( insert ); - try { - return IdentifierGeneratorHelper.getGeneratedIdentity( - rs, - persister.getRootTableKeyColumnNames()[0], - persister.getIdentifierType(), - session.getJdbcServices().getJdbcEnvironment().getDialect() - ); - } - finally { - session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( rs, insert ); - } - } - - public Object determineGeneratedIdentifier(SharedSessionContractImplementor session, Object entity) { - throw new AssertionFailure( "insert statement returns generated value" ); - } - } - - /** - * Delegate for dealing with IDENTITY columns where the dialect requires an - * additional command execution to retrieve the generated IDENTITY value - */ - public static class BasicDelegate - extends AbstractSelectingDelegate - implements InsertGeneratedIdentifierDelegate { - private final PostInsertIdentityPersister persister; - private final Dialect dialect; - - public BasicDelegate(PostInsertIdentityPersister persister, Dialect dialect) { - super( persister ); - this.persister = persister; - this.dialect = dialect; - } - - @Override - public IdentifierGeneratingInsert prepareIdentifierGeneratingInsert(SqlStringGenerationContext context) { - IdentifierGeneratingInsert insert = new IdentifierGeneratingInsert( dialect ); - insert.addIdentityColumn( persister.getRootTableKeyColumnNames()[0] ); - return insert; - } - - @Override - protected String getSelectSQL() { - return persister.getIdentitySelectString(); - } - - @Override - protected Object getResult( - SharedSessionContractImplementor session, - ResultSet rs, - Object object) throws SQLException { - return IdentifierGeneratorHelper.getGeneratedIdentity( - rs, - persister.getRootTableKeyColumnNames()[0], - persister.getIdentifierType(), - session.getJdbcServices().getJdbcEnvironment().getDialect() - ); + return new BasicSelectingDelegate( persister, dialect ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentityPersister.java b/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentityPersister.java index f33f60a177..0b70bc4bb8 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentityPersister.java @@ -6,6 +6,7 @@ */ package org.hibernate.id; import org.hibernate.persister.entity.EntityPersister; +import org.hibernate.persister.entity.mutation.EntityMutationTarget; /** * A persister that may have an identity assigned by execution of @@ -13,7 +14,7 @@ import org.hibernate.persister.entity.EntityPersister; * * @author Gavin King */ -public interface PostInsertIdentityPersister extends EntityPersister { +public interface PostInsertIdentityPersister extends EntityPersister, EntityMutationTarget { /** * Get a SQL select string that performs a select based on a unique * key determined by the given property name). diff --git a/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java index 2fb1516a4b..10c179a14a 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java @@ -12,14 +12,20 @@ import java.sql.SQLException; import java.util.Properties; import org.hibernate.HibernateException; +import org.hibernate.Internal; import org.hibernate.MappingException; import org.hibernate.boot.model.relational.SqlStringGenerationContext; import org.hibernate.dialect.Dialect; +import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.id.insert.AbstractSelectingDelegate; import org.hibernate.id.insert.IdentifierGeneratingInsert; import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; +import org.hibernate.jdbc.Expectation; +import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping; import org.hibernate.service.ServiceRegistry; +import org.hibernate.sql.model.ast.builder.TableInsertBuilder; +import org.hibernate.sql.model.ast.builder.TableInsertBuilderStandard; import org.hibernate.type.BasicType; import org.hibernate.type.Type; @@ -48,7 +54,8 @@ public class SelectGenerator extends AbstractPostInsertGenerator { return new SelectGeneratorDelegate( persister, dialect, uniqueKeyPropertyName ); } - private static String determineNameOfPropertyToUse(PostInsertIdentityPersister persister, String supplied) { + @Internal + public static String determineNameOfPropertyToUse(PostInsertIdentityPersister persister, String supplied) { if ( supplied != null ) { return supplied; } @@ -74,13 +81,7 @@ public class SelectGenerator extends AbstractPostInsertGenerator { return persister.getPropertyNames()[naturalIdPropertyIndices[0]]; } - - /** - * The delegate for the select generation strategy. - */ - public static class SelectGeneratorDelegate - extends AbstractSelectingDelegate - implements InsertGeneratedIdentifierDelegate { + private static class SelectGeneratorDelegate extends AbstractSelectingDelegate { private final PostInsertIdentityPersister persister; private final Dialect dialect; @@ -90,45 +91,50 @@ public class SelectGenerator extends AbstractPostInsertGenerator { private final String idSelectString; - private SelectGeneratorDelegate( + public SelectGeneratorDelegate( PostInsertIdentityPersister persister, Dialect dialect, - String suppliedUniqueKeyPropertyName) { + String configuredPropertyName) { super( persister ); this.persister = persister; this.dialect = dialect; - this.uniqueKeyPropertyName = determineNameOfPropertyToUse( persister, suppliedUniqueKeyPropertyName ); + this.uniqueKeyPropertyName = determineNameOfPropertyToUse( persister, configuredPropertyName ); idSelectString = persister.getSelectByUniqueKeyString( uniqueKeyPropertyName ); uniqueKeyType = persister.getPropertyType( uniqueKeyPropertyName ); idType = (BasicType) persister.getIdentifierType(); } + protected String getSelectSQL() { + return idSelectString; + } + @Override public IdentifierGeneratingInsert prepareIdentifierGeneratingInsert(SqlStringGenerationContext context) { return new IdentifierGeneratingInsert( dialect ); } - - // AbstractSelectingDelegate impl ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - protected String getSelectSQL() { - return idSelectString; + @Override + public TableInsertBuilder createTableInsertBuilder(BasicEntityIdentifierMapping identifierMapping, Expectation expectation, SessionFactoryImplementor sessionFactory) { + return new TableInsertBuilderStandard( + persister, + persister.getIdentifierTableMapping(), + sessionFactory + ); } protected void bindParameters( - SharedSessionContractImplementor session, - PreparedStatement ps, - Object entity) throws SQLException { + Object entity, PreparedStatement ps, SharedSessionContractImplementor session) throws SQLException { Object uniqueKeyValue = persister.getPropertyValue( entity, uniqueKeyPropertyName ); uniqueKeyType.nullSafeSet( ps, uniqueKeyValue, 1, session ); } - protected Object getResult( - SharedSessionContractImplementor session, + @Override + protected Object extractGeneratedValue( + Object entity, ResultSet rs, - Object entity) throws SQLException { + SharedSessionContractImplementor session) throws SQLException { if ( !rs.next() ) { throw new IdentifierGenerationException( "the inserted row could not be located by the unique key: " + diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java index cc1cb869f6..6a3784f27d 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java @@ -9,7 +9,10 @@ package org.hibernate.id.insert; import java.sql.PreparedStatement; import java.sql.SQLException; +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; import org.hibernate.engine.jdbc.spi.JdbcCoordinator; +import org.hibernate.engine.jdbc.spi.SqlStatementLogger; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.id.PostInsertIdentityPersister; import org.hibernate.pretty.MessageHelper; @@ -29,17 +32,35 @@ public abstract class AbstractReturningDelegate implements InsertGeneratedIdenti this.persister = persister; } + @Override + public Object performInsert( + PreparedStatementDetails insertStatementDetails, + JdbcValueBindings valueBindings, + Object entity, + SharedSessionContractImplementor session) { + final SqlStatementLogger sqlStatementLogger = session.getJdbcServices().getSqlStatementLogger(); + + sqlStatementLogger.logStatement( insertStatementDetails.getSqlString() ); + valueBindings.beforeStatement( insertStatementDetails, session ); + + return executeAndExtract( + insertStatementDetails.getSqlString(), + insertStatementDetails.getStatement(), + session + ); + } + @Override public final Object performInsert( - String insertSQL, + String insertSql, SharedSessionContractImplementor session, Binder binder) { try { // prepare and execute the insert - PreparedStatement insert = prepare( insertSQL, session ); + PreparedStatement insert = prepareStatement( insertSql, session ); try { binder.bindValues( insert ); - return executeAndExtract( insert, session ); + return executeAndExtract( insertSql, insert, session ); } finally { releaseStatement( insert, session ); @@ -49,7 +70,7 @@ public abstract class AbstractReturningDelegate implements InsertGeneratedIdenti throw session.getJdbcServices().getSqlExceptionHelper().convert( sqle, "could not insert: " + MessageHelper.infoString( persister ), - insertSQL + insertSql ); } } @@ -58,10 +79,10 @@ public abstract class AbstractReturningDelegate implements InsertGeneratedIdenti return persister; } - protected abstract PreparedStatement prepare(String insertSQL, SharedSessionContractImplementor session) throws SQLException; - - protected abstract Object executeAndExtract(PreparedStatement insert, SharedSessionContractImplementor session) - throws SQLException; + protected abstract Object executeAndExtract( + String insertSql, + PreparedStatement insertStatement, + SharedSessionContractImplementor session); protected void releaseStatement(PreparedStatement insert, SharedSessionContractImplementor session) { final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator(); diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java index 4c0dd3aeea..90968c0650 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java @@ -10,6 +10,11 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.jdbc.spi.JdbcCoordinator; +import org.hibernate.engine.jdbc.spi.JdbcServices; +import org.hibernate.engine.jdbc.spi.MutationStatementPreparer; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.id.PostInsertIdentityPersister; import org.hibernate.pretty.MessageHelper; @@ -28,6 +33,86 @@ public abstract class AbstractSelectingDelegate implements InsertGeneratedIdenti this.persister = persister; } + /** + * Get the SQL statement to be used to retrieve generated key values. + * + * @return The SQL command string + */ + protected abstract String getSelectSQL(); + + protected void bindParameters( + Object entity, + PreparedStatement ps, + SharedSessionContractImplementor session) throws SQLException { + } + + /** + * Extract the generated key value from the given result set + * from execution of {@link #getSelectSQL()}. + * + */ + protected abstract Object extractGeneratedValue( + Object entity, + ResultSet rs, + SharedSessionContractImplementor session) throws SQLException; + + @Override + public PreparedStatement prepareStatement(String insertSql, SharedSessionContractImplementor session) { + final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator(); + final MutationStatementPreparer statementPreparer = jdbcCoordinator.getMutationStatementPreparer(); + return statementPreparer.prepareStatement( insertSql, PreparedStatement.NO_GENERATED_KEYS ); + } + + @Override + public Object performInsert( + PreparedStatementDetails insertStatementDetails, + JdbcValueBindings jdbcValueBindings, + Object entity, + SharedSessionContractImplementor session) { + final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator(); + final JdbcServices jdbcServices = session.getJdbcServices(); + + jdbcServices.getSqlStatementLogger().logStatement( insertStatementDetails.getSqlString() ); + jdbcValueBindings.beforeStatement( insertStatementDetails, session ); + + final PreparedStatement insertStatement = insertStatementDetails.getStatement(); + jdbcCoordinator.getResultSetReturn().executeUpdate( insertStatement ); + + // the insert is complete, select the generated id... + + final String idSelectSql = getSelectSQL(); + final PreparedStatement idSelect = jdbcCoordinator + .getStatementPreparer() + .prepareStatement( idSelectSql ); + + try { + bindParameters( entity, idSelect, session ); + + final ResultSet rs = session.getJdbcCoordinator().getResultSetReturn().extract( idSelect ); + try { + return extractGeneratedValue( entity, rs, session ); + } + catch (SQLException e) { + throw jdbcServices.getSqlExceptionHelper().convert( + e, + "Unable to execute post-insert id selection query", + idSelectSql + ); + } + finally { + session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( idSelect ); + session.getJdbcCoordinator().afterStatementExecution(); + } + } + catch (SQLException e) { + throw jdbcServices.getSqlExceptionHelper().convert( + e, + "Unable to bind parameters for post-insert id selection query", + idSelectSql + ); + } + } + @Override public final Object performInsert( String insertSQL, @@ -65,10 +150,10 @@ public abstract class AbstractSelectingDelegate implements InsertGeneratedIdenti .getStatementPreparer() .prepareStatement( selectSQL, false ); try { - bindParameters( session, idSelect, binder.getEntity() ); + bindParameters( binder.getEntity(), idSelect, session ); ResultSet rs = session.getJdbcCoordinator().getResultSetReturn().extract( idSelect ); try { - return getResult( session, rs, binder.getEntity() ); + return extractGeneratedValue( binder.getEntity(), rs, session ); } finally { session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( rs, idSelect ); @@ -89,40 +174,4 @@ public abstract class AbstractSelectingDelegate implements InsertGeneratedIdenti } } - /** - * Get the SQL statement to be used to retrieve generated key values. - * - * @return The SQL command string - */ - protected abstract String getSelectSQL(); - - /** - * Bind any required parameter values into the SQL command {@link #getSelectSQL}. - * - * @param session The session - * @param ps The prepared {@linkplain #getSelectSQL SQL} command - * @param entity The entity being saved. - * - */ - protected void bindParameters( - SharedSessionContractImplementor session, - PreparedStatement ps, - Object entity) throws SQLException { - } - - /** - * Extract the generated key value from the given result set. - * - * @param session The session - * @param rs The result set containing the generated primary key values. - * @param entity The entity being saved. - * - * @return The generated identifier - * - */ - protected abstract Object getResult( - SharedSessionContractImplementor session, - ResultSet rs, - Object entity) throws SQLException; - } diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/BasicSelectingDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/BasicSelectingDelegate.java new file mode 100644 index 0000000000..f767548f36 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/id/insert/BasicSelectingDelegate.java @@ -0,0 +1,81 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.id.insert; + +import java.sql.ResultSet; +import java.sql.SQLException; + +import org.hibernate.boot.model.relational.SqlStringGenerationContext; +import org.hibernate.dialect.Dialect; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.id.IdentifierGeneratorHelper; +import org.hibernate.id.PostInsertIdentityPersister; +import org.hibernate.jdbc.Expectation; +import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping; +import org.hibernate.sql.model.ast.builder.TableInsertBuilder; +import org.hibernate.sql.model.ast.builder.TableInsertBuilderStandard; + +/** + * Delegate for dealing with IDENTITY columns where the dialect requires an + * additional command execution to retrieve the generated IDENTITY value + */ +public class BasicSelectingDelegate extends AbstractSelectingDelegate { + private final PostInsertIdentityPersister persister; + private final Dialect dialect; + + public BasicSelectingDelegate(PostInsertIdentityPersister persister, Dialect dialect) { + super( persister ); + this.persister = persister; + this.dialect = dialect; + } + + @Override + public IdentifierGeneratingInsert prepareIdentifierGeneratingInsert(SqlStringGenerationContext context) { + IdentifierGeneratingInsert insert = new IdentifierGeneratingInsert( dialect ); + insert.addIdentityColumn( persister.getRootTableKeyColumnNames()[ 0 ] ); + return insert; + } + + @Override + public TableInsertBuilder createTableInsertBuilder( + BasicEntityIdentifierMapping identifierMapping, + Expectation expectation, + SessionFactoryImplementor sessionFactory) { + final TableInsertBuilder builder = new TableInsertBuilderStandard( + persister, + persister.getIdentifierTableMapping(), + sessionFactory + ); + + final String value = dialect.getIdentityColumnSupport().getIdentityInsertString(); + if ( value != null ) { + builder.addKeyColumn( identifierMapping.getSelectionExpression(), value, identifierMapping.getJdbcMapping() ); + } + + return builder; + } + + @Override + protected String getSelectSQL() { + return persister.getIdentitySelectString(); + } + + @Override + protected Object extractGeneratedValue( + Object entity, + ResultSet rs, + SharedSessionContractImplementor session) throws SQLException { + return IdentifierGeneratorHelper.getGeneratedIdentity( + rs, + persister.getNavigableRole(), + persister.getRootTableKeyColumnNames()[ 0 ], + persister.getIdentifierType(), + session.getJdbcServices().getJdbcEnvironment().getDialect() + ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/GetGeneratedKeysDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/GetGeneratedKeysDelegate.java new file mode 100644 index 0000000000..140371beaa --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/id/insert/GetGeneratedKeysDelegate.java @@ -0,0 +1,190 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.id.insert; + +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Locale; + +import org.hibernate.boot.model.relational.SqlStringGenerationContext; +import org.hibernate.dialect.Dialect; +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.jdbc.spi.JdbcCoordinator; +import org.hibernate.engine.jdbc.spi.JdbcServices; +import org.hibernate.engine.jdbc.spi.MutationStatementPreparer; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.id.IdentifierGeneratorHelper; +import org.hibernate.id.PostInsertIdentityPersister; +import org.hibernate.jdbc.Expectation; +import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping; +import org.hibernate.sql.model.ast.builder.TableInsertBuilder; +import org.hibernate.sql.model.ast.builder.TableInsertBuilderStandard; + +/** + * Delegate for dealing with IDENTITY columns using JDBC3 getGeneratedKeys + * + * @author Andrea Boriero + */ +public class GetGeneratedKeysDelegate extends AbstractReturningDelegate { + private final PostInsertIdentityPersister persister; + private final Dialect dialect; + + public GetGeneratedKeysDelegate(PostInsertIdentityPersister persister, Dialect dialect) { + super( persister ); + this.persister = persister; + this.dialect = dialect; + } + + @Override + public IdentifierGeneratingInsert prepareIdentifierGeneratingInsert(SqlStringGenerationContext context) { + IdentifierGeneratingInsert insert = new IdentifierGeneratingInsert( dialect ); + insert.addIdentityColumn( persister.getRootTableKeyColumnNames()[0] ); + return insert; + } + + @Override + public TableInsertBuilder createTableInsertBuilder( + BasicEntityIdentifierMapping identifierMapping, + Expectation expectation, + SessionFactoryImplementor sessionFactory) { + final TableInsertBuilder builder = new TableInsertBuilderStandard( + persister, + persister.getIdentifierTableMapping(), + sessionFactory + ); + + final String value = dialect.getIdentityColumnSupport().getIdentityInsertString(); + if ( value != null ) { + builder.addKeyColumn( persister.getRootTableKeyColumnNames()[0], value, identifierMapping.getJdbcMapping() ); + } + + return builder; + } + + @Override + public PreparedStatement prepareStatement(String insertSql, SharedSessionContractImplementor session) { + final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator(); + final MutationStatementPreparer statementPreparer = jdbcCoordinator.getMutationStatementPreparer(); + return statementPreparer.prepareStatement( + insertSql, + PreparedStatement.RETURN_GENERATED_KEYS + ); + } + + + @Override + public Object performInsert( + PreparedStatementDetails insertStatementDetails, + JdbcValueBindings jdbcValueBindings, + Object entity, + SharedSessionContractImplementor session) { + final JdbcServices jdbcServices = session.getJdbcServices(); + final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator(); + + final String insertSql = insertStatementDetails.getSqlString(); + + jdbcServices.getSqlStatementLogger().logStatement( insertSql ); + + final PreparedStatement insertStatement = insertStatementDetails.resolveStatement(); + jdbcValueBindings.beforeStatement( insertStatementDetails, session ); + + try { + jdbcCoordinator.getResultSetReturn().executeUpdate( insertStatement ); + + try { + final ResultSet rs = insertStatement.getGeneratedKeys(); + try { + return IdentifierGeneratorHelper.getGeneratedIdentity( + rs, + persister.getNavigableRole(), + persister.getRootTableKeyColumnNames()[ 0 ], + persister.getIdentifierType(), + jdbcServices.getJdbcEnvironment().getDialect() + ); + } + catch (SQLException e) { + throw jdbcServices.getSqlExceptionHelper().convert( + e, + () -> String.format( + Locale.ROOT, + "Unable to extract generated key from generated-key for `%s`", + persister.getNavigableRole().getFullPath() + ), + insertSql + ); + } + finally { + if ( rs != null ) { + jdbcCoordinator + .getLogicalConnection() + .getResourceRegistry() + .release( rs, insertStatement ); + } + } + } + finally { + jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( insertStatement ); + } + } + catch (SQLException e) { + throw jdbcServices.getSqlExceptionHelper().convert( + e, + "Unable to extract generated-keys ResultSet", + insertSql + ); + } + } + + @Override + public Object executeAndExtract( + String insertSql, + PreparedStatement insertStatement, + SharedSessionContractImplementor session) { + final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator(); + final JdbcServices jdbcServices = session.getJdbcServices(); + + jdbcCoordinator.getResultSetReturn().executeUpdate( insertStatement ); + + try { + final ResultSet rs = insertStatement.getGeneratedKeys(); + try { + return IdentifierGeneratorHelper.getGeneratedIdentity( + rs, + persister.getNavigableRole(), + persister.getRootTableKeyColumnNames()[0], + persister.getIdentifierType(), + jdbcServices.getJdbcEnvironment().getDialect() + ); + } + catch (SQLException e) { + throw jdbcServices.getSqlExceptionHelper().convert( + e, + "Unable to extract generated key(s) from generated-keys ResultSet", + insertSql + ); + } + finally { + if ( rs != null ) { + jdbcCoordinator + .getLogicalConnection() + .getResourceRegistry() + .release( rs, insertStatement ); + } + } + } + catch (SQLException e) { + throw jdbcServices.getSqlExceptionHelper().convert( + e, + "Unable to extract generated-keys ResultSet", + insertSql + ); + } + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/InsertGeneratedIdentifierDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/InsertGeneratedIdentifierDelegate.java index 85404674ab..48a5f798d7 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/insert/InsertGeneratedIdentifierDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/id/insert/InsertGeneratedIdentifierDelegate.java @@ -6,8 +6,16 @@ */ package org.hibernate.id.insert; +import java.sql.PreparedStatement; + import org.hibernate.boot.model.relational.SqlStringGenerationContext; +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.jdbc.Expectation; +import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping; +import org.hibernate.sql.model.ast.builder.TableInsertBuilder; /** * Responsible for handling delegation relating to variants in how @@ -19,6 +27,31 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; * @author Steve Ebersole */ public interface InsertGeneratedIdentifierDelegate { + /** + * Create a TableInsertBuilder with any specific identity handling encoded + */ + TableInsertBuilder createTableInsertBuilder( + BasicEntityIdentifierMapping identifierMapping, + Expectation expectation, + SessionFactoryImplementor sessionFactory); + + PreparedStatement prepareStatement(String insertSql, SharedSessionContractImplementor session); + + /** + * Perform the insert and extract the database-generated value + * + * @see #createTableInsertBuilder + */ + Object performInsert( + PreparedStatementDetails insertStatementDetails, + JdbcValueBindings valueBindings, + Object entity, + SharedSessionContractImplementor session); + + + + + /** * Build a {@link org.hibernate.sql.Insert} specific to the delegate's mode diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/InsertReturningDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/InsertReturningDelegate.java new file mode 100644 index 0000000000..11df319931 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/id/insert/InsertReturningDelegate.java @@ -0,0 +1,106 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.id.insert; + +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +import org.hibernate.boot.model.relational.SqlStringGenerationContext; +import org.hibernate.dialect.Dialect; +import org.hibernate.dialect.identity.IdentityColumnSupport; +import org.hibernate.engine.jdbc.spi.JdbcCoordinator; +import org.hibernate.engine.jdbc.spi.JdbcServices; +import org.hibernate.engine.jdbc.spi.MutationStatementPreparer; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.id.IdentifierGeneratorHelper; +import org.hibernate.id.PostInsertIdentityPersister; +import org.hibernate.jdbc.Expectation; +import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping; +import org.hibernate.sql.model.ast.builder.TableInsertBuilder; + +/** + * Delegate for dealing with IDENTITY columns where the dialect supports returning + * the generated IDENTITY value directly from the insert statement. + * + * @see org.hibernate.id.IdentityGenerator + * @see IdentityColumnSupport#supportsInsertSelectIdentity() + */ +public class InsertReturningDelegate extends AbstractReturningDelegate { + private final PostInsertIdentityPersister persister; + private final Dialect dialect; + + public InsertReturningDelegate(PostInsertIdentityPersister persister, Dialect dialect) { + super( persister ); + this.persister = persister; + this.dialect = dialect; + } + + @Override + public IdentifierGeneratingInsert prepareIdentifierGeneratingInsert(SqlStringGenerationContext context) { + InsertSelectIdentityInsert insert = new InsertSelectIdentityInsert( dialect ); + insert.addIdentityColumn( persister.getRootTableKeyColumnNames()[ 0 ] ); + return insert; + } + + @Override + public TableInsertBuilder createTableInsertBuilder( + BasicEntityIdentifierMapping identifierMapping, + Expectation expectation, + SessionFactoryImplementor sessionFactory) { + return new TableInsertReturningBuilder( persister, sessionFactory ); + } + + @Override + protected Object executeAndExtract( + String insertSql, + PreparedStatement insertStatement, + SharedSessionContractImplementor session) { + final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator(); + final JdbcServices jdbcServices = session.getJdbcServices(); + + final ResultSet rs = jdbcCoordinator.getResultSetReturn().execute( insertStatement ); + + try { + return IdentifierGeneratorHelper.getGeneratedIdentity( + rs, + persister.getNavigableRole(), + persister.getRootTableKeyColumnNames()[ 0 ], + persister.getIdentifierType(), + jdbcServices.getJdbcEnvironment().getDialect() + ); + } + catch (SQLException e) { + throw jdbcServices.getSqlExceptionHelper().convert( + e, + "Unable to extract generated key(s) from generated-keys ResultSet", + insertSql + ); + } + finally { + jdbcCoordinator + .getLogicalConnection() + .getResourceRegistry() + .release( rs, insertStatement ); + } + } + + @Override + public String prepareIdentifierGeneratingInsert(String insertSQL) { + return dialect.getIdentityColumnSupport().appendIdentitySelectToInsert( insertSQL ); + } + + @Override + public PreparedStatement prepareStatement(String insertSql, SharedSessionContractImplementor session) { + final MutationStatementPreparer statementPreparer = session + .getJdbcCoordinator() + .getMutationStatementPreparer(); + + return statementPreparer.prepareStatement( insertSql, PreparedStatement.NO_GENERATED_KEYS ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/TableInsertReturningBuilder.java b/hibernate-core/src/main/java/org/hibernate/id/insert/TableInsertReturningBuilder.java new file mode 100644 index 0000000000..46cb32971f --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/id/insert/TableInsertReturningBuilder.java @@ -0,0 +1,46 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.id.insert; + +import java.util.Collections; + +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.id.PostInsertIdentityPersister; +import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping; +import org.hibernate.sql.ast.tree.expression.ColumnReference; +import org.hibernate.sql.model.ast.TableInsert; +import org.hibernate.sql.model.ast.builder.AbstractTableInsertBuilder; +import org.hibernate.sql.model.internal.TableInsertStandard; + +/** + * @author Steve Ebersole + */ +public class TableInsertReturningBuilder extends AbstractTableInsertBuilder { + public TableInsertReturningBuilder( + PostInsertIdentityPersister mutationTarget, + SessionFactoryImplementor sessionFactory) { + super( mutationTarget, mutationTarget.getIdentifierTableMapping(), sessionFactory ); + } + + @Override + protected PostInsertIdentityPersister getMutationTarget() { + return (PostInsertIdentityPersister) super.getMutationTarget(); + } + + @Override + public TableInsert buildMutation() { + final BasicEntityIdentifierMapping identifierMapping = (BasicEntityIdentifierMapping) getMutationTarget().getIdentifierMapping(); + return new TableInsertStandard( + getMutatingTable(), + getMutationTarget(), + combine( getValueBindingList(), getKeyBindingList(), getLobValueBindingList() ), + true, + Collections.singletonList( new ColumnReference( getMutatingTable(), identifierMapping ) ), + getParameters() + ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java index 0437fd7235..b895f8b2bb 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java @@ -19,8 +19,6 @@ import java.util.ServiceConfigurationError; import java.util.Set; import javax.naming.NameNotFoundException; import javax.naming.NamingException; -import jakarta.transaction.Synchronization; -import jakarta.transaction.SystemException; import org.hibernate.HibernateException; import org.hibernate.LockMode; @@ -43,6 +41,9 @@ import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; + import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.ERROR; import static org.jboss.logging.Logger.Level.INFO; @@ -71,6 +72,10 @@ public interface CoreMessageLogger extends BasicLogger { id = 8) void autoFlushWillNotWork(); + /** + * @deprecated Use {@link org.hibernate.engine.jdbc.batch.JdbcBatchLogging#batchContainedStatementsOnRelease} instead + */ + @Deprecated @LogMessage(level = INFO) @Message(value = "On release of batch it still contained JDBC statements", id = 10) void batchContainedStatementsOnRelease(); @@ -1019,8 +1024,12 @@ public interface CoreMessageLogger extends BasicLogger { @Message(value = "Unable to evictData temporary id table after use [%s]", id = 314) void unableToDropTemporaryIdTable(String message); + /** + * @deprecated Use {@link org.hibernate.engine.jdbc.batch.JdbcBatchLogging#unableToExecuteBatch} instead + */ @LogMessage(level = ERROR) @Message(value = "Exception executing batch [%s], SQL: %s", id = 315) + @Deprecated void unableToExecuteBatch(Exception e, String sql ); @LogMessage(level = WARN) @@ -1147,8 +1156,12 @@ public interface CoreMessageLogger extends BasicLogger { @Message(value = "Could not read or init a hi value", id = 351) void unableToReadOrInitHiValue(@Cause SQLException e); + /** + * @deprecated Use {@link org.hibernate.engine.jdbc.batch.JdbcBatchLogging#unableToReleaseBatchStatement} instead + */ @LogMessage(level = ERROR) @Message(value = "Unable to release batch statement...", id = 352) + @Deprecated void unableToReleaseBatchStatement(); @LogMessage(level = ERROR) @@ -1268,8 +1281,12 @@ public interface CoreMessageLogger extends BasicLogger { @Message(value = "Unexpected literal token type [%s] passed for numeric processing", id = 380) void unexpectedLiteralTokenType(int type); + /** + * @deprecated Use {@link org.hibernate.engine.jdbc.JdbcLogging#unexpectedRowCounts} instead + */ @LogMessage(level = WARN) @Message(value = "JDBC driver did not return the expected number of row counts", id = 381) + @Deprecated void unexpectedRowCounts(); @LogMessage(level = WARN) diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/LazyValue.java b/hibernate-core/src/main/java/org/hibernate/internal/util/LazyValue.java index b5742bda5b..233b4b31bf 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/LazyValue.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/LazyValue.java @@ -6,6 +6,7 @@ */ package org.hibernate.internal.util; +import java.util.Objects; import java.util.function.Supplier; /** @@ -24,17 +25,13 @@ public class LazyValue { this.supplier = supplier; } - public Object getValue() { + public T getValue() { if ( value == null ) { final T obtainedValue = supplier.get(); - if ( obtainedValue == null ) { - value = NULL; - } - else { - value = obtainedValue; - } + value = Objects.requireNonNullElse( obtainedValue, NULL ); } - return value == NULL ? null : value; + //noinspection unchecked + return value == NULL ? null : (T) value; } } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessHelper.java index acdc8fe3a3..a697bbe29b 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessHelper.java @@ -102,4 +102,40 @@ public class NullnessHelper { return null; } + + /** + * Ensures that either:
    + *
  • all values are null
    • + *
  • all values are non-null
    • + *
+ */ + public static boolean areSameNullness(Object... values) { + if ( values == null || values.length > 2 ) { + // we have no elements or 1 + return true; + } + + final boolean firstValueIsNull = values[0] == null; + for ( int i = 1; i < values.length; i++ ) { + // look for mismatch + if ( firstValueIsNull != (values[i] == null) ) { + return false; + } + } + + return true; + } + + public static boolean areAllNonNull(Object... objects) { + if ( objects == null || objects.length == 0 ) { + return true; + } + + for ( int i = 0; i < objects.length; i++ ) { + if ( objects[i] == null ) { + return false; + } + } + return true; + } } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java index 8e563ffa9f..21971f9c69 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java @@ -492,6 +492,19 @@ public final class StringHelper { return results; } + public static int count(String text, String match) { + int count = 0; + + int index = text.indexOf( match ); + + while ( index > -1 ) { + count++; + index = text.indexOf( match, index + 1 ); + } + + return count; + } + public static int count(String text, char match) { if ( text == null ) { return 0; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java index 392348a310..cd7c6396dd 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java @@ -26,6 +26,16 @@ public final class ArrayHelper { return indexOf( array, object ) > -1; } + public static boolean contains(int[] array, int value) { + for ( int i = 0; i < array.length; i++ ) { + if ( array[i] == value ) { + return true; + } + } + + return false; + } + public static int indexOf(Object[] array, Object object) { return indexOf( array, array.length, object ); } @@ -246,6 +256,15 @@ public final class ArrayHelper { return true; } + public static boolean isAnyTrue(boolean... values) { + for ( boolean value : values ) { + if ( value ) { + return true; + } + } + return false; + } + public static boolean[] negate(boolean[] valueNullness) { boolean[] result = new boolean[valueNullness.length]; for (int i = 0; i < valueNullness.length; i++) { diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java index 5e91408574..927784930d 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java @@ -443,4 +443,23 @@ public final class CollectionHelper { properties.put( pairs[i], pairs[i+1] ); } } + + public static List combine(List list1, List list2) { + final ArrayList combined = arrayList( list1.size() + list2.size() ); + combined.addAll( list1 ); + combined.addAll( list2 ); + return combined; + } + + public static List combine(List... lists) { + final ArrayList combined = new ArrayList<>(); + for ( int i = 0; i < lists.length; i++ ) { + combined.addAll( lists[i] ); + } + return combined; + } + + public static int size(List values) { + return values == null ? 0 : values.size(); + } } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/LazySet.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/LazySet.java new file mode 100644 index 0000000000..02fe9be9a2 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/LazySet.java @@ -0,0 +1,47 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.internal.util.collections; + +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; +import java.util.function.Consumer; +import java.util.function.Supplier; + +/** + * @author Steve Ebersole + */ +public class LazySet { + private final Supplier> setBuilder; + private Set set; + + public LazySet() { + this( HashSet::new ); + } + + public LazySet(Supplier> setBuilder) { + this.setBuilder = setBuilder; + } + + public void add(T element) { + if ( set == null ) { + set = setBuilder.get(); + } + set.add( element ); + } + + public void forEach(Consumer action) { + if ( set == null ) { + return; + } + set.forEach( action ); + } + + public Set getUnderlyingSet() { + return set == null ? Collections.emptySet() : set; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectation.java b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectation.java index 5df0c04991..9a72bc6dab 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectation.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectation.java @@ -16,6 +16,23 @@ import org.hibernate.HibernateException; * @author Steve Ebersole */ public interface Expectation { + + /** + * Is it acceptable to combiner this expectation with statement batching? + * + * @return True if batching can be combined with this expectation; false otherwise. + */ + boolean canBeBatched(); + + /** + * The number of parameters this expectation implies. E.g., + * {@link Expectations.BasicParamExpectation} requires a single + * OUT parameter for reading back the number of affected rows. + */ + default int getNumberOfParametersUsed() { + return 0; + } + /** * Perform verification of the outcome of the RDBMS operation based on * the type of expectation defined. @@ -38,11 +55,4 @@ public interface Expectation { * @throws HibernateException Problem performing preparation. */ int prepare(PreparedStatement statement) throws SQLException, HibernateException; - - /** - * Is it acceptable to combiner this expectation with statement batching? - * - * @return True if batching can be combined with this expectation; false otherwise. - */ - boolean canBeBatched(); } diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java index 24c9f5c1ae..fdb94644d8 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java @@ -114,6 +114,11 @@ public class Expectations { this.parameterPosition = parameterPosition; } + @Override + public int getNumberOfParametersUsed() { + return 1; + } + @Override public int prepare(PreparedStatement statement) throws SQLException, HibernateException { toCallableStatement( statement ).registerOutParameter( parameterPosition, Types.NUMERIC ); diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractNaturalIdLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractNaturalIdLoader.java index df4183a8ef..b760a72bed 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractNaturalIdLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractNaturalIdLoader.java @@ -28,16 +28,15 @@ import org.hibernate.metamodel.mapping.EntityIdentifierMapping; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.NaturalIdMapping; import org.hibernate.metamodel.mapping.SelectableMapping; -import org.hibernate.spi.NavigablePath; import org.hibernate.query.internal.SimpleQueryOptions; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.spi.QueryParameterBindings; +import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.spi.SimpleFromClauseAccessImpl; import org.hibernate.sql.ast.spi.SqlAliasBaseManager; import org.hibernate.sql.ast.spi.SqlExpressionResolver; -import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.ast.tree.from.TableGroup; @@ -49,9 +48,9 @@ import org.hibernate.sql.exec.internal.CallbackImpl; import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; import org.hibernate.sql.exec.spi.Callback; import org.hibernate.sql.exec.spi.ExecutionContext; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcParameterBinding; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.Fetch; import org.hibernate.sql.results.graph.FetchParent; @@ -193,7 +192,7 @@ public abstract class AbstractNaturalIdLoader implements NaturalIdLoader { ); final QueryOptions queryOptions = new SimpleQueryOptions( lockOptions, false ); - final JdbcSelect jdbcSelect = sqlAstTranslatorFactory.buildSelectTranslator( sessionFactory, sqlSelect ) + final JdbcOperationQuerySelect jdbcSelect = sqlAstTranslatorFactory.buildSelectTranslator( sessionFactory, sqlSelect ) .translate( jdbcParamBindings, queryOptions ); final StatisticsImplementor statistics = sessionFactory.getStatistics(); @@ -356,7 +355,7 @@ public abstract class AbstractNaturalIdLoader implements NaturalIdLoader { session ); assert offset == jdbcParameters.size(); - final JdbcSelect jdbcSelect = sqlAstTranslatorFactory.buildSelectTranslator( sessionFactory, sqlSelect ) + final JdbcOperationQuerySelect jdbcSelect = sqlAstTranslatorFactory.buildSelectTranslator( sessionFactory, sqlSelect ) .translate( jdbcParamBindings, QueryOptions.NONE ); final List results = session.getFactory().getJdbcServices().getJdbcSelectExecutor().list( diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java index 87ce55e41d..ce942798c6 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java @@ -32,8 +32,8 @@ import org.hibernate.sql.ast.tree.select.SelectStatement; import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; import org.hibernate.sql.exec.spi.Callback; import org.hibernate.sql.exec.spi.ExecutionContext; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; import org.hibernate.sql.results.internal.RowTransformerStandardImpl; import org.hibernate.sql.results.spi.ListResultsConsumer; @@ -133,7 +133,7 @@ public class CollectionElementLoaderByIndex implements Loader { session ); assert offset == jdbcParameters.size(); - final JdbcSelect jdbcSelect = sqlAstTranslatorFactory.buildSelectTranslator( sessionFactory, sqlAst ) + final JdbcOperationQuerySelect jdbcSelect = sqlAstTranslatorFactory.buildSelectTranslator( sessionFactory, sqlAst ) .translate( jdbcParameterBindings, QueryOptions.NONE ); List list = jdbcServices.getJdbcSelectExecutor().list( diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderBatchKey.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderBatchKey.java index 9d5cc668a2..968642db25 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderBatchKey.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderBatchKey.java @@ -32,8 +32,8 @@ import org.hibernate.sql.ast.tree.select.SelectStatement; import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; import org.hibernate.sql.exec.spi.Callback; import org.hibernate.sql.exec.spi.ExecutionContext; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; import org.hibernate.sql.results.graph.entity.LoadingEntityEntry; import org.hibernate.sql.results.internal.RowTransformerStandardImpl; import org.hibernate.sql.results.spi.ListResultsConsumer; @@ -170,7 +170,7 @@ public class CollectionLoaderBatchKey implements CollectionLoader { final JdbcEnvironment jdbcEnvironment = jdbcServices.getJdbcEnvironment(); final SqlAstTranslatorFactory sqlAstTranslatorFactory = jdbcEnvironment.getSqlAstTranslatorFactory(); - final JdbcSelect jdbcSelect = sqlAstTranslatorFactory + final JdbcOperationQuerySelect jdbcSelect = sqlAstTranslatorFactory .buildSelectTranslator( sessionFactory, sqlAst ) .translate( null, QueryOptions.NONE ); diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java index 2dd1a35c2d..3ebfdd6afc 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java @@ -30,8 +30,8 @@ import org.hibernate.sql.ast.tree.select.SelectStatement; import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; import org.hibernate.sql.exec.spi.Callback; import org.hibernate.sql.exec.spi.ExecutionContext; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; import org.hibernate.sql.results.graph.entity.LoadingEntityEntry; import org.hibernate.sql.results.internal.RowTransformerStandardImpl; import org.hibernate.sql.results.spi.ListResultsConsumer; @@ -107,7 +107,7 @@ public class CollectionLoaderSingleKey implements CollectionLoader { ); assert offset == jdbcParameters.size(); - final JdbcSelect jdbcSelect = sqlAstTranslatorFactory + final JdbcOperationQuerySelect jdbcSelect = sqlAstTranslatorFactory .buildSelectTranslator( sessionFactory, sqlAst ) .translate( jdbcParameterBindings, QueryOptions.NONE ); diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSubSelectFetch.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSubSelectFetch.java index c6d8104db7..83f6a96a2f 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSubSelectFetch.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSubSelectFetch.java @@ -30,7 +30,7 @@ import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.tree.select.SelectStatement; import org.hibernate.sql.exec.spi.Callback; import org.hibernate.sql.exec.spi.ExecutionContext; -import org.hibernate.sql.exec.spi.JdbcSelect; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.entity.LoadingEntityEntry; import org.hibernate.sql.results.internal.ResultsHelper; @@ -116,7 +116,7 @@ public class CollectionLoaderSubSelectFetch implements CollectionLoader { } } - final JdbcSelect jdbcSelect = sqlAstTranslatorFactory + final JdbcOperationQuerySelect jdbcSelect = sqlAstTranslatorFactory .buildSelectTranslator( sessionFactory, sqlAst ) .translate( this.subselect.getLoadingJdbcParameterBindings(), QueryOptions.NONE ); diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java index 9b3f08f219..f1120d5dc8 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java @@ -17,11 +17,11 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.metamodel.mapping.EntityMappingType; -import org.hibernate.spi.NavigablePath; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.spi.QueryParameterBindings; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.sqm.sql.FromClauseIndex; +import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.spi.SqlAliasBaseManager; @@ -38,8 +38,8 @@ import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; import org.hibernate.sql.exec.internal.JdbcParameterImpl; import org.hibernate.sql.exec.spi.Callback; import org.hibernate.sql.exec.spi.ExecutionContext; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.internal.RowTransformerDatabaseSnapshotImpl; import org.hibernate.sql.results.spi.ListResultsConsumer; @@ -47,8 +47,6 @@ import org.hibernate.type.StandardBasicTypes; import org.jboss.logging.Logger; -import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey; - /** * @author Steve Ebersole */ @@ -57,7 +55,7 @@ class DatabaseSnapshotExecutor { private final EntityMappingType entityDescriptor; - private final JdbcSelect jdbcSelect; + private final JdbcOperationQuerySelect jdbcSelect; private final List jdbcParameters; DatabaseSnapshotExecutor( diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoadPlan.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoadPlan.java index ef6c3a300f..171f9d0368 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoadPlan.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoadPlan.java @@ -8,8 +8,7 @@ package org.hibernate.loader.ast.internal; import org.hibernate.loader.ast.spi.Loadable; import org.hibernate.metamodel.mapping.ModelPart; -import org.hibernate.sql.ast.tree.select.SelectStatement; -import org.hibernate.sql.exec.spi.JdbcSelect; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; /** * Common contract for SQL AST based loading @@ -30,5 +29,5 @@ public interface LoadPlan { /** * The JdbcSelect for the load */ - JdbcSelect getJdbcSelect(); + JdbcOperationQuerySelect getJdbcSelect(); } diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdLoaderStandard.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdLoaderStandard.java index f627724ed9..d0a7302aa5 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdLoaderStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdLoaderStandard.java @@ -44,8 +44,8 @@ import org.hibernate.sql.ast.tree.select.SelectStatement; import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; import org.hibernate.sql.exec.spi.Callback; import org.hibernate.sql.exec.spi.ExecutionContext; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; import org.hibernate.sql.results.graph.entity.LoadingEntityEntry; import org.hibernate.sql.results.internal.RowTransformerStandardImpl; import org.hibernate.sql.results.spi.ListResultsConsumer; @@ -279,7 +279,7 @@ public class MultiIdLoaderStandard implements MultiIdEntityLoader { // we should have used all the JdbcParameter references (created bindings for all) assert offset == jdbcParameters.size(); - final JdbcSelect jdbcSelect = sqlAstTranslatorFactory.buildSelectTranslator( sessionFactory, sqlAst ) + final JdbcOperationQuerySelect jdbcSelect = sqlAstTranslatorFactory.buildSelectTranslator( sessionFactory, sqlAst ) .translate( jdbcParameterBindings, QueryOptions.NONE ); final SubselectFetch.RegistrationHandler subSelectFetchableKeysHandler; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java index 73eb34deb3..8942647f59 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java @@ -30,8 +30,8 @@ import org.hibernate.sql.ast.tree.select.SelectStatement; import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; import org.hibernate.sql.exec.spi.Callback; import org.hibernate.sql.exec.spi.ExecutionContext; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; import org.hibernate.sql.results.graph.entity.LoadingEntityEntry; import org.hibernate.sql.results.internal.RowTransformerStandardImpl; import org.hibernate.sql.results.spi.ListResultsConsumer; @@ -60,7 +60,7 @@ public class MultiNaturalIdLoadingBatcher { private final KeyValueResolver keyValueResolver; - private final JdbcSelect jdbcSelect; + private final JdbcOperationQuerySelect jdbcSelect; public MultiNaturalIdLoadingBatcher( EntityMappingType entityDescriptor, diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderDynamicBatch.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderDynamicBatch.java index f9e0126230..29a47c8593 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderDynamicBatch.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderDynamicBatch.java @@ -29,8 +29,8 @@ import org.hibernate.sql.ast.tree.select.SelectStatement; import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; import org.hibernate.sql.exec.spi.Callback; import org.hibernate.sql.exec.spi.ExecutionContext; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; import org.hibernate.sql.results.graph.entity.LoadingEntityEntry; import org.hibernate.sql.results.internal.RowTransformerStandardImpl; import org.hibernate.sql.results.spi.ListResultsConsumer; @@ -129,7 +129,7 @@ public class SingleIdEntityLoaderDynamicBatch extends SingleIdEntityLoaderSup } assert offset == jdbcParameters.size(); - final JdbcSelect jdbcSelect = sqlAstTranslatorFactory + final JdbcOperationQuerySelect jdbcSelect = sqlAstTranslatorFactory .buildSelectTranslator( sessionFactory, sqlAst ) .translate( jdbcParameterBindings, QueryOptions.NONE ); diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdLoadPlan.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdLoadPlan.java index 4b9b0e09ce..5c7747c008 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdLoadPlan.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdLoadPlan.java @@ -27,8 +27,8 @@ import org.hibernate.sql.exec.internal.CallbackImpl; import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; import org.hibernate.sql.exec.spi.Callback; import org.hibernate.sql.exec.spi.ExecutionContext; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; import org.hibernate.sql.results.internal.RowTransformerStandardImpl; import org.hibernate.sql.results.spi.ListResultsConsumer; import org.hibernate.sql.results.spi.RowTransformer; @@ -46,7 +46,7 @@ public class SingleIdLoadPlan implements SingleEntityLoadPlan { private final org.hibernate.persister.entity.Loadable persister; private final ModelPart restrictivePart; private final LockOptions lockOptions; - private final JdbcSelect jdbcSelect; + private final JdbcOperationQuerySelect jdbcSelect; private final List jdbcParameters; public SingleIdLoadPlan( @@ -94,7 +94,7 @@ public class SingleIdLoadPlan implements SingleEntityLoadPlan { } @Override - public JdbcSelect getJdbcSelect() { + public JdbcOperationQuerySelect getJdbcSelect() { return jdbcSelect; } diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleUniqueKeyEntityLoaderStandard.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleUniqueKeyEntityLoaderStandard.java index 4abfafe752..048ce520ac 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleUniqueKeyEntityLoaderStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleUniqueKeyEntityLoaderStandard.java @@ -33,8 +33,8 @@ import org.hibernate.sql.exec.internal.CallbackImpl; import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; import org.hibernate.sql.exec.spi.Callback; import org.hibernate.sql.exec.spi.ExecutionContext; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; import org.hibernate.sql.results.spi.ListResultsConsumer; /** @@ -96,7 +96,7 @@ public class SingleUniqueKeyEntityLoaderStandard implements SingleUniqueKeyEn session ); assert offset == jdbcParameters.size(); - final JdbcSelect jdbcSelect = sqlAstTranslatorFactory.buildSelectTranslator( sessionFactory, sqlAst ) + final JdbcOperationQuerySelect jdbcSelect = sqlAstTranslatorFactory.buildSelectTranslator( sessionFactory, sqlAst ) .translate( jdbcParameterBindings, QueryOptions.NONE ); final List list = sessionFactory.getJdbcServices().getJdbcSelectExecutor().list( @@ -185,7 +185,7 @@ public class SingleUniqueKeyEntityLoaderStandard implements SingleUniqueKeyEn session ); assert offset == jdbcParameters.size(); - final JdbcSelect jdbcSelect = sqlAstTranslatorFactory.buildSelectTranslator( sessionFactory, sqlAst ) + final JdbcOperationQuerySelect jdbcSelect = sqlAstTranslatorFactory.buildSelectTranslator( sessionFactory, sqlAst ) .translate( jdbcParameterBindings, QueryOptions.NONE ); final List list = sessionFactory.getJdbcServices().getJdbcSelectExecutor().list( diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java index 8dc065acb1..bb1e49169a 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java @@ -845,4 +845,14 @@ public abstract class Collection implements Fetchable, Value, Filterable { public void setMappedByProperty(String mappedByProperty) { this.mappedByProperty = mappedByProperty; } + + @Override + public boolean isColumnInsertable(int index) { + return false; + } + + @Override + public boolean isColumnUpdateable(int index) { + return false; + } } diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Component.java b/hibernate-core/src/main/java/org/hibernate/mapping/Component.java index 0819490991..69cf99a944 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Component.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Component.java @@ -565,6 +565,7 @@ public class Component extends SimpleValue implements MetaAttributable, Sortable return sortProperties( false ); } + private int[] sortProperties(boolean forceRetainOriginalOrder) { if ( originalPropertyOrder != ArrayHelper.EMPTY_INT_ARRAY ) { return originalPropertyOrder; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java b/hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java index cddcc6c543..5ddc8891bf 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java @@ -15,6 +15,7 @@ import org.hibernate.MappingException; import org.hibernate.annotations.NotFoundAction; import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.engine.spi.Mapping; +import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.service.ServiceRegistry; import org.hibernate.type.EntityType; import org.hibernate.type.Type; @@ -180,7 +181,7 @@ public class OneToMany implements Value { public boolean[] getColumnInsertability() { //TODO: we could just return all false... - throw new UnsupportedOperationException(); + return ArrayHelper.EMPTY_BOOLEAN_ARRAY; } @Override @@ -190,7 +191,7 @@ public class OneToMany implements Value { public boolean[] getColumnUpdateability() { //TODO: we could just return all false... - throw new UnsupportedOperationException(); + return ArrayHelper.EMPTY_BOOLEAN_ARRAY; } @Override @@ -216,6 +217,16 @@ public class OneToMany implements Value { : null; } + @Override + public boolean isColumnInsertable(int index) { + return false; + } + + @Override + public boolean isColumnUpdateable(int index) { + return false; + } + @Override public String toString() { return getClass().getSimpleName(); diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java index 693d97c3a3..31046fd265 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java @@ -17,7 +17,6 @@ import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.Properties; -import jakarta.persistence.AttributeConverter; import org.hibernate.AssertionFailure; import org.hibernate.FetchMode; @@ -66,6 +65,8 @@ import org.hibernate.type.internal.ConvertedBasicTypeImpl; import org.hibernate.type.spi.TypeConfiguration; import org.hibernate.usertype.DynamicParameterizedType; +import jakarta.persistence.AttributeConverter; + /** * A mapping model object that represents any value that maps to columns. * @@ -984,6 +985,22 @@ public abstract class SimpleValue implements KeyValue { return false; } + @Override + public boolean isColumnInsertable(int index) { + if ( insertability.size() > 0 ) { + return insertability.get( index ); + } + return false; + } + + @Override + public boolean isColumnUpdateable(int index) { + if ( updatability.size() > 0 ) { + return updatability.get( index ); + } + return false; + } + private static boolean[] extractBooleansFromList(List list) { final boolean[] array = new boolean[ list.size() ]; int i = 0; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Value.java b/hibernate-core/src/main/java/org/hibernate/mapping/Value.java index 89ebde58c5..095b7b4436 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Value.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Value.java @@ -107,4 +107,8 @@ public interface Value extends Serializable { ServiceRegistry getServiceRegistry(); Value copy(); + + boolean isColumnInsertable(int index); + + boolean isColumnUpdateable(int index); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/CollectionClassification.java b/hibernate-core/src/main/java/org/hibernate/metamodel/CollectionClassification.java index 7996091881..236b116727 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/CollectionClassification.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/CollectionClassification.java @@ -174,4 +174,9 @@ public enum CollectionClassification { return null; } + + public boolean isRowUpdatePossible() { + // anything other than BAG and SET + return this != BAG && this != SET; + } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMapping.java index 913078a9d9..298997124c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMapping.java @@ -10,6 +10,7 @@ import org.hibernate.property.access.spi.PropertyAccess; import org.hibernate.sql.results.graph.DatabaseSnapshotContributor; import org.hibernate.sql.results.graph.Fetchable; import org.hibernate.tuple.ValueGeneration; +import org.hibernate.type.descriptor.java.JavaType; import org.hibernate.type.descriptor.java.MutabilityPlan; import org.hibernate.type.descriptor.java.MutabilityPlanExposer; @@ -80,4 +81,9 @@ public interface AttributeMapping default MutabilityPlan getExposedMutabilityPlan() { return getAttributeMetadataAccess().resolveAttributeMetadata( null ).getMutabilityPlan(); } + + default int compare(Object value1, Object value2) { + //noinspection unchecked,rawtypes + return ( (JavaType) getJavaType() ).getComparator().compare( value1, value2 ); + } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CollectionPart.java index 1c18adedac..c105be4e53 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CollectionPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CollectionPart.java @@ -21,8 +21,17 @@ import org.hibernate.type.descriptor.java.JavaTypedExpressible; */ public interface CollectionPart extends ModelPart, Fetchable, JavaTypedExpressible { enum Nature { + /** + * The Collection element or Map element + */ ELEMENT( "{element}" ), + /** + * The List index or Map key + */ INDEX( "{index}" ), + /** + * The identifier for + */ ID( "{collection-id}" ); private final String name; @@ -82,4 +91,8 @@ public interface CollectionPart extends ModelPart, Fetchable, JavaTypedExpressib default String getPartName() { return getNature().getName(); } + + default ModelPart getInclusionCheckPart() { + return this; + } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableMappingType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableMappingType.java index 03a1d91557..1620caee15 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableMappingType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableMappingType.java @@ -13,6 +13,7 @@ import org.hibernate.mapping.IndexedConsumer; import org.hibernate.metamodel.mapping.internal.EmbeddedAttributeMapping; import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess; import org.hibernate.metamodel.spi.EmbeddableRepresentationStrategy; +import org.hibernate.property.access.spi.Getter; import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.from.TableGroup; @@ -89,4 +90,17 @@ public interface EmbeddableMappingType extends ManagedMappingType, SelectableMap ) ); } + + default int compare(Object value1, Object value2) { + final List attributeMappings = getAttributeMappings(); + for ( int i = 0; i < attributeMappings.size(); i++ ) { + final AttributeMapping attributeMapping = attributeMappings.get( i ); + final Getter getter = attributeMapping.getPropertyAccess().getGetter(); + final int comparison = attributeMapping.compare( getter.get( value1 ), getter.get( value2 ) ); + if ( comparison != 0 ) { + return comparison; + } + } + return 0; + } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityIdentifierMapping.java index b15ad7fa4f..fe4c36206a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityIdentifierMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityIdentifierMapping.java @@ -6,8 +6,6 @@ */ package org.hibernate.metamodel.mapping; -import java.io.Serializable; - import org.hibernate.TransientObjectException; import org.hibernate.engine.internal.ForeignKeys; import org.hibernate.engine.spi.IdentifierValue; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java index c5e3f6f291..5c10b12713 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java @@ -26,9 +26,9 @@ import org.hibernate.metamodel.UnsupportedMappingException; import org.hibernate.metamodel.spi.EntityRepresentationStrategy; import org.hibernate.metamodel.spi.MappingMetamodelImplementor; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.spi.NavigablePath; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy; +import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.spi.SqlAliasBase; @@ -56,7 +56,8 @@ import static org.hibernate.bytecode.enhance.spi.LazyPropertyInitializer.UNFETCH * * @author Steve Ebersole */ -public interface EntityMappingType extends ManagedMappingType, EntityValuedModelPart, Loadable, Restrictable, Discriminatable { +public interface EntityMappingType + extends ManagedMappingType, EntityValuedModelPart, Loadable, Restrictable, Discriminatable { /** * Safety-net. * @@ -278,6 +279,7 @@ public interface EntityMappingType extends ManagedMappingType, EntityValuedModel void visitConstraintOrderedTables(ConstraintOrderedTableConsumer consumer); + default EntityMappingType getRootEntityDescriptor() { final EntityMappingType superMappingType = getSuperMappingType(); if ( superMappingType == null ) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityRowIdMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityRowIdMapping.java index 39915952cf..f27d954f37 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityRowIdMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityRowIdMapping.java @@ -11,6 +11,6 @@ package org.hibernate.metamodel.mapping; * * @see org.hibernate.annotations.RowId */ -public interface EntityRowIdMapping extends VirtualModelPart { +public interface EntityRowIdMapping extends VirtualModelPart, SelectableMapping { String getRowIdName(); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ForeignKeyDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ForeignKeyDescriptor.java index 230e93b843..b0cedc601d 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ForeignKeyDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ForeignKeyDescriptor.java @@ -85,6 +85,11 @@ public interface ForeignKeyDescriptor extends VirtualModelPart, ValueMapping { } } + /** + * Compare the 2 values + */ + int compare(Object key1, Object key2); + /** * Create a DomainResult for the referring-side of the fk */ @@ -134,9 +139,16 @@ public interface ForeignKeyDescriptor extends VirtualModelPart, ValueMapping { return visitKeySelectables( offset, consumer ); } - Object getAssociationKeyFromSide( + default Object getAssociationKeyFromSide( Object targetObject, Nature nature, + SharedSessionContractImplementor session) { + return getAssociationKeyFromSide( targetObject, getSide( nature ), session ); + } + + Object getAssociationKeyFromSide( + Object targetObject, + ForeignKeyDescriptor.Side side, SharedSessionContractImplementor session); int visitKeySelectables(int offset, SelectableConsumer consumer); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java index 7b2148e319..1ebfb346e1 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java @@ -11,8 +11,8 @@ import java.util.function.BiConsumer; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.metamodel.model.domain.NavigableRole; -import org.hibernate.spi.NavigablePath; import org.hibernate.query.sqm.sql.internal.DomainResultProducer; +import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.results.graph.DomainResult; @@ -104,6 +104,15 @@ public interface ModelPart extends MappingModelExpressible { void breakDownJdbcValues(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session); + @FunctionalInterface + interface IndexedJdbcValueConsumer { + void consume(int valueIndex, Object value, SelectableMapping jdbcValueMapping); + } + + default void decompose(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { + breakDownJdbcValues( domainValue, valueConsumer, session ); + } + EntityMappingType findContainingEntityMapping(); default boolean areEqual(Object one, Object other, SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableConsumer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableConsumer.java index de8ec3ac47..44ace130bf 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableConsumer.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableConsumer.java @@ -6,6 +6,8 @@ */ package org.hibernate.metamodel.mapping; +import java.util.function.BiConsumer; + /** * Consumer used to visit selectable (column/formula) mappings * @@ -22,6 +24,127 @@ public interface SelectableConsumer { */ void accept(int selectionIndex, SelectableMapping selectableMapping); + /** + * Simple form of visitation over a number of columns by name, using + * a separate {@link SelectableMappings} as a base for additional details. + *

+ * Intended for use in visiting table keys, where we know JdbcMappings, etc. + * from the identifier. + *

+ * The expectation here is for the following details to be available:

    + *
  • {@link SelectableMapping#getContainingTableExpression()}
    • + *
  • {@link SelectableMapping#getSelectionExpression()} (the column name)
    • + *
  • {@link SelectableMapping#getWriteExpression()}
    • + *
  • {@link SelectableMapping#getJdbcMapping()}
    • + *
+ */ + default void accept(String tableName, JdbcMappingContainer base, String[] columnNames) { + assert base.getJdbcTypeCount() == columnNames.length; + + final MutableSelectableMapping mutableSelectableMapping = new MutableSelectableMapping( tableName, base, columnNames ); + mutableSelectableMapping.forEach( this::accept ); + } + + + class MutableSelectableMapping implements SelectableMapping { + private final String tableName; + private final JdbcMappingContainer base; + private final String[] columnNames; + + private int index; + + public MutableSelectableMapping(String tableName, JdbcMappingContainer base, String[] columnNames) { + this.tableName = tableName; + this.base = base; + this.columnNames = columnNames; + + assert base.getJdbcTypeCount() == columnNames.length; + } + + private void forEach(BiConsumer consumer) { + for ( index = 0; index < columnNames.length; index++ ) { + consumer.accept( index, this ); + } + } + + @Override + public String getContainingTableExpression() { + return tableName; + } + + @Override + public String getSelectionExpression() { + return columnNames[index]; + } + + @Override + public JdbcMapping getJdbcMapping() { + return base.getJdbcMappings().get( index ); + } + + @Override + public boolean isFormula() { + return false; + } + + @Override + public boolean isNullable() { + return false; + } + + @Override + public boolean isInsertable() { + // we insert keys + return true; + } + + @Override + public boolean isUpdateable() { + // we never update keys + return false; + } + + @Override + public String getColumnDefinition() { + // we could probably use the details from `base`, but + // this method should really never be called on this object + throw new UnsupportedOperationException(); + } + + @Override + public Long getLength() { + // we could probably use the details from `base`, but + // this method should really never be called on this object + throw new UnsupportedOperationException(); + } + + @Override + public Integer getPrecision() { + // we could probably use the details from `base`, but + // this method should really never be called on this object + return null; + } + + @Override + public Integer getScale() { + // we could probably use the details from `base`, but + // this method should really never be called on this object + return null; + } + + @Override + public String getCustomReadExpression() { + return null; + } + + @Override + public String getCustomWriteExpression() { + return null; + } + } + + + /** * Simple form allowing visitation over a number of column names within a * table. @@ -79,6 +202,21 @@ public interface SelectableConsumer { return false; } + @Override + public boolean isNullable() { + return true; + } + + @Override + public boolean isInsertable() { + return true; + } + + @Override + public boolean isUpdateable() { + return true; + } + @Override public JdbcMapping getJdbcMapping() { return null; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMapping.java index ae0932814a..3a09c5080d 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMapping.java @@ -6,15 +6,57 @@ */ package org.hibernate.metamodel.mapping; +import org.hibernate.Incubating; +import org.hibernate.annotations.ColumnTransformer; + /** * Mapping of a selectable (column/formula) * * @author Christian Beikov */ +@Incubating public interface SelectableMapping extends SqlTypedMapping { + /** + * The name of the table to which this selectable is mapped + */ String getContainingTableExpression(); + + /** + * The selection's expression. This is the column name or formula + */ String getSelectionExpression(); + + /** + * The selection's read expression accounting for formula treatment as well + * as {@link ColumnTransformer#read()} + */ String getCustomReadExpression(); + + /** + * The selection's write expression accounting {@link ColumnTransformer#write()} + * + * @apiNote Always null for formula mappings + */ String getCustomWriteExpression(); + + default String getWriteExpression() { + final String customWriteExpression = getCustomWriteExpression(); + return customWriteExpression != null + ? customWriteExpression + : "?"; + } + + /** + * Is the mapping a formula instead of a physical column? + */ boolean isFormula(); + + /** + * Is the mapping considered nullable? + */ + boolean isNullable(); + + boolean isInsertable(); + + boolean isUpdateable(); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValueMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValueMapping.java index 5c68847a8f..977ceaef75 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValueMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValueMapping.java @@ -32,7 +32,7 @@ public interface ValueMapping extends MappingModelExpressible, JavaTypedExpressi return getMappedType().getMappedJavaType(); } - /**return null; + /** * Treat operation. Asks the ValueMapping to treat itself as the * given `targetType`, if it can. * diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java index 8c86d44550..a12ae3924a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java @@ -27,6 +27,7 @@ import org.hibernate.mapping.Column; import org.hibernate.mapping.Component; import org.hibernate.mapping.Property; import org.hibernate.mapping.Selectable; +import org.hibernate.mapping.Value; import org.hibernate.metamodel.UnsupportedMappingException; import org.hibernate.metamodel.mapping.AttributeMapping; import org.hibernate.metamodel.mapping.AttributeMetadata; @@ -156,6 +157,8 @@ public abstract class AbstractEmbeddableMapping implements EmbeddableMappingType original, original.getPropertyAccess(), original.getValueGeneration(), + selectableMapping.isInsertable(), + selectableMapping.isUpdateable(), selectableMapping ); currentIndex++; @@ -196,7 +199,7 @@ public abstract class AbstractEmbeddableMapping implements EmbeddableMappingType for ( int i = 0; i < subMappings.length; i++ ) { subMappings[i] = selectableMappings.getSelectable( currentIndex++ ); } - attributeMapping = MappingModelCreationHelper.createInverseModelPart( + attributeMapping = (AttributeMapping) MappingModelCreationHelper.createInverseModelPart( (EmbeddableValuedModelPart) attributeMapping, declaringType, declaringTableGroupProducer, @@ -245,8 +248,9 @@ public abstract class AbstractEmbeddableMapping implements EmbeddableMappingType final PropertyAccess propertyAccess = representationStrategy.resolvePropertyAccess( bootPropertyDescriptor ); final AttributeMapping attributeMapping; + final Value value = bootPropertyDescriptor.getValue(); if ( subtype instanceof BasicType ) { - final BasicValue basicValue = (BasicValue) bootPropertyDescriptor.getValue(); + final BasicValue basicValue = (BasicValue) value; final Selectable selectable = basicValue.getColumn(); final String containingTableExpression; final String columnExpression; @@ -277,18 +281,21 @@ public abstract class AbstractEmbeddableMapping implements EmbeddableMappingType final Long length; final Integer precision; final Integer scale; + final boolean nullable; if ( selectable instanceof Column ) { Column column = (Column) selectable; columnDefinition = column.getSqlType(); length = column.getLength(); precision = column.getPrecision(); scale = column.getScale(); + nullable = column.isNullable(); } else { columnDefinition = null; length = null; precision = null; scale = null; + nullable = true; } attributeMapping = MappingModelCreationHelper.buildBasicAttributeMapping( @@ -307,6 +314,9 @@ public abstract class AbstractEmbeddableMapping implements EmbeddableMappingType length, precision, scale, + nullable, + value.isColumnInsertable( 0 ), + value.isColumnUpdateable( 0 ), propertyAccess, compositeType.getCascadeStyle( attributeIndex ), creationProcess @@ -315,12 +325,12 @@ public abstract class AbstractEmbeddableMapping implements EmbeddableMappingType columnPosition++; } else if ( subtype instanceof AnyType ) { - final Any bootValueMapping = (Any) bootPropertyDescriptor.getValue(); + final Any bootValueMapping = (Any) value; final AnyType anyType = (AnyType) subtype; final boolean nullable = bootValueMapping.isNullable(); - final boolean insertable = bootPropertyDescriptor.isInsertable(); - final boolean updateable = bootPropertyDescriptor.isUpdateable(); + final boolean insertable = value.isColumnInsertable( 0 ); + final boolean updateable = value.isColumnUpdateable( 0 ); final boolean includeInOptimisticLocking = bootPropertyDescriptor.isOptimisticLocked(); final CascadeStyle cascadeStyle = compositeType.getCascadeStyle( attributeIndex ); final MutabilityPlan mutabilityPlan; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java new file mode 100644 index 0000000000..ea2f2c7053 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java @@ -0,0 +1,433 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.metamodel.mapping.internal; + +import java.util.HashSet; +import java.util.Set; + +import org.hibernate.annotations.NotFoundAction; +import org.hibernate.engine.FetchStyle; +import org.hibernate.engine.FetchTiming; +import org.hibernate.internal.util.StringHelper; +import org.hibernate.mapping.Collection; +import org.hibernate.mapping.IndexedCollection; +import org.hibernate.mapping.OneToMany; +import org.hibernate.mapping.PersistentClass; +import org.hibernate.mapping.ToOne; +import org.hibernate.mapping.Value; +import org.hibernate.metamodel.mapping.AssociationKey; +import org.hibernate.metamodel.mapping.EntityIdentifierMapping; +import org.hibernate.metamodel.mapping.EntityMappingType; +import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; +import org.hibernate.metamodel.model.domain.NavigableRole; +import org.hibernate.persister.collection.CollectionPersister; +import org.hibernate.persister.entity.PropertyMapping; +import org.hibernate.spi.NavigablePath; +import org.hibernate.sql.ast.spi.FromClauseAccess; +import org.hibernate.sql.ast.spi.SqlAliasBase; +import org.hibernate.sql.ast.spi.SqlAstCreationContext; +import org.hibernate.sql.ast.spi.SqlExpressionResolver; +import org.hibernate.sql.ast.tree.from.PluralTableGroup; +import org.hibernate.sql.ast.tree.from.StandardTableGroup; +import org.hibernate.sql.ast.tree.from.TableGroup; +import org.hibernate.sql.ast.tree.from.TableGroupProducer; +import org.hibernate.sql.ast.tree.from.TableReference; +import org.hibernate.sql.results.graph.DomainResult; +import org.hibernate.sql.results.graph.DomainResultCreationState; +import org.hibernate.sql.results.graph.FetchOptions; +import org.hibernate.sql.results.graph.FetchParent; +import org.hibernate.sql.results.graph.entity.EntityFetch; +import org.hibernate.sql.results.graph.entity.internal.EntityFetchJoinedImpl; +import org.hibernate.type.CompositeType; +import org.hibernate.type.Type; + +/** + * Base support for EntityCollectionPart implementations + * + * @author Steve Ebersole + */ +public abstract class AbstractEntityCollectionPart implements EntityCollectionPart, FetchOptions, TableGroupProducer { + private final NavigableRole navigableRole; + private final Nature nature; + private final CollectionPersister collectionDescriptor; + private final EntityMappingType associatedEntityTypeDescriptor; + private final NotFoundAction notFoundAction; + + private final Set targetKeyPropertyNames; + + public AbstractEntityCollectionPart( + Nature nature, + Collection collectionBootDescriptor, + CollectionPersister collectionDescriptor, + EntityMappingType associatedEntityTypeDescriptor, + NotFoundAction notFoundAction, + MappingModelCreationProcess creationProcess) { + this.navigableRole = collectionDescriptor.getNavigableRole().appendContainer( nature.getName() ); + this.nature = nature; + this.collectionDescriptor = collectionDescriptor; + this.associatedEntityTypeDescriptor = associatedEntityTypeDescriptor; + this.notFoundAction = notFoundAction; + + this.targetKeyPropertyNames = resolveTargetKeyPropertyNames( + nature, + collectionDescriptor, + collectionBootDescriptor, + associatedEntityTypeDescriptor, + creationProcess + ); + } + + @Override + public String toString() { + return "EntityCollectionPart(" + navigableRole.getFullPath() + ")@" + System.identityHashCode( this ); + } + + public CollectionPersister getCollectionDescriptor() { + return collectionDescriptor; + } + + protected Set getTargetKeyPropertyNames() { + return targetKeyPropertyNames; + } + + @Override + public NavigableRole getNavigableRole() { + return navigableRole; + } + + @Override + public Nature getNature() { + return nature; + } + + @Override + public String getFetchableName() { + return nature.getName(); + } + + @Override + public EntityMappingType getAssociatedEntityMappingType() { + return associatedEntityTypeDescriptor; + } + + @Override + public NotFoundAction getNotFoundAction() { + return notFoundAction; + } + + @Override + public FetchOptions getMappedFetchOptions() { + return this; + } + + @Override + public FetchStyle getStyle() { + return FetchStyle.JOIN; + } + + @Override + public FetchTiming getTiming() { + return FetchTiming.IMMEDIATE; + } + + @Override + public boolean incrementFetchDepth() { + // the collection itself already increments the depth + return false; + } + + @Override + public boolean isOptional() { + return false; + } + + @Override + public boolean isUnwrapProxy() { + return false; + } + + @Override + public EntityMappingType findContainingEntityMapping() { + return collectionDescriptor.getAttributeMapping().findContainingEntityMapping(); + } + + @Override + public int getNumberOfFetchables() { + return getAssociatedEntityMappingType().getNumberOfFetchables(); + } + + @Override + public DomainResult createDomainResult( + NavigablePath navigablePath, + TableGroup tableGroup, + String resultVariable, + DomainResultCreationState creationState) { + final TableGroup partTableGroup = resolveTableGroup( navigablePath, creationState ); + return associatedEntityTypeDescriptor.createDomainResult( navigablePath, partTableGroup, resultVariable, creationState ); + } + + @Override + public EntityFetch generateFetch( + FetchParent fetchParent, + NavigablePath fetchablePath, + FetchTiming fetchTiming, + boolean selected, + String resultVariable, + DomainResultCreationState creationState) { + final AssociationKey associationKey = resolveFetchAssociationKey(); + final boolean added = creationState.registerVisitedAssociationKey( associationKey ); + + final TableGroup partTableGroup = resolveTableGroup( fetchablePath, creationState ); + final EntityFetchJoinedImpl fetch = new EntityFetchJoinedImpl( + fetchParent, + this, + partTableGroup, + fetchablePath, + creationState + ); + + if ( added ) { + creationState.removeVisitedAssociationKey( associationKey ); + } + + return fetch; + } + + protected abstract AssociationKey resolveFetchAssociationKey(); + + private TableGroup resolveTableGroup(NavigablePath fetchablePath, DomainResultCreationState creationState) { + final FromClauseAccess fromClauseAccess = creationState.getSqlAstCreationState().getFromClauseAccess(); + return fromClauseAccess.resolveTableGroup( fetchablePath, (np) -> { + final PluralTableGroup parentTableGroup = (PluralTableGroup) fromClauseAccess.getTableGroup( np.getParent() ); + switch ( nature ) { + case ELEMENT: { + return parentTableGroup.getElementTableGroup(); + } + case INDEX: { + return resolveIndexTableGroup( parentTableGroup, fetchablePath, fromClauseAccess, creationState ); + } + } + + throw new IllegalStateException( "Could not find table group for: " + np ); + } ); + } + + private TableGroup resolveIndexTableGroup( + PluralTableGroup collectionTableGroup, + NavigablePath fetchablePath, + FromClauseAccess fromClauseAccess, + DomainResultCreationState creationState) { + + // todo (mutation) : account for `@MapKey( name = "someManyToOne" )` + return collectionTableGroup.getIndexTableGroup(); + } + + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // TableGroupProducer + + @Override + public String getSqlAliasStem() { + return getCollectionDescriptor().getAttributeMapping().getSqlAliasStem(); + } + + @Override + public boolean containsTableReference(String tableExpression) { + return getCollectionDescriptor().getAttributeMapping().containsTableReference( tableExpression ); + } + + public TableGroup createTableGroupInternal( + boolean canUseInnerJoins, + NavigablePath navigablePath, + boolean fetched, + String sourceAlias, + final SqlAliasBase sqlAliasBase, + SqlExpressionResolver sqlExpressionResolver, + SqlAstCreationContext creationContext) { + final TableReference primaryTableReference = getEntityMappingType().createPrimaryTableReference( + sqlAliasBase, + sqlExpressionResolver, + creationContext + ); + + return new StandardTableGroup( + canUseInnerJoins, + navigablePath, + this, + fetched, + sourceAlias, + primaryTableReference, + true, + sqlAliasBase, + (tableExpression) -> getEntityMappingType().containsTableReference( tableExpression ), + (tableExpression, tg) -> getEntityMappingType().createTableReferenceJoin( + tableExpression, + sqlAliasBase, + primaryTableReference, + sqlExpressionResolver, + creationContext + ), + creationContext.getSessionFactory() + ); + } + + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Initialization + + private static Set resolveTargetKeyPropertyNames( + Nature nature, + CollectionPersister collectionDescriptor, + Collection collectionBootDescriptor, + EntityMappingType elementTypeDescriptor, + MappingModelCreationProcess creationProcess) { + final Value bootModelValue = nature == Nature.INDEX + ? ( (IndexedCollection) collectionBootDescriptor ).getIndex() + : collectionBootDescriptor.getElement(); + final PersistentClass entityBinding = creationProcess.getCreationContext() + .getMetadata() + .getEntityBinding( elementTypeDescriptor.getEntityName() ); + + final String referencedPropertyName; + if ( bootModelValue instanceof OneToMany ) { + final String mappedByProperty = collectionDescriptor.getMappedByProperty(); + referencedPropertyName = StringHelper.isEmpty( mappedByProperty ) + ? null + : mappedByProperty; + } + else { + final ToOne toOne = (ToOne) bootModelValue; + referencedPropertyName = toOne.getReferencedPropertyName(); + } + + + if ( referencedPropertyName == null ) { + final Set targetKeyPropertyNames = new HashSet<>( 2 ); + targetKeyPropertyNames.add( EntityIdentifierMapping.ROLE_LOCAL_NAME ); + final Type propertyType; + if ( entityBinding.getIdentifierMapper() == null ) { + propertyType = entityBinding.getIdentifier().getType(); + } + else { + propertyType = entityBinding.getIdentifierMapper().getType(); + } + if ( entityBinding.getIdentifierProperty() == null ) { + final CompositeType compositeType; + if ( propertyType.isComponentType() && ( compositeType = (CompositeType) propertyType ).isEmbedded() + && compositeType.getPropertyNames().length == 1 ) { + ToOneAttributeMapping.addPrefixedPropertyNames( + targetKeyPropertyNames, + compositeType.getPropertyNames()[0], + compositeType.getSubtypes()[0], + creationProcess.getCreationContext().getSessionFactory() + ); + ToOneAttributeMapping.addPrefixedPropertyNames( + targetKeyPropertyNames, + ForeignKeyDescriptor.PART_NAME, + compositeType.getSubtypes()[0], + creationProcess.getCreationContext().getSessionFactory() + ); + } + else { + ToOneAttributeMapping.addPrefixedPropertyNames( + targetKeyPropertyNames, + null, + propertyType, + creationProcess.getCreationContext().getSessionFactory() + ); + ToOneAttributeMapping.addPrefixedPropertyNames( + targetKeyPropertyNames, + ForeignKeyDescriptor.PART_NAME, + propertyType, + creationProcess.getCreationContext().getSessionFactory() + ); + } + } + else { + ToOneAttributeMapping.addPrefixedPropertyNames( + targetKeyPropertyNames, + entityBinding.getIdentifierProperty().getName(), + propertyType, + creationProcess.getCreationContext().getSessionFactory() + ); + ToOneAttributeMapping.addPrefixedPropertyNames( + targetKeyPropertyNames, + ForeignKeyDescriptor.PART_NAME, + propertyType, + creationProcess.getCreationContext().getSessionFactory() + ); + } + return targetKeyPropertyNames; + } + else if ( bootModelValue instanceof OneToMany ) { + final Set targetKeyPropertyNames = new HashSet<>( 2 ); + int dotIndex = -1; + while ( ( dotIndex = referencedPropertyName.indexOf( '.', dotIndex + 1 ) ) != -1 ) { + targetKeyPropertyNames.add( referencedPropertyName.substring( 0, dotIndex ) ); + } + final Type propertyType = ( (PropertyMapping) elementTypeDescriptor.getEntityPersister() ) + .toType( referencedPropertyName ); + ToOneAttributeMapping.addPrefixedPropertyNames( + targetKeyPropertyNames, + referencedPropertyName, + propertyType, + creationProcess.getCreationContext().getSessionFactory() + ); + ToOneAttributeMapping.addPrefixedPropertyNames( + targetKeyPropertyNames, + ForeignKeyDescriptor.PART_NAME, + propertyType, + creationProcess.getCreationContext().getSessionFactory() + ); + return targetKeyPropertyNames; + } + else { + final Type propertyType = entityBinding.getRecursiveProperty( referencedPropertyName ).getType(); + final CompositeType compositeType; + if ( propertyType.isComponentType() && ( compositeType = (CompositeType) propertyType ).isEmbedded() + && compositeType.getPropertyNames().length == 1 ) { + final Set targetKeyPropertyNames = new HashSet<>( 2 ); + ToOneAttributeMapping.addPrefixedPropertyNames( + targetKeyPropertyNames, + compositeType.getPropertyNames()[0], + compositeType.getSubtypes()[0], + creationProcess.getCreationContext().getSessionFactory() + ); + ToOneAttributeMapping.addPrefixedPropertyNames( + targetKeyPropertyNames, + ForeignKeyDescriptor.PART_NAME, + compositeType.getSubtypes()[0], + creationProcess.getCreationContext().getSessionFactory() + ); + return targetKeyPropertyNames; + } + else { + final String mapsIdAttributeName; + if ( ( mapsIdAttributeName = ToOneAttributeMapping.findMapsIdPropertyName( elementTypeDescriptor, referencedPropertyName ) ) != null ) { + final Set targetKeyPropertyNames = new HashSet<>( 2 ); + targetKeyPropertyNames.add( referencedPropertyName ); + ToOneAttributeMapping.addPrefixedPropertyNames( + targetKeyPropertyNames, + mapsIdAttributeName, + elementTypeDescriptor.getEntityPersister().getIdentifierType(), + creationProcess.getCreationContext().getSessionFactory() + ); + ToOneAttributeMapping.addPrefixedPropertyNames( + targetKeyPropertyNames, + ForeignKeyDescriptor.PART_NAME, + elementTypeDescriptor.getEntityPersister().getIdentifierType(), + creationProcess.getCreationContext().getSessionFactory() + ); + return targetKeyPropertyNames; + } + else { + return Set.of( referencedPropertyName, ForeignKeyDescriptor.PART_NAME ); + } + } + } + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java index 9ab26ca262..b7fc951114 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java @@ -30,7 +30,6 @@ import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; -import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableReference; @@ -43,8 +42,6 @@ import org.hibernate.sql.results.graph.basic.BasicFetch; import org.hibernate.type.MetaType; import org.hibernate.type.descriptor.java.JavaType; -import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey; - /** * Acts as a ModelPart for the discriminator portion of an any-valued mapping * @@ -62,8 +59,9 @@ public class AnyDiscriminatorPart implements BasicValuedModelPart, FetchOptions, private final Long length; private final Integer precision; private final Integer scale; - private final boolean nullable; + private boolean isInsertable; + private boolean isUpdateable; private final MetaType metaType; public AnyDiscriminatorPart( @@ -75,7 +73,8 @@ public class AnyDiscriminatorPart implements BasicValuedModelPart, FetchOptions, Long length, Integer precision, Integer scale, - boolean nullable, + boolean insertable, + boolean updateable, MetaType metaType) { this.navigableRole = partRole; this.declaringType = declaringType; @@ -85,7 +84,8 @@ public class AnyDiscriminatorPart implements BasicValuedModelPart, FetchOptions, this.length = length; this.precision = precision; this.scale = scale; - this.nullable = nullable; + this.isInsertable = insertable; + this.isUpdateable = updateable; this.metaType = metaType; } @@ -112,6 +112,21 @@ public class AnyDiscriminatorPart implements BasicValuedModelPart, FetchOptions, return false; } + @Override + public boolean isNullable() { + return false; + } + + @Override + public boolean isInsertable() { + return isInsertable; + } + + @Override + public boolean isUpdateable() { + return isUpdateable; + } + @Override public String getCustomReadExpression() { return null; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java index 8f6ceff73e..52c3ff325f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java @@ -16,18 +16,17 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.mapping.IndexedConsumer; import org.hibernate.metamodel.mapping.BasicValuedModelPart; -import org.hibernate.metamodel.mapping.SelectableConsumer; import org.hibernate.metamodel.mapping.DiscriminatedAssociationModelPart; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingType; +import org.hibernate.metamodel.mapping.SelectableConsumer; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; -import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableReference; @@ -56,13 +55,22 @@ public class AnyKeyPart implements BasicValuedModelPart, FetchOptions { private final Integer precision; private final Integer scale; private final boolean nullable; + private boolean isInsertable; + private boolean isUpdateable; private final JdbcMapping jdbcMapping; public AnyKeyPart( NavigableRole navigableRole, - DiscriminatedAssociationModelPart anyPart, String table, + DiscriminatedAssociationModelPart anyPart, + String table, String column, - String columnDefinition, Long length, Integer precision, Integer scale, boolean nullable, + String columnDefinition, + Long length, + Integer precision, + Integer scale, + boolean nullable, + boolean insertable, + boolean updateable, JdbcMapping jdbcMapping) { this.navigableRole = navigableRole; this.table = table; @@ -73,6 +81,8 @@ public class AnyKeyPart implements BasicValuedModelPart, FetchOptions { this.precision = precision; this.scale = scale; this.nullable = nullable; + this.isInsertable = insertable; + this.isUpdateable = updateable; this.jdbcMapping = jdbcMapping; } @@ -91,6 +101,21 @@ public class AnyKeyPart implements BasicValuedModelPart, FetchOptions { return false; } + @Override + public boolean isNullable() { + return nullable; + } + + @Override + public boolean isInsertable() { + return isInsertable; + } + + @Override + public boolean isUpdateable() { + return isUpdateable; + } + @Override public String getCustomReadExpression() { return null; @@ -250,7 +275,7 @@ public class AnyKeyPart implements BasicValuedModelPart, FetchOptions { @Override public Object disassemble(Object value, SharedSessionContractImplementor session) { - return anyPart.disassemble( value, session ); + return value; } @Override @@ -260,7 +285,8 @@ public class AnyKeyPart implements BasicValuedModelPart, FetchOptions { int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return anyPart.forEachDisassembledJdbcValue( value, clause, offset, valuesConsumer, session ); + valuesConsumer.consume( offset, value, jdbcMapping ); + return 1; } @Override @@ -269,6 +295,7 @@ public class AnyKeyPart implements BasicValuedModelPart, FetchOptions { TableGroup tableGroup, String resultVariable, DomainResultCreationState creationState) { + // todo (6.2) : how is this correct? return anyPart.createDomainResult( navigablePath, tableGroup, resultVariable, creationState ); } @@ -277,6 +304,7 @@ public class AnyKeyPart implements BasicValuedModelPart, FetchOptions { NavigablePath navigablePath, TableGroup tableGroup, DomainResultCreationState creationState) { + // todo (6.2) : how is this correct? anyPart.applySqlSelections( navigablePath, tableGroup, creationState ); } @@ -286,6 +314,7 @@ public class AnyKeyPart implements BasicValuedModelPart, FetchOptions { TableGroup tableGroup, DomainResultCreationState creationState, BiConsumer selectionConsumer) { + // todo (6.2) : how is this correct? anyPart.applySqlSelections( navigablePath, tableGroup, creationState, selectionConsumer ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java index 3482cff490..79d4314d3f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java @@ -28,7 +28,6 @@ import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; -import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.results.graph.DomainResult; @@ -60,6 +59,9 @@ public class BasicAttributeMapping private final Integer scale; private final JdbcMapping jdbcMapping; + private final boolean nullable; + private final boolean insertable; + private final boolean updateable; private final JavaType domainTypeDescriptor; @@ -79,6 +81,9 @@ public class BasicAttributeMapping Long length, Integer precision, Integer scale, + boolean nullable, + boolean insertable, + boolean updateable, JdbcMapping jdbcMapping, ManagedMappingType declaringType, PropertyAccess propertyAccess, @@ -101,6 +106,9 @@ public class BasicAttributeMapping this.length = length; this.precision = precision; this.scale = scale; + this.nullable = nullable; + this.insertable = insertable; + this.updateable = updateable; this.jdbcMapping = jdbcMapping; this.domainTypeDescriptor = jdbcMapping.getJavaTypeDescriptor(); @@ -119,6 +127,8 @@ public class BasicAttributeMapping BasicValuedModelPart original, PropertyAccess propertyAccess, ValueGeneration valueGeneration, + boolean insertable, + boolean updateable, SelectableMapping selectableMapping) { String attributeName = null; int stateArrayPosition = 0; @@ -153,6 +163,9 @@ public class BasicAttributeMapping selectableMapping.getLength(), selectableMapping.getPrecision(), selectableMapping.getScale(), + selectableMapping.isNullable(), + insertable, + updateable, original.getJdbcMapping(), declaringType, propertyAccess, @@ -185,6 +198,21 @@ public class BasicAttributeMapping return isFormula; } + @Override + public boolean isNullable() { + return nullable; + } + + @Override + public boolean isInsertable() { + return insertable; + } + + @Override + public boolean isUpdateable() { + return updateable; + } + @Override public String getCustomReadExpression() { return customReadExpression; @@ -250,7 +278,7 @@ public class BasicAttributeMapping private SqlSelection resolveSqlSelection( NavigablePath navigablePath, TableGroup tableGroup, - boolean allowFkOptimization, + @SuppressWarnings("SameParameterValue") boolean allowFkOptimization, FetchParent fetchParent, DomainResultCreationState creationState) { final SqlExpressionResolver expressionResolver = creationState.getSqlAstCreationState().getSqlExpressionResolver(); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java index b4c6981ae2..d514d378d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java @@ -19,7 +19,6 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.mapping.IndexedConsumer; import org.hibernate.mapping.PersistentClass; import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping; -import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.EntityIdentifierMapping; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.JdbcMapping; @@ -34,7 +33,6 @@ import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; -import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableReference; @@ -67,6 +65,8 @@ public class BasicEntityIdentifierMappingImpl implements BasicEntityIdentifierMa private final Long length; private final Integer precision; private final Integer scale; + private final boolean insertable; + private final boolean updateable; private final BasicType idType; @@ -82,12 +82,16 @@ public class BasicEntityIdentifierMappingImpl implements BasicEntityIdentifierMa Long length, Integer precision, Integer scale, + boolean insertable, + boolean updateable, BasicType idType, MappingModelCreationProcess creationProcess) { this.columnDefinition = columnDefinition; this.length = length; this.precision = precision; this.scale = scale; + this.insertable = insertable; + this.updateable = updateable; assert attributeName != null; this.attributeName = attributeName; this.rootTable = rootTable; @@ -113,6 +117,11 @@ public class BasicEntityIdentifierMappingImpl implements BasicEntityIdentifierMa ); } + @Override + public String toString() { + return "EntityIdentifierMapping(" + idRole.getFullPath() + ")"; + } + @Override public PropertyAccess getPropertyAccess() { return propertyAccess; @@ -287,6 +296,21 @@ public class BasicEntityIdentifierMappingImpl implements BasicEntityIdentifierMa return false; } + @Override + public boolean isNullable() { + return false; + } + + @Override + public boolean isInsertable() { + return updateable; + } + + @Override + public boolean isUpdateable() { + return insertable; + } + @Override public String getCustomReadExpression() { return null; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java index ac36a12f9b..d32eb0ff7a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java @@ -16,11 +16,11 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.mapping.IndexedConsumer; import org.hibernate.metamodel.mapping.BasicValuedModelPart; import org.hibernate.metamodel.mapping.CollectionPart; -import org.hibernate.metamodel.mapping.SelectableConsumer; -import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingType; +import org.hibernate.metamodel.mapping.SelectableConsumer; +import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.spi.EntityIdentifierNavigablePath; @@ -28,7 +28,6 @@ import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; -import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.from.PluralTableGroup; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableReference; @@ -90,6 +89,21 @@ public class BasicValuedCollectionPart return selectableMapping.isFormula(); } + @Override + public boolean isNullable() { + return selectableMapping.isNullable(); + } + + @Override + public boolean isInsertable() { + return selectableMapping.isInsertable(); + } + + @Override + public boolean isUpdateable() { + return selectableMapping.isUpdateable(); + } + @Override public String getCustomReadExpression() { return selectableMapping.getCustomReadExpression(); @@ -287,7 +301,12 @@ public class BasicValuedCollectionPart @Override public void breakDownJdbcValues(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { - valueConsumer.consume( domainValue, this ); + valueConsumer.consume( disassemble( domainValue, session ), this ); + } + + @Override + public void decompose(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { + valueConsumer.consume( disassemble( domainValue, session ), this ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CaseStatementDiscriminatorMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CaseStatementDiscriminatorMappingImpl.java index fb32b597d5..e31dd0723d 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CaseStatementDiscriminatorMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CaseStatementDiscriminatorMappingImpl.java @@ -204,6 +204,21 @@ public class CaseStatementDiscriminatorMappingImpl extends AbstractDiscriminator return null; } + @Override + public boolean isNullable() { + return false; + } + + @Override + public boolean isInsertable() { + return false; + } + + @Override + public boolean isUpdateable() { + return false; + } + @Override public String getContainingTableExpression() { throw new UnsupportedOperationException(); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java index 2244fcbc40..0dbe26f474 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java @@ -17,6 +17,7 @@ import org.hibernate.metamodel.mapping.CollectionIdentifierDescriptor; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingType; +import org.hibernate.metamodel.mapping.SelectableConsumer; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.spi.NavigablePath; @@ -26,7 +27,6 @@ import org.hibernate.sql.ast.spi.SqlAstCreationContext; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; -import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.DomainResultCreationState; @@ -80,6 +80,21 @@ public class CollectionIdentifierDescriptorImpl implements CollectionIdentifierD return false; } + @Override + public boolean isInsertable() { + return true; + } + + @Override + public boolean isUpdateable() { + return false; + } + + @Override + public boolean isNullable() { + return false; + } + @Override public String getCustomReadExpression() { return null; @@ -171,6 +186,12 @@ public class CollectionIdentifierDescriptorImpl implements CollectionIdentifierD ); } + @Override + public int forEachSelectable(int offset, SelectableConsumer consumer) { + consumer.accept( offset, this ); + return 1; + } + @Override public void breakDownJdbcValues(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { valueConsumer.consume( domainValue, this ); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java index 71ad4305a7..ac4d9904dd 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java @@ -7,6 +7,7 @@ package org.hibernate.metamodel.mapping.internal; import java.io.Serializable; +import java.util.Objects; import java.util.function.BiConsumer; import java.util.function.Consumer; @@ -298,18 +299,12 @@ public class DiscriminatedAssociationAttributeMapping @Override public void breakDownJdbcValues(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { - final EntityMappingType concreteMappingType = determineConcreteType( domainValue, session ); + discriminatorMapping.breakDownJdbcValues( domainValue, valueConsumer, session ); + } - final Object discriminator = discriminatorMapping - .getModelPart() - .resolveDiscriminatorForEntityType( concreteMappingType ); - final Object disassembledDiscriminator = discriminatorMapping.getDiscriminatorPart().disassemble( discriminator, session ); - valueConsumer.consume( disassembledDiscriminator, discriminatorMapping.getDiscriminatorPart() ); - - final EntityIdentifierMapping identifierMapping = concreteMappingType.getIdentifierMapping(); - final Object identifier = identifierMapping.getIdentifier( domainValue ); - final Object disassembledKey = discriminatorMapping.getKeyPart().disassemble( identifier, session ); - valueConsumer.consume( disassembledKey, discriminatorMapping.getKeyPart() ); + @Override + public void decompose(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { + discriminatorMapping.decompose( domainValue, valueConsumer, session ); } @Override @@ -341,7 +336,7 @@ public class DiscriminatedAssociationAttributeMapping consumer.accept( getKeyPart() ); } - public static class MutabilityPlanImpl implements MutabilityPlan { + public static class MutabilityPlanImpl implements MutabilityPlan { // for now use the AnyType for consistency with write-operations private final AnyType anyType; @@ -406,13 +401,7 @@ public class DiscriminatedAssociationAttributeMapping SqlExpressionResolver sqlExpressionResolver, FromClauseAccess fromClauseAccess, SqlAstCreationContext creationContext) { - final SqlAstJoinType joinType; - if ( requestedJoinType == null ) { - joinType = SqlAstJoinType.INNER; - } - else { - joinType = requestedJoinType; - } + final SqlAstJoinType joinType = Objects.requireNonNullElse( requestedJoinType, SqlAstJoinType.INNER ); final TableGroup tableGroup = createRootTableGroupJoin( navigablePath, lhs, diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java index bc1c98b305..ab69d0d7d0 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java @@ -94,7 +94,8 @@ public class DiscriminatedAssociationMapping implements MappingType, FetchOption metaColumn.getLength(), metaColumn.getPrecision(), metaColumn.getScale(), - bootValueMapping.isNullable(), + bootValueMapping.isColumnInsertable( 0 ), + bootValueMapping.isColumnUpdateable( 0 ), (MetaType) anyType.getDiscriminatorType() ); @@ -110,6 +111,8 @@ public class DiscriminatedAssociationMapping implements MappingType, FetchOption keyColumn.getPrecision(), keyColumn.getScale(), bootValueMapping.isNullable(), + bootValueMapping.isColumnInsertable( 1 ), + bootValueMapping.isColumnUpdateable( 1 ), keyType ); @@ -129,10 +132,9 @@ public class DiscriminatedAssociationMapping implements MappingType, FetchOption private final DiscriminatedAssociationModelPart modelPart; private final AnyDiscriminatorPart discriminatorPart; private final BasicValuedModelPart keyPart; - private final JavaType baseAssociationJtd; - private final FetchTiming fetchTiming; + private final SessionFactoryImplementor sessionFactory; private static class ValueMapping { private final Object discriminatorValue; @@ -159,6 +161,7 @@ public class DiscriminatedAssociationMapping implements MappingType, FetchOption this.keyPart = keyPart; this.baseAssociationJtd = baseAssociationJtd; this.fetchTiming = fetchTiming; + this.sessionFactory = sessionFactory; final RuntimeMetamodels runtimeMetamodels = sessionFactory.getRuntimeMetamodels(); discriminatorValueMappings.forEach( @@ -203,6 +206,58 @@ public class DiscriminatedAssociationMapping implements MappingType, FetchOption return null; } + public void breakDownJdbcValues(Object domainValue, ModelPart.JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { + if ( domainValue == null ) { + valueConsumer.consume( null, getDiscriminatorPart() ); + valueConsumer.consume( null, getKeyPart() ); + return; + } + + final EntityMappingType concreteMappingType = determineConcreteType( domainValue, session ); + + final Object discriminator = getModelPart().resolveDiscriminatorForEntityType( concreteMappingType ); + final Object disassembledDiscriminator = getDiscriminatorPart().disassemble( discriminator, session ); + valueConsumer.consume( disassembledDiscriminator, getDiscriminatorPart() ); + + final EntityIdentifierMapping identifierMapping = concreteMappingType.getIdentifierMapping(); + final Object identifier = identifierMapping.getIdentifier( domainValue ); + final Object disassembledKey = getKeyPart().disassemble( identifier, session ); + valueConsumer.consume( disassembledKey, getKeyPart() ); + } + + public void decompose( + Object domainValue, + ModelPart.JdbcValueConsumer valueConsumer, + SharedSessionContractImplementor session) { + if ( domainValue == null ) { + valueConsumer.consume( null, getDiscriminatorPart() ); + valueConsumer.consume( null, getKeyPart() ); + return; + } + + final EntityMappingType concreteMappingType = determineConcreteType( domainValue, session ); + + final Object discriminator = getModelPart().resolveDiscriminatorForEntityType( concreteMappingType ); + getDiscriminatorPart().decompose( discriminator, valueConsumer, session ); + + final EntityIdentifierMapping identifierMapping = concreteMappingType.getIdentifierMapping(); + final Object identifier = identifierMapping.getIdentifier( domainValue ); + getKeyPart().decompose( identifier, valueConsumer, session ); + } + + private EntityMappingType determineConcreteType(Object entity, SharedSessionContractImplementor session) { + final String entityName; + if ( session == null ) { + entityName = sessionFactory.bestGuessEntityName( entity ); + } + else { + entityName = session.bestGuessEntityName( entity ); + } + return sessionFactory + .getRuntimeMetamodels() + .getEntityMappingType( entityName ); + } + public void forEachConcreteType(Consumer consumer) { discriminatorValueMappings.forEach( valueMapping -> consumer.accept( valueMapping.entityMapping ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java index e354a83539..8e864b55e3 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java @@ -10,6 +10,7 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; import org.hibernate.engine.FetchTiming; +import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.mapping.Any; import org.hibernate.mapping.IndexedConsumer; @@ -24,14 +25,14 @@ import org.hibernate.metamodel.mapping.SelectableConsumer; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.spi.NavigablePath; +import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.spi.SqlAliasBaseGenerator; import org.hibernate.sql.ast.spi.SqlAstCreationContext; import org.hibernate.sql.ast.spi.SqlExpressionResolver; -import org.hibernate.sql.ast.tree.from.StandardVirtualTableGroup; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlSelection; +import org.hibernate.sql.ast.tree.from.StandardVirtualTableGroup; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableGroupJoin; import org.hibernate.sql.ast.tree.predicate.Predicate; @@ -49,6 +50,7 @@ import org.hibernate.type.descriptor.java.JavaType; */ public class DiscriminatedCollectionPart implements DiscriminatedAssociationModelPart, CollectionPart { private final Nature nature; + private final SessionFactoryImplementor sessionFactory; private final NavigableRole partRole; private final CollectionPersister collectionDescriptor; @@ -73,6 +75,8 @@ public class DiscriminatedCollectionPart implements DiscriminatedAssociationMode bootValueMapping, creationProcess ); + + sessionFactory = creationProcess.getCreationContext().getSessionFactory(); } @Override @@ -252,7 +256,12 @@ public class DiscriminatedCollectionPart implements DiscriminatedAssociationMode @Override public void breakDownJdbcValues(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { - discriminatorMapping.getDiscriminatorPart().breakDownJdbcValues( domainValue, valueConsumer, session ); + discriminatorMapping.breakDownJdbcValues( domainValue, valueConsumer, session ); + } + + @Override + public void decompose(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { + discriminatorMapping.decompose( domainValue, valueConsumer, session ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java index c95673c4e1..a60797b0b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java @@ -33,6 +33,7 @@ import org.hibernate.mapping.Component; import org.hibernate.mapping.IndexedConsumer; import org.hibernate.mapping.Property; import org.hibernate.mapping.Selectable; +import org.hibernate.mapping.Value; import org.hibernate.metamodel.mapping.AttributeMapping; import org.hibernate.metamodel.mapping.AttributeMetadata; import org.hibernate.metamodel.mapping.AttributeMetadataAccess; @@ -81,9 +82,11 @@ public class EmbeddableMappingTypeImpl extends AbstractEmbeddableMapping impleme public static EmbeddableMappingTypeImpl from( Component bootDescriptor, CompositeType compositeType, + boolean[] insertability, + boolean[] updateability, Function embeddedPartBuilder, MappingModelCreationProcess creationProcess) { - return from( bootDescriptor, compositeType, null, null, embeddedPartBuilder, creationProcess ); + return from( bootDescriptor, compositeType, null, null, insertability, updateability, embeddedPartBuilder, creationProcess ); } public static EmbeddableMappingTypeImpl from( @@ -91,6 +94,8 @@ public class EmbeddableMappingTypeImpl extends AbstractEmbeddableMapping impleme CompositeType compositeType, String rootTableExpression, String[] rootTableKeyColumnNames, + boolean[] insertability, + boolean[] updateability, Function embeddedPartBuilder, MappingModelCreationProcess creationProcess) { final RuntimeModelCreationContext creationContext = creationProcess.getCreationContext(); @@ -113,6 +118,8 @@ public class EmbeddableMappingTypeImpl extends AbstractEmbeddableMapping impleme compositeType, rootTableExpression, rootTableKeyColumnNames, + insertability, + updateability, creationProcess ) ); @@ -199,6 +206,8 @@ public class EmbeddableMappingTypeImpl extends AbstractEmbeddableMapping impleme CompositeType compositeType, String rootTableExpression, String[] rootTableKeyColumnNames, + boolean[] insertability, + boolean[] updateability, MappingModelCreationProcess creationProcess) { // for some reason I cannot get this to work, though only a single test fails - `CompositeElementTest` // return finishInitialization( @@ -245,8 +254,9 @@ public class EmbeddableMappingTypeImpl extends AbstractEmbeddableMapping impleme final AttributeMapping attributeMapping; final Type subtype = subtypes[attributeIndex]; + final Value value = bootPropertyDescriptor.getValue(); if ( subtype instanceof BasicType ) { - final BasicValue basicValue = (BasicValue) bootPropertyDescriptor.getValue(); + final BasicValue basicValue = (BasicValue) value; final Selectable selectable = basicValue.getColumn(); final String containingTableExpression; final String columnExpression; @@ -279,18 +289,21 @@ public class EmbeddableMappingTypeImpl extends AbstractEmbeddableMapping impleme final Long length; final Integer precision; final Integer scale; + final boolean nullable; if ( selectable instanceof Column ) { Column column = (Column) selectable; columnDefinition = column.getSqlType(); length = column.getLength(); precision = column.getPrecision(); scale = column.getScale(); + nullable = column.isNullable(); } else { columnDefinition = null; length = null; precision = null; scale = null; + nullable = true; } attributeMapping = MappingModelCreationHelper.buildBasicAttributeMapping( bootPropertyDescriptor.getName(), @@ -308,6 +321,9 @@ public class EmbeddableMappingTypeImpl extends AbstractEmbeddableMapping impleme length, precision, scale, + nullable, + insertability[columnPosition], + updateability[columnPosition], representationStrategy.resolvePropertyAccess( bootPropertyDescriptor ), compositeType.getCascadeStyle( attributeIndex ), creationProcess @@ -316,19 +332,19 @@ public class EmbeddableMappingTypeImpl extends AbstractEmbeddableMapping impleme columnPosition++; } else if ( subtype instanceof AnyType ) { - final Any bootValueMapping = (Any) bootPropertyDescriptor.getValue(); + final Any bootValueMapping = (Any) value; final AnyType anyType = (AnyType) subtype; final PropertyAccess propertyAccess = representationStrategy.resolvePropertyAccess( bootPropertyDescriptor ); final boolean nullable = bootValueMapping.isNullable(); - final boolean insertable = bootPropertyDescriptor.isInsertable(); - final boolean updateable = bootPropertyDescriptor.isUpdateable(); + final boolean insertable = insertability[columnPosition]; + final boolean updateable = updateability[columnPosition]; final boolean includeInOptimisticLocking = bootPropertyDescriptor.isOptimisticLocked(); final CascadeStyle cascadeStyle = compositeType.getCascadeStyle( attributeIndex ); final MutabilityPlan mutabilityPlan; if ( updateable ) { - mutabilityPlan = new MutabilityPlan() { + mutabilityPlan = new MutabilityPlan<>() { @Override public boolean isMutable() { return true; @@ -618,12 +634,40 @@ public class EmbeddableMappingTypeImpl extends AbstractEmbeddableMapping impleme else { for ( int i = 0; i < size; i++ ) { final AttributeMapping attributeMapping = attributeMappings.get( i ); - final Object attributeValue = attributeMapping.getPropertyAccess().getGetter().get( domainValue ); + final Object attributeValue = domainValue == null + ? null + : attributeMapping.getPropertyAccess().getGetter().get( domainValue ); attributeMapping.breakDownJdbcValues( attributeValue, valueConsumer, session ); } } } + @Override + public void decompose(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { + if ( domainValue instanceof Object[] ) { + final Object[] values = (Object[]) domainValue; + assert values.length == attributeMappings.size(); + + for ( int i = 0; i < attributeMappings.size(); i++ ) { + final AttributeMapping attributeMapping = attributeMappings.get( i ); + final Object attributeValue = values[ i ]; + attributeMapping.decompose( attributeValue, valueConsumer, session ); + } + } + else { + attributeMappings.forEach( (attributeMapping) -> { + if ( attributeMapping instanceof PluralAttributeMapping ) { + return; + } + + final Object attributeValue = domainValue == null + ? null + : attributeMapping.getPropertyAccess().getGetter().get( domainValue ); + attributeMapping.decompose( attributeValue, valueConsumer, session ); + } ); + } + } + @Override public Object disassemble(Object value, SharedSessionContractImplementor session) { final Object[] result = new Object[ getNumberOfAttributeMappings() ]; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java index 1d10ad22f4..38238ddcb9 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java @@ -15,9 +15,9 @@ import org.hibernate.engine.FetchTiming; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.internal.util.collections.CollectionHelper; import org.hibernate.metamodel.mapping.AttributeMetadataAccess; +import org.hibernate.metamodel.mapping.EmbeddableMappingType; import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart; import org.hibernate.metamodel.mapping.EntityMappingType; -import org.hibernate.metamodel.mapping.EmbeddableMappingType; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.ManagedMappingType; import org.hibernate.metamodel.mapping.ModelPart; @@ -27,8 +27,8 @@ import org.hibernate.metamodel.mapping.SelectableMappings; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.property.access.internal.PropertyAccessStrategyBasicImpl; import org.hibernate.property.access.spi.PropertyAccess; -import org.hibernate.spi.NavigablePath; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; +import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.spi.FromClauseAccess; @@ -181,6 +181,11 @@ public class EmbeddedAttributeMapping return parentInjectionAttributePropertyAccess; } + @Override + public int compare(Object value1, Object value2) { + return super.compare( value1, value2 ); + } + @Override public int forEachSelectable(int offset, SelectableConsumer consumer) { return getEmbeddableTypeDescriptor().forEachSelectable( offset, consumer ); @@ -191,6 +196,11 @@ public class EmbeddedAttributeMapping getEmbeddableTypeDescriptor().breakDownJdbcValues( domainValue, valueConsumer, session ); } + @Override + public void decompose(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { + getEmbeddableTypeDescriptor().decompose( domainValue, valueConsumer, session ); + } + @Override public DomainResult createDomainResult( NavigablePath navigablePath, diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedCollectionPart.java index f3197f731a..7da77f356e 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedCollectionPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedCollectionPart.java @@ -15,18 +15,19 @@ import org.hibernate.engine.FetchStyle; import org.hibernate.engine.FetchTiming; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.metamodel.mapping.CollectionPart; -import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.EmbeddableMappingType; +import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingType; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.PluralAttributeMapping; +import org.hibernate.metamodel.mapping.SelectableConsumer; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.property.access.internal.PropertyAccessStrategyBasicImpl; import org.hibernate.property.access.spi.PropertyAccess; -import org.hibernate.spi.NavigablePath; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; +import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.spi.FromClauseAccess; @@ -35,7 +36,6 @@ import org.hibernate.sql.ast.spi.SqlAstCreationContext; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; -import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.SqlTuple; import org.hibernate.sql.ast.tree.from.PluralTableGroup; @@ -330,6 +330,11 @@ public class EmbeddedCollectionPart implements CollectionPart, EmbeddableValuedF return getEmbeddableTypeDescriptor().getFetchable( position ); } + @Override + public int forEachSelectable(int offset, SelectableConsumer consumer) { + return getEmbeddableTypeDescriptor().forEachSelectable( offset, consumer ); + } + @Override public void breakDownJdbcValues(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { getEmbeddableTypeDescriptor().breakDownJdbcValues( domainValue, valueConsumer, session ); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java index b96a2740a9..e74c877a5e 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java @@ -12,6 +12,7 @@ import java.util.function.BiConsumer; import java.util.function.IntFunction; import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.internal.util.MutableInteger; import org.hibernate.mapping.IndexedConsumer; import org.hibernate.metamodel.mapping.AssociationKey; import org.hibernate.metamodel.mapping.CompositeIdentifierMapping; @@ -143,12 +144,12 @@ public class EmbeddedForeignKeyDescriptor implements ForeignKeyDescriptor { } @Override - public ModelPart getKeyPart() { + public EmbeddableValuedModelPart getKeyPart() { return keySide.getModelPart().getEmbeddableTypeDescriptor().getEmbeddedValueMapping(); } @Override - public ModelPart getTargetPart() { + public EmbeddableValuedModelPart getTargetPart() { return targetSide.getModelPart().getEmbeddableTypeDescriptor().getEmbeddedValueMapping(); } @@ -162,6 +163,11 @@ public class EmbeddedForeignKeyDescriptor implements ForeignKeyDescriptor { return targetSide; } + @Override + public int compare(Object key1, Object key2) { + return getKeyPart().getEmbeddableTypeDescriptor().compare( key1, key2 ); + } + @Override public ForeignKeyDescriptor withKeySelectionMapping( ManagedMappingType declaringType, @@ -502,27 +508,37 @@ public class EmbeddedForeignKeyDescriptor implements ForeignKeyDescriptor { @Override public void breakDownJdbcValues(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { - assert domainValue instanceof Object[]; - - final Object[] values = (Object[]) domainValue; - - keySelectableMappings.forEachSelectable( - (index, selectable) -> valueConsumer.consume( values[ index ], selectable ) - ); + if ( domainValue == null ) { + keySelectableMappings.forEachSelectable( (index, selectable) -> { + valueConsumer.consume( null, selectable ); + } ); + } + else if ( domainValue instanceof Object[] ) { + final Object[] values = (Object[]) domainValue; + keySelectableMappings.forEachSelectable( (index, selectable) -> { + valueConsumer.consume( values[ index ], selectable ); + } ); + } + else { + final MutableInteger columnPosition = new MutableInteger(); + keySide.getModelPart().breakDownJdbcValues( + domainValue, + (jdbcValue, jdbcValueMapping) -> valueConsumer.consume( + jdbcValue, + keySelectableMappings.getSelectable( columnPosition.getAndIncrement() ) + ), + session + ); + } } @Override public Object getAssociationKeyFromSide( Object targetObject, - Nature nature, + ForeignKeyDescriptor.Side side, SharedSessionContractImplementor session) { - final ModelPart modelPart; - if ( nature == Nature.KEY ) { - modelPart = keySide.getModelPart(); - } - else { - modelPart = targetSide.getModelPart(); - } + final ModelPart modelPart = side.getModelPart(); + // If the mapping type has an identifier type, that identifier is the key if ( modelPart instanceof SingleAttributeIdentifierMapping ) { return ( (SingleAttributeIdentifierMapping) modelPart ).getIdentifierIfNotUnsaved( targetObject, session ); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityCollectionPart.java index 45dd2058e3..597caac60e 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityCollectionPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityCollectionPart.java @@ -1,809 +1,80 @@ /* * 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 http://www.gnu.org/licenses/lgpl-2.1.html + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ package org.hibernate.metamodel.mapping.internal; -import java.util.HashSet; -import java.util.Set; -import java.util.function.BiConsumer; -import java.util.function.Consumer; - -import org.hibernate.NotYetImplementedFor6Exception; +import org.hibernate.Internal; import org.hibernate.annotations.NotFoundAction; -import org.hibernate.dialect.Dialect; -import org.hibernate.engine.FetchStyle; -import org.hibernate.engine.FetchTiming; -import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.internal.util.StringHelper; import org.hibernate.mapping.Collection; -import org.hibernate.mapping.IndexedCollection; -import org.hibernate.mapping.Map; -import org.hibernate.mapping.OneToMany; -import org.hibernate.mapping.PersistentClass; -import org.hibernate.mapping.SimpleValue; -import org.hibernate.mapping.ToOne; -import org.hibernate.mapping.Value; -import org.hibernate.metamodel.mapping.BasicValuedModelPart; import org.hibernate.metamodel.mapping.CollectionPart; -import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart; -import org.hibernate.metamodel.mapping.EntityAssociationMapping; -import org.hibernate.metamodel.mapping.EntityIdentifierMapping; import org.hibernate.metamodel.mapping.EntityMappingType; -import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; -import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.metamodel.mapping.MappingType; -import org.hibernate.metamodel.mapping.ModelPart; -import org.hibernate.metamodel.mapping.ModelPartContainer; -import org.hibernate.metamodel.mapping.SelectableConsumer; -import org.hibernate.metamodel.mapping.SelectableMapping; -import org.hibernate.metamodel.mapping.VirtualModelPart; -import org.hibernate.metamodel.model.domain.NavigableRole; +import org.hibernate.metamodel.mapping.NonTransientException; import org.hibernate.persister.collection.CollectionPersister; -import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.persister.entity.Joinable; -import org.hibernate.persister.entity.PropertyMapping; -import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.SqlAstJoinType; -import org.hibernate.sql.ast.spi.FromClauseAccess; -import org.hibernate.sql.ast.spi.SqlAliasBase; -import org.hibernate.sql.ast.spi.SqlAliasBaseGenerator; -import org.hibernate.sql.ast.spi.SqlAstCreationContext; -import org.hibernate.sql.ast.spi.SqlExpressionResolver; -import org.hibernate.sql.ast.spi.SqlSelection; -import org.hibernate.sql.ast.tree.from.LazyTableGroup; -import org.hibernate.sql.ast.tree.from.OneToManyTableGroup; -import org.hibernate.sql.ast.tree.from.PluralTableGroup; -import org.hibernate.sql.ast.tree.from.StandardTableGroup; -import org.hibernate.sql.ast.tree.from.TableGroup; -import org.hibernate.sql.ast.tree.from.TableGroupJoin; -import org.hibernate.sql.ast.tree.from.TableReference; -import org.hibernate.sql.ast.tree.predicate.Predicate; -import org.hibernate.sql.results.graph.DomainResult; -import org.hibernate.sql.results.graph.DomainResultCreationState; -import org.hibernate.sql.results.graph.FetchOptions; -import org.hibernate.sql.results.graph.FetchParent; -import org.hibernate.sql.results.graph.Fetchable; -import org.hibernate.sql.results.graph.entity.EntityFetch; import org.hibernate.sql.results.graph.entity.EntityValuedFetchable; -import org.hibernate.sql.results.graph.entity.internal.EntityFetchJoinedImpl; -import org.hibernate.type.CompositeType; -import org.hibernate.type.EntityType; -import org.hibernate.type.Type; import org.hibernate.type.descriptor.java.JavaType; -import static java.util.Objects.requireNonNullElse; - /** + * An entity-valued collection-part. + * + * @apiNote This mapping does not include {@linkplain DiscriminatedCollectionPart "ANY"} mappings + * + * @implSpec Allows for 2-phase initialization via {@link #finishInitialization} + * * @author Steve Ebersole */ -public class EntityCollectionPart - implements CollectionPart, EntityAssociationMapping, EntityValuedFetchable, FetchOptions { - private final NavigableRole navigableRole; - private final CollectionPersister collectionDescriptor; - private final Nature nature; - private final EntityMappingType entityMappingType; - private final Set targetKeyPropertyNames; +public interface EntityCollectionPart extends CollectionPart, EntityValuedFetchable { + enum Cardinality { ONE_TO_MANY, MANY_TO_MANY } - private ModelPart fkTargetModelPart; - private ForeignKeyDescriptor fkDescriptor; + Cardinality getCardinality(); - public EntityCollectionPart( - CollectionPersister collectionDescriptor, - Nature nature, - Value bootModelValue, - @SuppressWarnings("unused") NotFoundAction notFoundAction, - EntityMappingType entityMappingType, - MappingModelCreationProcess creationProcess) { - this.navigableRole = collectionDescriptor.getNavigableRole().appendContainer( nature.getName() ); - this.collectionDescriptor = collectionDescriptor; - this.nature = nature; - this.entityMappingType = entityMappingType; + NotFoundAction getNotFoundAction(); - final PersistentClass entityBinding = creationProcess.getCreationContext() - .getMetadata() - .getEntityBinding( entityMappingType.getEntityName() ); - final String referencedPropertyName; + EntityMappingType getAssociatedEntityMappingType(); - if ( bootModelValue instanceof OneToMany ) { - final String mappedByProperty = collectionDescriptor.getMappedByProperty(); - referencedPropertyName = StringHelper.isEmpty( mappedByProperty ) - ? null - : mappedByProperty; - } - else { - final ToOne toOne = (ToOne) bootModelValue; - referencedPropertyName = toOne.getReferencedPropertyName(); - } - - if ( referencedPropertyName == null ) { - final Set targetKeyPropertyNames = new HashSet<>( 2 ); - targetKeyPropertyNames.add( EntityIdentifierMapping.ROLE_LOCAL_NAME ); - final Type propertyType; - if ( entityBinding.getIdentifierMapper() == null ) { - propertyType = entityBinding.getIdentifier().getType(); - } - else { - propertyType = entityBinding.getIdentifierMapper().getType(); - } - if ( entityBinding.getIdentifierProperty() == null ) { - final CompositeType compositeType; - if ( propertyType.isComponentType() && ( compositeType = (CompositeType) propertyType ).isEmbedded() - && compositeType.getPropertyNames().length == 1 ) { - ToOneAttributeMapping.addPrefixedPropertyNames( - targetKeyPropertyNames, - compositeType.getPropertyNames()[0], - compositeType.getSubtypes()[0], - creationProcess.getCreationContext().getSessionFactory() - ); - ToOneAttributeMapping.addPrefixedPropertyNames( - targetKeyPropertyNames, - ForeignKeyDescriptor.PART_NAME, - compositeType.getSubtypes()[0], - creationProcess.getCreationContext().getSessionFactory() - ); - } - else { - ToOneAttributeMapping.addPrefixedPropertyNames( - targetKeyPropertyNames, - null, - propertyType, - creationProcess.getCreationContext().getSessionFactory() - ); - ToOneAttributeMapping.addPrefixedPropertyNames( - targetKeyPropertyNames, - ForeignKeyDescriptor.PART_NAME, - propertyType, - creationProcess.getCreationContext().getSessionFactory() - ); - } - } - else { - ToOneAttributeMapping.addPrefixedPropertyNames( - targetKeyPropertyNames, - entityBinding.getIdentifierProperty().getName(), - propertyType, - creationProcess.getCreationContext().getSessionFactory() - ); - ToOneAttributeMapping.addPrefixedPropertyNames( - targetKeyPropertyNames, - ForeignKeyDescriptor.PART_NAME, - propertyType, - creationProcess.getCreationContext().getSessionFactory() - ); - } - this.targetKeyPropertyNames = targetKeyPropertyNames; - } - else if ( bootModelValue instanceof OneToMany ) { - final Set targetKeyPropertyNames = new HashSet<>( 2 ); - int dotIndex = -1; - while ( ( dotIndex = referencedPropertyName.indexOf( '.', dotIndex + 1 ) ) != -1 ) { - targetKeyPropertyNames.add( referencedPropertyName.substring( 0, dotIndex ) ); - } - final Type propertyType = ( (PropertyMapping) entityMappingType.getEntityPersister() ) - .toType( referencedPropertyName ); - ToOneAttributeMapping.addPrefixedPropertyNames( - targetKeyPropertyNames, - referencedPropertyName, - propertyType, - creationProcess.getCreationContext().getSessionFactory() - ); - ToOneAttributeMapping.addPrefixedPropertyNames( - targetKeyPropertyNames, - ForeignKeyDescriptor.PART_NAME, - propertyType, - creationProcess.getCreationContext().getSessionFactory() - ); - this.targetKeyPropertyNames = targetKeyPropertyNames; - } - else { - final Type propertyType = entityBinding.getRecursiveProperty( referencedPropertyName ).getType(); - final CompositeType compositeType; - if ( propertyType.isComponentType() && ( compositeType = (CompositeType) propertyType ).isEmbedded() - && compositeType.getPropertyNames().length == 1 ) { - final Set targetKeyPropertyNames = new HashSet<>( 2 ); - ToOneAttributeMapping.addPrefixedPropertyNames( - targetKeyPropertyNames, - compositeType.getPropertyNames()[0], - compositeType.getSubtypes()[0], - creationProcess.getCreationContext().getSessionFactory() - ); - ToOneAttributeMapping.addPrefixedPropertyNames( - targetKeyPropertyNames, - ForeignKeyDescriptor.PART_NAME, - compositeType.getSubtypes()[0], - creationProcess.getCreationContext().getSessionFactory() - ); - this.targetKeyPropertyNames = targetKeyPropertyNames; - } - else { - final String mapsIdAttributeName; - if ( ( mapsIdAttributeName = ToOneAttributeMapping.findMapsIdPropertyName( entityMappingType, referencedPropertyName ) ) != null ) { - final Set targetKeyPropertyNames = new HashSet<>( 2 ); - targetKeyPropertyNames.add( referencedPropertyName ); - ToOneAttributeMapping.addPrefixedPropertyNames( - targetKeyPropertyNames, - mapsIdAttributeName, - entityMappingType.getEntityPersister().getIdentifierType(), - creationProcess.getCreationContext().getSessionFactory() - ); - ToOneAttributeMapping.addPrefixedPropertyNames( - targetKeyPropertyNames, - ForeignKeyDescriptor.PART_NAME, - entityMappingType.getEntityPersister().getIdentifierType(), - creationProcess.getCreationContext().getSessionFactory() - ); - this.targetKeyPropertyNames = targetKeyPropertyNames; - } - else { - this.targetKeyPropertyNames = Set.of( referencedPropertyName, ForeignKeyDescriptor.PART_NAME ); - } - } - } - } - - public void finishInitialization( - CollectionPersister collectionDescriptor, - Collection bootValueMapping, - String fkTargetModelPartName, - MappingModelCreationProcess creationProcess) { - if ( fkTargetModelPartName == null ) { - if ( nature == Nature.INDEX ) { - final String mapKeyPropertyName = ( (Map) bootValueMapping ).getMapKeyPropertyName(); - if ( mapKeyPropertyName == null ) { - fkTargetModelPart = entityMappingType.getIdentifierMapping(); - } - else { - final EntityPersister elementPersister = ( (EntityType) collectionDescriptor.getElementType() ) - .getAssociatedEntityPersister( creationProcess.getCreationContext().getSessionFactory() ); - fkTargetModelPart = elementPersister.findByPath( mapKeyPropertyName ); - if ( fkTargetModelPart == null ) { - // This is expected to happen when processing a - // PostInitCallbackEntry because the callbacks - // are not ordered. The exception is caught in - // MappingModelCreationProcess.executePostInitCallbacks() - // and the callback is re-queued. - throw new IllegalStateException( "Couldn't find model part for path [" + mapKeyPropertyName + "] on entity: " + elementPersister.getEntityName() ); - } - } - } - else { - final String mappedByProperty = bootValueMapping.getMappedByProperty(); - if ( collectionDescriptor.isOneToMany() && mappedByProperty != null && !mappedByProperty.isEmpty() ) { - fkTargetModelPart = entityMappingType.findByPath( mappedByProperty ); - if ( fkTargetModelPart == null ) { - // This is expected to happen when processing a - // PostInitCallbackEntry because the callbacks - // are not ordered. The exception is caught in - // MappingModelCreationProcess.executePostInitCallbacks() - // and the callback is re-queued. - throw new IllegalStateException( "Couldn't find model part for path [" + mappedByProperty + "] on entity: " + entityMappingType.getEntityName() ); - } - } - else { - fkTargetModelPart = entityMappingType.getIdentifierMapping(); - } - } - } - else { - fkTargetModelPart = entityMappingType.findSubPart( fkTargetModelPartName, null ); - } - if ( nature == Nature.ELEMENT ) { - fkDescriptor = createForeignKeyDescriptor( - bootValueMapping.getElement(), - (EntityType) collectionDescriptor.getElementType(), - creationProcess, - collectionDescriptor.getFactory().getJdbcServices().getDialect() - ); - } - else { - fkDescriptor = createForeignKeyDescriptor( - ( (IndexedCollection) bootValueMapping).getIndex(), - (EntityType) collectionDescriptor.getIndexType(), - creationProcess, - collectionDescriptor.getFactory().getJdbcServices().getDialect() - ); - } - } - - private ForeignKeyDescriptor createForeignKeyDescriptor( - Value fkBootDescriptorSource, - EntityType entityType, - MappingModelCreationProcess creationProcess, - Dialect dialect) { - final EntityPersister associatedEntityDescriptor = creationProcess.getEntityPersister( entityType.getAssociatedEntityName() ); - // If this is mapped by a to-one attribute, we can use the FK of that attribute - if ( fkTargetModelPart instanceof ToOneAttributeMapping ) { - final ToOneAttributeMapping toOneAttributeMapping = (ToOneAttributeMapping) fkTargetModelPart; - if ( toOneAttributeMapping.getForeignKeyDescriptor() == null ) { - throw new IllegalStateException( "Not yet ready: " + toOneAttributeMapping ); - } - return toOneAttributeMapping.getForeignKeyDescriptor(); - } - final ModelPart fkTargetPart = fkTargetModelPart; - - final String fkKeyTableName; - if ( nature == Nature.INDEX ) { - final String indexPropertyName = collectionDescriptor.getAttributeMapping() - .getIndexMetadata() - .getIndexPropertyName(); - if ( indexPropertyName == null ) { - fkKeyTableName = ( (Joinable) collectionDescriptor ).getTableName(); - } - else { - fkKeyTableName = fkBootDescriptorSource.getTable().getQuotedName( dialect ); - } - } - else { - fkKeyTableName = ( (Joinable) collectionDescriptor ).getTableName(); - } - if ( fkTargetPart instanceof BasicValuedModelPart ) { - final BasicValuedModelPart basicFkTargetPart = (BasicValuedModelPart) fkTargetPart; - final SelectableMapping keySelectableMapping = SelectableMappingImpl.from( - fkKeyTableName, - fkBootDescriptorSource.getSelectables().get(0), - basicFkTargetPart.getJdbcMapping(), - creationProcess.getCreationContext().getTypeConfiguration(), - dialect, - creationProcess.getSqmFunctionRegistry() - ); - final boolean hasConstraint; - if ( fkBootDescriptorSource instanceof SimpleValue ) { - hasConstraint = ( (SimpleValue) fkBootDescriptorSource ).isConstrained(); - } - else { - // We assume there is a constraint if the key is not nullable - hasConstraint = !fkBootDescriptorSource.isNullable(); - } - return new SimpleForeignKeyDescriptor( - associatedEntityDescriptor, - basicFkTargetPart, - null, - keySelectableMapping, - basicFkTargetPart, - entityType.isReferenceToPrimaryKey(), - hasConstraint - ); - } - else if ( fkTargetPart instanceof EmbeddableValuedModelPart ) { - return MappingModelCreationHelper.buildEmbeddableForeignKeyDescriptor( - (EmbeddableValuedModelPart) fkTargetPart, - fkBootDescriptorSource, - findContainingEntityMapping(), - collectionDescriptor.getAttributeMapping(), - false, - dialect, - creationProcess - ); - } - else { - throw new NotYetImplementedFor6Exception( - "Support for composite foreign keys not yet implemented : " + collectionDescriptor - .getRole() - ); - } + @Override + default String getFetchableName() { + return getPartName(); } @Override - public SqlAstJoinType getDefaultSqlAstJoinType(TableGroup parentTableGroup) { - return SqlAstJoinType.INNER; + default EntityMappingType getPartMappingType() { + return getAssociatedEntityMappingType(); } @Override - public boolean isSimpleJoinPredicate(Predicate predicate) { - return fkDescriptor.isSimpleJoinPredicate( predicate ); + default EntityMappingType getEntityMappingType() { + return getAssociatedEntityMappingType(); } @Override - public Nature getNature() { - return nature; + default JavaType getJavaType() { + return getAssociatedEntityMappingType().getJavaType(); } @Override - public MappingType getPartMappingType() { - return getEntityMappingType(); - } - - @Override - public EntityMappingType getEntityMappingType() { - return entityMappingType; - } - - @Override - public EntityMappingType getAssociatedEntityMappingType() { - return getEntityMappingType(); - } - - @Override - public ModelPart getKeyTargetMatchPart() { - return collectionDescriptor.isOneToMany() - ? entityMappingType.getIdentifierMapping() - : fkTargetModelPart; - } - - @Override - public JavaType getJavaType() { - return getEntityMappingType().getJavaType(); - } - - @Override - public JavaType getExpressibleJavaType() { + default JavaType getExpressibleJavaType() { return getJavaType(); } - @Override - public NavigableRole getNavigableRole() { - return navigableRole; - } - - @Override - public String getFetchableName() { - return nature.getName(); - } - - @Override - public FetchOptions getMappedFetchOptions() { - return this; - } - - @Override - public boolean incrementFetchDepth() { - // the collection itself already increments the depth - return false; - } - - @Override - public ModelPart findSubPart(String name) { - return findSubPart( name, null ); - } - - @Override - public ModelPart findSubPart(String name, EntityMappingType targetType) { - // Prefer resolving the key part of the foreign key rather than the target part if possible - // to allow deferring the initialization of the target table group, omitting it if possible. - // This is not possible for one-to-many associations because we need to create the target table group eagerly, - // to preserve the cardinality. Also, the OneToManyTableGroup has no reference to the parent table group - if ( !collectionDescriptor.isOneToMany() && targetKeyPropertyNames.contains( name ) ) { - if ( fkTargetModelPart instanceof ToOneAttributeMapping ) { - return ( (ToOneAttributeMapping) fkTargetModelPart ).findSubPart( name, targetType ); - } - final ModelPart keyPart = fkDescriptor.getKeyPart(); - if ( keyPart instanceof EmbeddableValuedModelPart && keyPart instanceof VirtualModelPart ) { - return ( (ModelPartContainer) keyPart ).findSubPart( name, targetType ); - } - return keyPart; - } - return EntityValuedFetchable.super.findSubPart( name, targetType ); - } - - @Override - public boolean isOptional() { - return false; - } - - @Override - public boolean isUnwrapProxy() { - return false; - } - - @Override - public DomainResult createDomainResult( - NavigablePath navigablePath, - TableGroup tableGroup, - String resultVariable, - DomainResultCreationState creationState) { - final TableGroup partTableGroup = resolveTableGroup( navigablePath, creationState ); - return entityMappingType.createDomainResult( navigablePath, partTableGroup, resultVariable, creationState ); - } - - @Override - public EntityFetch generateFetch( - FetchParent fetchParent, - NavigablePath fetchablePath, - FetchTiming fetchTiming, - boolean selected, - String resultVariable, - DomainResultCreationState creationState) { - final ForeignKeyDescriptor foreignKeyDescriptor = getForeignKeyDescriptor(); - final boolean added = creationState.registerVisitedAssociationKey( foreignKeyDescriptor.getAssociationKey() ); - - final TableGroup partTableGroup = resolveTableGroup( fetchablePath, creationState ); - final EntityFetchJoinedImpl fetch = new EntityFetchJoinedImpl( - fetchParent, - this, - partTableGroup, - fetchablePath, - creationState - ); - - if ( added ) { - creationState.removeVisitedAssociationKey( foreignKeyDescriptor.getAssociationKey() ); - } - - return fetch; - } - - private TableGroup resolveTableGroup(NavigablePath fetchablePath, DomainResultCreationState creationState) { - final FromClauseAccess fromClauseAccess = creationState.getSqlAstCreationState().getFromClauseAccess(); - return fromClauseAccess.resolveTableGroup( - fetchablePath, - np -> { - final PluralTableGroup parentTableGroup = (PluralTableGroup) fromClauseAccess.getTableGroup( np.getParent() ); - switch ( nature ) { - case ELEMENT: - return parentTableGroup.getElementTableGroup(); - case INDEX: - return parentTableGroup.getIndexTableGroup(); - } - - throw new IllegalStateException( "Could not find table group for: " + np ); - } - ); - } - - @Override - public int forEachSelectable(int offset, SelectableConsumer consumer) { - return entityMappingType.forEachSelectable( offset, consumer ); - } - - @Override - public void breakDownJdbcValues(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { - fkTargetModelPart.breakDownJdbcValues( domainValue, valueConsumer, session ); - } - - @Override - public void applySqlSelections( - NavigablePath navigablePath, - TableGroup tableGroup, - DomainResultCreationState creationState) { - entityMappingType.applySqlSelections( navigablePath, tableGroup, creationState ); - } - - @Override - public void applySqlSelections( - NavigablePath navigablePath, - TableGroup tableGroup, - DomainResultCreationState creationState, - BiConsumer selectionConsumer) { - entityMappingType.applySqlSelections( navigablePath, tableGroup, creationState, selectionConsumer ); - } - - @Override - public EntityMappingType findContainingEntityMapping() { - return collectionDescriptor.getAttributeMapping().findContainingEntityMapping(); - } - - @Override - public int getNumberOfFetchables() { - return entityMappingType.getNumberOfFetchables(); - } - - @Override - public Fetchable getFetchable(int position) { - return entityMappingType.getFetchable( position ); - } - - public String getMappedBy() { - return collectionDescriptor.getMappedByProperty(); - } - - @Override - public String toString() { - return "EntityCollectionPart(" + navigableRole + ")@" + System.identityHashCode( this ); - } - - @Override - public ForeignKeyDescriptor getForeignKeyDescriptor() { - return fkDescriptor; - } - - @Override - public ForeignKeyDescriptor.Nature getSideNature() { - return collectionDescriptor.isOneToMany() - ? ForeignKeyDescriptor.Nature.TARGET - : ForeignKeyDescriptor.Nature.KEY; - } - - @Override - public boolean isReferenceToPrimaryKey() { - return fkDescriptor.getSide( getSideNature().inverse() ).getModelPart() instanceof EntityIdentifierMapping; - } - - @Override - public boolean isFkOptimizationAllowed() { - return !collectionDescriptor.isOneToMany(); - } - - public CollectionPersister getCollectionDescriptor() { - return collectionDescriptor; - } - - @Override - public FetchStyle getStyle() { - return FetchStyle.JOIN; - } - - @Override - public FetchTiming getTiming() { - return FetchTiming.IMMEDIATE; - } - - @Override - public TableGroupJoin createTableGroupJoin( - NavigablePath navigablePath, - TableGroup collectionTableGroup, - String explicitSourceAlias, - SqlAstJoinType requestedJoinType, - boolean fetched, - boolean addsPredicate, - SqlAliasBaseGenerator aliasBaseGenerator, - SqlExpressionResolver sqlExpressionResolver, - FromClauseAccess fromClauseAccess, - SqlAstCreationContext creationContext) { - final SqlAstJoinType joinType = requireNonNullElse( requestedJoinType, SqlAstJoinType.INNER ); - - if ( collectionDescriptor.isOneToMany() && nature == Nature.ELEMENT ) { - // If this is a one-to-many, the element part is already available, so we return a TableGroupJoin "hull" - return new TableGroupJoin( - navigablePath, - joinType, - ( (OneToManyTableGroup) collectionTableGroup ).getElementTableGroup(), - null - ); - } - - final LazyTableGroup lazyTableGroup = createRootTableGroupJoin( - navigablePath, - collectionTableGroup, - explicitSourceAlias, - requestedJoinType, - fetched, - null, - aliasBaseGenerator, - sqlExpressionResolver, - fromClauseAccess, - creationContext - ); - final TableGroupJoin join = new TableGroupJoin( - navigablePath, - joinType, - lazyTableGroup, - null - ); - - lazyTableGroup.setTableGroupInitializerCallback( - tableGroup -> join.applyPredicate( - fkDescriptor.generateJoinPredicate( - tableGroup.getPrimaryTableReference(), - collectionTableGroup.resolveTableReference( fkDescriptor.getKeyTable() ), - sqlExpressionResolver, - creationContext - ) - ) - ); - - return join; - } - - @Override - public LazyTableGroup createRootTableGroupJoin( - NavigablePath navigablePath, - TableGroup lhs, - String explicitSourceAlias, - SqlAstJoinType requestedJoinType, - boolean fetched, - Consumer predicateConsumer, - SqlAliasBaseGenerator aliasBaseGenerator, - SqlExpressionResolver sqlExpressionResolver, - FromClauseAccess fromClauseAccess, - SqlAstCreationContext creationContext) { - final SqlAstJoinType joinType = requireNonNullElse( requestedJoinType, SqlAstJoinType.INNER ); - final SqlAliasBase sqlAliasBase = aliasBaseGenerator.createSqlAliasBase( getSqlAliasStem() ); - final boolean canUseInnerJoin = joinType == SqlAstJoinType.INNER || lhs.canUseInnerJoins(); - - final LazyTableGroup lazyTableGroup = new LazyTableGroup( - canUseInnerJoin, - navigablePath, - fetched, - () -> createTableGroupInternal( - canUseInnerJoin, - navigablePath, - fetched, - null, - sqlAliasBase, - sqlExpressionResolver, - creationContext - ), - (np, tableExpression) -> { - if ( ! fkDescriptor.getKeyTable().equals( tableExpression ) ) { - return false; - } - - if ( navigablePath.equals( np.getParent() ) ) { - return targetKeyPropertyNames.contains( np.getLocalName() ); - } - - final String relativePath = np.relativize( navigablePath ); - if ( relativePath == null ) { - return false; - } - - // Empty relative path means the navigable paths are equal, - // in which case we allow resolving the parent table group - return relativePath.isEmpty() || targetKeyPropertyNames.contains( relativePath ); - }, - this, - explicitSourceAlias, - sqlAliasBase, - creationContext.getSessionFactory(), - lhs - ); - - if ( predicateConsumer != null ) { - final TableReference keySideTableReference = lhs.resolveTableReference( - navigablePath, - fkDescriptor.getKeyTable() - ); - - lazyTableGroup.setTableGroupInitializerCallback( - tableGroup -> predicateConsumer.accept( - fkDescriptor.generateJoinPredicate( - tableGroup.getPrimaryTableReference(), - keySideTableReference, - sqlExpressionResolver, - creationContext - ) - ) - ); - } - - return lazyTableGroup; - } - - public TableGroup createTableGroupInternal( - boolean canUseInnerJoins, - NavigablePath navigablePath, - boolean fetched, - String sourceAlias, - final SqlAliasBase sqlAliasBase, - SqlExpressionResolver sqlExpressionResolver, - SqlAstCreationContext creationContext) { - final TableReference primaryTableReference = getEntityMappingType().createPrimaryTableReference( - sqlAliasBase, - sqlExpressionResolver, - creationContext - ); - - return new StandardTableGroup( - canUseInnerJoins, - navigablePath, - this, - fetched, - sourceAlias, - primaryTableReference, - true, - sqlAliasBase, - (tableExpression) -> getEntityMappingType().containsTableReference( tableExpression ), - (tableExpression, tg) -> getEntityMappingType().createTableReferenceJoin( - tableExpression, - sqlAliasBase, - primaryTableReference, - sqlExpressionResolver, - creationContext - ), - creationContext.getSessionFactory() - ); - } - - @Override - public String getSqlAliasStem() { - return collectionDescriptor.getAttributeMapping().getSqlAliasStem(); - } - - @Override - public boolean containsTableReference(String tableExpression) { - return collectionDescriptor.getAttributeMapping().containsTableReference( tableExpression ); - } + /** + * Perform any delayed initialization. + *

+ * The initialization is considered successful if the result is {@code true}. It is + * considered unsuccessful if the result is {@code false} or an exception is thrown. + * Unsuccessful initializations are generally retried "later", to allow waiting for + * model-parts being available e.g. + *

+ * If the exception is something that will just never succeed, consider throwing + * an exception with the {@link NonTransientException} marker to allow the creation + * process to stop immediately + */ + @Internal + boolean finishInitialization( + CollectionPersister collectionDescriptor, + Collection bootValueMapping, + String fkTargetModelPartName, + MappingModelCreationProcess creationProcess); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityRowIdMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityRowIdMappingImpl.java index 3f34e3b341..430f9967ed 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityRowIdMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityRowIdMappingImpl.java @@ -14,7 +14,6 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.EntityRowIdMapping; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingType; -import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.Clause; @@ -32,7 +31,7 @@ import org.hibernate.type.descriptor.java.JavaType; /** * @author Nathan Xu */ -public class EntityRowIdMappingImpl implements EntityRowIdMapping, SelectableMapping { +public class EntityRowIdMappingImpl implements EntityRowIdMapping { private final String rowIdName; private final EntityMappingType declaringType; private final String tableExpression; @@ -191,6 +190,21 @@ public class EntityRowIdMappingImpl implements EntityRowIdMapping, SelectableMap return false; } + @Override + public boolean isNullable() { + return false; + } + + @Override + public boolean isInsertable() { + return false; + } + + @Override + public boolean isUpdateable() { + return false; + } + @Override public JdbcMapping getJdbcMapping() { return rowIdType.getJdbcMapping(); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java index 28c0855f90..666a0769d1 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java @@ -14,9 +14,9 @@ import org.hibernate.engine.FetchTiming; import org.hibernate.engine.internal.UnsavedValueFactory; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.engine.spi.VersionValue; +import org.hibernate.mapping.IndexedConsumer; import org.hibernate.mapping.KeyValue; import org.hibernate.mapping.RootClass; -import org.hibernate.mapping.IndexedConsumer; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.EntityVersionMapping; import org.hibernate.metamodel.mapping.JdbcMapping; @@ -27,7 +27,6 @@ import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; -import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.results.graph.DomainResult; @@ -124,6 +123,21 @@ public class EntityVersionMappingImpl implements EntityVersionMapping, FetchOpti return false; } + @Override + public boolean isNullable() { + return false; + } + + @Override + public boolean isInsertable() { + return true; + } + + @Override + public boolean isUpdateable() { + return true; + } + @Override public String getCustomReadExpression() { return null; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ExplicitColumnDiscriminatorMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ExplicitColumnDiscriminatorMappingImpl.java index 66119bd0cd..c64e623397 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ExplicitColumnDiscriminatorMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ExplicitColumnDiscriminatorMappingImpl.java @@ -12,13 +12,10 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; -import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableReference; -import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey; - /** * @author Steve Ebersole */ @@ -117,6 +114,21 @@ public class ExplicitColumnDiscriminatorMappingImpl extends AbstractDiscriminato return columnFormula != null; } + @Override + public boolean isNullable() { + return false; + } + + @Override + public boolean isInsertable() { + return isPhysical; + } + + @Override + public boolean isUpdateable() { + return false; + } + @Override public boolean isPhysical() { return isPhysical; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java index 31b0c1f529..1d7a93c0dc 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java @@ -31,8 +31,8 @@ import org.hibernate.sql.ast.tree.select.SelectStatement; import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; import org.hibernate.sql.exec.spi.Callback; import org.hibernate.sql.exec.spi.ExecutionContext; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; import org.hibernate.sql.results.spi.ListResultsConsumer; import org.hibernate.tuple.GenerationTiming; import org.hibernate.tuple.InDatabaseValueGenerationStrategy; @@ -132,7 +132,7 @@ public class GeneratedValuesProcessor { session ); assert offset == jdbcParameters.size(); - final JdbcSelect jdbcSelect = sqlAstTranslatorFactory + final JdbcOperationQuerySelect jdbcSelect = sqlAstTranslatorFactory .buildSelectTranslator( sessionFactory, selectStatement ) .translate( jdbcParamBindings, QueryOptions.NONE ); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InverseNonAggregatedIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InverseNonAggregatedIdentifierMapping.java index d3ed696010..403f5e15c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InverseNonAggregatedIdentifierMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InverseNonAggregatedIdentifierMapping.java @@ -27,7 +27,6 @@ import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlAstCreationState; -import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.expression.Expression; @@ -263,7 +262,6 @@ public class InverseNonAggregatedIdentifierMapping extends EmbeddedAttributeMapp @Override public void breakDownJdbcValues(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { - assert domainValue instanceof Object[]; identifierValueMapper.breakDownJdbcValues( domainValue, valueConsumer, session ); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ManyToManyCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ManyToManyCollectionPart.java new file mode 100644 index 0000000000..c342995640 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ManyToManyCollectionPart.java @@ -0,0 +1,510 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.metamodel.mapping.internal; + +import java.util.Locale; +import java.util.function.Consumer; + +import org.hibernate.annotations.NotFoundAction; +import org.hibernate.dialect.Dialect; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.internal.util.StringHelper; +import org.hibernate.mapping.Collection; +import org.hibernate.mapping.IndexedCollection; +import org.hibernate.mapping.Map; +import org.hibernate.mapping.SimpleValue; +import org.hibernate.mapping.Value; +import org.hibernate.metamodel.mapping.Association; +import org.hibernate.metamodel.mapping.AssociationKey; +import org.hibernate.metamodel.mapping.BasicValuedModelPart; +import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart; +import org.hibernate.metamodel.mapping.EntityAssociationMapping; +import org.hibernate.metamodel.mapping.EntityIdentifierMapping; +import org.hibernate.metamodel.mapping.EntityMappingType; +import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; +import org.hibernate.metamodel.mapping.ModelPart; +import org.hibernate.metamodel.mapping.ModelPartContainer; +import org.hibernate.metamodel.mapping.PluralAttributeMapping; +import org.hibernate.metamodel.mapping.SelectableConsumer; +import org.hibernate.metamodel.mapping.SelectableMapping; +import org.hibernate.metamodel.mapping.VirtualModelPart; +import org.hibernate.persister.collection.CollectionPersister; +import org.hibernate.persister.collection.mutation.CollectionMutationTarget; +import org.hibernate.spi.NavigablePath; +import org.hibernate.sql.ast.SqlAstJoinType; +import org.hibernate.sql.ast.spi.FromClauseAccess; +import org.hibernate.sql.ast.spi.SqlAliasBase; +import org.hibernate.sql.ast.spi.SqlAliasBaseGenerator; +import org.hibernate.sql.ast.spi.SqlAstCreationContext; +import org.hibernate.sql.ast.spi.SqlExpressionResolver; +import org.hibernate.sql.ast.tree.from.LazyTableGroup; +import org.hibernate.sql.ast.tree.from.TableGroup; +import org.hibernate.sql.ast.tree.from.TableGroupJoin; +import org.hibernate.sql.ast.tree.from.TableReference; +import org.hibernate.sql.ast.tree.predicate.Predicate; +import org.hibernate.type.EntityType; + +import static java.util.Objects.requireNonNullElse; + +/** + * Entity-valued collection-part mapped through a join table. Models both

    + *
  • {@link jakarta.persistence.ManyToMany} mappings
    • + *
  • {@link jakarta.persistence.OneToMany} with {@link jakarta.persistence.JoinTable} mappings
    • + *
+ * + * ``` + * user( id, ... ) + * group( id, ... ) + * membership( user_fk, group_fk ) + * + * `Group.membership` + * table: membership + * key: group_fk + * element: user_fk + * ``` + * + * @author Steve Ebersole + */ +public class ManyToManyCollectionPart extends AbstractEntityCollectionPart implements EntityAssociationMapping { + private ForeignKeyDescriptor foreignKey; + private ModelPart fkTargetModelPart; + + public ManyToManyCollectionPart( + Nature nature, + Collection collectionBootDescriptor, + CollectionPersister collectionDescriptor, + EntityMappingType associatedEntityDescriptor, + MappingModelCreationProcess creationProcess) { + this( nature, collectionBootDescriptor, collectionDescriptor, associatedEntityDescriptor, NotFoundAction.EXCEPTION, creationProcess ); + } + + public ManyToManyCollectionPart( + Nature nature, + Collection collectionBootDescriptor, + CollectionPersister collectionDescriptor, + EntityMappingType associatedEntityDescriptor, + NotFoundAction notFoundAction, + MappingModelCreationProcess creationProcess) { + super( nature, collectionBootDescriptor, collectionDescriptor, associatedEntityDescriptor, notFoundAction, creationProcess ); + } + + @Override + public Cardinality getCardinality() { + return Cardinality.MANY_TO_MANY; + } + + @Override + public ModelPart getInclusionCheckPart() { + return getForeignKeyDescriptor().getKeyPart(); + } + + @Override + protected AssociationKey resolveFetchAssociationKey() { + assert getForeignKeyDescriptor() != null; + return getForeignKeyDescriptor().getAssociationKey(); + } + + @Override + public ModelPart findSubPart(String name, EntityMappingType targetType) { + // Prefer resolving the key part of the foreign key rather than the target part if possible + // to allow deferring the initialization of the target table group, omitting it if possible. + // This is not possible for one-to-many associations because we need to create the target table group eagerly, + // to preserve the cardinality. Also, the OneToManyTableGroup has no reference to the parent table group + if ( getTargetKeyPropertyNames().contains( name ) ) { + if ( fkTargetModelPart instanceof ToOneAttributeMapping ) { + return ( (ToOneAttributeMapping) fkTargetModelPart ).findSubPart( name, targetType ); + } + final ModelPart keyPart = foreignKey.getKeyPart(); + if ( keyPart instanceof EmbeddableValuedModelPart && keyPart instanceof VirtualModelPart ) { + return ( (ModelPartContainer) keyPart ).findSubPart( name, targetType ); + } + return keyPart; + } + + return super.findSubPart( name, targetType ); + } + + @Override + public void breakDownJdbcValues(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { + fkTargetModelPart.breakDownJdbcValues( domainValue, valueConsumer, session ); + } + + @Override + public int forEachSelectable(int offset, SelectableConsumer consumer) { + foreignKey.getKeyPart().forEachSelectable( offset, consumer ); + return getJdbcTypeCount(); + } + + @Override + public void decompose(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { + foreignKey.getKeyPart().decompose( + foreignKey.getAssociationKeyFromSide( domainValue, foreignKey.getTargetSide(), session ), + valueConsumer, + session + ); + } + + + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Association / TableGroupJoinProducer + + @Override + public ForeignKeyDescriptor getForeignKeyDescriptor() { + return foreignKey; + } + + @Override + public ForeignKeyDescriptor.Nature getSideNature() { + return ForeignKeyDescriptor.Nature.KEY; + } + + @Override + public SqlAstJoinType getDefaultSqlAstJoinType(TableGroup parentTableGroup) { + return SqlAstJoinType.INNER; + } + + @Override + public boolean isSimpleJoinPredicate(Predicate predicate) { + return getForeignKeyDescriptor().isSimpleJoinPredicate( predicate ); + } + + @Override + public boolean isReferenceToPrimaryKey() { + return getForeignKeyDescriptor().getTargetPart() instanceof EntityIdentifierMapping; + } + + @Override + public boolean isFkOptimizationAllowed() { + return true; + } + + @Override + public ModelPart getKeyTargetMatchPart() { + return fkTargetModelPart; + } + + @Override + public TableGroupJoin createTableGroupJoin( + NavigablePath navigablePath, + TableGroup collectionTableGroup, + String explicitSourceAlias, + SqlAstJoinType requestedJoinType, + boolean fetched, + boolean addsPredicate, + SqlAliasBaseGenerator aliasBaseGenerator, + SqlExpressionResolver sqlExpressionResolver, + FromClauseAccess fromClauseAccess, + SqlAstCreationContext creationContext) { + final SqlAstJoinType joinType = requireNonNullElse( requestedJoinType, SqlAstJoinType.INNER ); + + final LazyTableGroup lazyTableGroup = createRootTableGroupJoin( + navigablePath, + collectionTableGroup, + explicitSourceAlias, + requestedJoinType, + fetched, + null, + aliasBaseGenerator, + sqlExpressionResolver, + fromClauseAccess, + creationContext + ); + + final TableGroupJoin join = new TableGroupJoin( + navigablePath, + joinType, + lazyTableGroup, + null + ); + + lazyTableGroup.setTableGroupInitializerCallback( + tableGroup -> join.applyPredicate( + foreignKey.generateJoinPredicate( + tableGroup.getPrimaryTableReference(), + collectionTableGroup.resolveTableReference( foreignKey.getKeyTable() ), + sqlExpressionResolver, + creationContext + ) + ) + ); + + return join; + } + + public LazyTableGroup createRootTableGroupJoin( + NavigablePath navigablePath, + TableGroup lhs, + String explicitSourceAlias, + SqlAstJoinType requestedJoinType, + boolean fetched, + Consumer predicateConsumer, + SqlAliasBaseGenerator aliasBaseGenerator, + SqlExpressionResolver sqlExpressionResolver, + FromClauseAccess fromClauseAccess, + SqlAstCreationContext creationContext) { + final SqlAstJoinType joinType = requireNonNullElse( requestedJoinType, SqlAstJoinType.INNER ); + final SqlAliasBase sqlAliasBase = aliasBaseGenerator.createSqlAliasBase( getSqlAliasStem() ); + final boolean canUseInnerJoin = joinType == SqlAstJoinType.INNER || lhs.canUseInnerJoins(); + + final LazyTableGroup lazyTableGroup = new LazyTableGroup( + canUseInnerJoin, + navigablePath, + fetched, + () -> createTableGroupInternal( + canUseInnerJoin, + navigablePath, + fetched, + null, + sqlAliasBase, + sqlExpressionResolver, + creationContext + ), + (np, tableExpression) -> { + if ( ! foreignKey.getKeyTable().equals( tableExpression ) ) { + return false; + } + + if ( navigablePath.equals( np.getParent() ) ) { + return getTargetKeyPropertyNames().contains( np.getLocalName() ); + } + + final String relativePath = np.relativize( navigablePath ); + if ( relativePath == null ) { + return false; + } + + // Empty relative path means the navigable paths are equal, + // in which case we allow resolving the parent table group + return relativePath.isEmpty() || getTargetKeyPropertyNames().contains( relativePath ); + }, + this, + explicitSourceAlias, + sqlAliasBase, + creationContext.getSessionFactory(), + lhs + ); + + if ( predicateConsumer != null ) { + final TableReference keySideTableReference = lhs.resolveTableReference( + navigablePath, + foreignKey.getKeyTable() + ); + + lazyTableGroup.setTableGroupInitializerCallback( + tableGroup -> predicateConsumer.accept( + foreignKey.generateJoinPredicate( + tableGroup.getPrimaryTableReference(), + keySideTableReference, + sqlExpressionResolver, + creationContext + ) + ) + ); + } + + return lazyTableGroup; + } + + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Initialization + + @Override + public boolean finishInitialization( + CollectionPersister collectionDescriptor, + Collection bootCollectionDescriptor, + String fkTargetModelPartName, + MappingModelCreationProcess creationProcess) { + if ( fkTargetModelPartName != null ) { + // @OneToMany + @JoinTable w/ @JoinColumn( referencedColumnName="fkTargetModelPartName" ) + fkTargetModelPart = resolveNamedTargetPart( fkTargetModelPartName, getAssociatedEntityMappingType(), collectionDescriptor ); + } + else if ( getNature() == Nature.INDEX ) { + assert bootCollectionDescriptor.isIndexed(); + + final PluralAttributeMapping pluralAttribute = collectionDescriptor.getAttributeMapping(); + final String mapKeyPropertyName = ( (Map) bootCollectionDescriptor ).getMapKeyPropertyName(); + if ( StringHelper.isNotEmpty( mapKeyPropertyName ) ) { + // @MapKey( name="fkTargetModelPartName" ) + final EntityCollectionPart elementDescriptor = (EntityCollectionPart) pluralAttribute.getElementDescriptor(); + final EntityMappingType entityMappingType = elementDescriptor.getEntityMappingType(); + fkTargetModelPart = resolveNamedTargetPart( mapKeyPropertyName, entityMappingType, collectionDescriptor ); + } + else { + fkTargetModelPart = getAssociatedEntityMappingType().getIdentifierMapping(); + } + } + else if ( StringHelper.isNotEmpty( bootCollectionDescriptor.getMappedByProperty() ) ) { + final ModelPart mappedByPart = resolveNamedTargetPart( bootCollectionDescriptor.getMappedByProperty(), getAssociatedEntityMappingType(), collectionDescriptor ); + if ( mappedByPart instanceof Association ) { + final Association toOne = (Association) mappedByPart; + if ( toOne.getForeignKeyDescriptor() == null ) { + // key is not yet ready, we need to wait + return false; + } + foreignKey = toOne.getForeignKeyDescriptor(); + } + else { + final PluralAttributeMapping manyToManyInverse = (PluralAttributeMapping) mappedByPart; + if ( manyToManyInverse.getKeyDescriptor() == null ) { + // the collection-key is not yet ready, we need to wait + return false; + } + foreignKey = manyToManyInverse.getKeyDescriptor(); + } + + fkTargetModelPart = foreignKey.getTargetPart(); + return true; + } + else { + // non-inverse @ManyToMany + fkTargetModelPart = getAssociatedEntityMappingType().getIdentifierMapping(); + } + + if ( getNature() == Nature.ELEMENT ) { + foreignKey = createForeignKeyDescriptor( + bootCollectionDescriptor.getElement(), + (EntityType) collectionDescriptor.getElementType(), + fkTargetModelPart, + creationProcess, + collectionDescriptor.getFactory().getJdbcServices().getDialect() + ); + } + else { + assert bootCollectionDescriptor.isIndexed(); + foreignKey = createForeignKeyDescriptor( + ( (IndexedCollection) bootCollectionDescriptor ).getIndex(), + (EntityType) collectionDescriptor.getIndexType(), + fkTargetModelPart, + creationProcess, + collectionDescriptor.getFactory().getJdbcServices().getDialect() + ); + } + + return true; + } + + private static ModelPart resolveNamedTargetPart( + String targetPartName, + EntityMappingType entityMappingType, + CollectionPersister collectionDescriptor) { + final ModelPart namedPart = entityMappingType.findByPath( targetPartName ); + if ( namedPart == null ) { + // This is expected to happen when processing a + // PostInitCallbackEntry because the callbacks + // are not ordered. The exception is caught in + // MappingModelCreationProcess.executePostInitCallbacks() + // and the callback is re-queued. + throw new IllegalStateException( + String.format( + Locale.ROOT, + "Could not resolve path `%s` relative to `%s` for many-to-many foreign-key target mapping - `%s`", + targetPartName, + entityMappingType.getEntityName(), + collectionDescriptor.getRole() + ) + ); + } + return namedPart; + } + + private ForeignKeyDescriptor createForeignKeyDescriptor( + Value fkBootDescriptorSource, + EntityType entityType, + ModelPart fkTargetModelPart, + MappingModelCreationProcess creationProcess, + Dialect dialect) { + assert fkTargetModelPart != null; + + // If this is mapped by a to-one attribute, we can use the FK of that attribute + if ( fkTargetModelPart instanceof ToOneAttributeMapping ) { + final ToOneAttributeMapping toOneAttributeMapping = (ToOneAttributeMapping) fkTargetModelPart; + if ( toOneAttributeMapping.getForeignKeyDescriptor() == null ) { + throw new IllegalStateException( "Not yet ready: " + toOneAttributeMapping ); + } + return toOneAttributeMapping.getForeignKeyDescriptor(); + } + + if ( fkTargetModelPart instanceof ManyToManyCollectionPart ) { + // can this ever be anything other than another (the inverse) many-to-many part? + final ManyToManyCollectionPart targetModelPart = (ManyToManyCollectionPart) fkTargetModelPart; + if ( targetModelPart.getForeignKeyDescriptor() == null ) { + throw new IllegalStateException( "Not yet ready: " + targetModelPart ); + } + return targetModelPart.getForeignKeyDescriptor(); + } + + final String collectionTableName = ( (CollectionMutationTarget) getCollectionDescriptor() ).getCollectionTableMapping().getTableName(); + + if ( fkTargetModelPart instanceof BasicValuedModelPart ) { + return createSimpleForeignKeyDescriptor( + fkBootDescriptorSource, + entityType, + creationProcess, + dialect, + collectionTableName, + (BasicValuedModelPart) fkTargetModelPart + ); + } + + if ( fkTargetModelPart instanceof EmbeddableValuedModelPart ) { + return MappingModelCreationHelper.buildEmbeddableForeignKeyDescriptor( + (EmbeddableValuedModelPart) fkTargetModelPart, + fkBootDescriptorSource, + findContainingEntityMapping(), + getCollectionDescriptor().getAttributeMapping(), + false, + fkBootDescriptorSource.getColumnInsertability(), + fkBootDescriptorSource.getColumnUpdateability(), + dialect, + creationProcess + ); + } + + throw new UnsupportedOperationException( + "Could not create many-to-many foreign-key : " + getNavigableRole().getFullPath() + ); + } + + private SimpleForeignKeyDescriptor createSimpleForeignKeyDescriptor( + Value fkBootDescriptorSource, + EntityType entityType, + MappingModelCreationProcess creationProcess, + Dialect dialect, + String fkKeyTableName, + BasicValuedModelPart basicFkTargetPart) { + final SelectableMapping keySelectableMapping = SelectableMappingImpl.from( + fkKeyTableName, + fkBootDescriptorSource.getSelectables().get(0), + basicFkTargetPart.getJdbcMapping(), + creationProcess.getCreationContext().getTypeConfiguration(), + fkBootDescriptorSource.isColumnInsertable( 0 ), + fkBootDescriptorSource.isColumnUpdateable( 0 ), + dialect, + creationProcess.getSqmFunctionRegistry() + ); + + final boolean hasConstraint; + if ( fkBootDescriptorSource instanceof SimpleValue ) { + hasConstraint = ( (SimpleValue) fkBootDescriptorSource ).isConstrained(); + } + else { + // We assume there is a constraint if the key is not nullable + hasConstraint = !fkBootDescriptorSource.isNullable(); + } + + // here we build a ModelPart that represents the many-to-many table key referring to the element table + return new SimpleForeignKeyDescriptor( + getAssociatedEntityMappingType(), + keySelectableMapping, + basicFkTargetPart, + entityType.isReferenceToPrimaryKey(), + hasConstraint + ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java index aebe61d3ae..462272af2e 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java @@ -7,6 +7,7 @@ package org.hibernate.metamodel.mapping.internal; import java.io.Serializable; +import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.SortedMap; @@ -16,7 +17,6 @@ import org.hibernate.FetchMode; import org.hibernate.MappingException; import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.SharedSessionContract; -import org.hibernate.annotations.NotFoundAction; import org.hibernate.boot.model.relational.SqlStringGenerationContext; import org.hibernate.collection.internal.StandardArraySemantics; import org.hibernate.collection.internal.StandardBagSemantics; @@ -82,6 +82,11 @@ import org.hibernate.persister.entity.Joinable; import org.hibernate.property.access.internal.ChainedPropertyAccessImpl; import org.hibernate.property.access.spi.PropertyAccess; import org.hibernate.sql.ast.spi.SqlAliasStemHelper; +import org.hibernate.sql.ast.spi.SqlExpressionResolver; +import org.hibernate.sql.ast.tree.expression.ColumnReference; +import org.hibernate.sql.ast.tree.expression.Expression; +import org.hibernate.sql.ast.tree.expression.SqlTuple; +import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableGroupProducer; import org.hibernate.tuple.ValueGeneration; import org.hibernate.type.AssociationType; @@ -98,6 +103,7 @@ import org.hibernate.type.descriptor.java.spi.JavaTypeRegistry; import org.hibernate.type.spi.TypeConfiguration; import static org.hibernate.metamodel.mapping.MappingModelCreationLogger.LOGGER; +import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey; /** * @author Steve Ebersole @@ -126,11 +132,14 @@ public class MappingModelCreationHelper { final PropertyAccess propertyAccess = entityPersister.getRepresentationStrategy() .resolvePropertyAccess( bootEntityDescriptor.getIdentifierProperty() ); + final Component component = (Component) bootProperty.getValue(); final EmbeddableMappingTypeImpl embeddableMappingType = EmbeddableMappingTypeImpl.from( - (Component) bootProperty.getValue(), + component, cidType, rootTableName, rootTableKeyColumnNames, + component.getColumnInsertability(), + component.getColumnUpdateability(), embeddable -> new EmbeddedIdentifierMappingImpl( entityPersister, attributeName, @@ -182,6 +191,9 @@ public class MappingModelCreationHelper { Long length, Integer precision, Integer scale, + boolean nullable, + boolean insertable, + boolean updateable, PropertyAccess propertyAccess, CascadeStyle cascadeStyle, MappingModelCreationProcess creationProcess) { @@ -272,6 +284,9 @@ public class MappingModelCreationHelper { length, precision, scale, + nullable, + insertable, + updateable, attrType, declaringType, propertyAccess, @@ -305,6 +320,8 @@ public class MappingModelCreationHelper { attrType, tableExpression, rootTableKeyColumnNames, + component.getColumnInsertability(), + component.getColumnUpdateability(), attributeMappingType -> { if ( component.isEmbedded() ) { return new VirtualEmbeddedAttributeMapping( @@ -548,6 +565,8 @@ public class MappingModelCreationHelper { index.getSelectables().get(0), creationContext.getTypeConfiguration().getBasicTypeForJavaType( Integer.class ), creationProcess.getCreationContext().getTypeConfiguration(), + index.isColumnInsertable( 0 ), + index.isColumnUpdateable( 0 ), dialect, creationProcess.getSqmFunctionRegistry() ); @@ -598,6 +617,8 @@ public class MappingModelCreationHelper { index.getSelectables().get(0), creationContext.getTypeConfiguration().getBasicTypeForJavaType( Integer.class ), creationProcess.getCreationContext().getTypeConfiguration(), + index.isColumnInsertable( 0 ), + index.isColumnUpdateable( 0 ), dialect, creationProcess.getSqmFunctionRegistry() ); @@ -795,10 +816,11 @@ public class MappingModelCreationHelper { final KeyValue bootValueMappingKey = bootValueMapping.getKey(); final Type keyType = bootValueMappingKey.getType(); - final ModelPart fkTarget; + final ModelPart fkTargetPart; final String lhsPropertyName = collectionDescriptor.getCollectionType().getLHSPropertyName(); final boolean isReferenceToPrimaryKey = lhsPropertyName == null; final ManagedMappingType keyDeclaringType; + if ( collectionDescriptor.getElementType().isEntityType() ) { keyDeclaringType = ( (QueryableCollection) collectionDescriptor ).getElementPersister(); } @@ -809,55 +831,61 @@ public class MappingModelCreationHelper { // Since the declaring type is needed for certain operations, we use the one from the target side of the FK keyDeclaringType = declaringType; } + if ( isReferenceToPrimaryKey ) { - fkTarget = collectionDescriptor.getOwnerEntityPersister().getIdentifierMapping(); + fkTargetPart = collectionDescriptor.getOwnerEntityPersister().getIdentifierMapping(); } else { - fkTarget = declaringType.findAttributeMapping( lhsPropertyName ); + fkTargetPart = declaringType.findAttributeMapping( lhsPropertyName ); } if ( keyType instanceof BasicType ) { assert bootValueMappingKey.getColumnSpan() == 1; - assert fkTarget instanceof BasicValuedModelPart; - final BasicValuedModelPart simpleFkTarget = (BasicValuedModelPart) fkTarget; - final String tableExpression = getTableIdentifierExpression( bootValueMappingKey.getTable(), creationProcess ); + assert fkTargetPart instanceof BasicValuedModelPart; + + final BasicValuedModelPart simpleFkTargetPart = (BasicValuedModelPart) fkTargetPart; + + final String keyTableExpression = getTableIdentifierExpression( bootValueMappingKey.getTable(), creationProcess ); final SelectableMapping keySelectableMapping = SelectableMappingImpl.from( - tableExpression, + keyTableExpression, bootValueMappingKey.getSelectables().get(0), (JdbcMapping) keyType, creationProcess.getCreationContext().getTypeConfiguration(), + bootValueMappingKey.isColumnInsertable( 0 ), + bootValueMappingKey.isColumnUpdateable( 0 ), dialect, creationProcess.getSqmFunctionRegistry() ); - attributeMapping.setForeignKeyDescriptor( - new SimpleForeignKeyDescriptor( - keyDeclaringType, - simpleFkTarget, - null, - keySelectableMapping, - simpleFkTarget, - isReferenceToPrimaryKey, - ( (SimpleValue) bootValueMappingKey ).isConstrained() - ) - ); - } - else if ( fkTarget instanceof EmbeddableValuedModelPart ) { - final EmbeddedForeignKeyDescriptor embeddedForeignKeyDescriptor = - buildEmbeddableForeignKeyDescriptor( - (EmbeddableValuedModelPart) fkTarget, - bootValueMapping, - keyDeclaringType, - collectionDescriptor.getAttributeMapping(), - false, - dialect, - creationProcess - ); - attributeMapping.setForeignKeyDescriptor( embeddedForeignKeyDescriptor ); + final SimpleForeignKeyDescriptor keyDescriptor = new SimpleForeignKeyDescriptor( + keyDeclaringType, + keySelectableMapping, + simpleFkTargetPart, + isReferenceToPrimaryKey, + ( (SimpleValue) bootValueMappingKey ).isConstrained() + ); + attributeMapping.setForeignKeyDescriptor( keyDescriptor ); + creationProcess.registerForeignKey( collectionDescriptor.getAttributeMapping(), keyDescriptor ); + } + else if ( fkTargetPart instanceof EmbeddableValuedModelPart ) { + final EmbeddedForeignKeyDescriptor keyDescriptor = buildEmbeddableForeignKeyDescriptor( + (EmbeddableValuedModelPart) fkTargetPart, + bootValueMapping, + keyDeclaringType, + collectionDescriptor.getAttributeMapping(), + false, + bootValueMappingKey.getColumnInsertability(), + bootValueMappingKey.getColumnUpdateability(), + dialect, + creationProcess + ); + + attributeMapping.setForeignKeyDescriptor( keyDescriptor ); + creationProcess.registerForeignKey( collectionDescriptor.getAttributeMapping(), keyDescriptor ); } else { throw new NotYetImplementedFor6Exception( - "Support for " + fkTarget.getClass() + " foreign keys not yet implemented: " + bootValueMapping.getRole() + "Support for " + fkTargetPart.getClass() + " foreign keys not yet implemented: " + bootValueMapping.getRole() ); } } @@ -934,6 +962,8 @@ public class MappingModelCreationHelper { attributeMapping.getDeclaringType(), attributeMapping.findContainingEntityMapping(), true, + bootValueMapping.getColumnInsertability(), + bootValueMapping.getColumnUpdateability(), dialect, creationProcess ); @@ -965,42 +995,42 @@ public class MappingModelCreationHelper { final Iterator columnIterator = bootValueMapping.getColumnIterator(); final Table table = bootValueMapping.getTable(); final String tableExpression = getTableIdentifierExpression( table, creationProcess ); - final BasicValuedModelPart declaringKeyPart; final PropertyAccess declaringKeyPropertyAccess; if ( inversePropertyAccess == null ) { // So far, OneToOne mappings are only supported based on the owner's PK if ( bootValueMapping instanceof OneToOne ) { - declaringKeyPart = simpleFkTarget; final EntityIdentifierMapping identifierMapping = attributeMapping.findContainingEntityMapping() .getIdentifierMapping(); declaringKeyPropertyAccess = ( (PropertyBasedMapping) identifierMapping ).getPropertyAccess(); } else { - declaringKeyPart = simpleFkTarget; -// declaringKeyPropertyAccess = ( (PropertyBasedMapping) declaringKeyPart ).getPropertyAccess(); declaringKeyPropertyAccess = new ChainedPropertyAccessImpl( attributeMapping.getPropertyAccess(), - ( (PropertyBasedMapping) declaringKeyPart ).getPropertyAccess() + ( (PropertyBasedMapping) simpleFkTarget ).getPropertyAccess() ); } } else { - declaringKeyPart = simpleFkTarget; declaringKeyPropertyAccess = new ChainedPropertyAccessImpl( inversePropertyAccess, ( (PropertyBasedMapping) simpleFkTarget ).getPropertyAccess() ); } final SelectableMapping keySelectableMapping; + int i = 0; + final Value value = bootProperty.getValue(); if ( columnIterator.hasNext() ) { keySelectableMapping = SelectableMappingImpl.from( tableExpression, columnIterator.next(), simpleFkTarget.getJdbcMapping(), creationProcess.getCreationContext().getTypeConfiguration(), + value.isColumnInsertable( i ), + value.isColumnUpdateable( i ), dialect, creationProcess.getSqmFunctionRegistry() ); + i++; } else { // case of ToOne with @PrimaryKeyJoinColumn @@ -1009,6 +1039,8 @@ public class MappingModelCreationHelper { table.getPrimaryKey().getColumn( 0 ), simpleFkTarget.getJdbcMapping(), creationProcess.getCreationContext().getTypeConfiguration(), + value.isColumnInsertable( 0 ), + value.isColumnUpdateable( 0 ), dialect, creationProcess.getSqmFunctionRegistry() ); @@ -1016,27 +1048,31 @@ public class MappingModelCreationHelper { final ForeignKeyDescriptor foreignKeyDescriptor = new SimpleForeignKeyDescriptor( attributeMapping.getDeclaringType(), - declaringKeyPart, - declaringKeyPropertyAccess, keySelectableMapping, + declaringKeyPropertyAccess, simpleFkTarget, bootValueMapping.isReferenceToPrimaryKey(), bootValueMapping.isConstrained(), swapDirection ); attributeMapping.setForeignKeyDescriptor( foreignKeyDescriptor ); + creationProcess.registerForeignKey( attributeMapping, foreignKeyDescriptor ); } else if ( fkTarget instanceof EmbeddableValuedModelPart ) { + final Value value = bootProperty.getValue(); final EmbeddedForeignKeyDescriptor embeddedForeignKeyDescriptor = buildEmbeddableForeignKeyDescriptor( (EmbeddableValuedModelPart) fkTarget, bootValueMapping, attributeMapping.getDeclaringType(), attributeMapping.findContainingEntityMapping(), swapDirection, + value.getColumnInsertability(), + value.getColumnUpdateability(), dialect, creationProcess ); attributeMapping.setForeignKeyDescriptor( embeddedForeignKeyDescriptor ); + creationProcess.registerForeignKey( attributeMapping, embeddedForeignKeyDescriptor ); } else { throw new NotYetImplementedFor6Exception( @@ -1106,6 +1142,8 @@ public class MappingModelCreationHelper { ManagedMappingType keyDeclaringType, TableGroupProducer keyDeclaringTableGroupProducer, boolean inverse, + boolean[] insertable, + boolean[] updateable, Dialect dialect, MappingModelCreationProcess creationProcess) { final boolean hasConstraint; @@ -1113,7 +1151,7 @@ public class MappingModelCreationHelper { final String keyTableExpression; if ( bootValueMapping instanceof Collection ) { final Collection collectionBootValueMapping = (Collection) bootValueMapping; - hasConstraint = ( (SimpleValue) collectionBootValueMapping.getKey() ).isConstrained(); + hasConstraint = ((SimpleValue) collectionBootValueMapping.getKey()).isConstrained(); keyTableExpression = getTableIdentifierExpression( collectionBootValueMapping.getCollectionTable(), creationProcess @@ -1124,6 +1162,8 @@ public class MappingModelCreationHelper { getPropertyOrder( bootValueMapping, creationProcess ), creationProcess.getCreationContext().getSessionFactory(), creationProcess.getCreationContext().getTypeConfiguration(), + insertable, + updateable, dialect, creationProcess.getSqmFunctionRegistry() ); @@ -1134,7 +1174,7 @@ public class MappingModelCreationHelper { hasConstraint = !bootValueMapping.isNullable(); } else { - hasConstraint = ( (SimpleValue) bootValueMapping ).isConstrained(); + hasConstraint = ((SimpleValue) bootValueMapping).isConstrained(); } keyTableExpression = getTableIdentifierExpression( bootValueMapping.getTable(), @@ -1146,6 +1186,8 @@ public class MappingModelCreationHelper { getPropertyOrder( bootValueMapping, creationProcess ), creationProcess.getCreationContext().getSessionFactory(), creationProcess.getCreationContext().getTypeConfiguration(), + insertable, + updateable, dialect, creationProcess.getSqmFunctionRegistry() ); @@ -1293,6 +1335,8 @@ public class MappingModelCreationHelper { basicValue.getSelectables().get(0), basicValue.resolve().getJdbcMapping(), creationProcess.getCreationContext().getTypeConfiguration(), + basicValue.isColumnInsertable( 0 ), + basicValue.isColumnUpdateable( 0 ), dialect, creationProcess.getSqmFunctionRegistry() ); @@ -1311,6 +1355,8 @@ public class MappingModelCreationHelper { final EmbeddableMappingTypeImpl mappingType = EmbeddableMappingTypeImpl.from( component, compositeType, + component.getColumnInsertability(), + component.getColumnUpdateability(), inflightDescriptor -> new EmbeddedCollectionPart( collectionDescriptor, CollectionPart.Nature.INDEX, @@ -1330,27 +1376,38 @@ public class MappingModelCreationHelper { final EntityType indexEntityType = (EntityType) collectionDescriptor.getIndexType(); final EntityPersister associatedEntity = creationProcess.getEntityPersister( indexEntityType.getAssociatedEntityName() ); - final EntityCollectionPart indexDescriptor = new EntityCollectionPart( - collectionDescriptor, - CollectionPart.Nature.INDEX, - bootMapKeyDescriptor, - null, - associatedEntity, - creationProcess - ); + final EntityCollectionPart.Cardinality partCardinality = bootMapKeyDescriptor instanceof OneToMany + ? EntityCollectionPart.Cardinality.ONE_TO_MANY + : EntityCollectionPart.Cardinality.MANY_TO_MANY; + + final EntityCollectionPart indexDescriptor; + if ( bootMapKeyDescriptor instanceof OneToMany ) { + indexDescriptor = new OneToManyCollectionPart( + CollectionPart.Nature.INDEX, + bootValueMapping, + collectionDescriptor, + associatedEntity, + creationProcess + ); + } + else { + indexDescriptor = new ManyToManyCollectionPart( + CollectionPart.Nature.INDEX, + bootValueMapping, + collectionDescriptor, + associatedEntity, + creationProcess + ); + } creationProcess.registerInitializationCallback( "PluralAttributeMapping( " + bootValueMapping.getRole() + ") - index descriptor", - () -> { - indexDescriptor.finishInitialization( - collectionDescriptor, - bootValueMapping, - indexEntityType.getRHSUniqueKeyPropertyName(), - creationProcess - ); - - return true; - } + () -> indexDescriptor.finishInitialization( + collectionDescriptor, + bootValueMapping, + indexEntityType.getRHSUniqueKeyPropertyName(), + creationProcess + ) ); return indexDescriptor; @@ -1377,6 +1434,8 @@ public class MappingModelCreationHelper { basicElement.getSelectables().get(0), basicElement.resolve().getJdbcMapping(), creationProcess.getCreationContext().getTypeConfiguration(), + basicElement.isColumnInsertable( 0 ), + basicElement.isColumnUpdateable( 0 ), dialect, creationProcess.getSqmFunctionRegistry() ); @@ -1395,6 +1454,8 @@ public class MappingModelCreationHelper { final EmbeddableMappingTypeImpl mappingType = EmbeddableMappingTypeImpl.from( component, compositeType, + component.getColumnInsertability(), + component.getColumnUpdateability(), embeddableMappingType -> new EmbeddedCollectionPart( collectionDescriptor, CollectionPart.Nature.ELEMENT, @@ -1432,45 +1493,43 @@ public class MappingModelCreationHelper { final EntityType elementEntityType = (EntityType) collectionDescriptor.getElementType(); final EntityPersister associatedEntity = creationProcess.getEntityPersister( elementEntityType.getAssociatedEntityName() ); - final NotFoundAction notFoundAction; - if ( element instanceof ManyToOne ) { - notFoundAction = ( (ManyToOne) element ).getNotFoundAction(); - } - else if ( element instanceof OneToMany ) { - notFoundAction = ( (OneToMany) element ).getNotFoundAction(); + final EntityCollectionPart elementDescriptor; + if ( element instanceof OneToMany ) { + elementDescriptor = new OneToManyCollectionPart( + CollectionPart.Nature.ELEMENT, + bootDescriptor, + collectionDescriptor, + associatedEntity, + ( (OneToMany) element ).getNotFoundAction(), + creationProcess + ); } else { - throw new IllegalArgumentException( "Just seeing if this happens" ); + elementDescriptor = new ManyToManyCollectionPart( + CollectionPart.Nature.ELEMENT, + bootDescriptor, + collectionDescriptor, + associatedEntity, + ( (ManyToOne) element ).getNotFoundAction(), + creationProcess + ); } - final EntityCollectionPart elementDescriptor = new EntityCollectionPart( - collectionDescriptor, - CollectionPart.Nature.ELEMENT, - bootDescriptor.getElement(), - notFoundAction, - associatedEntity, - creationProcess - ); - creationProcess.registerInitializationCallback( - "PluralAttributeMapping( " + elementDescriptor.getNavigableRole() + ") - index descriptor", - () -> { - elementDescriptor.finishInitialization( - collectionDescriptor, - bootDescriptor, - elementEntityType.getRHSUniqueKeyPropertyName(), - creationProcess - ); - - return true; - } + "PluralAttributeMapping( " + elementDescriptor.getNavigableRole() + ") - element descriptor", + () -> elementDescriptor.finishInitialization( + collectionDescriptor, + bootDescriptor, + elementEntityType.getRHSUniqueKeyPropertyName(), + creationProcess + ) ); return elementDescriptor; } - throw new NotYetImplementedFor6Exception( - "Support for plural attributes with element type [" + element + "] not yet implemented" + throw new UnsupportedOperationException( + "Unexpected plural-attribute element type : " + element.getClass().getName() ); } @@ -1513,6 +1572,68 @@ public class MappingModelCreationHelper { } } + public static Expression buildColumnReferenceExpression( + ModelPart modelPart, + SqlExpressionResolver sqlExpressionResolver, + SessionFactoryImplementor sessionFactory) { + return buildColumnReferenceExpression( null, modelPart, sqlExpressionResolver, sessionFactory ); + } + + public static Expression buildColumnReferenceExpression( + TableGroup tableGroup, + ModelPart modelPart, + SqlExpressionResolver sqlExpressionResolver, + SessionFactoryImplementor sessionFactory) { + final int jdbcTypeCount = modelPart.getJdbcTypeCount(); + + if ( modelPart instanceof EmbeddableValuedModelPart ) { + final List columnReferences = new ArrayList<>( jdbcTypeCount ); + modelPart.forEachSelectable( + (columnIndex, selection) -> { + final ColumnReference colRef; + final String qualifier; + if ( tableGroup == null ) { + qualifier = selection.getContainingTableExpression(); + } + else { + qualifier = tableGroup.resolveTableReference( selection.getContainingTableExpression() ).getIdentificationVariable(); + } + if ( sqlExpressionResolver == null ) { + colRef = new ColumnReference( qualifier, selection ); + } + else { + colRef = (ColumnReference) sqlExpressionResolver.resolveSqlExpression( + createColumnReferenceKey( qualifier, selection.getSelectionExpression() ), + sqlAstProcessingState -> new ColumnReference( qualifier, selection ) + ); + } + columnReferences.add( colRef ); + } + ); + return new SqlTuple( columnReferences, modelPart ); + } + else { + assert modelPart instanceof BasicValuedModelPart; + final BasicValuedModelPart basicPart = (BasicValuedModelPart) modelPart; + final String qualifier; + if ( tableGroup == null ) { + qualifier = basicPart.getContainingTableExpression(); + } + else { + qualifier = tableGroup.resolveTableReference( basicPart.getContainingTableExpression() ).getIdentificationVariable(); + } + if ( sqlExpressionResolver == null ) { + return new ColumnReference( qualifier, basicPart ); + } + else { + return sqlExpressionResolver.resolveSqlExpression( + createColumnReferenceKey( qualifier, basicPart.getSelectionExpression() ), + sqlAstProcessingState -> new ColumnReference( qualifier, basicPart ) + ); + } + } + } + private static class CollectionMappingTypeImpl implements CollectionMappingType { private final JavaType collectionJtd; private final CollectionSemantics semantics; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationProcess.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationProcess.java index ea67356f75..631780a394 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationProcess.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationProcess.java @@ -10,10 +10,13 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.function.Consumer; +import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; import org.hibernate.metamodel.mapping.MappingModelCreationLogger; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.NonTransientException; +import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.query.sqm.function.SqmFunctionRegistry; @@ -180,6 +183,44 @@ public class MappingModelCreationProcess { registerInitializationCallback( description, callback ); } + private final Map keyDescriptorMap = new HashMap<>(); + private final Map>> keyDescriptorWaitingConsumerMap = new HashMap<>(); + + public void withForeignKey(ModelPart keyOwner, Consumer consumer) { + withForeignKey( keyOwner.getNavigableRole(), consumer ); + } + + private void withForeignKey(NavigableRole navigableRole, Consumer consumer) { + final ForeignKeyDescriptor keyDescriptor = keyDescriptorMap.get( navigableRole ); + if ( keyDescriptor != null ) { + consumer.accept( keyDescriptor ); + } + else { + final List> existingConsumers = keyDescriptorWaitingConsumerMap.get( navigableRole ); + final List> consumers; + if ( existingConsumers != null ) { + consumers = existingConsumers; + } + else { + consumers = new ArrayList<>(); + keyDescriptorWaitingConsumerMap.put( navigableRole, consumers ); + } + consumers.add( consumer ); + } + } + + public void registerForeignKey(ModelPart keyOwner, ForeignKeyDescriptor keyDescriptor) { + final NavigableRole navigableRole = keyOwner.getNavigableRole(); + keyDescriptorMap.put( navigableRole, keyDescriptor ); + + final List> waitingConsumers = keyDescriptorWaitingConsumerMap.remove( navigableRole ); + if ( waitingConsumers != null ) { + for ( int i = 0; i < waitingConsumers.size(); i++ ) { + waitingConsumers.get( i ).accept( keyDescriptor ); + } + } + } + @FunctionalInterface public interface PostInitCallback { boolean process(); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java index 3b55d781a6..97c6a7940a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java @@ -28,7 +28,6 @@ import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlAstCreationState; -import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.expression.Expression; @@ -289,7 +288,6 @@ public class NonAggregatedIdentifierMappingImpl extends AbstractCompositeIdentif @Override public void breakDownJdbcValues(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { - assert domainValue instanceof Object[]; identifierValueMapper.breakDownJdbcValues( domainValue, valueConsumer, session ); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java new file mode 100644 index 0000000000..9c6a4951bc --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java @@ -0,0 +1,232 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.metamodel.mapping.internal; + +import java.util.function.Consumer; + +import org.hibernate.annotations.NotFoundAction; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.mapping.Collection; +import org.hibernate.mapping.Map; +import org.hibernate.metamodel.mapping.AssociationKey; +import org.hibernate.metamodel.mapping.AttributeMapping; +import org.hibernate.metamodel.mapping.EntityMappingType; +import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; +import org.hibernate.metamodel.mapping.PluralAttributeMapping; +import org.hibernate.metamodel.mapping.SelectableConsumer; +import org.hibernate.persister.collection.CollectionPersister; +import org.hibernate.spi.NavigablePath; +import org.hibernate.sql.ast.SqlAstJoinType; +import org.hibernate.sql.ast.spi.FromClauseAccess; +import org.hibernate.sql.ast.spi.SqlAliasBase; +import org.hibernate.sql.ast.spi.SqlAliasBaseGenerator; +import org.hibernate.sql.ast.spi.SqlAstCreationContext; +import org.hibernate.sql.ast.spi.SqlExpressionResolver; +import org.hibernate.sql.ast.tree.from.OneToManyTableGroup; +import org.hibernate.sql.ast.tree.from.TableGroup; +import org.hibernate.sql.ast.tree.from.TableGroupJoin; +import org.hibernate.sql.ast.tree.from.TableGroupJoinProducer; +import org.hibernate.sql.ast.tree.predicate.Predicate; + +import static java.util.Objects.requireNonNullElse; + +/** + * order( id, ... ) + * item( id, order_fk, ... ) + * + * `Order#items` + * table : item + * key : order_fk + * element : id + * + * @author Steve Ebersole + */ +public class OneToManyCollectionPart extends AbstractEntityCollectionPart implements TableGroupJoinProducer { + private final String mapKeyPropertyName; + private AssociationKey fetchAssociationKey; + + public OneToManyCollectionPart( + Nature nature, + Collection bootCollectionDescriptor, + CollectionPersister collectionDescriptor, + EntityMappingType elementTypeDescriptor, + MappingModelCreationProcess creationProcess) { + this( nature, bootCollectionDescriptor, collectionDescriptor, elementTypeDescriptor, NotFoundAction.EXCEPTION, creationProcess ); + } + + public OneToManyCollectionPart( + Nature nature, + Collection bootCollectionDescriptor, + CollectionPersister collectionDescriptor, + EntityMappingType elementTypeDescriptor, + NotFoundAction notFoundAction, + MappingModelCreationProcess creationProcess) { + super( nature, bootCollectionDescriptor, collectionDescriptor, elementTypeDescriptor, notFoundAction, creationProcess ); + + if ( nature == Nature.INDEX && bootCollectionDescriptor instanceof Map ) { + mapKeyPropertyName = ( (Map) bootCollectionDescriptor ).getMapKeyPropertyName(); + } + else { + mapKeyPropertyName = null; + } + } + + @Override + public Cardinality getCardinality() { + return Cardinality.ONE_TO_MANY; + } + + @Override + public void breakDownJdbcValues( + Object domainValue, + JdbcValueConsumer valueConsumer, + SharedSessionContractImplementor session) { + getAssociatedEntityMappingType().getIdentifierMapping().breakDownJdbcValues( + disassemble( domainValue, session ), + valueConsumer, + session + ); + } + + @Override + public Object disassemble(Object value, SharedSessionContractImplementor session) { + if ( value == null ) { + return null; + } + + // should be an instance of the associated entity + return getAssociatedEntityMappingType().getIdentifierMapping().getIdentifier( value ); + } + + @Override + public int forEachSelectable(int offset, SelectableConsumer consumer) { + return getCollectionDescriptor().getAttributeMapping().getKeyDescriptor().getKeyPart().forEachSelectable( offset, consumer ); +// return super.forEachSelectable( offset, consumer ); + } + + @Override + protected AssociationKey resolveFetchAssociationKey() { + return fetchAssociationKey; + } + + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // TableGroupJoinProducer + // todo (mutation) : this is only needed for `AbstractEntityCollectionPart#generateFetch` + // to create the map-key join + + @Override + public SqlAstJoinType getDefaultSqlAstJoinType(TableGroup parentTableGroup) { + return SqlAstJoinType.INNER; + } + + @Override + public boolean isSimpleJoinPredicate(Predicate predicate) { + return getCollectionDescriptor().getAttributeMapping().getKeyDescriptor().isSimpleJoinPredicate( predicate ); + } + + @Override + public TableGroupJoin createTableGroupJoin( + NavigablePath navigablePath, + TableGroup collectionTableGroup, + String explicitSourceAlias, + SqlAstJoinType requestedJoinType, + boolean fetched, + boolean addsPredicate, + SqlAliasBaseGenerator aliasBaseGenerator, + SqlExpressionResolver sqlExpressionResolver, + FromClauseAccess fromClauseAccess, + SqlAstCreationContext creationContext) { + final SqlAstJoinType joinType = requireNonNullElse( requestedJoinType, SqlAstJoinType.INNER ); + final TableGroup elementTableGroup = ( (OneToManyTableGroup) collectionTableGroup ).getElementTableGroup(); + + // INDEX is implied if mapKeyPropertyName is not null + if ( mapKeyPropertyName != null ) { + final EntityCollectionPart elementPart = (EntityCollectionPart) getCollectionDescriptor().getAttributeMapping().getElementDescriptor(); + final EntityMappingType elementEntity = elementPart.getAssociatedEntityMappingType(); + final AttributeMapping mapKeyAttribute = elementEntity.findAttributeMapping( mapKeyPropertyName ); + if ( mapKeyAttribute instanceof ToOneAttributeMapping ) { + final ToOneAttributeMapping toOne = (ToOneAttributeMapping) mapKeyAttribute; + final NavigablePath mapKeyPropertyPath = navigablePath.append( mapKeyPropertyName ); + final TableGroupJoin tableGroupJoin = toOne.createTableGroupJoin( + mapKeyPropertyPath, + elementTableGroup, + null, + null, + fetched, + addsPredicate, + aliasBaseGenerator, + sqlExpressionResolver, + fromClauseAccess, + creationContext + ); + fromClauseAccess.registerTableGroup( mapKeyPropertyPath, tableGroupJoin.getJoinedGroup() ); + return tableGroupJoin; + } + } + + return new TableGroupJoin( navigablePath, joinType, elementTableGroup, null ); + } + + @Override + public TableGroup createRootTableGroupJoin( + NavigablePath navigablePath, + TableGroup lhs, + String explicitSourceAlias, + SqlAstJoinType sqlAstJoinType, + boolean fetched, + Consumer predicateConsumer, + SqlAliasBaseGenerator aliasBaseGenerator, + SqlExpressionResolver sqlExpressionResolver, + FromClauseAccess fromClauseAccess, + SqlAstCreationContext creationContext) { + return createTableGroupInternal( + true, + navigablePath, + fetched, + explicitSourceAlias, + aliasBaseGenerator.createSqlAliasBase( getSqlAliasStem() ), + sqlExpressionResolver, + creationContext + ); + } + + public TableGroup createAssociatedTableGroup( + boolean canUseInnerJoins, + NavigablePath append, + boolean fetched, + String sourceAlias, + SqlAliasBase sqlAliasBase, + SqlExpressionResolver sqlExpressionResolver, + SqlAstCreationContext creationContext) { + return createTableGroupInternal( canUseInnerJoins, append, fetched, sourceAlias, sqlAliasBase, sqlExpressionResolver, creationContext ); + } + + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Initialization + + @Override + public boolean finishInitialization( + CollectionPersister collectionDescriptor, + Collection bootValueMapping, + String fkTargetModelPartName, + MappingModelCreationProcess creationProcess) { + final PluralAttributeMapping pluralAttribute = getCollectionDescriptor().getAttributeMapping(); + if ( pluralAttribute == null ) { + return false; + } + + final ForeignKeyDescriptor foreignKey = pluralAttribute.getKeyDescriptor(); + if ( foreignKey == null ) { + return false; + } + + fetchAssociationKey = foreignKey.getAssociationKey(); + return true; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java index 08803fe76a..dc86911869 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java @@ -53,11 +53,11 @@ import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.from.CollectionTableGroup; import org.hibernate.sql.ast.tree.from.NamedTableReference; +import org.hibernate.sql.ast.tree.from.OneToManyTableGroup; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableGroupJoin; import org.hibernate.sql.ast.tree.from.TableGroupJoinProducer; import org.hibernate.sql.ast.tree.from.TableReference; -import org.hibernate.sql.ast.tree.from.OneToManyTableGroup; import org.hibernate.sql.ast.tree.predicate.Predicate; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.DomainResultCreationState; @@ -664,7 +664,7 @@ public class PluralAttributeMappingImpl SqlExpressionResolver sqlExpressionResolver, FromClauseAccess fromClauseAccess, SqlAstCreationContext creationContext) { - final TableGroup elementTableGroup = ( (EntityCollectionPart) elementDescriptor ).createTableGroupInternal( + final TableGroup elementTableGroup = ( (OneToManyCollectionPart) elementDescriptor ).createAssociatedTableGroup( canUseInnerJoins, navigablePath.append( CollectionPart.Nature.ELEMENT.getName() ), fetched, @@ -676,6 +676,7 @@ public class PluralAttributeMappingImpl final OneToManyTableGroup tableGroup = new OneToManyTableGroup( this, elementTableGroup, +// this::createIndexTableGroup, creationContext.getSessionFactory() ); @@ -713,8 +714,7 @@ public class PluralAttributeMappingImpl final TableReference collectionTableReference = new NamedTableReference( collectionTableName, sqlAliasBase.generateNewAlias(), - true, - creationContext.getSessionFactory() + true ); final CollectionTableGroup tableGroup = new CollectionTableGroup( diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingImpl.java index 48f2b6da05..75346f4e24 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingImpl.java @@ -6,11 +6,13 @@ */ package org.hibernate.metamodel.mapping.internal; +import java.util.Locale; + import org.hibernate.dialect.Dialect; import org.hibernate.mapping.Column; import org.hibernate.mapping.Selectable; -import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.JdbcMapping; +import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.query.sqm.function.SqmFunctionRegistry; import org.hibernate.type.spi.TypeConfiguration; @@ -23,6 +25,9 @@ public class SelectableMappingImpl extends SqlTypedMappingImpl implements Select private final String selectionExpression; private final String customReadExpression; private final String customWriteExpression; + private final boolean nullable; + private final boolean insertable; + private final boolean updateable; private final boolean isFormula; public SelectableMappingImpl( @@ -34,6 +39,9 @@ public class SelectableMappingImpl extends SqlTypedMappingImpl implements Select Long length, Integer precision, Integer scale, + boolean nullable, + boolean insertable, + boolean updateable, boolean isFormula, JdbcMapping jdbcMapping) { super( columnDefinition, length, precision, scale, jdbcMapping ); @@ -42,6 +50,9 @@ public class SelectableMappingImpl extends SqlTypedMappingImpl implements Select this.selectionExpression = selectionExpression == null ? null : selectionExpression.intern(); this.customReadExpression = customReadExpression == null ? null : customReadExpression.intern(); this.customWriteExpression = customWriteExpression == null ? null : customWriteExpression.intern(); + this.nullable = nullable; + this.insertable = insertable; + this.updateable = updateable; this.isFormula = isFormula; } @@ -50,6 +61,8 @@ public class SelectableMappingImpl extends SqlTypedMappingImpl implements Select final Selectable selectable, final JdbcMapping jdbcMapping, final TypeConfiguration typeConfiguration, + boolean insertable, + boolean updateable, final Dialect dialect, final SqmFunctionRegistry sqmFunctionRegistry) { final String columnExpression; @@ -57,12 +70,14 @@ public class SelectableMappingImpl extends SqlTypedMappingImpl implements Select final Long length; final Integer precision; final Integer scale; + final boolean isNullable; if ( selectable.isFormula() ) { columnExpression = selectable.getTemplate( dialect, typeConfiguration, sqmFunctionRegistry ); columnDefinition = null; length = null; precision = null; scale = null; + isNullable = true; } else { Column column = (Column) selectable; @@ -71,6 +86,8 @@ public class SelectableMappingImpl extends SqlTypedMappingImpl implements Select length = column.getLength(); precision = column.getPrecision(); scale = column.getScale(); + + isNullable = column.isNullable(); } return new SelectableMappingImpl( containingTableExpression, @@ -81,11 +98,24 @@ public class SelectableMappingImpl extends SqlTypedMappingImpl implements Select length, precision, scale, + isNullable, + insertable, + updateable, selectable.isFormula(), jdbcMapping ); } + @Override + public String toString() { + return String.format( + Locale.ROOT, + "SelectableMapping(`%s`.`%s`)", + containingTableExpression, + selectionExpression + ); + } + @Override public String getContainingTableExpression() { return containingTableExpression; @@ -110,4 +140,19 @@ public class SelectableMappingImpl extends SqlTypedMappingImpl implements Select public boolean isFormula() { return isFormula; } + + @Override + public boolean isNullable() { + return nullable; + } + + @Override + public boolean isInsertable() { + return insertable; + } + + @Override + public boolean isUpdateable() { + return updateable; + } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java index 05eebfe9cc..12e63ee190 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java @@ -56,6 +56,49 @@ public class SelectableMappingsImpl implements SelectableMappings { } public static SelectableMappings from( + String containingTableExpression, + Value value, + int[] propertyOrder, + Mapping mapping, + TypeConfiguration typeConfiguration, + boolean[] insertable, + boolean[] updateable, + Dialect dialect, + SqmFunctionRegistry sqmFunctionRegistry) { + if ( insertable.length == 0 ) { + return from( + containingTableExpression, + value, + propertyOrder, + mapping, + typeConfiguration, + dialect, + sqmFunctionRegistry + ); + } + final List jdbcMappings = new ArrayList<>(); + resolveJdbcMappings( jdbcMappings, mapping, value.getType() ); + + final List selectables = value.getVirtualSelectables(); + + final SelectableMapping[] selectableMappings = new SelectableMapping[jdbcMappings.size()]; + for ( int i = 0; i < selectables.size(); i++ ) { + selectableMappings[propertyOrder[i]] = SelectableMappingImpl.from( + containingTableExpression, + selectables.get( i ), + jdbcMappings.get( propertyOrder[i] ), + typeConfiguration, + insertable[i], + updateable[i], + dialect, + sqmFunctionRegistry + ); + } + + return new SelectableMappingsImpl( selectableMappings ); + } + + private static SelectableMappings from( String containingTableExpression, Value value, int[] propertyOrder, @@ -75,6 +118,8 @@ public class SelectableMappingsImpl implements SelectableMappings { selectables.get( i ), jdbcMappings.get( propertyOrder[i] ), typeConfiguration, + false, + false, dialect, sqmFunctionRegistry ); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java index 7447f6ee25..2a0826e77b 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java @@ -71,30 +71,35 @@ public class SimpleForeignKeyDescriptor implements ForeignKeyDescriptor, BasicVa PropertyAccess keyPropertyAccess, SelectableMapping keySelectableMapping, BasicValuedModelPart targetModelPart, + boolean insertable, + boolean updateable, boolean refersToPrimaryKey, boolean hasConstraint) { - this( keyDeclaringType, keyModelPart, keyPropertyAccess, keySelectableMapping, targetModelPart, refersToPrimaryKey, hasConstraint, false ); + this( + BasicAttributeMapping.withSelectableMapping( + keyDeclaringType, + keyModelPart, + keyPropertyAccess, + NoValueGeneration.INSTANCE, + insertable, + updateable, + keySelectableMapping + ), + targetModelPart, + refersToPrimaryKey, + hasConstraint, + false + ); } public SimpleForeignKeyDescriptor( - ManagedMappingType keyDeclaringType, BasicValuedModelPart keyModelPart, - PropertyAccess keyPropertyAccess, - SelectableMapping keySelectableMapping, BasicValuedModelPart targetModelPart, boolean refersToPrimaryKey, boolean hasConstraint, boolean swapDirection) { - assert keySelectableMapping != null; assert targetModelPart != null; - keyModelPart = BasicAttributeMapping.withSelectableMapping( - keyDeclaringType, - keyModelPart, - keyPropertyAccess, - NoValueGeneration.INSTANCE, - keySelectableMapping - ); if ( swapDirection ) { this.keySide = new SimpleForeignKeyDescriptorSide( Nature.KEY, targetModelPart ); this.targetSide = new SimpleForeignKeyDescriptorSide( Nature.TARGET, keyModelPart ); @@ -103,10 +108,56 @@ public class SimpleForeignKeyDescriptor implements ForeignKeyDescriptor, BasicVa this.keySide = new SimpleForeignKeyDescriptorSide( Nature.KEY, keyModelPart ); this.targetSide = new SimpleForeignKeyDescriptorSide( Nature.TARGET, targetModelPart ); } + this.refersToPrimaryKey = refersToPrimaryKey; this.hasConstraint = hasConstraint; } + public SimpleForeignKeyDescriptor( + ManagedMappingType keyDeclaringType, + SelectableMapping keySelectableMapping, + BasicValuedModelPart targetModelPart, + boolean refersToPrimaryKey, + boolean hasConstraint) { + this( + keyDeclaringType, + keySelectableMapping, + ( (PropertyBasedMapping) targetModelPart ).getPropertyAccess(), + targetModelPart, + refersToPrimaryKey, + hasConstraint, + false + ); + } + + /** + * + */ + public SimpleForeignKeyDescriptor( + ManagedMappingType keyDeclaringType, + SelectableMapping keySelectableMapping, + PropertyAccess valueAccess, + BasicValuedModelPart targetModelPart, + boolean refersToPrimaryKey, + boolean hasConstraint, + boolean swapDirection) { + this( + BasicAttributeMapping.withSelectableMapping( + keyDeclaringType, + targetModelPart, + valueAccess, + NoValueGeneration.INSTANCE, + keySelectableMapping.isInsertable(), + keySelectableMapping.isUpdateable(), + keySelectableMapping + ), + targetModelPart, + refersToPrimaryKey, + hasConstraint, + swapDirection + ); + } + @Override public String getKeyTable() { return keySide.getModelPart().getContainingTableExpression(); @@ -137,6 +188,12 @@ public class SimpleForeignKeyDescriptor implements ForeignKeyDescriptor, BasicVa return targetSide; } + @Override + public int compare(Object key1, Object key2) { + //noinspection unchecked,rawtypes + return ( (JavaType) keySide.getModelPart().getJavaType() ).getComparator().compare( key1, key2 ); + } + @Override public ForeignKeyDescriptor withKeySelectionMapping( ManagedMappingType declaringType, @@ -149,6 +206,8 @@ public class SimpleForeignKeyDescriptor implements ForeignKeyDescriptor, BasicVa ( (PropertyBasedMapping) keySide.getModelPart() ).getPropertyAccess(), selectableMappingAccess.apply( 0 ), targetSide.getModelPart(), + keySide.getModelPart().isInsertable(), + keySide.getModelPart().isUpdateable(), refersToPrimaryKey, hasConstraint ); @@ -367,7 +426,7 @@ public class SimpleForeignKeyDescriptor implements ForeignKeyDescriptor, BasicVa @Override public Object getAssociationKeyFromSide( Object targetObject, - Nature nature, + ForeignKeyDescriptor.Side side, SharedSessionContractImplementor session) { if ( targetObject == null ) { return null; @@ -375,13 +434,7 @@ public class SimpleForeignKeyDescriptor implements ForeignKeyDescriptor, BasicVa if ( refersToPrimaryKey && targetObject instanceof HibernateProxy ) { return ( (HibernateProxy) targetObject ).getHibernateLazyInitializer().getIdentifier(); } - final ModelPart modelPart; - if ( nature == Nature.KEY ) { - modelPart = keySide.getModelPart(); - } - else { - modelPart = targetSide.getModelPart(); - } + final ModelPart modelPart = side.getModelPart(); if ( modelPart instanceof EntityIdentifierMapping ) { return ( (EntityIdentifierMapping) modelPart ).getIdentifierIfNotUnsaved( targetObject, session ); } @@ -468,6 +521,21 @@ public class SimpleForeignKeyDescriptor implements ForeignKeyDescriptor, BasicVa return keySide.getModelPart().isFormula(); } + @Override + public boolean isNullable() { + return keySide.getModelPart().isNullable(); + } + + @Override + public boolean isInsertable() { + return keySide.getModelPart().isInsertable(); + } + + @Override + public boolean isUpdateable() { + return keySide.getModelPart().isUpdateable(); + } + @Override public String getCustomReadExpression() { return keySide.getModelPart().getCustomReadExpression(); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java index 2ceb7f39f3..9371d10a8e 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java @@ -33,6 +33,7 @@ import org.hibernate.mapping.Selectable; import org.hibernate.mapping.ToOne; import org.hibernate.mapping.Value; import org.hibernate.metamodel.mapping.AssociationKey; +import org.hibernate.metamodel.mapping.AttributeMapping; import org.hibernate.metamodel.mapping.AttributeMetadataAccess; import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart; @@ -53,9 +54,9 @@ import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.persister.entity.AbstractEntityPersister; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.property.access.spi.PropertyAccess; +import org.hibernate.spi.EntityIdentifierNavigablePath; import org.hibernate.spi.NavigablePath; import org.hibernate.spi.TreatedNavigablePath; -import org.hibernate.spi.EntityIdentifierNavigablePath; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.spi.FromClauseAccess; @@ -958,8 +959,8 @@ public class ToOneAttributeMapping final NavigablePath parentPath = grandparentNavigablePath.getParent(); // This can be null for a collection loader if ( parentPath == null ) { - return grandparentNavigablePath.equals( - entityMappingType.findSubPart( bidirectionalAttributeName ).getNavigableRole() + return grandparentNavigablePath.getFullPath().equals( + entityMappingType.findSubPart( bidirectionalAttributeName ).getNavigableRole().getFullPath() ); } else { @@ -1600,58 +1601,61 @@ public class ToOneAttributeMapping break; } } + if ( CollectionPart.Nature.ELEMENT.getName().equals( parentTableGroup.getNavigablePath().getLocalName() ) ) { - final PluralTableGroup pluralTableGroup = (PluralTableGroup) fromClauseAccess.findTableGroup( - parentTableGroup.getNavigablePath().getParent() - ); - final String indexPropertyName = pluralTableGroup.getModelPart() - .getIndexMetadata() - .getIndexPropertyName(); - final String pathName; - if ( embeddablePathSb != null ) { - pathName = embeddablePathSb.append( getAttributeName() ).toString(); - } - else { - pathName = getAttributeName(); - } - if ( pathName.equals( indexPropertyName ) ) { - final TableGroup indexTableGroup = pluralTableGroup.getIndexTableGroup(); - // If this is the map key property, we can reuse the index table group - initializeIfNeeded( lhs, requestedJoinType, indexTableGroup ); - return new TableGroupJoin( - navigablePath, - joinType, - new MappedByTableGroup( - navigablePath, - this, - indexTableGroup, - fetched, - pluralTableGroup, - (np, tableExpression) -> { - if ( !canUseParentTableGroup ) { - return false; - } + final NavigablePath parentParentPath = parentTableGroup.getNavigablePath().getParent(); + final PluralTableGroup pluralTableGroup = (PluralTableGroup) fromClauseAccess.findTableGroup( parentParentPath ); + if ( pluralTableGroup != null ) { + final String indexPropertyName = pluralTableGroup.getModelPart() + .getIndexMetadata() + .getIndexPropertyName(); + final String pathName; + if ( embeddablePathSb != null ) { + pathName = embeddablePathSb.append( getAttributeName() ).toString(); + } + else { + pathName = getAttributeName(); + } - if ( !identifyingColumnsTableExpression.equals( tableExpression ) ) { - return false; - } + if ( pathName.equals( indexPropertyName ) ) { + final TableGroup indexTableGroup = pluralTableGroup.getIndexTableGroup(); + // If this is the map key property, we can reuse the index table group + initializeIfNeeded( lhs, requestedJoinType, indexTableGroup ); + return new TableGroupJoin( + navigablePath, + joinType, + new MappedByTableGroup( + navigablePath, + this, + indexTableGroup, + fetched, + pluralTableGroup, + (np, tableExpression) -> { + if ( !canUseParentTableGroup ) { + return false; + } - if ( navigablePath.equals( np.getParent() ) ) { - return targetKeyPropertyNames.contains( np.getLocalName() ); - } + if ( !identifyingColumnsTableExpression.equals( tableExpression ) ) { + return false; + } - final String relativePath = np.relativize( navigablePath ); - if ( relativePath == null ) { - return false; - } + if ( navigablePath.equals( np.getParent() ) ) { + return targetKeyPropertyNames.contains( np.getLocalName() ); + } - // Empty relative path means the navigable paths are equal, - // in which case we allow resolving the parent table group - return relativePath.isEmpty() || targetKeyPropertyNames.contains( relativePath ); - } - ), - null - ); + final String relativePath = np.relativize( navigablePath ); + if ( relativePath == null ) { + return false; + } + + // Empty relative path means the navigable paths are equal, + // in which case we allow resolving the parent table group + return relativePath.isEmpty() || targetKeyPropertyNames.contains( relativePath ); + } + ), + null + ); + } } } } @@ -1922,11 +1926,53 @@ public class ToOneAttributeMapping Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { - foreignKeyDescriptor.breakDownJdbcValues( - foreignKeyDescriptor.getAssociationKeyFromSide( domainValue, sideNature.inverse(), session ), - valueConsumer, - session - ); + if ( cardinality == Cardinality.ONE_TO_ONE && sideNature == ForeignKeyDescriptor.Nature.TARGET ) { + return; + } + + final Object value = extractValue( domainValue, session ); + foreignKeyDescriptor.breakDownJdbcValues( value, valueConsumer, session ); + } + + private Object extractValue(Object domainValue, SharedSessionContractImplementor session) { + if ( domainValue == null ) { + return null; + } + + if ( referencedPropertyName != null ) { + assert getAssociatedEntityMappingType() + .getRepresentationStrategy() + .getInstantiator() + .isInstance( domainValue, session.getSessionFactory() ); + return extractAttributePathValue( domainValue, getAssociatedEntityMappingType(), referencedPropertyName ); + } + + return foreignKeyDescriptor.getAssociationKeyFromSide( domainValue, sideNature.inverse(), session ); + } + + private static Object extractAttributePathValue(Object domainValue, EntityMappingType entityType, String attributePath) { + if ( ! attributePath.contains( "." ) ) { + return entityType.findAttributeMapping( attributePath ).getValue( domainValue ); + } + + Object value = domainValue; + ManagedMappingType managedType = entityType; + final String[] pathParts = attributePath.split( "\\." ); + for ( int i = 0; i < pathParts.length; i++ ) { + assert managedType != null; + + final String pathPart = pathParts[ i ]; + final AttributeMapping attributeMapping = managedType.findAttributeMapping( pathPart ); + value = attributeMapping.getValue( value ); + if ( attributeMapping.getMappedType() instanceof ManagedMappingType ) { + managedType = (ManagedMappingType) attributeMapping.getMappedType(); + } + else { + managedType = null; + } + } + + return value; } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java index 1cb66159ad..717d471a66 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java @@ -74,7 +74,6 @@ public class VirtualIdEmbeddable extends AbstractEmbeddableMapping implements Id final CompositeType compositeType = (CompositeType) virtualIdSource.getType(); this.attributeMappings = arrayList( (compositeType).getPropertyNames().length ); - // todo (6.0) : can/should this be a separate VirtualIdEmbedded? ( (CompositeTypeImplementor) compositeType ).injectMappingModelPart( idMapping, creationProcess ); creationProcess.registerInitializationCallback( @@ -317,12 +316,31 @@ public class VirtualIdEmbeddable extends AbstractEmbeddableMapping implements Id } ); } + @Override + public void decompose(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) { + if ( idMapping.getIdClassEmbeddable() != null ) { + // during decompose, if there is an IdClass for the entity the + // incoming `domainValue` should be an instance of that IdClass + idMapping.getIdClassEmbeddable().decompose( domainValue, valueConsumer, session ); + } + else { + for ( int i = 0; i < attributeMappings.size(); i++ ) { + final SingularAttributeMapping attributeMapping = attributeMappings.get( i ); + attributeMapping.decompose( + attributeMapping.getValue( domainValue ), + valueConsumer, + session + ); + } + } + } + @Override public Object disassemble(Object value, SharedSessionContractImplementor session) { final Object[] result = new Object[ attributeMappings.size() ]; for ( int i = 0; i < attributeMappings.size(); i++ ) { final AttributeMapping attributeMapping = attributeMappings.get( i ); - Object o = attributeMapping.getPropertyAccess().getGetter().get( value ); + final Object o = attributeMapping.getValue( value ); result[i] = attributeMapping.disassemble( o, session ); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/ConvertibleValueMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/ConvertibleValueMapping.java deleted file mode 100644 index c47cc95de1..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/ConvertibleValueMapping.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * 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 http://www.gnu.org/licenses/lgpl-2.1.html - */ -package org.hibernate.metamodel.model.convert.spi; - -import org.hibernate.metamodel.mapping.ModelPart; - -/** - * Describes a part of the domain model to which a value converter can be applied - * - * @author Steve Ebersole - */ -public interface ConvertibleValueMapping extends ModelPart { - /** - * Get the value converter associated with this value mapping. May - * return {@code null} - */ - BasicValueConverter getValueConverter(); -} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/EnumValueConverter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/EnumValueConverter.java index 90c23fad7a..fe1f1152af 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/EnumValueConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/EnumValueConverter.java @@ -12,7 +12,7 @@ import java.sql.SQLException; import org.hibernate.Remove; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.sql.ast.tree.select.SelectStatement; -import org.hibernate.sql.exec.spi.JdbcOperation; +import org.hibernate.sql.exec.spi.JdbcOperationQuery; import org.hibernate.type.descriptor.java.EnumJavaType; /** @@ -32,7 +32,7 @@ public interface EnumValueConverter, R> extends BasicValueConv * @since 6.0 * * @deprecated Added temporarily in support of dual SQL execution until - * fully migrated to {@link SelectStatement} and {@link JdbcOperation} + * fully migrated to {@link SelectStatement} and {@link JdbcOperationQuery} */ @Remove @Deprecated diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java index 941641d152..c7cc406103 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java @@ -12,6 +12,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; @@ -27,6 +28,7 @@ import org.hibernate.LockOptions; import org.hibernate.MappingException; import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.QueryException; +import org.hibernate.Remove; import org.hibernate.TransientObjectException; import org.hibernate.cache.CacheException; import org.hibernate.cache.spi.access.CollectionDataAccess; @@ -37,7 +39,8 @@ import org.hibernate.cache.spi.entry.UnstructuredCacheEntry; import org.hibernate.collection.spi.CollectionSemantics; import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.dialect.Dialect; -import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.internal.MutationQueryOptions; import org.hibernate.engine.jdbc.spi.JdbcCoordinator; import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.engine.profile.Fetch; @@ -49,13 +52,10 @@ import org.hibernate.engine.spi.PersistenceContext; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.engine.spi.SubselectFetch; -import org.hibernate.exception.spi.SQLExceptionConverter; import org.hibernate.id.IdentifierGenerator; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.FilterAliasGenerator; import org.hibernate.internal.FilterHelper; import org.hibernate.internal.util.StringHelper; -import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.jdbc.Expectation; import org.hibernate.jdbc.Expectations; import org.hibernate.loader.ast.internal.CollectionElementLoaderByIndex; @@ -75,40 +75,57 @@ import org.hibernate.mapping.Selectable; import org.hibernate.mapping.Table; import org.hibernate.mapping.Value; import org.hibernate.metadata.CollectionMetadata; -import org.hibernate.metamodel.mapping.JdbcMapping; +import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; import org.hibernate.metamodel.mapping.PluralAttributeMapping; +import org.hibernate.metamodel.mapping.SelectableConsumer; +import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper; import org.hibernate.metamodel.mapping.internal.PluralAttributeMappingImpl; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; +import org.hibernate.persister.collection.mutation.CollectionMutationTarget; +import org.hibernate.persister.collection.mutation.CollectionTableMapping; +import org.hibernate.persister.collection.mutation.RemoveCoordinator; +import org.hibernate.persister.collection.mutation.RowMutationOperations; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.Joinable; import org.hibernate.persister.entity.PropertyMapping; import org.hibernate.persister.internal.SqlFragmentPredicate; import org.hibernate.persister.spi.PersisterCreationContext; import org.hibernate.pretty.MessageHelper; -import org.hibernate.spi.NavigablePath; import org.hibernate.query.named.NamedQueryMemento; import org.hibernate.query.spi.QueryOptions; +import org.hibernate.spi.NavigablePath; import org.hibernate.sql.Alias; -import org.hibernate.sql.Delete; -import org.hibernate.sql.Insert; import org.hibernate.sql.SimpleSelect; import org.hibernate.sql.Template; -import org.hibernate.sql.Update; +import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SimpleFromClauseAccessImpl; import org.hibernate.sql.ast.spi.SqlAliasBaseConstant; import org.hibernate.sql.ast.spi.SqlAliasBaseManager; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.expression.AliasedExpression; +import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.ast.tree.predicate.Predicate; import org.hibernate.sql.ast.tree.select.QuerySpec; import org.hibernate.sql.ast.tree.select.SelectClause; import org.hibernate.sql.ast.tree.select.SelectStatement; +import org.hibernate.sql.exec.spi.JdbcParameterBinder; +import org.hibernate.sql.model.ModelMutationLogging; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.TableMapping.MutationDetails; +import org.hibernate.sql.model.ast.ColumnValueBinding; +import org.hibernate.sql.model.ast.ColumnValueParameter; +import org.hibernate.sql.model.ast.ColumnWriteFragment; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.ast.RestrictedTableMutation; +import org.hibernate.sql.model.internal.TableDeleteStandard; +import org.hibernate.sql.model.jdbc.JdbcDeleteMutation; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.internal.SqlSelectionImpl; import org.hibernate.type.CollectionType; @@ -116,7 +133,8 @@ import org.hibernate.type.CompositeType; import org.hibernate.type.EntityType; import org.hibernate.type.Type; -import org.jboss.logging.Logger; +import static org.hibernate.internal.util.collections.CollectionHelper.arrayList; +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER; /** * Base implementation of the {@code QueryableCollection} interface. @@ -127,20 +145,13 @@ import org.jboss.logging.Logger; * @see OneToManyPersister */ public abstract class AbstractCollectionPersister - implements CollectionMetadata, SQLLoadableCollection, PluralAttributeMappingImpl.Aware { - - private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, - AbstractCollectionPersister.class.getName() ); - - // TODO: encapsulate the protected instance variables! + implements SQLLoadableCollection, PluralAttributeMappingImpl.Aware, CollectionMutationTarget, CollectionMetadata { private final NavigableRole navigableRole; + private final CollectionSemantics collectionSemantics; + + private final CollectionTableMapping tableMapping; - // SQL statements - private final String sqlDeleteString; - private final String sqlInsertRowString; - private final String sqlUpdateRowString; - private final String sqlDeleteRowString; private final String sqlSelectSizeString; private final String sqlDetectRowByIndexString; private final String sqlDetectRowByElementString; @@ -187,7 +198,6 @@ public abstract class AbstractCollectionPersister protected final String identifierColumnName; private final String identifierColumnAlias; - // private final String unquotedIdentifierColumnName; protected final String qualifiedTableName; @@ -232,16 +242,6 @@ public abstract class AbstractCollectionPersister private final String manyToManyWhereString; private final String manyToManyWhereTemplate; - // custom sql - private final boolean insertCallable; - private final boolean updateCallable; - private final boolean deleteCallable; - private final boolean deleteAllCallable; - private final ExecuteUpdateResultCheckStyle insertCheckStyle; - private final ExecuteUpdateResultCheckStyle updateCheckStyle; - private final ExecuteUpdateResultCheckStyle deleteCheckStyle; - private final ExecuteUpdateResultCheckStyle deleteAllCheckStyle; - private final Serializable[] spaces; private final Map collectionPropertyColumnAliases = new HashMap<>(); @@ -252,10 +252,8 @@ public abstract class AbstractCollectionPersister private volatile CollectionLoader standardCollectionLoader; private CollectionElementLoaderByIndex collectionElementLoaderByIndex; - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - // "mapping model" + private PluralAttributeMapping attributeMapping; - private final CollectionSemantics collectionSemantics; @Deprecated(since = "6.0") public AbstractCollectionPersister( @@ -271,9 +269,6 @@ public abstract class AbstractCollectionPersister RuntimeModelCreationContext creationContext) throws MappingException, CacheException { final Value elementBootDescriptor = collectionBootDescriptor.getElement(); - final Value indexBootDescriptor = collectionBootDescriptor instanceof IndexedCollection - ? ( (IndexedCollection) collectionBootDescriptor ).getIndex() - : null; this.factory = creationContext.getSessionFactory(); this.cacheAccessStrategy = cacheAccessStrategy; @@ -486,8 +481,10 @@ public abstract class AbstractCollectionPersister i++; } indexContainsFormula = hasFormula; - baseIndex = indexedCollection.isList() ? - ( (List) indexedCollection ).getBaseIndex() : 0; + //noinspection ConstantConditions + baseIndex = indexedCollection.isList() + ? ( (List) indexedCollection ).getBaseIndex() + : 0; } else { indexContainsFormula = false; @@ -506,6 +503,7 @@ public abstract class AbstractCollectionPersister if ( collectionBootDescriptor.isOneToMany() ) { throw new MappingException( "one-to-many collections with identifiers are not supported" ); } + //noinspection ConstantConditions IdentifierCollection idColl = (IdentifierCollection) collectionBootDescriptor; identifierType = idColl.getIdentifier().getType(); Column col = idColl.getIdentifier().getColumns().get(0); @@ -522,69 +520,15 @@ public abstract class AbstractCollectionPersister identifierType = null; identifierColumnName = null; identifierColumnAlias = null; - // unquotedIdentifierColumnName = null; identifierGenerator = null; } // GENERATE THE SQL: - // sqlSelectString = sqlSelectString(); - // sqlSelectRowString = sqlSelectRowString(); - - if ( collectionBootDescriptor.getCustomSQLInsert() == null ) { - sqlInsertRowString = generateInsertRowString(); - insertCallable = false; - insertCheckStyle = ExecuteUpdateResultCheckStyle.COUNT; - } - else { - sqlInsertRowString = collectionBootDescriptor.getCustomSQLInsert(); - insertCallable = collectionBootDescriptor.isCustomInsertCallable(); - insertCheckStyle = collectionBootDescriptor.getCustomSQLInsertCheckStyle() == null - ? ExecuteUpdateResultCheckStyle.determineDefault( collectionBootDescriptor.getCustomSQLInsert(), insertCallable ) - : collectionBootDescriptor.getCustomSQLInsertCheckStyle(); - } - - if ( collectionBootDescriptor.getCustomSQLUpdate() == null ) { - sqlUpdateRowString = generateUpdateRowString(); - updateCallable = false; - updateCheckStyle = ExecuteUpdateResultCheckStyle.COUNT; - } - else { - sqlUpdateRowString = collectionBootDescriptor.getCustomSQLUpdate(); - updateCallable = collectionBootDescriptor.isCustomUpdateCallable(); - updateCheckStyle = collectionBootDescriptor.getCustomSQLUpdateCheckStyle() == null - ? ExecuteUpdateResultCheckStyle.determineDefault( collectionBootDescriptor.getCustomSQLUpdate(), insertCallable ) - : collectionBootDescriptor.getCustomSQLUpdateCheckStyle(); - } - - if ( collectionBootDescriptor.getCustomSQLDelete() == null ) { - sqlDeleteRowString = generateDeleteRowString(); - deleteCallable = false; - deleteCheckStyle = ExecuteUpdateResultCheckStyle.NONE; - } - else { - sqlDeleteRowString = collectionBootDescriptor.getCustomSQLDelete(); - deleteCallable = collectionBootDescriptor.isCustomDeleteCallable(); - deleteCheckStyle = ExecuteUpdateResultCheckStyle.NONE; - } - - if ( collectionBootDescriptor.getCustomSQLDeleteAll() == null ) { - sqlDeleteString = generateDeleteString(); - deleteAllCallable = false; - deleteAllCheckStyle = ExecuteUpdateResultCheckStyle.NONE; - } - else { - sqlDeleteString = collectionBootDescriptor.getCustomSQLDeleteAll(); - deleteAllCallable = collectionBootDescriptor.isCustomDeleteAllCallable(); - deleteAllCheckStyle = ExecuteUpdateResultCheckStyle.NONE; - } - sqlSelectSizeString = generateSelectSizeString( collectionBootDescriptor.isIndexed() && !collectionBootDescriptor.isMap() ); sqlDetectRowByIndexString = generateDetectRowByIndexString(); sqlDetectRowByElementString = generateDetectRowByElementString(); - logStaticSQL(); - isLazy = collectionBootDescriptor.isLazy(); isExtraLazy = collectionBootDescriptor.isExtraLazy(); @@ -670,13 +614,26 @@ public abstract class AbstractCollectionPersister .resolveRepresentation( collectionBootDescriptor ); if ( queryLoaderName != null ) { - // We must resolve the named query on-demand through the boot model because it isn't initialized yet - final NamedQueryMemento namedQueryMemento = factory.getQueryEngine().getNamedObjectRepository() + final NamedQueryMemento namedQueryMemento = factory + .getQueryEngine() + .getNamedObjectRepository() .resolve( factory, collectionBootDescriptor.getMetadata(), queryLoaderName ); if ( namedQueryMemento == null ) { throw new IllegalArgumentException( "Could not resolve named load-query [" + navigableRole + "] : " + queryLoaderName ); } } + + tableMapping = buildCollectionTableMapping( collectionBootDescriptor, qualifiedTableName ); + } + + @Override + public NavigableRole getNavigableRole() { + return navigableRole; + } + + @Override + public String getRole() { + return navigableRole.getFullPath(); } @Override @@ -688,61 +645,6 @@ public abstract class AbstractCollectionPersister return MappingModelCreationHelper.getTableIdentifierExpression( table, factory ); } -// private class ColumnMapperImpl implements ColumnMapper { -// @Override -// public SqlValueReference[] map(String reference) { -// final String[] columnNames; -// final String[] formulaTemplates; -// -// // handle the special "$element$" property name... -// if ( "$element$".equals( reference ) ) { -// columnNames = elementColumnNames; -// formulaTemplates = elementFormulaTemplates; -// } -// else { -// columnNames = elementPropertyMapping.toColumns( reference ); -// formulaTemplates = formulaTemplates( reference, columnNames.length ); -// } -// -// final SqlValueReference[] result = new SqlValueReference[ columnNames.length ]; -// int i = 0; -// for ( final String columnName : columnNames ) { -// if ( columnName == null ) { -// // if the column name is null, it indicates that this index in the property value mapping is -// // actually represented by a formula. -//// final int propertyIndex = elementPersister.getEntityMetamodel().getPropertyIndex( reference ); -// final String formulaTemplate = formulaTemplates[i]; -// result[i] = new FormulaReference() { -// @Override -// public String getFormulaFragment() { -// return formulaTemplate; -// } -// }; -// } -// else { -// result[i] = new ColumnReference() { -// @Override -// public String getColumnName() { -// return columnName; -// } -// }; -// } -// i++; -// } -// return result; -// } -// } - -// private String[] formulaTemplates(String reference, int expectedSize) { -// try { -// final int propertyIndex = elementPersister.getEntityMetamodel().getPropertyIndex( reference ); -// return ( (Queryable) elementPersister ).getSubclassPropertyFormulaTemplateClosure()[propertyIndex]; -// } -// catch (Exception e) { -// return new String[expectedSize]; -// } -// } - @Override public void postInstantiate() throws MappingException { if ( queryLoaderName == null ) { @@ -754,6 +656,7 @@ public abstract class AbstractCollectionPersister .resolve( factory, null, queryLoaderName ); collectionLoader = new CollectionLoaderNamedQuery( this, namedQueryMemento ); } + if ( attributeMapping.getIndexDescriptor() != null ) { collectionElementLoaderByIndex = new CollectionElementLoaderByIndex( attributeMapping, @@ -762,29 +665,40 @@ public abstract class AbstractCollectionPersister getFactory() ); } + + logStaticSQL(); } protected void logStaticSQL() { - if ( LOG.isDebugEnabled() ) { - LOG.debugf( "Static SQL for collection: %s", getRole() ); - if ( getSQLInsertRowString() != null ) { - LOG.debugf( " Row insert: %s", getSQLInsertRowString() ); - } - if ( getSQLUpdateRowString() != null ) { - LOG.debugf( " Row update: %s", getSQLUpdateRowString() ); - } - if ( getSQLDeleteRowString() != null ) { - LOG.debugf( " Row delete: %s", getSQLDeleteRowString() ); - } - if ( getSQLDeleteString() != null ) { - LOG.debugf( " One-shot delete: %s", getSQLDeleteString() ); - } + if ( !ModelMutationLogging.MODEL_MUTATION_LOGGER_DEBUG_ENABLED ) { + return; + } + + MODEL_MUTATION_LOGGER.debugf( "Static SQL for collection: %s", getRole() ); + + final String insertRowSql = getRowMutationOperations().getInsertRowOperation().getSqlString(); + if ( insertRowSql != null ) { + MODEL_MUTATION_LOGGER.debugf( " Row insert: %s", insertRowSql ); + } + + final String updateRowSql = getRowMutationOperations().getUpdateRowOperation().getSqlString(); + if ( updateRowSql != null ) { + MODEL_MUTATION_LOGGER.debugf( " Row update: %s", updateRowSql ); + } + + final String deleteRowSql = getRowMutationOperations().getDeleteRowOperation().getSqlString(); + if ( deleteRowSql != null ) { + MODEL_MUTATION_LOGGER.debugf( " Row delete: %s", deleteRowSql ); + } + + final String deleteAllSql = getRemoveCoordinator().getSqlString(); + if ( deleteAllSql != null ) { + MODEL_MUTATION_LOGGER.debugf( " One-shot delete: %s", deleteAllSql ); } } @Override public void initialize(Object key, SharedSessionContractImplementor session) throws HibernateException { -// getAppropriateInitializer( key, session ).initialize( key, session ); determineLoaderToUse( key, session ).load( key, session ); } @@ -868,11 +782,6 @@ public abstract class AbstractCollectionPersister return new CollectionLoaderSingleKey( attributeMapping, loadQueryInfluencers, getFactory() ); } - @Override - public NavigableRole getNavigableRole() { - return navigableRole; - } - @Override public CollectionDataAccess getCacheAccessStrategy() { return cacheAccessStrategy; @@ -888,6 +797,9 @@ public abstract class AbstractCollectionPersister return collectionType; } + protected abstract RowMutationOperations getRowMutationOperations(); + protected abstract RemoveCoordinator getRemoveCoordinator(); + @Override public String getSQLOrderByString(String alias) { // return hasOrdering() @@ -932,22 +844,6 @@ public abstract class AbstractCollectionPersister return hasWhere; } - protected String getSQLDeleteString() { - return sqlDeleteString; - } - - protected String getSQLInsertRowString() { - return sqlInsertRowString; - } - - protected String getSQLUpdateRowString() { - return sqlUpdateRowString; - } - - protected String getSQLDeleteRowString() { - return sqlDeleteRowString; - } - @Override public Type getKeyType() { return keyType; @@ -963,16 +859,6 @@ public abstract class AbstractCollectionPersister return elementType; } - @Override - public BasicValueConverter getElementConverter() { - return elementType instanceof JdbcMapping ? ( (JdbcMapping) elementType ).getValueConverter() : null; - } - - @Override - public BasicValueConverter getIndexConverter() { - return indexType instanceof JdbcMapping ? ( (JdbcMapping) indexType ).getValueConverter() : null; - } - /** * Return the element class of an array, or null otherwise. needed by arrays */ @@ -981,6 +867,11 @@ public abstract class AbstractCollectionPersister return elementClass; } + /** + * @deprecated No longer used. + */ + @Deprecated(forRemoval = true) + @Remove protected Object decrementIndexByBase(Object index) { if ( baseIndex != 0 ) { index = (Integer)index - baseIndex; @@ -988,40 +879,6 @@ public abstract class AbstractCollectionPersister return index; } - /** - * Write the key to a JDBC {@code PreparedStatement} - */ - protected int writeKey(PreparedStatement st, Object key, int i, SharedSessionContractImplementor session) - throws HibernateException, SQLException { - - if ( key == null ) { - throw new NullPointerException( "null key for collection: " + navigableRole.getFullPath() ); // an assertion - } - getKeyType().nullSafeSet( st, key, i, session ); - return i + keyColumnAliases.length; - } - - /** - * Write the element to a JDBC {@code PreparedStatement} - */ - protected int writeElement(PreparedStatement st, Object elt, int i, SharedSessionContractImplementor session) - throws HibernateException, SQLException { - getElementType().nullSafeSet( st, elt, i, elementColumnIsSettable, session ); - - return i + ArrayHelper.countTrue( elementColumnIsSettable ); - - } - - /** - * Write the index to a JDBC {@code PreparedStatement} - */ - protected int writeIndex(PreparedStatement st, Object index, int i, SharedSessionContractImplementor session) - throws HibernateException, SQLException { - getIndexType().nullSafeSet( st, incrementIndexByBase( index ), i, indexColumnIsSettable, session ); - - return i + ArrayHelper.countTrue( indexColumnIsSettable ); - } - protected Object incrementIndexByBase(Object index) { if ( baseIndex != 0 ) { index = (Integer)index + baseIndex; @@ -1029,40 +886,6 @@ public abstract class AbstractCollectionPersister return index; } - /** - * Write the element to a JDBC {@code PreparedStatement} - */ - protected int writeElementToWhere(PreparedStatement st, Object elt, int i, SharedSessionContractImplementor session) - throws HibernateException, SQLException { - if ( elementIsPureFormula ) { - throw new AssertionFailure( "cannot use a formula-based element in the where condition" ); - } - getElementType().nullSafeSet( st, elt, i, elementColumnIsInPrimaryKey, session ); - return i + elementColumnAliases.length; - } - - /** - * Write the index to a JDBC {@code PreparedStatement} - */ - protected int writeIndexToWhere(PreparedStatement st, Object index, int i, SharedSessionContractImplementor session) - throws HibernateException, SQLException { - if ( indexContainsFormula ) { - throw new AssertionFailure( "cannot use a formula-based index in the where condition" ); - } - getIndexType().nullSafeSet( st, incrementIndexByBase( index ), i, session ); - return i + indexColumnAliases.length; - } - - /** - * Write the identifier to a JDBC {@code PreparedStatement} - */ - public int writeIdentifier(PreparedStatement st, Object id, int i, SharedSessionContractImplementor session) - throws HibernateException, SQLException { - - getIdentifierType().nullSafeSet( st, id, i, session ); - return i + 1; - } - @Override public boolean isPrimitiveArray() { return isPrimitiveArray; @@ -1073,36 +896,6 @@ public abstract class AbstractCollectionPersister return isArray; } - @Override - public String[] getKeyColumnAliases(String suffix) { - return new Alias( suffix ).toAliasStrings( keyColumnAliases ); - } - - @Override - public String[] getElementColumnAliases(String suffix) { - return new Alias( suffix ).toAliasStrings( elementColumnAliases ); - } - - @Override - public String[] getIndexColumnAliases(String suffix) { - if ( hasIndex ) { - return new Alias( suffix ).toAliasStrings( indexColumnAliases ); - } - else { - return null; - } - } - - @Override - public String getIdentifierColumnAlias(String suffix) { - if ( hasIdentifier ) { - return new Alias( suffix ).toAliasString( identifierColumnAlias ); - } - else { - return null; - } - } - @Override public String getIdentifierColumnName() { if ( hasIdentifier ) { @@ -1205,7 +998,7 @@ public abstract class AbstractCollectionPersister .getSqlAstTranslatorFactory() .buildSelectTranslator( getFactory(), new SelectStatement( rootQuerySpec ) ) .translate( null, QueryOptions.NONE ) - .getSql(); + .getSqlString(); final int fromIndex = sql.lastIndexOf( " from" ); final String expression; if ( fromIndex != -1 ) { @@ -1319,203 +1112,9 @@ public abstract class AbstractCollectionPersister return qualifiedTableName; } - private BasicBatchKey removeBatchKey; - @Override public void remove(Object id, SharedSessionContractImplementor session) throws HibernateException { - if ( !isInverse && isRowDeleteEnabled() ) { - - if ( LOG.isDebugEnabled() ) { - LOG.debugf( "Deleting collection: %s", - MessageHelper.collectionInfoString( this, id, getFactory() ) ); - } - - // Remove all the old entries - - try { - int offset = 1; - final PreparedStatement st; - Expectation expectation = Expectations.appropriateExpectation( getDeleteAllCheckStyle() ); - boolean callable = isDeleteAllCallable(); - boolean useBatch = expectation.canBeBatched(); - final String sql = getSQLDeleteString(); - if ( useBatch ) { - if ( removeBatchKey == null ) { - removeBatchKey = new BasicBatchKey( - getRole() + "#REMOVE", - expectation - ); - } - st = session - .getJdbcCoordinator() - .getBatch( removeBatchKey ) - .getBatchStatement( sql, callable ); - } - else { - st = session - .getJdbcCoordinator() - .getStatementPreparer() - .prepareStatement( sql, callable ); - } - - try { - offset += expectation.prepare( st ); - - writeKey( st, id, offset, session ); - if ( useBatch ) { - session - .getJdbcCoordinator() - .getBatch( removeBatchKey ) - .addToBatch(); - } - else { - expectation.verifyOutcome( session.getJdbcCoordinator().getResultSetReturn().executeUpdate( st ), st, -1, sql ); - } - } - catch ( SQLException sqle ) { - if ( useBatch ) { - session.getJdbcCoordinator().abortBatch(); - } - throw sqle; - } - finally { - if ( !useBatch ) { - session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( st ); - session.getJdbcCoordinator().afterStatementExecution(); - } - } - - LOG.debug( "Done deleting collection" ); - } - catch ( SQLException sqle ) { - throw sqlExceptionHelper.convert( - sqle, - "could not delete collection: " + - MessageHelper.collectionInfoString( this, id, getFactory() ), - getSQLDeleteString() - ); - } - - } - - } - - protected BasicBatchKey recreateBatchKey; - - @Override - public void recreate(PersistentCollection collection, Object id, SharedSessionContractImplementor session) - throws HibernateException { - - if ( isInverse ) { - return; - } - - if ( !isRowInsertEnabled() ) { - return; - } - - - if ( LOG.isDebugEnabled() ) { - LOG.debugf( - "Inserting collection: %s", - MessageHelper.collectionInfoString( this, collection, id, session ) - ); - } - - try { - // create all the new entries - Iterator entries = collection.entries( this ); - final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator(); - if ( entries.hasNext() ) { - Expectation expectation = Expectations.appropriateExpectation( getInsertCheckStyle() ); - collection.preInsert( this ); - int i = 0; - int count = 0; - while ( entries.hasNext() ) { - - final Object entry = entries.next(); - if ( collection.entryExists( entry, i ) ) { - int offset = 1; - final PreparedStatement st; - boolean callable = isInsertCallable(); - boolean useBatch = expectation.canBeBatched(); - final String sql = getSQLInsertRowString(); - - if ( useBatch ) { - if ( recreateBatchKey == null ) { - recreateBatchKey = new BasicBatchKey( - getRole() + "#RECREATE", - expectation - ); - } - st = jdbcCoordinator - .getBatch( recreateBatchKey ) - .getBatchStatement( sql, callable ); - } - else { - st = jdbcCoordinator - .getStatementPreparer() - .prepareStatement( sql, callable ); - } - - try { - offset += expectation.prepare( st ); - - // TODO: copy/paste from insertRows() - int loc = writeKey( st, id, offset, session ); - if ( hasIdentifier ) { - loc = writeIdentifier( st, collection.getIdentifier( entry, i ), loc, session ); - } - if ( hasIndex /* && !indexIsFormula */) { - loc = writeIndex( st, collection.getIndex( entry, i, this ), loc, session ); - } - loc = writeElement( st, collection.getElement( entry ), loc, session ); - - if ( useBatch ) { - jdbcCoordinator - .getBatch( recreateBatchKey ) - .addToBatch(); - } - else { - expectation.verifyOutcome( jdbcCoordinator - .getResultSetReturn().executeUpdate( st ), st, -1, sql ); - } - - collection.afterRowInsert( this, entry, i ); - count++; - } - catch ( SQLException sqle ) { - if ( useBatch ) { - jdbcCoordinator.abortBatch(); - } - throw sqle; - } - finally { - if ( !useBatch ) { - jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( st ); - jdbcCoordinator.afterStatementExecution(); - } - } - - } - i++; - } - - LOG.debugf( "Done inserting collection: %s rows inserted", count ); - - } - else { - LOG.debug( "Collection was empty" ); - } - } - catch ( SQLException sqle ) { - throw sqlExceptionHelper.convert( - sqle, - "could not insert collection: " + - MessageHelper.collectionInfoString( this, collection, id, session ), - getSQLInsertRowString() - ); - } + getRemoveCoordinator().deleteAllRows( id, session ); } protected boolean isRowDeleteEnabled() { @@ -1527,232 +1126,10 @@ public abstract class AbstractCollectionPersister return !isInverse() && isRowDeleteEnabled(); } - private BasicBatchKey deleteBatchKey; - - @Override - public void deleteRows(PersistentCollection collection, Object id, SharedSessionContractImplementor session) - throws HibernateException { - - if ( isInverse ) { - return; - } - - if ( !isRowDeleteEnabled() ) { - return; - } - - if ( LOG.isDebugEnabled() ) { - LOG.debugf( - "Deleting rows of collection: %s", - MessageHelper.collectionInfoString( this, collection, id, session ) - ); - } - - boolean deleteByIndex = !isOneToMany() && hasIndex && !indexContainsFormula; - final Expectation expectation = Expectations.appropriateExpectation( getDeleteCheckStyle() ); - try { - // delete all the deleted entries - Iterator deletes = collection.getDeletes( this, !deleteByIndex ); - if ( deletes.hasNext() ) { - int offset = 1; - int count = 0; - while ( deletes.hasNext() ) { - final PreparedStatement st; - boolean callable = isDeleteCallable(); - boolean useBatch = expectation.canBeBatched(); - final String sql = getSQLDeleteRowString(); - - if ( useBatch ) { - if ( deleteBatchKey == null ) { - deleteBatchKey = new BasicBatchKey( - getRole() + "#DELETE", - expectation - ); - } - st = session - .getJdbcCoordinator() - .getBatch( deleteBatchKey ) - .getBatchStatement( sql, callable ); - } - else { - st = session - .getJdbcCoordinator() - .getStatementPreparer() - .prepareStatement( sql, callable ); - } - - try { - expectation.prepare( st ); - - Object entry = deletes.next(); - int loc = offset; - if ( hasIdentifier ) { - writeIdentifier( st, entry, loc, session ); - } - else { - loc = writeKey( st, id, loc, session ); - if ( deleteByIndex ) { - writeIndexToWhere( st, entry, loc, session ); - } - else { - writeElementToWhere( st, entry, loc, session ); - } - } - - if ( useBatch ) { - session - .getJdbcCoordinator() - .getBatch( deleteBatchKey ) - .addToBatch(); - } - else { - expectation.verifyOutcome( session.getJdbcCoordinator().getResultSetReturn().executeUpdate( st ), st, -1, sql ); - } - count++; - } - catch ( SQLException sqle ) { - if ( useBatch ) { - session.getJdbcCoordinator().abortBatch(); - } - throw sqle; - } - finally { - if ( !useBatch ) { - session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( st ); - session.getJdbcCoordinator().afterStatementExecution(); - } - } - - LOG.debugf( "Done deleting collection rows: %s deleted", count ); - } - } - else { - LOG.debug( "No rows to delete" ); - } - } - catch ( SQLException sqle ) { - throw sqlExceptionHelper.convert( - sqle, - "could not delete collection rows: " + - MessageHelper.collectionInfoString( this, collection, id, session ), - getSQLDeleteRowString() - ); - } - } - protected boolean isRowInsertEnabled() { return true; } - private BasicBatchKey insertBatchKey; - - @Override - public void insertRows(PersistentCollection collection, Object id, SharedSessionContractImplementor session) - throws HibernateException { - - if ( isInverse ) { - return; - } - - if ( !isRowInsertEnabled() ) { - return; - } - - if ( LOG.isDebugEnabled() ) { - LOG.debugf( - "Inserting rows of collection: %s", - MessageHelper.collectionInfoString( this, collection, id, session ) - ); - } - - try { - // insert all the new entries - collection.preInsert( this ); - Iterator entries = collection.entries( this ); - Expectation expectation = Expectations.appropriateExpectation( getInsertCheckStyle() ); - boolean callable = isInsertCallable(); - boolean useBatch = expectation.canBeBatched(); - String sql = getSQLInsertRowString(); - int i = 0; - int count = 0; - while ( entries.hasNext() ) { - int offset = 1; - Object entry = entries.next(); - PreparedStatement st; - if ( collection.needsInserting( entry, i, elementType ) ) { - - if ( useBatch ) { - if ( insertBatchKey == null ) { - insertBatchKey = new BasicBatchKey( - getRole() + "#INSERT", - expectation - ); - } - st = session - .getJdbcCoordinator() - .getBatch( insertBatchKey ) - .getBatchStatement( sql, callable ); - } - else { - st = session - .getJdbcCoordinator() - .getStatementPreparer() - .prepareStatement( sql, callable ); - } - - try { - offset += expectation.prepare( st ); - // TODO: copy/paste from recreate() - offset = writeKey( st, id, offset, session ); - if ( hasIdentifier ) { - offset = writeIdentifier( st, collection.getIdentifier( entry, i ), offset, session ); - } - if ( hasIndex /* && !indexIsFormula */) { - offset = writeIndex( st, collection.getIndex( entry, i, this ), offset, session ); - } - writeElement( st, collection.getElement( entry ), offset, session ); - - if ( useBatch ) { - session.getJdbcCoordinator().getBatch( insertBatchKey ).addToBatch(); - } - else { - expectation.verifyOutcome( session.getJdbcCoordinator().getResultSetReturn().executeUpdate( st ), st, -1, sql ); - } - collection.afterRowInsert( this, entry, i ); - count++; - } - catch ( SQLException sqle ) { - if ( useBatch ) { - session.getJdbcCoordinator().abortBatch(); - } - throw sqle; - } - finally { - if ( !useBatch ) { - session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( st ); - session.getJdbcCoordinator().afterStatementExecution(); - } - } - } - i++; - } - LOG.debugf( "Done inserting rows: %s inserted", count ); - } - catch ( SQLException sqle ) { - throw sqlExceptionHelper.convert( - sqle, - "could not insert collection rows: " + - MessageHelper.collectionInfoString( this, collection, id, session ), - getSQLInsertRowString() - ); - } - } - - @Override - public String getRole() { - return navigableRole.getFullPath(); - } - public String getOwnerEntityName() { return entityName; } @@ -1957,31 +1334,6 @@ public abstract class AbstractCollectionPersister return spaces; } - protected abstract String generateDeleteString(); - - protected abstract String generateDeleteRowString(); - - protected abstract String generateUpdateRowString(); - - protected abstract String generateInsertRowString(); - - @Override - public void updateRows(PersistentCollection collection, Object id, SharedSessionContractImplementor session) - throws HibernateException { - - if ( !isInverse && collection.isRowUpdatePossible() ) { - - LOG.debugf( "Updating rows of collection: %s#%s", navigableRole.getFullPath(), id ); - - // update all the modified entries - int count = doUpdateRows( id, collection, session ); - - LOG.debugf( "Done updating rows: %s updated", count ); - } - } - - protected abstract int doUpdateRows(Object key, PersistentCollection collection, SharedSessionContractImplementor session); - @Override public void processQueuedOps(PersistentCollection collection, Object key, SharedSessionContractImplementor session) { if ( collection.hasQueuedOperations() ) { @@ -2002,38 +1354,6 @@ public abstract class AbstractCollectionPersister return factory; } - protected boolean isInsertCallable() { - return insertCallable; - } - - protected ExecuteUpdateResultCheckStyle getInsertCheckStyle() { - return insertCheckStyle; - } - - protected boolean isUpdateCallable() { - return updateCallable; - } - - protected ExecuteUpdateResultCheckStyle getUpdateCheckStyle() { - return updateCheckStyle; - } - - protected boolean isDeleteCallable() { - return deleteCallable; - } - - protected ExecuteUpdateResultCheckStyle getDeleteCheckStyle() { - return deleteCheckStyle; - } - - protected boolean isDeleteAllCallable() { - return deleteAllCallable; - } - - protected ExecuteUpdateResultCheckStyle getDeleteAllCheckStyle() { - return deleteAllCheckStyle; - } - @Override public String toString() { return StringHelper.unqualify( getClass().getName() ) + '(' + navigableRole.getFullPath() + ')'; @@ -2044,11 +1364,6 @@ public abstract class AbstractCollectionPersister return isVersioned && getOwnerEntityPersister().isVersioned(); } - // TODO: deprecate??? - protected SQLExceptionConverter getSQLExceptionConverter() { - return getSQLExceptionHelper().getSqlExceptionConverter(); - } - // TODO: needed??? protected SqlExceptionHelper getSQLExceptionHelper() { return sqlExceptionHelper; @@ -2226,10 +1541,10 @@ public abstract class AbstractCollectionPersister // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // "mapping model" - // todo (6.0) : atm there is no way to get a `PluralAttributeMapping` reference except through its declaring `ManagedTypeMapping` attributes. this is a backhand way - // of getting access to it for use from the persister + // todo (6.0) : atm there is no way to get a `PluralAttributeMapping` reference except through + // its declaring `ManagedTypeMapping` attributes. this is a backhand way of getting access + // to it for use from the persister - private PluralAttributeMapping attributeMapping; @Override public void injectAttributeMapping(PluralAttributeMapping attributeMapping) { @@ -2278,15 +1593,234 @@ public abstract class AbstractCollectionPersister return collectionSemantics; } - protected Insert createInsert() { - return new Insert( getFactory().getJdbcServices().getDialect() ); + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // CollectionMutationTarget + + @Override + public PluralAttributeMapping getTargetPart() { + return attributeMapping; } - protected Update createUpdate() { - return new Update( getFactory().getJdbcServices().getDialect() ); + @Override + public String getIdentifierTableName() { + return tableMapping.getTableName(); } - protected Delete createDelete() { - return new Delete(); + @Override + public CollectionTableMapping getCollectionTableMapping() { + return tableMapping; + } + + @Override + public boolean hasPhysicalIndexColumn() { + return hasIndex && !indexContainsFormula; + } + + @Override + public void forEachMutableTable(Consumer consumer) { + consumer.accept( tableMapping ); + } + + @Override + public void forEachMutableTableReverse(Consumer consumer) { + consumer.accept( tableMapping ); + } + + private static CollectionTableMapping buildCollectionTableMapping( + Collection collectionBootDescriptor, + String qualifiedTableName) { + return new CollectionTableMapping( + qualifiedTableName, + !collectionBootDescriptor.isOneToMany(), + collectionBootDescriptor.isInverse(), + new MutationDetails( + MutationType.INSERT, + determineExpectation( + collectionBootDescriptor.getCustomSQLInsertCheckStyle(), + collectionBootDescriptor.getCustomSQLInsert(), + collectionBootDescriptor.isCustomInsertCallable() + ), + collectionBootDescriptor.getCustomSQLInsert(), + collectionBootDescriptor.isCustomInsertCallable() + ), + new MutationDetails( + MutationType.UPDATE, + determineExpectation( + collectionBootDescriptor.getCustomSQLUpdateCheckStyle(), + collectionBootDescriptor.getCustomSQLUpdate(), + collectionBootDescriptor.isCustomUpdateCallable() + ), + collectionBootDescriptor.getCustomSQLUpdate(), + collectionBootDescriptor.isCustomUpdateCallable() + ), + collectionBootDescriptor.getKey().isCascadeDeleteEnabled(), + new MutationDetails( + MutationType.DELETE, + determineExpectation( + collectionBootDescriptor.getCustomSQLDeleteAllCheckStyle(), + collectionBootDescriptor.getCustomSQLDeleteAll(), + collectionBootDescriptor.isCustomDeleteAllCallable(), + Expectations.NONE + ), + collectionBootDescriptor.getCustomSQLDeleteAll(), + collectionBootDescriptor.isCustomDeleteAllCallable() + ), + new MutationDetails( + MutationType.DELETE, + determineExpectation( + collectionBootDescriptor.getCustomSQLDeleteCheckStyle(), + collectionBootDescriptor.getCustomSQLDelete(), + collectionBootDescriptor.isCustomDeleteCallable() + ), + collectionBootDescriptor.getCustomSQLDelete(), + collectionBootDescriptor.isCustomDeleteCallable() + ) + ); + } + + private static Expectation determineExpectation( + ExecuteUpdateResultCheckStyle explicitStyle, + String customSql, + boolean customSqlCallable, + Expectation fallback) { + if ( explicitStyle != null ) { + return Expectations.appropriateExpectation( explicitStyle ); + } + + if ( customSql == null ) { + return fallback; + } + + return Expectations.appropriateExpectation( + ExecuteUpdateResultCheckStyle.determineDefault( customSql, customSqlCallable ) + ); + } + + private static Expectation determineExpectation( + ExecuteUpdateResultCheckStyle explicitStyle, + String customSql, + boolean customSqlCallable) { + return determineExpectation( explicitStyle, customSql, customSqlCallable, Expectations.BASIC ); + } + + protected JdbcMutationOperation buildDeleteAllOperation(MutatingTableReference tableReference) { + if ( tableMapping.getDeleteDetails().getCustomSql() != null ) { + return buildCustomSqlDeleteAllOperation( tableReference ); + } + + return buildGeneratedDeleteAllOperation( tableReference ); + } + + private JdbcDeleteMutation buildCustomSqlDeleteAllOperation(MutatingTableReference tableReference) { + final PluralAttributeMapping attributeMapping = getAttributeMapping(); + final ForeignKeyDescriptor keyDescriptor = attributeMapping.getKeyDescriptor(); + + final java.util.List parameterBinders = arrayList( keyDescriptor.getJdbcTypeCount() ); + keyDescriptor.getKeyPart().forEachSelectable( (selectionIndex, selectableMapping) -> { + final ColumnReference columnReference = new ColumnReference( tableReference, selectableMapping ); + final ColumnValueParameter columnValueParameter = new ColumnValueParameter( + columnReference, + ParameterUsage.RESTRICT + ); + parameterBinders.add( columnValueParameter ); + } ); + + final TableMapping tableMapping = tableReference.getTableMapping(); + return new JdbcDeleteMutation( + tableMapping, + this, + tableMapping.getDeleteDetails().getCustomSql(), + tableMapping.getDeleteDetails().isCallable(), + tableMapping.getDeleteDetails().getExpectation(), + parameterBinders + ); + } + + private JdbcMutationOperation buildGeneratedDeleteAllOperation(MutatingTableReference tableReference) { + final RestrictedTableMutation sqlAst = generateDeleteAllAst( tableReference ); + + final SqlAstTranslator translator = getFactory().getJdbcServices() + .getDialect() + .getSqlAstTranslatorFactory() + .buildModelMutationTranslator( sqlAst, getFactory() ); + + return translator.translate( null, MutationQueryOptions.INSTANCE ); + } + + public RestrictedTableMutation generateDeleteAllAst(MutatingTableReference tableReference) { + assert getAttributeMapping() != null; + + final ForeignKeyDescriptor fkDescriptor = getAttributeMapping().getKeyDescriptor(); + assert fkDescriptor != null; + + final int keyColumnCount = fkDescriptor.getJdbcTypeCount(); + final java.util.List keyRestrictionBindings = arrayList( keyColumnCount ); + final java.util.List parameters = arrayList( keyColumnCount ); + + //noinspection Convert2Lambda + fkDescriptor.getKeyPart().forEachSelectable( new SelectableConsumer() { + @Override + public void accept(int selectionIndex, SelectableMapping selectableMapping) { + final ColumnReference columnReference = new ColumnReference( tableReference, selectableMapping ); + final ColumnValueParameter columnValueParameter = new ColumnValueParameter( + columnReference, + ParameterUsage.RESTRICT + ); + parameters.add( columnValueParameter ); + keyRestrictionBindings.add( + new ColumnValueBinding( + columnReference, + new ColumnWriteFragment( + "?", + columnValueParameter, + selectableMapping.getJdbcMapping() + ) + ) + ); + } + } ); + + //noinspection unchecked,rawtypes + return (RestrictedTableMutation) new TableDeleteStandard( + tableReference, + this, + keyRestrictionBindings, + Collections.emptyList(), + parameters + ); + } + + + + + @Override + public String[] getKeyColumnAliases(String suffix) { + return new Alias( suffix ).toAliasStrings( keyColumnAliases ); + } + + @Override + public String[] getElementColumnAliases(String suffix) { + return new Alias( suffix ).toAliasStrings( elementColumnAliases ); + } + + @Override + public String[] getIndexColumnAliases(String suffix) { + if ( hasIndex ) { + return new Alias( suffix ).toAliasStrings( indexColumnAliases ); + } + else { + return null; + } + } + + @Override + public String getIdentifierColumnAlias(String suffix) { + if ( hasIdentifier ) { + return new Alias( suffix ).toAliasString( identifierColumnAlias ); + } + else { + return null; + } } } diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java index d3684d270f..e0cb2d269d 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java @@ -6,32 +6,60 @@ */ package org.hibernate.persister.collection; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.cache.CacheException; import org.hibernate.cache.spi.access.CollectionDataAccess; import org.hibernate.collection.spi.PersistentCollection; -import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.internal.MutationQueryOptions; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.internal.FilterAliasGenerator; import org.hibernate.internal.StaticFilterAliasGenerator; +import org.hibernate.internal.util.MutableInteger; import org.hibernate.internal.util.collections.ArrayHelper; -import org.hibernate.jdbc.Expectation; -import org.hibernate.jdbc.Expectations; import org.hibernate.mapping.Collection; +import org.hibernate.metamodel.mapping.CollectionIdentifierDescriptor; +import org.hibernate.metamodel.mapping.CollectionPart; +import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; +import org.hibernate.metamodel.mapping.ModelPart; +import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; +import org.hibernate.persister.collection.mutation.CollectionTableMapping; +import org.hibernate.persister.collection.mutation.DeleteRowsCoordinator; +import org.hibernate.persister.collection.mutation.DeleteRowsCoordinatorNoOp; +import org.hibernate.persister.collection.mutation.DeleteRowsCoordinatorStandard; +import org.hibernate.persister.collection.mutation.InsertRowsCoordinator; +import org.hibernate.persister.collection.mutation.InsertRowsCoordinatorNoOp; +import org.hibernate.persister.collection.mutation.InsertRowsCoordinatorStandard; +import org.hibernate.persister.collection.mutation.OperationProducer; +import org.hibernate.persister.collection.mutation.RemoveCoordinator; +import org.hibernate.persister.collection.mutation.RemoveCoordinatorNoOp; +import org.hibernate.persister.collection.mutation.RemoveCoordinatorStandard; +import org.hibernate.persister.collection.mutation.RowMutationOperations; +import org.hibernate.persister.collection.mutation.UpdateRowsCoordinator; +import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorNoOp; +import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorStandard; import org.hibernate.persister.spi.PersisterCreationContext; -import org.hibernate.pretty.MessageHelper; -import org.hibernate.sql.Delete; -import org.hibernate.sql.Insert; -import org.hibernate.sql.Update; +import org.hibernate.sql.ast.SqlAstTranslator; +import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.from.TableGroup; +import org.hibernate.sql.exec.spi.JdbcParameterBinder; +import org.hibernate.sql.model.ast.ColumnValueParameter; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.ast.RestrictedTableMutation; +import org.hibernate.sql.model.ast.TableInsert; +import org.hibernate.sql.model.ast.TableMutation; +import org.hibernate.sql.model.ast.builder.TableDeleteBuilderStandard; +import org.hibernate.sql.model.ast.builder.TableInsertBuilderStandard; +import org.hibernate.sql.model.ast.builder.TableUpdateBuilderStandard; +import org.hibernate.sql.model.jdbc.JdbcDeleteMutation; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; +import org.hibernate.sql.model.jdbc.JdbcUpdateMutation; + +import static org.hibernate.internal.util.collections.CollectionHelper.arrayList; +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER; +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER_DEBUG_ENABLED; /** * A {@link CollectionPersister} for {@linkplain jakarta.persistence.ElementCollection @@ -43,6 +71,11 @@ import org.hibernate.sql.ast.tree.from.TableGroup; * @author Gavin King */ public class BasicCollectionPersister extends AbstractCollectionPersister { + private final RowMutationOperations rowMutationOperations; + private final InsertRowsCoordinator insertRowsCoordinator; + private final UpdateRowsCoordinator updateCoordinator; + private final DeleteRowsCoordinator deleteRowsCoordinator; + private final RemoveCoordinator removeCoordinator; public boolean isCascadeDeleteEnabled() { return false; @@ -61,81 +94,54 @@ public class BasicCollectionPersister extends AbstractCollectionPersister { CollectionDataAccess cacheAccessStrategy, RuntimeModelCreationContext creationContext) throws MappingException, CacheException { super( collectionBinding, cacheAccessStrategy, creationContext ); + + this.rowMutationOperations = buildRowMutationOperations(); + + this.insertRowsCoordinator = buildInsertRowCoordinator(); + this.updateCoordinator = buildUpdateRowCoordinator(); + this.deleteRowsCoordinator = buildDeleteRowCoordinator(); + this.removeCoordinator = buildDeleteAllCoordinator(); } - /** - * Generate the SQL DELETE that deletes all rows - */ - @Override - protected String generateDeleteString() { - final Delete delete = createDelete().setTableName( qualifiedTableName ) - .addPrimaryKeyColumns( keyColumnNames ); - - if ( hasWhere ) { - delete.setWhere( sqlWhereString ); - } - - if ( getFactory().getSessionFactoryOptions().isCommentsEnabled() ) { - delete.setComment( "delete collection " + getRole() ); - } - - return delete.toStatementString(); + protected RowMutationOperations getRowMutationOperations() { + return rowMutationOperations; } - /** - * Generate the SQL INSERT that creates a new row - */ + protected InsertRowsCoordinator getCreateEntryCoordinator() { + return insertRowsCoordinator; + } @Override - protected String generateInsertRowString() { - final Insert insert = createInsert().setTableName( qualifiedTableName ) - .addColumns( keyColumnNames ); - - if ( hasIdentifier ) { - insert.addColumn( identifierColumnName ); - } - - if ( hasIndex /*&& !indexIsFormula*/ ) { - insert.addColumns( indexColumnNames, indexColumnIsSettable ); - } - - if ( getFactory().getSessionFactoryOptions().isCommentsEnabled() ) { - insert.setComment( "insert collection row " + getRole() ); - } - - //if ( !elementIsFormula ) { - insert.addColumns( elementColumnNames, elementColumnIsSettable, elementColumnWriters ); - //} - - return insert.toStatementString(); + public void recreate(PersistentCollection collection, Object id, SharedSessionContractImplementor session) { + getCreateEntryCoordinator().insertRows( collection, id, collection::includeInRecreate, session ); } - /** - * Generate the SQL UPDATE that updates a row - */ @Override - protected String generateUpdateRowString() { - final Update update = createUpdate().setTableName( qualifiedTableName ); + public void insertRows(PersistentCollection collection, Object id, SharedSessionContractImplementor session) + throws HibernateException { + getCreateEntryCoordinator().insertRows( collection, id, collection::includeInInsert, session ); + } - //if ( !elementIsFormula ) { - update.addColumns( elementColumnNames, elementColumnIsSettable, elementColumnWriters ); - //} + protected UpdateRowsCoordinator getUpdateEntryCoordinator() { + return updateCoordinator; + } - if ( hasIdentifier ) { - update.addPrimaryKeyColumns( new String[] {identifierColumnName} ); - } - else if ( hasIndex && !indexContainsFormula ) { - update.addPrimaryKeyColumns( ArrayHelper.join( keyColumnNames, indexColumnNames ) ); - } - else { - update.addPrimaryKeyColumns( keyColumnNames ); - update.addPrimaryKeyColumns( elementColumnNames, elementColumnIsInPrimaryKey, elementColumnWriters ); - } + @Override + public void updateRows(PersistentCollection collection, Object id, SharedSessionContractImplementor session) { + getUpdateEntryCoordinator().updateRows( id, collection, session ); + } - if ( getFactory().getSessionFactoryOptions().isCommentsEnabled() ) { - update.setComment( "update collection row " + getRole() ); - } + protected DeleteRowsCoordinator getRemoveEntryCoordinator() { + return deleteRowsCoordinator; + } - return update.toStatementString(); + @Override + public void deleteRows(PersistentCollection collection, Object id, SharedSessionContractImplementor session) { + getRemoveEntryCoordinator().deleteRows( collection, id, session ); + } + + @Override + protected RemoveCoordinator getRemoveCoordinator() { + return removeCoordinator; } @Override @@ -143,40 +149,540 @@ public class BasicCollectionPersister extends AbstractCollectionPersister { // nothing to do } - /** - * Generate the SQL DELETE that deletes a particular row - */ - @Override - protected String generateDeleteRowString() { - final Delete delete = createDelete().setTableName( qualifiedTableName ); - if ( hasIdentifier ) { - delete.addPrimaryKeyColumns( new String[] {identifierColumnName} ); - } - else if ( hasIndex && !indexContainsFormula ) { - delete.addPrimaryKeyColumns( ArrayHelper.join( keyColumnNames, indexColumnNames ) ); - } - else { - delete.addPrimaryKeyColumns( keyColumnNames ); - delete.addPrimaryKeyColumns( elementColumnNames, elementColumnIsInPrimaryKey, elementColumnWriters ); + private UpdateRowsCoordinator buildUpdateRowCoordinator() { + final boolean performUpdates = getCollectionSemantics().getCollectionClassification().isRowUpdatePossible() + && ArrayHelper.isAnyTrue( elementColumnIsSettable ) + && !isInverse(); + + if ( !performUpdates ) { + if ( MODEL_MUTATION_LOGGER_DEBUG_ENABLED ) { + MODEL_MUTATION_LOGGER.debugf( + "Skipping collection row updates - %s", + getRolePath() + ); + } + return new UpdateRowsCoordinatorNoOp( this ); } - if ( getFactory().getSessionFactoryOptions().isCommentsEnabled() ) { - delete.setComment( "delete collection row " + getRole() ); - } - - return delete.toStatementString(); + return new UpdateRowsCoordinatorStandard( this, rowMutationOperations, getFactory() ); } + private InsertRowsCoordinator buildInsertRowCoordinator() { + if ( isInverse() || !isRowInsertEnabled() ) { + if ( MODEL_MUTATION_LOGGER_DEBUG_ENABLED ) { + MODEL_MUTATION_LOGGER.debugf( + "Skipping collection inserts - %s", + getRolePath() + ); + } + return new InsertRowsCoordinatorNoOp( this ); + } + + return new InsertRowsCoordinatorStandard( this, rowMutationOperations ); + } + + private DeleteRowsCoordinator buildDeleteRowCoordinator() { + if ( ! needsRemove() ) { + if ( MODEL_MUTATION_LOGGER_DEBUG_ENABLED ) { + MODEL_MUTATION_LOGGER.debugf( + "Skipping collection row deletions - %s", + getRolePath() + ); + } + return new DeleteRowsCoordinatorNoOp( this ); + } + + return new DeleteRowsCoordinatorStandard( this, rowMutationOperations, hasPhysicalIndexColumn() ); + } + + private RemoveCoordinator buildDeleteAllCoordinator() { + if ( ! needsRemove() ) { + if ( MODEL_MUTATION_LOGGER_DEBUG_ENABLED ) { + MODEL_MUTATION_LOGGER.debugf( + "Skipping collection removals - %s", + getRolePath() + ); + } + return new RemoveCoordinatorNoOp( this ); + } + + return new RemoveCoordinatorStandard( this, this::buildDeleteAllOperation ); + } + + + private RowMutationOperations buildRowMutationOperations() { + final OperationProducer insertRowOperationProducer; + final RowMutationOperations.Values insertRowValues; + if ( !isInverse() && isRowInsertEnabled() ) { + insertRowOperationProducer = this::generateInsertRowOperation; + insertRowValues = this::applyInsertRowValues; + } + else { + insertRowOperationProducer = null; + insertRowValues = null; + } + + final OperationProducer updateRowOperationProducer; + final RowMutationOperations.Values updateRowValues; + final RowMutationOperations.Restrictions updateRowRestrictions; + if ( getCollectionSemantics().getCollectionClassification().isRowUpdatePossible() + && ArrayHelper.isAnyTrue( elementColumnIsSettable ) + && !isInverse() ) { + updateRowOperationProducer = this::generateUpdateRowOperation; + updateRowValues = this::applyUpdateRowValues; + updateRowRestrictions = this::applyUpdateRowRestrictions; + } + else { + updateRowOperationProducer = null; + updateRowValues = null; + updateRowRestrictions = null; + } + + + final OperationProducer deleteRowOperationProducer; + final RowMutationOperations.Restrictions deleteRowRestrictions; + if ( !isInverse() && isRowDeleteEnabled() ) { + deleteRowOperationProducer = this::generateDeleteRowOperation; + deleteRowRestrictions = this::applyDeleteRowRestrictions; + } + else { + deleteRowOperationProducer = null; + deleteRowRestrictions = null; + } + + return new RowMutationOperations( + this, + insertRowOperationProducer, + insertRowValues, + updateRowOperationProducer, + updateRowValues, + updateRowRestrictions, + deleteRowOperationProducer, + deleteRowRestrictions + ); + } + + + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Insert handling + + private JdbcMutationOperation generateInsertRowOperation(MutatingTableReference tableReference) { + if ( getIdentifierTableMapping().getInsertDetails().getCustomSql() != null ) { + return buildCustomSqlInsertRowOperation( tableReference ); + } + + return buildGeneratedInsertRowOperation( tableReference ); + + } + + private JdbcMutationOperation buildCustomSqlInsertRowOperation(MutatingTableReference tableReference) { + final TableInsertBuilderStandard insertBuilder = new TableInsertBuilderStandard( this, tableReference, getFactory() ); + applyInsertDetails( insertBuilder ); + + final TableInsert tableInsert = insertBuilder.buildMutation(); + return tableInsert.createMutationOperation( null, getFactory() ); + } + + private void applyInsertDetails(TableInsertBuilderStandard insertBuilder) { + final PluralAttributeMapping attributeMapping = getAttributeMapping(); + + final ForeignKeyDescriptor foreignKey = attributeMapping.getKeyDescriptor(); + foreignKey.getKeyPart().forEachSelectable( (position, mapping) -> insertBuilder.addValueColumn( mapping ) ); + + final CollectionIdentifierDescriptor identifierDescriptor = attributeMapping.getIdentifierDescriptor(); + final CollectionPart indexDescriptor = attributeMapping.getIndexDescriptor(); + if ( identifierDescriptor != null ) { + identifierDescriptor.forEachSelectable( (position, mapping) -> insertBuilder.addValueColumn( mapping ) ); + } + else if ( indexDescriptor != null ) { + indexDescriptor.forEachSelectable( (position, mapping) -> { + if ( indexColumnIsSettable[position] ) { + insertBuilder.addValueColumn( mapping ); + } + } ); + } + + attributeMapping.getElementDescriptor().forEachSelectable( (position, mapping) -> { + if ( elementColumnIsSettable[position] ) { + insertBuilder.addValueColumn( mapping ); + } + } ); + } + + private JdbcMutationOperation buildGeneratedInsertRowOperation(MutatingTableReference tableReference) { + final TableMutation sqlAst = generateInsertRowAst( tableReference ); + + final SqlAstTranslator translator = getFactory().getJdbcServices() + .getDialect() + .getSqlAstTranslatorFactory() + .buildModelMutationTranslator( sqlAst, getFactory() ); + + return translator.translate( null, MutationQueryOptions.INSTANCE ); + } + + private TableMutation generateInsertRowAst(MutatingTableReference tableReference) { + final PluralAttributeMapping pluralAttribute = getAttributeMapping(); + assert pluralAttribute != null; + + final ForeignKeyDescriptor fkDescriptor = pluralAttribute.getKeyDescriptor(); + assert fkDescriptor != null; + + final TableInsertBuilderStandard insertBuilder = new TableInsertBuilderStandard( this, tableReference, getFactory() ); + applyInsertDetails( insertBuilder ); + + //noinspection unchecked,rawtypes + return (TableMutation) insertBuilder.buildMutation(); + } + + private void applyInsertRowValues( + PersistentCollection collection, + Object key, + Object rowValue, + int rowPosition, + SharedSessionContractImplementor session, + RowMutationOperations.ValuesBindingConsumer jdbcValueConsumer) { + final PluralAttributeMapping attributeMapping = getAttributeMapping(); + + if ( key == null ) { + throw new IllegalArgumentException( "null key for collection: " + getNavigableRole().getFullPath() ); + } + + final ForeignKeyDescriptor foreignKey = attributeMapping.getKeyDescriptor(); + foreignKey.getKeyPart().decompose( key, jdbcValueConsumer, session ); + + final MutableInteger columnPositionCount = new MutableInteger(); + + if ( attributeMapping.getIdentifierDescriptor() != null ) { + getAttributeMapping().getIdentifierDescriptor().decompose( + collection.getIdentifier( rowValue, rowPosition ), + jdbcValueConsumer, + session + ); + } + else if ( attributeMapping.getIndexDescriptor() != null ) { + // todo (mutation) : this would be more efficient if we exposed the "containing table" + // per value-mapping model-parts which is what we effectively support anyway. + // + // this would need to kind of like a union of ModelPart and ValueMapping, except: + // 1) not the managed-type structure from ModelPart + // 2) not BasicType from ValueMapping + // essentially any basic or composite mapping of column(s) + + getAttributeMapping().getIndexDescriptor().decompose( + incrementIndexByBase( collection.getIndex( rowValue, rowPosition, this ) ), + (jdbcValue, jdbcValueMapping) -> { + if ( !jdbcValueMapping.getContainingTableExpression().equals( getTableName() ) ) { + // indicates a many-to-many mapping and the index is contained on the + // associated entity table - we skip it here + return; + } + final int columnPosition = columnPositionCount.getAndIncrement(); + if ( indexColumnIsSettable[columnPosition] ) { + jdbcValueConsumer.consume( jdbcValue, jdbcValueMapping ); + } + }, + session + ); + + columnPositionCount.set( 0 ); + } + + attributeMapping.getElementDescriptor().decompose( + collection.getElement( rowValue ), + (jdbcValue, jdbcValueMapping) -> { + final int columnPosition = columnPositionCount.getAndIncrement(); + if ( elementColumnIsSettable[columnPosition] ) { + jdbcValueConsumer.consume( jdbcValue, jdbcValueMapping ); + } + }, + session + ); + } + + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Update handling + + private JdbcMutationOperation generateUpdateRowOperation(MutatingTableReference tableReference) { + if ( getIdentifierTableMapping().getInsertDetails().getCustomSql() != null ) { + return buildCustomSqlUpdateRowOperation( tableReference ); + } + + return buildGeneratedUpdateRowOperation( tableReference ); + + } + + private JdbcMutationOperation buildCustomSqlUpdateRowOperation(MutatingTableReference tableReference) { + final PluralAttributeMapping attribute = getAttributeMapping(); + assert attribute != null; + + final ForeignKeyDescriptor foreignKey = attribute.getKeyDescriptor(); + assert foreignKey != null; + + final int keyColumnCount = foreignKey.getJdbcTypeCount(); + final java.util.List parameterBinders = arrayList( keyColumnCount ); + foreignKey.getKeyPart().forEachSelectable( (selectionIndex, selectableMapping) -> parameterBinders.add( + new ColumnValueParameter( + new ColumnReference( tableReference, selectableMapping ), + ParameterUsage.RESTRICT + ) + ) ); + + return new JdbcUpdateMutation( + getCollectionTableMapping(), + this, + getCollectionTableMapping().getDeleteDetails().getCustomSql(), + getCollectionTableMapping().getDeleteDetails().isCallable(), + getCollectionTableMapping().getDeleteDetails().getExpectation(), + parameterBinders + ); + } + + private JdbcMutationOperation buildGeneratedUpdateRowOperation(MutatingTableReference tableReference) { + final RestrictedTableMutation sqlAst = generateUpdateRowAst( tableReference ); + + final SqlAstTranslator translator = getFactory().getJdbcServices() + .getDialect() + .getSqlAstTranslatorFactory() + .buildModelMutationTranslator( sqlAst, getFactory() ); + + return translator.translate( null, MutationQueryOptions.INSTANCE ); + } + + private RestrictedTableMutation generateUpdateRowAst(MutatingTableReference tableReference) { + final PluralAttributeMapping attribute = getAttributeMapping(); + assert attribute != null; + + final TableUpdateBuilderStandard updateBuilder = new TableUpdateBuilderStandard<>( this, tableReference, getFactory() ); + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // SET + + attribute.getElementDescriptor().forEachSelectable( (selectionIndex, selectableMapping) -> { + if ( ! selectableMapping.isUpdateable() || selectableMapping.isFormula() ) { + return; + } + + updateBuilder.addValueColumn( selectableMapping ); + } ); + + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // WHERE + + if ( attribute.getIdentifierDescriptor() != null ) { + attribute.getIdentifierDescriptor().forEachSelectable( updateBuilder::addKeyRestriction ); + } + else { + attribute.getKeyDescriptor().getKeyPart().forEachSelectable( updateBuilder::addKeyRestriction ); + + if ( attribute.getIndexDescriptor() != null && !indexContainsFormula ) { + attribute.getIndexDescriptor().forEachSelectable( updateBuilder::addKeyRestriction ); + } + else { + attribute.getElementDescriptor().forEachSelectable( (selectionIndex, selectableMapping) -> { + if ( selectableMapping.isFormula() || selectableMapping.isNullable() ) { + return; + } + updateBuilder.addKeyRestriction( selectableMapping ); + } ); + } + } + + //noinspection unchecked,rawtypes + return (RestrictedTableMutation) updateBuilder.buildMutation(); + } + + private void applyUpdateRowValues( + PersistentCollection collection, + Object key, + Object entry, + int entryPosition, + SharedSessionContractImplementor session, + RowMutationOperations.ValuesBindingConsumer jdbcValueConsumer) { + final Object element = collection.getElement( entry ); + final CollectionPart elementDescriptor = getAttributeMapping().getElementDescriptor(); + elementDescriptor.decompose( + element, + (jdbcValue, jdbcValueMapping) -> { + if ( !jdbcValueMapping.isUpdateable() || jdbcValueMapping.isFormula() ) { + return; + } + jdbcValueConsumer.consumeJdbcValueBinding( + jdbcValue, + jdbcValueMapping, + ParameterUsage.SET + ); + }, + session + ); + } + + private void applyUpdateRowRestrictions( + PersistentCollection collection, + Object key, + Object entry, + int entryPosition, + SharedSessionContractImplementor session, + ModelPart.JdbcValueConsumer restrictor) { + if ( getAttributeMapping().getIdentifierDescriptor() != null ) { + final CollectionIdentifierDescriptor identifierDescriptor = getAttributeMapping().getIdentifierDescriptor(); + final Object identifier = collection.getIdentifier( entry, entryPosition ); + identifierDescriptor.decompose( identifier, restrictor, session ); + } + else { + getAttributeMapping().getKeyDescriptor().getKeyPart().decompose( key, restrictor, session ); + + if ( getAttributeMapping().getIndexDescriptor() != null && !indexContainsFormula ) { + final Object index = collection.getIndex( entry, entryPosition, getAttributeMapping().getCollectionDescriptor() ); + final Object adjustedIndex = incrementIndexByBase( index ); + getAttributeMapping().getIndexDescriptor().decompose( adjustedIndex, restrictor, session ); + } + else { + final Object snapshotElement = collection.getSnapshotElement( entry, entryPosition ); + getAttributeMapping().getElementDescriptor().decompose( + snapshotElement, + (jdbcValue, jdbcValueMapping) -> { + if ( jdbcValueMapping.isNullable() && jdbcValueMapping.isFormula() ) { + return; + } + restrictor.consume( jdbcValue, jdbcValueMapping ); + }, + session + ); + } + } + } + + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Delete handling + + private JdbcMutationOperation generateDeleteRowOperation(MutatingTableReference tableReference) { + if ( getIdentifierTableMapping().getDeleteRowDetails().getCustomSql() != null ) { + return buildCustomSqlDeleteRowOperation( tableReference ); + } + + return buildGeneratedDeleteRowOperation( tableReference ); + } + + private JdbcMutationOperation buildCustomSqlDeleteRowOperation(MutatingTableReference tableReference) { + final PluralAttributeMapping attribute = getAttributeMapping(); + assert attribute != null; + + final ForeignKeyDescriptor foreignKey = attribute.getKeyDescriptor(); + assert foreignKey != null; + + final CollectionTableMapping tableMapping = (CollectionTableMapping) tableReference.getTableMapping(); + + final int keyColumnCount = foreignKey.getJdbcTypeCount(); + final java.util.List parameterBinders = arrayList( keyColumnCount ); + foreignKey.getKeyPart().forEachSelectable( (selectionIndex, selectableMapping) -> { + final ColumnReference columnReference = new ColumnReference( tableReference, selectableMapping ); + final ColumnValueParameter columnValueParameter = new ColumnValueParameter( + columnReference, + ParameterUsage.RESTRICT + ); + parameterBinders.add( columnValueParameter ); + } ); + + return new JdbcDeleteMutation( + tableMapping, + this, + tableMapping.getDeleteDetails().getCustomSql(), + tableMapping.getDeleteDetails().isCallable(), + tableMapping.getDeleteDetails().getExpectation(), + parameterBinders + ); + } + + private JdbcMutationOperation buildGeneratedDeleteRowOperation(MutatingTableReference tableReference) { + final RestrictedTableMutation sqlAst = generateDeleteRowAst( tableReference ); + + final SqlAstTranslator translator = getFactory().getJdbcServices() + .getDialect() + .getSqlAstTranslatorFactory() + .buildModelMutationTranslator( sqlAst, getFactory() ); + + return translator.translate( null, MutationQueryOptions.INSTANCE ); + } + + private RestrictedTableMutation generateDeleteRowAst(MutatingTableReference tableReference) { + final PluralAttributeMapping pluralAttribute = getAttributeMapping(); + assert pluralAttribute != null; + + final ForeignKeyDescriptor fkDescriptor = pluralAttribute.getKeyDescriptor(); + assert fkDescriptor != null; + + final TableDeleteBuilderStandard deleteBuilder = new TableDeleteBuilderStandard( this, tableReference, getFactory() ); + + if ( pluralAttribute.getIdentifierDescriptor() != null ) { + deleteBuilder.addKeyRestriction( pluralAttribute.getIdentifierDescriptor() ); + } + else { + pluralAttribute + .getKeyDescriptor() + .getKeyPart() + .forEachSelectable( (index, selectable) -> deleteBuilder.addKeyRestriction( selectable ) ); + + if ( hasIndex && !indexContainsFormula ) { + assert pluralAttribute.getIndexDescriptor() != null; + pluralAttribute + .getIndexDescriptor() + .forEachSelectable( (index, selectable) -> deleteBuilder.addKeyRestriction( selectable ) ); + } + else { + pluralAttribute + .getElementDescriptor() + .forEachSelectable( (index, selectable) -> deleteBuilder.addKeyRestriction( selectable ) ); + } + } + + //noinspection unchecked,rawtypes + return (RestrictedTableMutation) deleteBuilder.buildMutation(); + } + + private void applyDeleteRowRestrictions( + PersistentCollection collection, + Object keyValue, + Object rowValue, + int rowPosition, + SharedSessionContractImplementor session, + ModelPart.JdbcValueConsumer restrictor) { + final PluralAttributeMapping attributeMapping = getAttributeMapping(); + + if ( attributeMapping.getIdentifierDescriptor() != null ) { + attributeMapping.getIdentifierDescriptor().decompose( rowValue, restrictor, session ); + } + else { + getAttributeMapping().getKeyDescriptor().getKeyPart().decompose( keyValue, restrictor, session ); + + if ( hasPhysicalIndexColumn() ) { + attributeMapping.getIndexDescriptor().decompose( + incrementIndexByBase( rowValue ), + restrictor, + session + ); + } + else { + attributeMapping.getElementDescriptor().decompose( rowValue, restrictor, session ); + } + } + } + + @Override public boolean consumesEntityAlias() { return false; } + @Override public boolean consumesCollectionAlias() { -// return !isOneToMany(); return true; } + @Override public boolean isOneToMany() { return false; } @@ -186,153 +692,6 @@ public class BasicCollectionPersister extends AbstractCollectionPersister { return elementType.isEntityType(); //instanceof AssociationType; } - private BasicBatchKey updateBatchKey; - - @Override - protected int doUpdateRows(Object id, PersistentCollection collection, SharedSessionContractImplementor session) - throws HibernateException { - if ( ArrayHelper.isAllFalse( elementColumnIsSettable ) ) { - return 0; - } - - try { - final Expectation expectation = Expectations.appropriateExpectation( getUpdateCheckStyle() ); - final boolean callable = isUpdateCallable(); - boolean useBatch = expectation.canBeBatched() && session.getConfiguredJdbcBatchSize() > 1; - final Iterator entries = collection.entries( this ); - - final List elements = new ArrayList<>(); - while ( entries.hasNext() ) { - elements.add( entries.next() ); - } - - final String sql = getSQLUpdateRowString(); - int count = 0; - if ( collection.isElementRemoved() ) { - // the update should be done starting from the end to the list - for ( int i = elements.size() - 1; i >= 0; i-- ) { - count = doUpdateRow( - id, - collection, - session, - expectation, - callable, - useBatch, - elements, - sql, - count, - i - ); - } - } - else { - for ( int i = 0; i < elements.size(); i++ ) { - count = doUpdateRow( - id, - collection, - session, - expectation, - callable, - useBatch, - elements, - sql, - count, - i - ); - } - } - return count; - } - catch (SQLException sqle) { - throw session.getJdbcServices().getSqlExceptionHelper().convert( - sqle, - "could not update collection rows: " + MessageHelper.collectionInfoString( - this, - collection, - id, - session - ), - getSQLUpdateRowString() - ); - } - } - - private int doUpdateRow( - Object id, - PersistentCollection collection, - SharedSessionContractImplementor session, - Expectation expectation, boolean callable, boolean useBatch, List elements, String sql, int count, int i) - throws SQLException { - PreparedStatement st; - Object entry = elements.get( i ); - if ( collection.needsUpdating( entry, i, elementType ) ) { - int offset = 1; - - if ( useBatch ) { - if ( updateBatchKey == null ) { - updateBatchKey = new BasicBatchKey( - getRole() + "#UPDATE", - expectation - ); - } - st = session - .getJdbcCoordinator() - .getBatch( updateBatchKey ) - .getBatchStatement( sql, callable ); - } - else { - st = session - .getJdbcCoordinator() - .getStatementPreparer() - .prepareStatement( sql, callable ); - } - - try { - offset += expectation.prepare( st ); - int loc = writeElement( st, collection.getElement( entry ), offset, session ); - if ( hasIdentifier ) { - writeIdentifier( st, collection.getIdentifier( entry, i ), loc, session ); - } - else { - loc = writeKey( st, id, loc, session ); - if ( hasIndex && !indexContainsFormula ) { - writeIndexToWhere( st, collection.getIndex( entry, i, this ), loc, session ); - } - else { - writeElementToWhere( st, collection.getSnapshotElement( entry, i ), loc, session ); - } - } - - if ( useBatch ) { - session.getJdbcCoordinator() - .getBatch( updateBatchKey ) - .addToBatch(); - } - else { - expectation.verifyOutcome( - session.getJdbcCoordinator().getResultSetReturn().executeUpdate( - st - ), st, -1, sql - ); - } - } - catch (SQLException sqle) { - if ( useBatch ) { - session.getJdbcCoordinator().abortBatch(); - } - throw sqle; - } - finally { - if ( !useBatch ) { - session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( st ); - session.getJdbcCoordinator().afterStatementExecution(); - } - } - count++; - } - return count; - } - @Override public FilterAliasGenerator getFilterAliasGenerator(String rootAlias) { return new StaticFilterAliasGenerator( rootAlias ); @@ -342,5 +701,4 @@ public class BasicCollectionPersister extends AbstractCollectionPersister { public FilterAliasGenerator getFilterAliasGenerator(TableGroup tableGroup) { return getFilterAliasGenerator( tableGroup.getPrimaryTableReference().getIdentificationVariable() ); } - } diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java index 7512d37fc4..b6017e879b 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java @@ -27,7 +27,6 @@ import org.hibernate.metadata.CollectionMetadata; import org.hibernate.metamodel.CollectionClassification; import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.metamodel.mapping.Restrictable; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.persister.entity.EntityPersister; @@ -88,6 +87,13 @@ import org.hibernate.type.Type; public interface CollectionPersister extends Restrictable { NavigableRole getNavigableRole(); + String getRole(); + + /** + * Get the persister of the entity that "owns" this collection + */ + EntityPersister getOwnerEntityPersister(); + /** * Initialize the given collection with the given key */ @@ -107,14 +113,15 @@ public interface CollectionPersister extends Restrictable { } /** - * Get the cache + * Access to the collection's cache region */ CollectionDataAccess getCacheAccessStrategy(); /** - * Get the cache structure + * Get the structure used to store data into the collection's {@linkplain #getCacheAccessStrategy() cache region} */ CacheEntryStructure getCacheEntryStructure(); + /** * Get the associated {@code Type} */ @@ -136,20 +143,6 @@ public interface CollectionPersister extends Restrictable { */ Class getElementClass(); - /** - * The value converter for the element values of this collection - */ - default BasicValueConverter getElementConverter() { - return null; - } - - /** - * The value converter for index values of this collection (effectively map keys only) - */ - default BasicValueConverter getIndexConverter() { - return null; - } - /** * Is this an array or primitive values? */ @@ -235,12 +228,6 @@ public interface CollectionPersister extends Restrictable { * Get the name of this collection role (the fully qualified class name, * extended by a "property path") */ - String getRole(); - - /** - * Get the persister of the entity that "owns" this collection - */ - EntityPersister getOwnerEntityPersister(); /** * Get the surrogate key generation strategy (optional operation) @@ -320,42 +307,6 @@ public interface CollectionPersister extends Restrictable { throw new UnsupportedOperationException( "CollectionPersister used for [" + getRole() + "] does not support SQL AST" ); } - /** - * Generates the collection's key column aliases, based on the given - * suffix. - * - * @param suffix The suffix to use in the key column alias generation. - * @return The key column aliases. - */ - String[] getKeyColumnAliases(String suffix); - - /** - * Generates the collection's index column aliases, based on the given - * suffix. - * - * @param suffix The suffix to use in the index column alias generation. - * @return The key column aliases, or null if not indexed. - */ - String[] getIndexColumnAliases(String suffix); - - /** - * Generates the collection's element column aliases, based on the given - * suffix. - * - * @param suffix The suffix to use in the element column alias generation. - * @return The key column aliases. - */ - String[] getElementColumnAliases(String suffix); - - /** - * Generates the collection's identifier column aliases, based on the given - * suffix. - * - * @param suffix The suffix to use in the key column alias generation. - * @return The key column aliases. - */ - String getIdentifierColumnAlias(String suffix); - boolean isExtraLazy(); int getSize(Object key, SharedSessionContractImplementor session); boolean indexExists(Object key, Object index, SharedSessionContractImplementor session); @@ -392,4 +343,58 @@ public interface CollectionPersister extends Restrictable { Map enabledFilters, Set treatAsDeclarations, SqlAstCreationState creationState); + + + + /** + * Generates the collection's key column aliases, based on the given + * suffix. + * + * @param suffix The suffix to use in the key column alias generation. + * @return The key column aliases. + * + * @deprecated Read-by-position makes this irrelevant. Currently still used + * by {@link org.hibernate.query.sql.internal.SQLQueryParser} + */ + @Deprecated( since = "6", forRemoval = true ) + String[] getKeyColumnAliases(String suffix); + + /** + * Generates the collection's index column aliases, based on the given + * suffix. + * + * @param suffix The suffix to use in the index column alias generation. + * @return The key column aliases, or null if not indexed. + * + * @deprecated Read-by-position makes this irrelevant. Currently still used + * by {@link org.hibernate.query.sql.internal.SQLQueryParser} + */ + @Deprecated( since = "6", forRemoval = true ) + String[] getIndexColumnAliases(String suffix); + + /** + * Generates the collection's element column aliases, based on the given + * suffix. + * + * @param suffix The suffix to use in the element column alias generation. + * @return The key column aliases. + * + * @deprecated Read-by-position makes this irrelevant. Currently still used + * by {@link org.hibernate.query.sql.internal.SQLQueryParser} + */ + @Deprecated( since = "6", forRemoval = true ) + String[] getElementColumnAliases(String suffix); + + /** + * Generates the collection's identifier column aliases, based on the given + * suffix. + * + * @param suffix The suffix to use in the key column alias generation. + * @return The key column aliases. + * + * @deprecated Read-by-position makes this irrelevant. Currently still used + * by {@link org.hibernate.query.sql.internal.SQLQueryParser} + */ + @Deprecated( since = "6", forRemoval = true ) + String getIdentifierColumnAlias(String suffix); } diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java index 2717add6b6..3f298dc427 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java @@ -6,9 +6,9 @@ */ package org.hibernate.persister.collection; -import java.sql.PreparedStatement; -import java.sql.SQLException; +import java.util.Collections; import java.util.Iterator; +import java.util.List; import java.util.function.Consumer; import org.hibernate.HibernateException; @@ -17,20 +17,67 @@ import org.hibernate.cache.CacheException; import org.hibernate.cache.spi.access.CollectionDataAccess; import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey; +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.MutationExecutor; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.internal.MutationQueryOptions; +import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.internal.FilterAliasGenerator; +import org.hibernate.internal.util.NullnessHelper; import org.hibernate.internal.util.collections.ArrayHelper; -import org.hibernate.jdbc.Expectation; -import org.hibernate.jdbc.Expectations; import org.hibernate.mapping.Collection; +import org.hibernate.metamodel.mapping.CollectionPart; +import org.hibernate.metamodel.mapping.EntityIdentifierMapping; +import org.hibernate.metamodel.mapping.EntityMappingType; +import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; +import org.hibernate.metamodel.mapping.ModelPart.JdbcValueConsumer; +import org.hibernate.metamodel.mapping.PluralAttributeMapping; +import org.hibernate.metamodel.mapping.internal.EntityCollectionPart; +import org.hibernate.metamodel.mapping.internal.OneToManyCollectionPart; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; +import org.hibernate.persister.collection.mutation.CollectionTableMapping; +import org.hibernate.persister.collection.mutation.DeleteRowsCoordinator; +import org.hibernate.persister.collection.mutation.DeleteRowsCoordinatorNoOp; +import org.hibernate.persister.collection.mutation.DeleteRowsCoordinatorStandard; +import org.hibernate.persister.collection.mutation.InsertRowsCoordinator; +import org.hibernate.persister.collection.mutation.InsertRowsCoordinatorNoOp; +import org.hibernate.persister.collection.mutation.InsertRowsCoordinatorStandard; +import org.hibernate.persister.collection.mutation.OperationProducer; +import org.hibernate.persister.collection.mutation.RemoveCoordinator; +import org.hibernate.persister.collection.mutation.RemoveCoordinatorNoOp; +import org.hibernate.persister.collection.mutation.RemoveCoordinatorStandard; +import org.hibernate.persister.collection.mutation.RowMutationOperations; +import org.hibernate.persister.collection.mutation.UpdateRowsCoordinator; +import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorNoOp; +import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorOneToMany; import org.hibernate.persister.entity.Joinable; import org.hibernate.persister.spi.PersisterCreationContext; -import org.hibernate.pretty.MessageHelper; -import org.hibernate.sql.Update; +import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAstCreationState; +import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.predicate.Predicate; +import org.hibernate.sql.exec.spi.JdbcParameterBinder; +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.ast.ColumnValueBinding; +import org.hibernate.sql.model.ast.ColumnValueParameter; +import org.hibernate.sql.model.ast.ColumnWriteFragment; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.ast.RestrictedTableMutation; +import org.hibernate.sql.model.ast.TableUpdate; +import org.hibernate.sql.model.ast.builder.TableUpdateBuilderStandard; +import org.hibernate.sql.model.internal.MutationOperationGroupSingle; +import org.hibernate.sql.model.internal.TableUpdateStandard; +import org.hibernate.sql.model.jdbc.JdbcDeleteMutation; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; +import org.hibernate.sql.model.jdbc.JdbcUpdateMutation; + +import static org.hibernate.internal.util.collections.CollectionHelper.arrayList; +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER; +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER_DEBUG_ENABLED; +import static org.hibernate.sql.model.ast.builder.TableUpdateBuilder.NULL; /** * A {@link CollectionPersister} for {@link jakarta.persistence.OneToMany one-to-one @@ -42,25 +89,17 @@ import org.hibernate.sql.ast.tree.predicate.Predicate; * @author Brett Meyer */ public class OneToManyPersister extends AbstractCollectionPersister { + private final RowMutationOperations rowMutationOperations; + + private final InsertRowsCoordinator insertRowsCoordinator; + private final UpdateRowsCoordinator updateRowsCoordinator; + private final DeleteRowsCoordinator deleteRowsCoordinator; + private final RemoveCoordinator removeCoordinator; private final boolean cascadeDeleteEnabled; private final boolean keyIsNullable; private final boolean keyIsUpdateable; - @Override - protected boolean isRowDeleteEnabled() { - return keyIsUpdateable && keyIsNullable; - } - - @Override - protected boolean isRowInsertEnabled() { - return keyIsUpdateable; - } - - public boolean isCascadeDeleteEnabled() { - return cascadeDeleteEnabled; - } - @Deprecated(since = "6.0") public OneToManyPersister( Collection collectionBinding, @@ -78,130 +117,76 @@ public class OneToManyPersister extends AbstractCollectionPersister { && creationContext.getSessionFactory().getJdbcServices().getDialect().supportsCascadeDelete(); keyIsNullable = collectionBinding.getKey().isNullable(); keyIsUpdateable = collectionBinding.getKey().isUpdateable(); + + this.rowMutationOperations = buildRowMutationOperations(); + + this.insertRowsCoordinator = buildInsertCoordinator(); + this.updateRowsCoordinator = buildUpdateCoordinator(); + this.deleteRowsCoordinator = buildDeleteCoordinator(); + this.removeCoordinator = buildDeleteAllCoordinator(); } - /** - * Generate the SQL UPDATE that updates all the foreign keys to null - */ @Override - protected String generateDeleteString() { - final Update update = createUpdate().setTableName( qualifiedTableName ) - .addColumns( keyColumnNames, "null" ); - - if ( hasIndex && !indexContainsFormula ) { - for ( int i = 0 ; i < indexColumnNames.length ; i++ ) { - if ( indexColumnIsSettable[i] ) { - update.addColumn( indexColumnNames[i], "null" ); - } - } - } - - update.addPrimaryKeyColumns( keyColumnNames ); - - if ( hasWhere ) { - update.setWhere( sqlWhereString ); - } - - if ( getFactory().getSessionFactoryOptions().isCommentsEnabled() ) { - update.setComment( "delete one-to-many " + getRole() ); - } - - return update.toStatementString(); + protected RowMutationOperations getRowMutationOperations() { + return rowMutationOperations; } - /** - * Generate the SQL UPDATE that updates a foreign key to a value - */ - @Override - protected String generateInsertRowString() { - final Update update = createUpdate().setTableName( qualifiedTableName ) - .addColumns( keyColumnNames ); - - if ( hasIndex && !indexContainsFormula ) { - for ( int i = 0 ; i < indexColumnNames.length ; i++ ) { - if ( indexColumnIsSettable[i] ) { - update.addColumn( indexColumnNames[i] ); - } - } - } - - //identifier collections not supported for 1-to-many - - if ( getFactory().getSessionFactoryOptions().isCommentsEnabled() ) { - update.setComment( "create one-to-many row " + getRole() ); - } - - return update.addPrimaryKeyColumns( elementColumnNames, elementColumnWriters ) - .toStatementString(); + protected InsertRowsCoordinator getInsertRowsCoordinator() { + return insertRowsCoordinator; } - /** - * Generate the SQL UPDATE that inserts a collection index - */ - @Override - protected String generateUpdateRowString() { - final Update update = createUpdate().setTableName( qualifiedTableName ); - - if ( hasIndex && !indexContainsFormula ) { - for ( int i = 0 ; i < indexColumnNames.length ; i++ ) { - if ( indexColumnIsSettable[i] ) { - update.addColumn( indexColumnNames[i] ); - } - } - } - - update.addPrimaryKeyColumns( elementColumnNames, elementColumnIsSettable, elementColumnWriters ); - - if ( hasIdentifier ) { - update.addPrimaryKeyColumns( new String[] {identifierColumnName} ); - } - - return update.toStatementString(); + protected UpdateRowsCoordinator getUpdateRowsCoordinator() { + return updateRowsCoordinator; + } + + protected DeleteRowsCoordinator getDeleteRowsCoordinator() { + return deleteRowsCoordinator; } - /** - * Generate the SQL UPDATE that updates a particular row's foreign - * key to null - */ @Override - protected String generateDeleteRowString() { - final Update update = createUpdate().setTableName( qualifiedTableName ) - .addColumns( keyColumnNames, "null" ); + protected RemoveCoordinator getRemoveCoordinator() { + return removeCoordinator; + } - if ( hasIndex && !indexContainsFormula ) { - for ( int i = 0 ; i < indexColumnNames.length ; i++ ) { - if ( indexColumnIsSettable[i] ) { - update.addColumn( indexColumnNames[i], "null" ); - } - } - } + @Override + protected boolean isRowDeleteEnabled() { + return keyIsUpdateable && keyIsNullable; + } - if ( getFactory().getSessionFactoryOptions().isCommentsEnabled() ) { - update.setComment( "delete one-to-many row " + getRole() ); - } + @Override + protected boolean isRowInsertEnabled() { + return keyIsUpdateable; + } - //use a combination of foreign key columns and pk columns, since - //the ordering of removal and addition is not guaranteed when - //a child moves from one parent to another - String[] rowSelectColumnNames = ArrayHelper.join( keyColumnNames, elementColumnNames ); - return update.addPrimaryKeyColumns( rowSelectColumnNames ) - .toStatementString(); + public boolean isCascadeDeleteEnabled() { + return cascadeDeleteEnabled; } @Override public void recreate(PersistentCollection collection, Object id, SharedSessionContractImplementor session) throws HibernateException { - super.recreate( collection, id, session ); + getInsertRowsCoordinator().insertRows( collection, id, collection::includeInRecreate, session ); writeIndex( collection, collection.entries( this ), id, true, session ); } @Override public void insertRows(PersistentCollection collection, Object id, SharedSessionContractImplementor session) throws HibernateException { - super.insertRows( collection, id, session ); + getInsertRowsCoordinator().insertRows( collection, id, collection::includeInInsert, session ); writeIndex( collection, collection.entries( this ), id, true, session ); } + @Override + public void updateRows(PersistentCollection collection, Object id, SharedSessionContractImplementor session) { + getUpdateRowsCoordinator().updateRows( id, collection, session ); +// oldUpdateRows( collection, id, session ); + } + + @Override + public void deleteRows(PersistentCollection collection, Object key, SharedSessionContractImplementor session) { + getDeleteRowsCoordinator().deleteRows( collection, key, session ); + } + @Override protected void doProcessQueuedOps(PersistentCollection collection, Object id, SharedSessionContractImplementor session) throws HibernateException { @@ -211,102 +196,83 @@ public class OneToManyPersister extends AbstractCollectionPersister { private void writeIndex( PersistentCollection collection, Iterator entries, - Object id, + Object key, boolean resetIndex, SharedSessionContractImplementor session) { + if ( !entries.hasNext() ) { + // no entries to update + return; + } + // If one-to-many and inverse, still need to create the index. See HHH-5732. - if ( isInverse && hasIndex && !indexContainsFormula && ArrayHelper.countTrue( indexColumnIsSettable ) > 0 ) { - try { - if ( entries.hasNext() ) { - int nextIndex = resetIndex ? 0 : getSize( id, session ); - Expectation expectation = Expectations.appropriateExpectation( getUpdateCheckStyle() ); - while ( entries.hasNext() ) { + final boolean doWrite = isInverse + && hasIndex + && !indexContainsFormula + && ArrayHelper.countTrue( indexColumnIsSettable ) > 0; + if ( !doWrite ) { + return; + } - final Object entry = entries.next(); - if ( entry != null && collection.entryExists( entry, nextIndex ) ) { - int offset = 1; - PreparedStatement st; - boolean callable = isUpdateCallable(); - boolean useBatch = expectation.canBeBatched(); - String sql = getSQLUpdateRowString(); + final JdbcMutationOperation updateRowOperation = rowMutationOperations.getUpdateRowOperation(); + final RowMutationOperations.Values updateRowValues = rowMutationOperations.getUpdateRowValues(); + final RowMutationOperations.Restrictions updateRowRestrictions = rowMutationOperations.getUpdateRowRestrictions(); + assert NullnessHelper.areAllNonNull( updateRowOperation, updateRowValues, updateRowRestrictions ); - if ( useBatch ) { - if ( recreateBatchKey == null ) { - recreateBatchKey = new BasicBatchKey( - getRole() + "#RECREATE", - expectation - ); - } - st = session - .getJdbcCoordinator() - .getBatch( recreateBatchKey ) - .getBatchStatement( sql, callable ); - } - else { - st = session - .getJdbcCoordinator() - .getStatementPreparer() - .prepareStatement( sql, callable ); - } + final MutationExecutorService mutationExecutorService = getFactory() + .getServiceRegistry() + .getService( MutationExecutorService.class ); + final MutationExecutor mutationExecutor = mutationExecutorService.createExecutor( + () -> new BasicBatchKey( getNavigableRole() + "#INDEX" ), + new MutationOperationGroupSingle( MutationType.UPDATE, this, updateRowOperation ), + session + ); - try { - offset += expectation.prepare( st ); - if ( hasIdentifier ) { - offset = writeIdentifier( - st, - collection.getIdentifier( entry, nextIndex ), - offset, - session - ); - } - offset = writeIndex( - st, - collection.getIndex( entry, nextIndex, this ), - offset, - session - ); - offset = writeElement( st, collection.getElement( entry ), offset, session ); + final JdbcValueBindings jdbcValueBindings = mutationExecutor.getJdbcValueBindings(); - if ( useBatch ) { - session.getJdbcCoordinator() - .getBatch( recreateBatchKey ) - .addToBatch(); - } - else { - expectation.verifyOutcome( - session.getJdbcCoordinator() - .getResultSetReturn() - .executeUpdate( st ), st, -1, sql - ); - } - } - catch (SQLException sqle) { - if ( useBatch ) { - session.getJdbcCoordinator().abortBatch(); - } - throw sqle; - } - finally { - if ( !useBatch ) { - session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( st ); - session.getJdbcCoordinator().afterStatementExecution(); - } - } + try { + int nextIndex = resetIndex ? 0 : getSize( key, session ); - } - nextIndex++; - } + while ( entries.hasNext() ) { + final Object entry = entries.next(); + + if ( entry != null && collection.entryExists( entry, nextIndex ) ) { + updateRowValues.applyValues( + collection, + key, + entry, + nextIndex, + session, + (jdbcValue, jdbcValueMapping, usage) -> jdbcValueBindings.bindValue( + jdbcValue, + jdbcValueMapping, + usage, + session + ) + ); + + updateRowRestrictions.applyRestrictions( + collection, + key, + entry, + nextIndex, + session, + (jdbcValue, jdbcValueMapping) -> jdbcValueBindings.bindValue( + jdbcValue, + jdbcValueMapping, + ParameterUsage.RESTRICT, + session + ) + ); + + mutationExecutor.execute( collection, null, null, null, session ); + nextIndex++; } } - catch (SQLException sqle) { - throw sqlExceptionHelper.convert( - sqle, - "could not update collection: " + - MessageHelper.collectionInfoString( this, collection, id, session ), - getSQLUpdateRowString() - ); - } } + finally { + mutationExecutor.release(); + } + } public boolean consumesEntityAlias() { @@ -326,171 +292,6 @@ public class OneToManyPersister extends AbstractCollectionPersister { return false; } - private BasicBatchKey deleteRowBatchKey; - private BasicBatchKey insertRowBatchKey; - - @Override - protected int doUpdateRows(Object id, PersistentCollection collection, SharedSessionContractImplementor session) { - - // we finish all the "removes" first to take care of possible unique - // constraints and so that we can take better advantage of batching - - try { - int count = 0; - if ( isRowDeleteEnabled() ) { - final Expectation deleteExpectation = Expectations.appropriateExpectation( getDeleteCheckStyle() ); - final boolean useBatch = deleteExpectation.canBeBatched(); - if ( useBatch && deleteRowBatchKey == null ) { - deleteRowBatchKey = new BasicBatchKey( - getRole() + "#DELETEROW", - deleteExpectation - ); - } - final String sql = getSQLDeleteRowString(); - - PreparedStatement st = null; - // update removed rows fks to null - try { - int i = 0; - Iterator entries = collection.entries( this ); - int offset = 1; - while ( entries.hasNext() ) { - Object entry = entries.next(); - if ( collection.needsUpdating( - entry, - i, - elementType - ) ) { // will still be issued when it used to be null - if ( useBatch ) { - st = session - .getJdbcCoordinator() - .getBatch( deleteRowBatchKey ) - .getBatchStatement( sql, isDeleteCallable() ); - } - else { - st = session - .getJdbcCoordinator() - .getStatementPreparer() - .prepareStatement( sql, isDeleteCallable() ); - } - int loc = writeKey( st, id, offset, session ); - writeElementToWhere( st, collection.getSnapshotElement( entry, i ), loc, session ); - if ( useBatch ) { - session - .getJdbcCoordinator() - .getBatch( deleteRowBatchKey ) - .addToBatch(); - } - else { - deleteExpectation.verifyOutcome( - session.getJdbcCoordinator() - .getResultSetReturn() - .executeUpdate( st ), st, -1, sql - ); - } - count++; - } - i++; - } - } - catch (SQLException e) { - if ( useBatch ) { - session.getJdbcCoordinator().abortBatch(); - } - throw e; - } - finally { - if ( !useBatch ) { - session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( st ); - session.getJdbcCoordinator().afterStatementExecution(); - } - } - } - - if ( isRowInsertEnabled() ) { - final Expectation insertExpectation = Expectations.appropriateExpectation( getInsertCheckStyle() ); - boolean useBatch = insertExpectation.canBeBatched(); - boolean callable = isInsertCallable(); - if ( useBatch && insertRowBatchKey == null ) { - insertRowBatchKey = new BasicBatchKey( - getRole() + "#INSERTROW", - insertExpectation - ); - } - final String sql = getSQLInsertRowString(); - - PreparedStatement st = null; - // now update all changed or added rows fks - try { - int i = 0; - Iterator entries = collection.entries( this ); - while ( entries.hasNext() ) { - Object entry = entries.next(); - int offset = 1; - if ( collection.needsUpdating( entry, i, elementType ) ) { - if ( useBatch ) { - st = session - .getJdbcCoordinator() - .getBatch( insertRowBatchKey ) - .getBatchStatement( sql, callable ); - } - else { - st = session - .getJdbcCoordinator() - .getStatementPreparer() - .prepareStatement( sql, callable ); - } - - offset += insertExpectation.prepare( st ); - - int loc = writeKey( st, id, offset, session ); - if ( hasIndex && !indexContainsFormula ) { - loc = writeIndexToWhere( st, collection.getIndex( entry, i, this ), loc, session ); - } - - writeElementToWhere( st, collection.getElement( entry ), loc, session ); - - if ( useBatch ) { - session.getJdbcCoordinator().getBatch( insertRowBatchKey ).addToBatch(); - } - else { - insertExpectation.verifyOutcome( - session.getJdbcCoordinator() - .getResultSetReturn() - .executeUpdate( st ), st, -1, sql - ); - } - count++; - } - i++; - } - } - catch (SQLException sqle) { - if ( useBatch ) { - session.getJdbcCoordinator().abortBatch(); - } - throw sqle; - } - finally { - if ( !useBatch ) { - session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( st ); - session.getJdbcCoordinator().afterStatementExecution(); - } - } - } - - return count; - } - catch (SQLException sqle) { - throw getFactory().getJdbcServices().getSqlExceptionHelper().convert( - sqle, - "could not update collection rows: " + - MessageHelper.collectionInfoString( this, collection, id, session ), - getSQLInsertRowString() - ); - } - } - @Override public String getTableName() { return ( (Joinable) getElementPersister() ).getTableName(); @@ -529,4 +330,481 @@ public class OneToManyPersister extends AbstractCollectionPersister { public FilterAliasGenerator getFilterAliasGenerator(TableGroup rootTableGroup) { return getElementPersister().getFilterAliasGenerator( rootTableGroup ); } + + + @Override + public RestrictedTableMutation generateDeleteAllAst(MutatingTableReference tableReference) { + assert getAttributeMapping() != null; + + final ForeignKeyDescriptor fkDescriptor = getAttributeMapping().getKeyDescriptor(); + assert fkDescriptor != null; + + final int keyColumnCount = fkDescriptor.getJdbcTypeCount(); + final int valuesCount = hasIndex + ? keyColumnCount + indexColumnNames.length + : keyColumnCount; + + final List keyRestrictionBindings = arrayList( keyColumnCount ); + final List parameters = arrayList( keyColumnCount ); + final List valueBindings = arrayList( valuesCount ); + + fkDescriptor.getKeyPart().forEachSelectable( (selectionIndex, selectableMapping) -> { + final ColumnReference columnReference = new ColumnReference( tableReference, selectableMapping ); + final ColumnValueParameter columnValueParameter = new ColumnValueParameter( + columnReference, + ParameterUsage.RESTRICT + ); + parameters.add( columnValueParameter ); + keyRestrictionBindings.add( + new ColumnValueBinding( + columnReference, + new ColumnWriteFragment( + "?", + columnValueParameter, + selectableMapping.getJdbcMapping() + ) + ) + ); + valueBindings.add( new ColumnValueBinding( + columnReference, + new ColumnWriteFragment( + "null", + null, + selectableMapping.getJdbcMapping() + ) + ) ); + } ); + + if ( hasIndex && !indexContainsFormula ) { + getAttributeMapping().getIndexDescriptor().forEachSelectable( (selectionIndex, selectableMapping) -> { + if ( ! selectableMapping.isUpdateable() ) { + return; + } + valueBindings.add( + new ColumnValueBinding( new ColumnReference( tableReference, selectableMapping ), + new ColumnWriteFragment( "null", null, selectableMapping.getJdbcMapping() ) + ) ); + } ); + } + + return new TableUpdateStandard( + tableReference, + this, + parameters, + valueBindings, + keyRestrictionBindings, + Collections.emptyList(), + sqlWhereString + ); + } + + + private RowMutationOperations buildRowMutationOperations() { + final OperationProducer insertRowOperationProducer; + final RowMutationOperations.Values insertRowValues; + if ( !isInverse() && isRowInsertEnabled() ) { + insertRowOperationProducer = this::generateInsertRowOperation; + insertRowValues = this::applyInsertRowValues; + } + else { + insertRowOperationProducer = null; + insertRowValues = null; + } + + final OperationProducer writeIndexOperationProducer; + final RowMutationOperations.Values writeIndexValues; + final RowMutationOperations.Restrictions writeIndexRestrictions; + final boolean needsWriteIndex = isInverse + && hasIndex + && !indexContainsFormula + && !ArrayHelper.isAllFalse( indexColumnIsSettable ); + if ( needsWriteIndex ) { + writeIndexOperationProducer = this::generateWriteIndexOperation; + writeIndexValues = this::applyWriteIndexValues; + writeIndexRestrictions = this::applyWriteIndexRestrictions; + } + else { + writeIndexOperationProducer = null; + writeIndexValues = null; + writeIndexRestrictions = null; + } + + final OperationProducer deleteEntryOperationProducer; + final RowMutationOperations.Restrictions deleteEntryRestrictions; + if ( !isInverse() && isRowDeleteEnabled() ) { + deleteEntryOperationProducer = this::generateDeleteRowOperation; + deleteEntryRestrictions = this::applyDeleteRowRestrictions; + } + else { + deleteEntryOperationProducer = null; + deleteEntryRestrictions = null; + } + + return new RowMutationOperations( + this, + insertRowOperationProducer, + insertRowValues, + writeIndexOperationProducer, + writeIndexValues, + writeIndexRestrictions, + deleteEntryOperationProducer, + deleteEntryRestrictions + ); + } + + + private InsertRowsCoordinator buildInsertCoordinator() { + if ( isInverse() || !isRowInsertEnabled() ) { + if ( MODEL_MUTATION_LOGGER_DEBUG_ENABLED ) { + MODEL_MUTATION_LOGGER.debugf( + "Skipping collection (re)creation - %s", + getRolePath() + ); + } + return new InsertRowsCoordinatorNoOp( this ); + } + + return new InsertRowsCoordinatorStandard( this, rowMutationOperations ); + } + + private UpdateRowsCoordinator buildUpdateCoordinator() { + if ( !isRowDeleteEnabled() && !isRowInsertEnabled() ) { + if ( MODEL_MUTATION_LOGGER_DEBUG_ENABLED ) { + MODEL_MUTATION_LOGGER.debugf( + "Skipping collection row updates - %s", + getRolePath() + ); + } + return new UpdateRowsCoordinatorNoOp( this ); + } + + return new UpdateRowsCoordinatorOneToMany( this, getRowMutationOperations(), getFactory() ); + } + + private DeleteRowsCoordinator buildDeleteCoordinator() { + if ( !needsRemove() ) { + if ( MODEL_MUTATION_LOGGER_DEBUG_ENABLED ) { + MODEL_MUTATION_LOGGER.debugf( + "Skipping collection row deletions - %s", + getRolePath() + ); + } + return new DeleteRowsCoordinatorNoOp( this ); + } + + return new DeleteRowsCoordinatorStandard( + this, + rowMutationOperations, + // never delete by index for one-to-many + false + ); + } + + private RemoveCoordinator buildDeleteAllCoordinator() { + if ( ! needsRemove() ) { + if ( MODEL_MUTATION_LOGGER_DEBUG_ENABLED ) { + MODEL_MUTATION_LOGGER.debugf( + "Skipping collection removals - %s", + getRolePath() + ); + } + return new RemoveCoordinatorNoOp( this ); + } + + return new RemoveCoordinatorStandard( this, this::buildDeleteAllOperation ); + } + + private JdbcMutationOperation generateDeleteRowOperation(MutatingTableReference tableReference) { + if ( getIdentifierTableMapping().getDeleteRowDetails().getCustomSql() != null ) { + return buildCustomSqlDeleteRowOperation( tableReference ); + } + + return buildGeneratedDeleteRowOperation( tableReference ); + } + + private JdbcMutationOperation buildCustomSqlDeleteRowOperation(MutatingTableReference tableReference) { + final PluralAttributeMapping attribute = getAttributeMapping(); + assert attribute != null; + + final ForeignKeyDescriptor foreignKey = attribute.getKeyDescriptor(); + assert foreignKey != null; + + final CollectionTableMapping tableMapping = (CollectionTableMapping) tableReference.getTableMapping(); + + final int keyColumnCount = foreignKey.getJdbcTypeCount(); + final java.util.List parameterBinders = arrayList( keyColumnCount ); + foreignKey.getKeyPart().forEachSelectable( (selectionIndex, selectableMapping) -> { + final ColumnReference columnReference = new ColumnReference( tableReference, selectableMapping ); + final ColumnValueParameter columnValueParameter = new ColumnValueParameter( + columnReference, + ParameterUsage.RESTRICT + ); + parameterBinders.add( columnValueParameter ); + } ); + + return new JdbcDeleteMutation( + tableMapping, + this, + tableMapping.getDeleteDetails().getCustomSql(), + tableMapping.getDeleteDetails().isCallable(), + tableMapping.getDeleteDetails().getExpectation(), + parameterBinders + ); + } + + private JdbcMutationOperation buildGeneratedDeleteRowOperation(MutatingTableReference tableReference) { + final RestrictedTableMutation sqlAst = generateDeleteRowAst( tableReference ); + + final SqlAstTranslator translator = getFactory().getJdbcServices() + .getDialect() + .getSqlAstTranslatorFactory() + .buildModelMutationTranslator( sqlAst, getFactory() ); + + return translator.translate( null, MutationQueryOptions.INSTANCE ); + } + + public RestrictedTableMutation generateDeleteRowAst(MutatingTableReference tableReference) { + final TableUpdateBuilderStandard updateBuilder = new TableUpdateBuilderStandard<>( this, tableReference, getFactory() ); + + // for each key column - + // 1) set the value to null + // 2) restrict based on key value + getAttributeMapping().getKeyDescriptor().forEachSelectable( (index, selectable) -> { + if ( selectable.isFormula() ) { + return; + } + + if ( selectable.isUpdateable() ) { + // set null + updateBuilder.addValueColumn( + selectable.getSelectionExpression(), + NULL, + selectable.getJdbcMapping() + ); + } + + // restrict + updateBuilder.addKeyRestriction( selectable ); + } ); + + // set the value for each index column to null + if ( hasIndex && !indexContainsFormula ) { + assert getAttributeMapping().getIndexDescriptor() != null; + + getAttributeMapping().getIndexDescriptor().forEachSelectable( (index, selectable) -> { + if ( !selectable.isUpdateable() ) { + return; + } + + updateBuilder.addValueColumn( + selectable.getSelectionExpression(), + NULL, + selectable.getJdbcMapping() + ); + } ); + } + + // for one-to-many, we know the element is an entity and need to restrict the update + // based on the element's id + final EntityCollectionPart entityPart = (EntityCollectionPart) getAttributeMapping().getElementDescriptor(); + final EntityIdentifierMapping entityId = entityPart.getAssociatedEntityMappingType().getIdentifierMapping(); + entityId.forEachSelectable( (index, selectable) -> updateBuilder.addKeyRestriction( selectable ) ); + + //noinspection unchecked,rawtypes + return (RestrictedTableMutation) updateBuilder.buildMutation(); + } + + private void applyDeleteRowRestrictions( + PersistentCollection collection, + Object keyValue, + Object rowValue, + int rowPosition, + SharedSessionContractImplementor session, + JdbcValueConsumer jdbcValueConsumer) { + final PluralAttributeMapping pluralAttribute = getAttributeMapping(); +// pluralAttribute.getKeyDescriptor().decompose( keyValue, jdbcValueConsumer, session ); + pluralAttribute.getElementDescriptor().decompose( rowValue, jdbcValueConsumer, session ); + } + + + private JdbcMutationOperation generateInsertRowOperation(MutatingTableReference tableReference) { + // NOTE : `TableUpdateBuilderStandard` and `TableUpdate` already handle custom-sql + final TableUpdate tableUpdate = buildTableUpdate( tableReference ); + return tableUpdate.createMutationOperation( null, getFactory() ); + } + + private TableUpdate buildTableUpdate(MutatingTableReference tableReference) { + final TableUpdateBuilderStandard updateBuilder = new TableUpdateBuilderStandard<>( this, tableReference, getFactory() ); + final PluralAttributeMapping attributeMapping = getAttributeMapping(); + + attributeMapping.getKeyDescriptor().getKeyPart().forEachSelectable( (position, mapping) -> updateBuilder.addValueColumn( mapping ) ); + + final CollectionPart indexDescriptor = attributeMapping.getIndexDescriptor(); + if ( indexDescriptor != null ) { + indexDescriptor.forEachSelectable( (position,mapping) -> { + if ( !mapping.isUpdateable() ) { + return; + } + updateBuilder.addValueColumn( mapping ); + } ); + } + + final EntityCollectionPart elementDescriptor = (EntityCollectionPart) attributeMapping.getElementDescriptor(); + final EntityMappingType elementType = elementDescriptor.getAssociatedEntityMappingType(); + elementType.getIdentifierMapping().forEachSelectable( (position, mapping) -> { + assert tableReference.getTableName().equals( mapping.getContainingTableExpression() ); + updateBuilder.addKeyRestriction( mapping ); + } ); + + return (TableUpdate) updateBuilder.buildMutation(); + } + + private void applyInsertRowValues( + PersistentCollection collection, + Object keyValue, + Object rowValue, + int rowPosition, + SharedSessionContractImplementor session, + RowMutationOperations.ValuesBindingConsumer bindingsConsumer) { + final PluralAttributeMapping attributeMapping = getAttributeMapping(); + + attributeMapping.getKeyDescriptor().getKeyPart().decompose( keyValue, bindingsConsumer, session ); + + final CollectionPart indexDescriptor = attributeMapping.getIndexDescriptor(); + + if ( indexDescriptor != null ) { + indexDescriptor.decompose( + incrementIndexByBase( collection.getIndex( rowValue, rowPosition, this ) ), + (value, jdbcValueMapping) -> { + if ( !jdbcValueMapping.isUpdateable() ) { + return; + } + bindingsConsumer.consume( value, jdbcValueMapping ); + }, + session + ); + } + + final Object elementValue = collection.getElement( rowValue ); + final EntityCollectionPart elementDescriptor = (EntityCollectionPart) attributeMapping.getElementDescriptor(); + final EntityIdentifierMapping identifierMapping = elementDescriptor.getAssociatedEntityMappingType().getIdentifierMapping(); + identifierMapping.decompose( + identifierMapping.getIdentifier( elementValue ), + (jdbcValue, jdbcValueMapping) -> bindingsConsumer.consumeJdbcValueBinding( + jdbcValue, + jdbcValueMapping, + ParameterUsage.RESTRICT + ), + session + ); + } + + + private JdbcMutationOperation generateWriteIndexOperation(MutatingTableReference tableReference) { + if ( getIdentifierTableMapping().getUpdateDetails().getCustomSql() != null ) { + return buildCustomSqlWriteIndexOperation( tableReference ); + } + + return buildGeneratedWriteIndexOperation( tableReference ); + } + + private JdbcMutationOperation buildCustomSqlWriteIndexOperation(MutatingTableReference tableReference) { + final PluralAttributeMapping attribute = getAttributeMapping(); + assert attribute != null; + + final ForeignKeyDescriptor foreignKey = attribute.getKeyDescriptor(); + assert foreignKey != null; + + final CollectionTableMapping tableMapping = (CollectionTableMapping) tableReference.getTableMapping(); + + final int keyColumnCount = foreignKey.getJdbcTypeCount(); + final java.util.List parameterBinders = arrayList( keyColumnCount ); + foreignKey.getKeyPart().forEachSelectable( (selectionIndex, selectableMapping) -> { + final ColumnReference columnReference = new ColumnReference( tableReference, selectableMapping ); + final ColumnValueParameter columnValueParameter = new ColumnValueParameter( + columnReference, + ParameterUsage.RESTRICT + ); + parameterBinders.add( columnValueParameter ); + } ); + + return new JdbcUpdateMutation( + tableMapping, + this, + tableMapping.getUpdateDetails().getCustomSql(), + tableMapping.getUpdateDetails().isCallable(), + tableMapping.getUpdateDetails().getExpectation(), + parameterBinders + ); + } + + private JdbcMutationOperation buildGeneratedWriteIndexOperation(MutatingTableReference tableReference) { + final TableUpdateBuilderStandard updateBuilder = new TableUpdateBuilderStandard<>( this, tableReference, getFactory() ); + + final OneToManyCollectionPart elementDescriptor = (OneToManyCollectionPart) getAttributeMapping().getElementDescriptor(); + elementDescriptor + .getAssociatedEntityMappingType() + .getIdentifierMapping() + .forEachSelectable( updateBuilder::addKeyRestriction ); + + // if the collection has an identifier, add its column as well + if ( getAttributeMapping().getIdentifierDescriptor() != null ) { + getAttributeMapping() + .getIdentifierDescriptor() + .forEachSelectable( updateBuilder::addKeyRestriction ); + } + + // for each index column: + // * add a restriction based on the previous value + // * add an assignment for the new value + getAttributeMapping().getIndexDescriptor().forEachSelectable( (selectionIndex, selectableMapping) -> { + if ( selectableMapping.isUpdateable() ) { + updateBuilder.addValueColumn( selectableMapping ); + } + } ); + + final RestrictedTableMutation tableUpdate = updateBuilder.buildMutation(); + return tableUpdate.createMutationOperation( null, getFactory() ); + } + + private void applyWriteIndexValues( + PersistentCollection collection, + Object key, + Object entry, + int entryPosition, + SharedSessionContractImplementor session, + RowMutationOperations.ValuesBindingConsumer bindingsConsumer) { + final Object index = collection.getIndex( entry, entryPosition, this ); + + getAttributeMapping().getIndexDescriptor().decompose( + index, + (jdbcValue, jdbcValueMapping) -> { + if ( !jdbcValueMapping.isUpdateable() ) { + return; + } + bindingsConsumer.consume( jdbcValue, jdbcValueMapping ); + }, + session + ); + } + + private void applyWriteIndexRestrictions( + PersistentCollection collection, + Object key, + Object entry, + int entryPosition, + SharedSessionContractImplementor session, + JdbcValueConsumer jdbcValueConsumer) { + final OneToManyCollectionPart elementDescriptor = (OneToManyCollectionPart) getAttributeMapping().getElementDescriptor(); + final EntityMappingType associatedType = elementDescriptor.getAssociatedEntityMappingType(); + final Object element = collection.getElement( entry ); + final Object elementIdentifier = associatedType.getIdentifierMapping().getIdentifier( element ); + associatedType.getIdentifierMapping().decompose( elementIdentifier, jdbcValueConsumer, session ); + + if ( getAttributeMapping().getIdentifierDescriptor() != null ) { + final Object identifier = collection.getIdentifier( entry, entryPosition ); + getAttributeMapping().getIdentifierDescriptor().decompose( identifier, jdbcValueConsumer, session ); + } + } + } diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/QueryableCollection.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/QueryableCollection.java index aeda702f46..d76e795598 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/collection/QueryableCollection.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/QueryableCollection.java @@ -13,8 +13,14 @@ import org.hibernate.persister.entity.PropertyMapping; /** * A collection role that may be queried or loaded by outer join. + * * @author Gavin King + * + * @deprecated Given the mapping-model and SQM, this contract is no longer needed. + * Note however that {@link org.hibernate.query.sql.internal.SQLQueryParser} currently + * uses this along with other */ +@Deprecated( since = "6", forRemoval = true ) public interface QueryableCollection extends PropertyMapping, Joinable, CollectionPersister { /** * Generate a list of collection index and element columns diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/SQLLoadableCollection.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/SQLLoadableCollection.java index 776a73e66c..cd166ecb1f 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/collection/SQLLoadableCollection.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/SQLLoadableCollection.java @@ -7,6 +7,7 @@ package org.hibernate.persister.collection; +@Deprecated( since = "6" ) public interface SQLLoadableCollection extends QueryableCollection { String[] getCollectionPropertyColumnAliases(String propertyName, String string); diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/AbstractUpdateRowsCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/AbstractUpdateRowsCoordinator.java new file mode 100644 index 0000000000..4d8def8c3e --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/AbstractUpdateRowsCoordinator.java @@ -0,0 +1,52 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +import org.hibernate.collection.spi.PersistentCollection; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.engine.spi.SharedSessionContractImplementor; + +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER; + +/** + * @author Steve Ebersole + */ +public abstract class AbstractUpdateRowsCoordinator implements UpdateRowsCoordinator { + private final CollectionMutationTarget mutationTarget; + private final SessionFactoryImplementor sessionFactory; + + public AbstractUpdateRowsCoordinator(CollectionMutationTarget mutationTarget, SessionFactoryImplementor sessionFactory) { + this.mutationTarget = mutationTarget; + this.sessionFactory = sessionFactory; + } + + @Override + public String toString() { + return "UpdateRowsCoordinator(" + getMutationTarget().getRolePath() + ")"; + } + + public SessionFactoryImplementor getSessionFactory() { + return sessionFactory; + } + + @Override + public CollectionMutationTarget getMutationTarget() { + return mutationTarget; + } + + @Override + public void updateRows(Object key, PersistentCollection collection, SharedSessionContractImplementor session) { + MODEL_MUTATION_LOGGER.tracef( "Updating collection rows - %s#%s", mutationTarget.getRolePath(), key ); + + // update all the modified entries + int count = doUpdate( key, collection, session ); + + MODEL_MUTATION_LOGGER.debugf( "Updated `%s` collection rows - %s#%s", count, mutationTarget.getRolePath(), key ); + } + + protected abstract int doUpdate(Object key, PersistentCollection collection, SharedSessionContractImplementor session); +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionMutationTarget.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionMutationTarget.java new file mode 100644 index 0000000000..e3a41e6b14 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionMutationTarget.java @@ -0,0 +1,30 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +import org.hibernate.metamodel.mapping.PluralAttributeMapping; +import org.hibernate.sql.model.MutationTarget; + +/** + * @author Steve Ebersole + */ +public interface CollectionMutationTarget extends MutationTarget { + @Override + PluralAttributeMapping getTargetPart(); + + CollectionTableMapping getCollectionTableMapping(); + + @Override + default CollectionTableMapping getIdentifierTableMapping() { + return getCollectionTableMapping(); + } + + /** + * Whether the collection has at least one physical index column + */ + boolean hasPhysicalIndexColumn(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionOperationCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionOperationCoordinator.java new file mode 100644 index 0000000000..e7f1d5d167 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionOperationCoordinator.java @@ -0,0 +1,19 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +/** + * Base contract for coordination of collection mutation operations + * + * @author Steve Ebersole + */ +public interface CollectionOperationCoordinator { + /** + * The collection being mutated + */ + CollectionMutationTarget getMutationTarget(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionTableMapping.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionTableMapping.java new file mode 100644 index 0000000000..ba07538925 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionTableMapping.java @@ -0,0 +1,100 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +import org.hibernate.sql.model.TableMapping; + +/** + * @author Steve Ebersole + */ +public class CollectionTableMapping implements TableMapping { + private final String tableName; + private final boolean isJoinTable; + private final boolean isInverse; + private final MutationDetails insertDetails; + private final MutationDetails updateDetails; + private final boolean cascadeDeleteEnabled; + private final MutationDetails deleteAllDetails; + private final MutationDetails deleteRowDetails; + +// ForeignKeyDescriptor collectionKey; +// private final ForeignKeyDescriptor elementFk; +// private final ForeignKeyDescriptor indexFk; + + public CollectionTableMapping( + String tableName, + boolean isJoinTable, + boolean isInverse, + MutationDetails insertDetails, + MutationDetails updateDetails, + boolean cascadeDeleteEnabled, + MutationDetails deleteAllDetails, + MutationDetails deleteRowDetails) { + this.tableName = tableName; + this.isJoinTable = isJoinTable; + this.isInverse = isInverse; + this.insertDetails = insertDetails; + this.updateDetails = updateDetails; + this.cascadeDeleteEnabled = cascadeDeleteEnabled; + this.deleteAllDetails = deleteAllDetails; + this.deleteRowDetails = deleteRowDetails; + } + + @Override + public String getTableName() { + return tableName; + } + + public boolean isJoinTable() { + return isJoinTable; + } + + @Override + public int getRelativePosition() { + return 0; + } + + @Override + public boolean isOptional() { + return false; + } + + @Override + public boolean isInverse() { + return isInverse; + } + + @Override + public boolean isIdentifierTable() { + // if there is an id (id-bag), the collection table would hold it + return true; + } + + @Override + public MutationDetails getInsertDetails() { + return insertDetails; + } + + @Override + public MutationDetails getUpdateDetails() { + return updateDetails; + } + + @Override + public boolean isCascadeDeleteEnabled() { + return cascadeDeleteEnabled; + } + + @Override + public MutationDetails getDeleteDetails() { + return deleteAllDetails; + } + + public MutationDetails getDeleteRowDetails() { + return deleteRowDetails; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinator.java new file mode 100644 index 0000000000..7001adea99 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinator.java @@ -0,0 +1,35 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +import org.hibernate.collection.spi.PersistentCollection; +import org.hibernate.engine.spi.SharedSessionContractImplementor; + +/** + * Coordinates the deletion of entries removed from the collection -
    + *
  • + * For collections with a collection-table, deletes rows from the + * collection table. + *
    • + *
  • + * For one-to-many, unsets the collection-key for the matched row + * in the association table. + *
    • + *
+ * + * @see org.hibernate.persister.collection.CollectionPersister#deleteRows + * @see RowMutationOperations#getDeleteRowOperation() + * @see RowMutationOperations#getDeleteRowRestrictions() + * + * @author Steve Ebersole + */ +public interface DeleteRowsCoordinator extends CollectionOperationCoordinator { + /** + * Perform the deletions + */ + void deleteRows(PersistentCollection collection, Object key, SharedSessionContractImplementor session); +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorNoOp.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorNoOp.java new file mode 100644 index 0000000000..bc12c7e814 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorNoOp.java @@ -0,0 +1,38 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +import org.hibernate.collection.spi.PersistentCollection; +import org.hibernate.engine.spi.SharedSessionContractImplementor; + +/** + * DeleteRowsCoordinator implementation for cases where deletion is not enabled + * + * @author Steve Ebersole + */ +public class DeleteRowsCoordinatorNoOp implements DeleteRowsCoordinator { + private final CollectionMutationTarget mutationTarget; + + public DeleteRowsCoordinatorNoOp(CollectionMutationTarget mutationTarget) { + this.mutationTarget = mutationTarget; + } + + @Override + public String toString() { + return "DeleteRowsCoordinator(" + mutationTarget.getRolePath() + " [DISABLED])"; + } + + @Override + public CollectionMutationTarget getMutationTarget() { + return mutationTarget; + } + + @Override + public void deleteRows(PersistentCollection collection, Object key, SharedSessionContractImplementor session) { + // nothing to do + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorStandard.java new file mode 100644 index 0000000000..a009d73056 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorStandard.java @@ -0,0 +1,136 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +import java.util.Iterator; + +import org.hibernate.collection.spi.PersistentCollection; +import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey; +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.MutationExecutor; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.metamodel.mapping.PluralAttributeMapping; +import org.hibernate.persister.collection.CollectionPersister; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.internal.MutationOperationGroupSingle; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; + +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER; +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER_DEBUG_ENABLED; + +/** + * @author Steve Ebersole + */ +public class DeleteRowsCoordinatorStandard implements DeleteRowsCoordinator { + private final CollectionMutationTarget mutationTarget; + private final RowMutationOperations rowMutationOperations; + private final boolean deleteByIndex; + + private final BasicBatchKey batchKey; + + private MutationOperationGroupSingle operationGroup; + + public DeleteRowsCoordinatorStandard( + CollectionMutationTarget mutationTarget, + RowMutationOperations rowMutationOperations, + boolean deleteByIndex) { + this.mutationTarget = mutationTarget; + this.rowMutationOperations = rowMutationOperations; + this.deleteByIndex = deleteByIndex; + + this.batchKey = new BasicBatchKey( mutationTarget.getRolePath() + "#DELETE" ); + } + + @Override + public CollectionMutationTarget getMutationTarget() { + return mutationTarget; + } + + @Override + public void deleteRows(PersistentCollection collection, Object key, SharedSessionContractImplementor session) { + if ( operationGroup == null ) { + operationGroup = createOperationGroup(); + } + + if ( MODEL_MUTATION_LOGGER_DEBUG_ENABLED ) { + MODEL_MUTATION_LOGGER.debugf( + "Deleting removed collection rows - %s : %s", + mutationTarget.getRolePath(), + key + ); + } + + final MutationExecutorService mutationExecutorService = session + .getFactory() + .getServiceRegistry() + .getService( MutationExecutorService.class ); + final MutationExecutor mutationExecutor = mutationExecutorService.createExecutor( + () -> batchKey, + operationGroup, + session + ); + final JdbcValueBindings jdbcValueBindings = mutationExecutor.getJdbcValueBindings(); + + try { + final PluralAttributeMapping pluralAttribute = mutationTarget.getTargetPart(); + final CollectionPersister collectionDescriptor = pluralAttribute.getCollectionDescriptor(); + + final Iterator deletes = collection.getDeletes( collectionDescriptor, !deleteByIndex ); + if ( !deletes.hasNext() ) { + MODEL_MUTATION_LOGGER.debug( "No rows to delete" ); + return; + } + + int deletionCount = 0; + + final RowMutationOperations.Restrictions restrictions = rowMutationOperations.getDeleteRowRestrictions(); + + while ( deletes.hasNext() ) { + final Object removal = deletes.next(); + + restrictions.applyRestrictions( + collection, + key, + removal, + deletionCount, + session, + (jdbcValue, jdbcValueMapping) -> { + if ( jdbcValueMapping.isFormula() || jdbcValueMapping.isNullable() ) { + return; + } + jdbcValueBindings.bindValue( + jdbcValue, + mutationTarget.getIdentifierTableName(), + jdbcValueMapping.getSelectionExpression(), + ParameterUsage.RESTRICT, + session + ); + } + ); + + mutationExecutor.execute( removal, null, null, null, session ); + + deletionCount++; + } + + MODEL_MUTATION_LOGGER.debugf( "Done deleting `%s` collection rows : %s", deletionCount, mutationTarget.getRolePath() ); + } + finally { + mutationExecutor.release(); + } + } + + private MutationOperationGroupSingle createOperationGroup() { + assert mutationTarget.getTargetPart() != null; + assert mutationTarget.getTargetPart().getKeyDescriptor() != null; + + final JdbcMutationOperation operation = rowMutationOperations.getDeleteRowOperation(); + return new MutationOperationGroupSingle( MutationType.DELETE, mutationTarget, operation ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinator.java new file mode 100644 index 0000000000..f7557f293c --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinator.java @@ -0,0 +1,65 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +import org.hibernate.collection.spi.PersistentCollection; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.metamodel.mapping.PluralAttributeMapping; +import org.hibernate.persister.collection.CollectionPersister; + +/** + * Coordinates the logical insertion of collection entries which are not yet persistent. + *

+ * Insertions are determined by {@linkplain EntryFilter filtering} the entries obtained + * from {@link PersistentCollection#entries(CollectionPersister)}. + *

+ * A "logical" insertion because the actual SQL used may be an UPDATE in the case of + * one-to-many mappings to set the foreign-key + * + * @see CollectionPersister#recreate + * @see CollectionPersister#insertRows + * @see RowMutationOperations#getInsertRowOperation() + * @see RowMutationOperations#getInsertRowValues() + * + * @author Steve Ebersole + */ +public interface InsertRowsCoordinator extends CollectionOperationCoordinator { + /** + * Perform the creation. + * + * @apiNote `entryChecker` allows simultaneously handling for both "insert" and + * "recreate" operations based on the checker's inclusion/exclusion of each entry + */ + void insertRows( + PersistentCollection collection, + Object id, + EntryFilter entryChecker, + SharedSessionContractImplementor session); + + /** + * A tri-predicate for including / excluding collection entries + * from iterative processing inside {@link #insertRows}. + */ + @FunctionalInterface + interface EntryFilter { + /** + * Whether the entry should be included + * + * @return {@code true} indicates the entry should be included and {@code false} + * indicates it should be excluded + */ + boolean include(Object entry, int position, PersistentCollection collection, PluralAttributeMapping attributeDescriptor); + + /** + * The inverse of {@link #include}. Here, {@code true} indicates exclusion and + * {@code false} indicates inclusion + */ + default boolean exclude(Object entry, int i, PersistentCollection collection, PluralAttributeMapping attributeDescriptor) { + return !include( entry, i, collection, attributeDescriptor ); + } + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorNoOp.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorNoOp.java new file mode 100644 index 0000000000..5416305235 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorNoOp.java @@ -0,0 +1,36 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +import org.hibernate.collection.spi.PersistentCollection; +import org.hibernate.engine.spi.SharedSessionContractImplementor; + +/** + * @author Steve Ebersole + */ +public class InsertRowsCoordinatorNoOp implements InsertRowsCoordinator { + private final CollectionMutationTarget mutationTarget; + + public InsertRowsCoordinatorNoOp(CollectionMutationTarget mutationTarget) { + this.mutationTarget = mutationTarget; + } + + @Override + public String toString() { + return "InsertRowsCoordinator(" + mutationTarget.getRolePath() + " (no-op))"; + } + + @Override + public CollectionMutationTarget getMutationTarget() { + return mutationTarget; + } + + @Override + public void insertRows(PersistentCollection collection, Object id, EntryFilter entryChecker, SharedSessionContractImplementor session) { + // nothing to do + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorStandard.java new file mode 100644 index 0000000000..053b9c4495 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorStandard.java @@ -0,0 +1,143 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +import java.util.Iterator; + +import org.hibernate.collection.spi.PersistentCollection; +import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey; +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.MutationExecutor; +import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.metamodel.mapping.PluralAttributeMapping; +import org.hibernate.persister.collection.CollectionPersister; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.internal.MutationOperationGroupSingle; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; + +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER; +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER_DEBUG_ENABLED; + +/** + * @author Steve Ebersole + */ +public class InsertRowsCoordinatorStandard implements InsertRowsCoordinator { + private final CollectionMutationTarget mutationTarget; + private final RowMutationOperations rowMutationOperations; + + private final BasicBatchKey batchKey; + + private MutationOperationGroupSingle operationGroup; + + public InsertRowsCoordinatorStandard( + CollectionMutationTarget mutationTarget, + RowMutationOperations rowMutationOperations) { + this.mutationTarget = mutationTarget; + this.rowMutationOperations = rowMutationOperations; + + this.batchKey = new BasicBatchKey( mutationTarget.getRolePath() + "#INSERT" ); + } + + @Override + public String toString() { + return "InsertRowsCoordinator(" + mutationTarget.getRolePath() + ")"; + } + + @Override + public CollectionMutationTarget getMutationTarget() { + return mutationTarget; + } + + @Override + public void insertRows( + PersistentCollection collection, + Object id, + EntryFilter entryChecker, + SharedSessionContractImplementor session) { + if ( operationGroup == null ) { + operationGroup = createOperationGroup(); + } + + if ( MODEL_MUTATION_LOGGER_DEBUG_ENABLED ) { + MODEL_MUTATION_LOGGER.debugf( + "Inserting collection rows - %s : %s", + mutationTarget.getRolePath(), + id + ); + } + + final PluralAttributeMapping pluralAttribute = mutationTarget.getTargetPart(); + final CollectionPersister collectionDescriptor = pluralAttribute.getCollectionDescriptor(); + + final MutationExecutorService mutationExecutorService = session + .getFactory() + .getServiceRegistry() + .getService( MutationExecutorService.class ); + final MutationExecutor mutationExecutor = mutationExecutorService.createExecutor( + () -> batchKey, + operationGroup, + session + ); + final JdbcValueBindings jdbcValueBindings = mutationExecutor.getJdbcValueBindings(); + + try { + final Iterator entries = collection.entries( collectionDescriptor ); + collection.preInsert( collectionDescriptor ); + if ( !entries.hasNext() ) { + MODEL_MUTATION_LOGGER.debugf( + "No collection rows to insert - %s : %s", + mutationTarget.getRolePath(), + id + ); + return; + } + + + int entryCount = 0; + final RowMutationOperations.Values insertRowValues = rowMutationOperations.getInsertRowValues(); + + while ( entries.hasNext() ) { + final Object entry = entries.next(); + + if ( entryChecker == null || entryChecker.include( entry, entryCount, collection, pluralAttribute ) ) { + // if the entry is included, perform the "insert" + insertRowValues.applyValues( collection, id, entry, entryCount, session, (value, jdbcValueMapping, usage) -> { +// if ( !jdbcValueMapping.isInsertable() ) { +// return; +// } + jdbcValueBindings.bindValue( + value, + jdbcValueMapping.getContainingTableExpression(), + jdbcValueMapping.getSelectionExpression(), + usage, + session + ); + } ); + + mutationExecutor.execute( entry, null, null, null, session ); + } + + entryCount++; + } + + MODEL_MUTATION_LOGGER.debugf( "Done inserting `%s` collection rows : %s", entryCount, mutationTarget.getRolePath() ); + + } + finally { + mutationExecutor.release(); + } + } + + private MutationOperationGroupSingle createOperationGroup() { + assert mutationTarget.getTargetPart() != null; + assert mutationTarget.getTargetPart().getKeyDescriptor() != null; + + final JdbcMutationOperation operation = rowMutationOperations.getInsertRowOperation(); + return new MutationOperationGroupSingle( MutationType.INSERT, mutationTarget, operation ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/OperationProducer.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/OperationProducer.java new file mode 100644 index 0000000000..8fec2b993d --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/OperationProducer.java @@ -0,0 +1,25 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; + +/** + * Callback for producing a {@link JdbcMutationOperation} given + * a collection-table reference + * + * @see RowMutationOperations + * @see UpdateRowsCoordinator + * @see RowMutationOperations + * + * @author Steve Ebersole + */ +@FunctionalInterface +public interface OperationProducer { + JdbcMutationOperation createOperation(MutatingTableReference tableReference); +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinator.java new file mode 100644 index 0000000000..ae68e75e2b --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinator.java @@ -0,0 +1,37 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +import org.hibernate.engine.spi.SharedSessionContractImplementor; + +/** + * Removes the collection:

    + *
  • + * For collections with a collection-table, this will execute a DELETE based + * on the {@linkplain org.hibernate.engine.spi.CollectionKey collection-key} + *
    • + *
  • + * For one-to-many collections, this executes an UPDATE to unset the collection-key + * on the association table + *
    • + *
+ * + * @see org.hibernate.persister.collection.CollectionPersister#remove + * + * @author Steve Ebersole + */ +public interface RemoveCoordinator extends CollectionOperationCoordinator { + /** + * The SQL used to perform the removal + */ + String getSqlString(); + + /** + * Delete all rows based on the collection-key + */ + void deleteAllRows(Object key, SharedSessionContractImplementor session); +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorNoOp.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorNoOp.java new file mode 100644 index 0000000000..6c711d7cc1 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorNoOp.java @@ -0,0 +1,40 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +import org.hibernate.engine.spi.SharedSessionContractImplementor; + +/** + * @author Steve Ebersole + */ +public class RemoveCoordinatorNoOp implements RemoveCoordinator { + private final CollectionMutationTarget mutationTarget; + + public RemoveCoordinatorNoOp(CollectionMutationTarget mutationTarget) { + this.mutationTarget = mutationTarget; + } + + @Override + public String toString() { + return "RemoveCoordinator(" + mutationTarget.getRolePath() + " [DISABLED])"; + } + + @Override + public CollectionMutationTarget getMutationTarget() { + return mutationTarget; + } + + @Override + public String getSqlString() { + return null; + } + + @Override + public void deleteAllRows(Object key, SharedSessionContractImplementor session) { + // nothing to do + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorStandard.java new file mode 100644 index 0000000000..3b9aba8266 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorStandard.java @@ -0,0 +1,143 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey; +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.MutationExecutor; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.internal.MutationOperationGroupSingle; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; + +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER; +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER_DEBUG_ENABLED; +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER_TRACE_ENABLED; + +/** + * Handles complete removal of a collection by its key + * + * @author Steve Ebersole + */ +public class RemoveCoordinatorStandard implements RemoveCoordinator { + private final CollectionMutationTarget mutationTarget; + private final OperationProducer operationProducer; + private final BasicBatchKey batchKey; + + private MutationOperationGroupSingle operationGroup; + + /** + * Creates the coordinator. + * + * @implNote We pass a Supplier here and lazily create the operation-group because + * of timing (chicken-egg) back on the persister. + */ + public RemoveCoordinatorStandard( + CollectionMutationTarget mutationTarget, + OperationProducer operationProducer) { + this.mutationTarget = mutationTarget; + this.operationProducer = operationProducer; + + this.batchKey = new BasicBatchKey( mutationTarget.getRolePath() + "#REMOVE" ); + } + + @Override + public String toString() { + return "RemoveCoordinator(" + mutationTarget.getRolePath() + ")"; + } + + @Override + public CollectionMutationTarget getMutationTarget() { + return mutationTarget; + } + + @Override + public String getSqlString() { + if ( operationGroup == null ) { + // delayed creation of the operation-group + operationGroup = buildOperationGroup(); + } + + final JdbcMutationOperation operation = operationGroup.getSingleOperation(); + return operation.getSqlString(); + } + + @Override + public void deleteAllRows(Object key, SharedSessionContractImplementor session) { + if ( MODEL_MUTATION_LOGGER_DEBUG_ENABLED ) { + MODEL_MUTATION_LOGGER.debugf( + "Deleting collection - %s : %s", + mutationTarget.getRolePath(), + key + ); + } + + if ( operationGroup == null ) { + // delayed creation of the operation-group + operationGroup = buildOperationGroup(); + } + + final MutationExecutorService mutationExecutorService = session + .getFactory() + .getServiceRegistry() + .getService( MutationExecutorService.class ); + final MutationExecutor mutationExecutor = mutationExecutorService.createExecutor( + () -> batchKey, + operationGroup, + session + ); + + try { + final JdbcValueBindings jdbcValueBindings = mutationExecutor.getJdbcValueBindings(); + final ForeignKeyDescriptor fkDescriptor = mutationTarget.getTargetPart().getKeyDescriptor(); + fkDescriptor.getKeyPart().decompose( + key, + (jdbcValue, jdbcValueMapping) -> jdbcValueBindings.bindValue( + jdbcValue, + mutationTarget.getIdentifierTableMapping().getTableName(), + jdbcValueMapping.getSelectionExpression(), + ParameterUsage.RESTRICT, + session + ), + session + ); + + mutationExecutor.execute( + key, + null, + null, + null, + session + ); + } + finally { + mutationExecutor.release(); + } + } + + private MutationOperationGroupSingle buildOperationGroup() { + assert mutationTarget.getTargetPart() != null; + assert mutationTarget.getTargetPart().getKeyDescriptor() != null; + + if ( MODEL_MUTATION_LOGGER_TRACE_ENABLED ) { + MODEL_MUTATION_LOGGER.tracef( "Starting RemoveCoordinator#buildOperationGroup - %s", mutationTarget.getRolePath() ); + } + + final CollectionTableMapping tableMapping = mutationTarget.getCollectionTableMapping(); + final MutatingTableReference tableReference = new MutatingTableReference( tableMapping ); + + return new MutationOperationGroupSingle( + MutationType.DELETE, + mutationTarget, + operationProducer.createOperation( tableReference ) + ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RowMutationOperations.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RowMutationOperations.java new file mode 100644 index 0000000000..c601713675 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RowMutationOperations.java @@ -0,0 +1,196 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +import org.hibernate.collection.spi.PersistentCollection; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.internal.util.NullnessHelper; +import org.hibernate.metamodel.mapping.ModelPart.JdbcValueConsumer; +import org.hibernate.metamodel.mapping.SelectableMapping; +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; + +/** + * Composition of the {@link MutationOperation} references for a collection mapping. + * + * @implSpec All collection operations are achieved through {@link JdbcMutationOperation} + * which is exposed here + * + * @author Steve Ebersole + */ +public class RowMutationOperations { + private final CollectionMutationTarget target; + + private final OperationProducer insertRowOperationProducer; + private final Values insertRowValues; + + private final OperationProducer updateRowOperationProducer; + private final Values updateRowValues; + private final Restrictions updateRowRestrictions; + + private final OperationProducer deleteRowOperationProducer; + private final Restrictions deleteRowRestrictions; + + private JdbcMutationOperation insertRowOperation; + private JdbcMutationOperation updateRowOperation; + private JdbcMutationOperation deleteRowOperation; + + public RowMutationOperations( + CollectionMutationTarget target, + OperationProducer insertRowOperationProducer, + Values insertRowValues, + OperationProducer updateRowOperationProducer, + Values updateRowValues, + Restrictions updateRowRestrictions, + OperationProducer deleteRowOperationProducer, + Restrictions deleteRowRestrictions) { + this.target = target; + + assert NullnessHelper.areSameNullness( insertRowOperationProducer, insertRowValues ); + assert NullnessHelper.areSameNullness( updateRowOperationProducer, updateRowValues, updateRowRestrictions ); + assert NullnessHelper.areSameNullness( deleteRowOperationProducer, deleteRowRestrictions ); + + this.insertRowOperationProducer = insertRowOperationProducer; + this.insertRowValues = insertRowValues; + + this.updateRowOperationProducer = updateRowOperationProducer; + this.updateRowValues = updateRowValues; + this.updateRowRestrictions = updateRowRestrictions; + + this.deleteRowOperationProducer = deleteRowOperationProducer; + this.deleteRowRestrictions = deleteRowRestrictions; + } + + @Override + public String toString() { + return "RowMutationOperations(" + target.getRolePath() + ")"; + } + + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // insert row + + public boolean hasInsertRow() { + return insertRowOperationProducer != null; + } + + public Values getInsertRowValues() { + return insertRowValues; + } + + public JdbcMutationOperation getInsertRowOperation() { + if ( !hasInsertRow() ) { + return null; + } + + JdbcMutationOperation local = insertRowOperation; + if ( local == null ) { + final MutatingTableReference tableReference = new MutatingTableReference( target.getCollectionTableMapping() ); + insertRowOperation = local = insertRowOperationProducer.createOperation( tableReference ); + } + + return local; + } + + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // update row + + public boolean hasUpdateRow() { + return updateRowOperationProducer != null; + } + + public JdbcMutationOperation getUpdateRowOperation() { + if ( !hasUpdateRow() ) { + return null; + } + + JdbcMutationOperation local = updateRowOperation; + if ( local == null ) { + final MutatingTableReference tableReference = new MutatingTableReference( target.getCollectionTableMapping() ); + updateRowOperation = local = updateRowOperationProducer.createOperation( tableReference ); + } + + return local; + } + + public Values getUpdateRowValues() { + return updateRowValues; + } + + public Restrictions getUpdateRowRestrictions() { + return updateRowRestrictions; + } + + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // delete row + + public boolean hasDeleteRow() { + return deleteRowOperationProducer != null; + } + + public Restrictions getDeleteRowRestrictions() { + return deleteRowRestrictions; + } + + public JdbcMutationOperation getDeleteRowOperation() { + if ( !hasDeleteRow() ) { + return null; + } + + JdbcMutationOperation local = deleteRowOperation; + if ( local == null ) { + final MutatingTableReference tableReference = new MutatingTableReference( target.getCollectionTableMapping() ); + deleteRowOperation = local = deleteRowOperationProducer.createOperation( tableReference ); + } + + return local; + } + + + @FunctionalInterface + public interface Restrictions { + void applyRestrictions( + PersistentCollection collection, + Object key, + Object rowValue, + int rowPosition, + SharedSessionContractImplementor session, + JdbcValueConsumer restrictor); + } + + @FunctionalInterface + public interface Values { + void applyValues( + PersistentCollection collection, + Object key, + Object rowValue, + int rowPosition, + SharedSessionContractImplementor session, + ValuesBindingConsumer valuesBindingConsumer); + } + + /** + * Consumer for insert-value bindings + * + * Unfortunate we need `usage` here, but it is needed to account for + * update-as-insert handling of one-to-many handling + */ + @FunctionalInterface + public interface ValuesBindingConsumer extends JdbcValueConsumer { + void consumeJdbcValueBinding(Object value, SelectableMapping jdbcValueMapping, ParameterUsage usage); + + @Override + default void consume(Object value, SelectableMapping jdbcValueMapping) { + // insert values will be SET most of the time + consumeJdbcValueBinding( value, jdbcValueMapping, ParameterUsage.SET ); + } + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinator.java new file mode 100644 index 0000000000..01974995c9 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinator.java @@ -0,0 +1,17 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +import org.hibernate.collection.spi.PersistentCollection; +import org.hibernate.engine.spi.SharedSessionContractImplementor; + +/** + * @author Steve Ebersole + */ +public interface UpdateRowsCoordinator extends CollectionOperationCoordinator { + void updateRows(Object key, PersistentCollection collection, SharedSessionContractImplementor session); +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorNoOp.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorNoOp.java new file mode 100644 index 0000000000..eff54e6d96 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorNoOp.java @@ -0,0 +1,37 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +import org.hibernate.collection.spi.PersistentCollection; +import org.hibernate.engine.spi.SharedSessionContractImplementor; + +/** + * @author Steve Ebersole + */ +public class UpdateRowsCoordinatorNoOp implements UpdateRowsCoordinator { + private final CollectionMutationTarget mutationTarget; + + public UpdateRowsCoordinatorNoOp(CollectionMutationTarget mutationTarget) { + this.mutationTarget = mutationTarget; + } + + @Override + public String toString() { + return "UpdateRowsCoordinator(" + mutationTarget.getRolePath() + " (no-op))"; + } + + @Override + public CollectionMutationTarget getMutationTarget() { + return mutationTarget; + } + + @Override + public void updateRows(Object key, PersistentCollection collection, SharedSessionContractImplementor session) { + // nothing to do + } + +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorOneToMany.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorOneToMany.java new file mode 100644 index 0000000000..c81d6230fd --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorOneToMany.java @@ -0,0 +1,185 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +import java.util.Iterator; + +import org.hibernate.collection.spi.PersistentCollection; +import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey; +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.MutationExecutor; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.metamodel.mapping.PluralAttributeMapping; +import org.hibernate.persister.collection.CollectionPersister; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.internal.MutationOperationGroupSingle; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; + +/** + * @author Steve Ebersole + */ +public class UpdateRowsCoordinatorOneToMany extends AbstractUpdateRowsCoordinator { + private final RowMutationOperations rowMutationOperations; + + private MutationOperationGroupSingle deleteOperationGroup; + private MutationOperationGroupSingle insertOperationGroup; + + public UpdateRowsCoordinatorOneToMany( + CollectionMutationTarget mutationTarget, + RowMutationOperations rowMutationOperations, + SessionFactoryImplementor sessionFactory) { + super( mutationTarget, sessionFactory ); + this.rowMutationOperations = rowMutationOperations; + } + + @Override + protected int doUpdate(Object key, PersistentCollection collection, SharedSessionContractImplementor session) { + // todo (mutation) : an alternative is to allow "filters" for the delete and insert coordinators + // to limit the rows to delete/insert based on `PersistentCollection#needsUpdating` + + if ( rowMutationOperations.hasDeleteRow() ) { + deleteRows( key, collection, session ); + } + + if ( rowMutationOperations.hasInsertRow() ) { + return insertRows( key, collection, session ); + } + + return 0; + } + + private void deleteRows(Object key, PersistentCollection collection, SharedSessionContractImplementor session) { + final MutationOperationGroupSingle operationGroup = resolveDeleteGroup(); + + final PluralAttributeMapping attributeMapping = getMutationTarget().getTargetPart(); + final CollectionPersister collectionDescriptor = attributeMapping.getCollectionDescriptor(); + + final MutationExecutorService mutationExecutorService = session + .getFactory() + .getServiceRegistry() + .getService( MutationExecutorService.class ); + final MutationExecutor mutationExecutor = mutationExecutorService.createExecutor( + () -> new BasicBatchKey( getMutationTarget().getRolePath() + "#UPDATE-DELETE" ), + operationGroup, + session + ); + + try { + final JdbcValueBindings jdbcValueBindings = mutationExecutor.getJdbcValueBindings(); + + final Iterator entries = collection.entries( collectionDescriptor ); + int entryPosition = -1; + + while ( entries.hasNext() ) { + final Object entry = entries.next(); + entryPosition++; + + if ( !collection.needsUpdating( entry, entryPosition, attributeMapping ) ) { + continue; + } + + rowMutationOperations.getDeleteRowRestrictions().applyRestrictions( + collection, + key, + entry, + entryPosition, + session, + (jdbcValue, jdbcValueMapping) -> jdbcValueBindings.bindValue( + jdbcValue, + jdbcValueMapping, + ParameterUsage.RESTRICT, + session + ) + ); + + mutationExecutor.execute( entry, null, null, null, session ); + } + } + finally { + mutationExecutor.release(); + } + } + + private MutationOperationGroupSingle resolveDeleteGroup() { + if ( deleteOperationGroup == null ) { + final JdbcMutationOperation operation = rowMutationOperations.getDeleteRowOperation(); + assert operation != null; + + deleteOperationGroup = new MutationOperationGroupSingle( MutationType.DELETE, getMutationTarget(), operation ); + } + + return deleteOperationGroup; + } + + private int insertRows(Object key, PersistentCollection collection, SharedSessionContractImplementor session) { + final MutationOperationGroupSingle operationGroup = resolveInsertGroup(); + + final PluralAttributeMapping attributeMapping = getMutationTarget().getTargetPart(); + final CollectionPersister collectionDescriptor = attributeMapping.getCollectionDescriptor(); + + final MutationExecutorService mutationExecutorService = session + .getFactory() + .getServiceRegistry() + .getService( MutationExecutorService.class ); + final MutationExecutor mutationExecutor = mutationExecutorService.createExecutor( + () -> new BasicBatchKey( getMutationTarget().getRolePath() + "#UPDATE-INSERT" ), + operationGroup, + session + ); + + try { + final JdbcValueBindings jdbcValueBindings = mutationExecutor.getJdbcValueBindings(); + + final Iterator entries = collection.entries( collectionDescriptor ); + int entryPosition = -1; + + while ( entries.hasNext() ) { + final Object entry = entries.next(); + entryPosition++; + + if ( !collection.needsUpdating( entry, entryPosition, attributeMapping ) ) { + continue; + } + + rowMutationOperations.getInsertRowValues().applyValues( + collection, + key, + entry, + entryPosition, + session, + (jdbcValue, jdbcValueMapping, usage) -> jdbcValueBindings.bindValue( + jdbcValue, + jdbcValueMapping, + usage, + session + ) + ); + + mutationExecutor.execute( entry, null, null, null, session ); + } + + return entryPosition; + } + finally { + mutationExecutor.release(); + } + } + + private MutationOperationGroupSingle resolveInsertGroup() { + if ( insertOperationGroup == null ) { + final JdbcMutationOperation operation = rowMutationOperations.getInsertRowOperation(); + assert operation != null; + + insertOperationGroup = new MutationOperationGroupSingle( MutationType.INSERT, getMutationTarget(), operation ); + } + + return insertOperationGroup; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorStandard.java new file mode 100644 index 0000000000..cd1a1e39a2 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorStandard.java @@ -0,0 +1,168 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.collection.mutation; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.hibernate.collection.spi.PersistentCollection; +import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey; +import org.hibernate.engine.jdbc.mutation.MutationExecutor; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.metamodel.mapping.PluralAttributeMapping; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.internal.MutationOperationGroupSingle; + +/** + * UpdateRowsCoordinator implementation for cases with a separate collection table + * + * @see org.hibernate.persister.collection.BasicCollectionPersister + * + * @author Steve Ebersole + */ +public class UpdateRowsCoordinatorStandard extends AbstractUpdateRowsCoordinator implements UpdateRowsCoordinator { + private final RowMutationOperations rowMutationOperations; + + private MutationOperationGroupSingle operationGroup; + + public UpdateRowsCoordinatorStandard( + CollectionMutationTarget mutationTarget, + RowMutationOperations rowMutationOperations, + SessionFactoryImplementor sessionFactory) { + super( mutationTarget, sessionFactory ); + this.rowMutationOperations = rowMutationOperations; + } + + @Override + protected int doUpdate(Object key, PersistentCollection collection, SharedSessionContractImplementor session) { + final MutationOperationGroupSingle operationGroup = getOperationGroup(); + + final MutationExecutorService mutationExecutorService = session + .getFactory() + .getServiceRegistry() + .getService( MutationExecutorService.class ); + final MutationExecutor mutationExecutor = mutationExecutorService.createExecutor( + () -> new BasicBatchKey( getMutationTarget().getRolePath() + "#UPDATE" ), + operationGroup, + session + ); + + try { + final Iterator entries = collection.entries( getMutationTarget().getTargetPart() + .getCollectionDescriptor() ); + int count = 0; + + if ( collection.isElementRemoved() ) { + // the update should be done starting from the end of the elements + // - make a copy so that we can go in reverse + final List elements = new ArrayList<>(); + while ( entries.hasNext() ) { + elements.add( entries.next() ); + } + + for ( int i = elements.size() - 1; i >= 0; i-- ) { + final Object entry = elements.get( i ); + final boolean updated = processRow( + key, + collection, + entry, + i, + mutationExecutor, + session + ); + if ( updated ) { + count++; + } + } + } + else { + int position = 0; + while ( entries.hasNext() ) { + final Object entry = entries.next(); + final boolean updated = processRow( + key, + collection, + entry, + position++, + mutationExecutor, + session + ); + if ( updated ) { + count++; + } + } + } + + return count; + } + finally { + mutationExecutor.release(); + } + } + + private boolean processRow( + Object key, + PersistentCollection collection, + Object entry, + int entryPosition, + MutationExecutor mutationExecutor, + SharedSessionContractImplementor session) { + final PluralAttributeMapping attribute = getMutationTarget().getTargetPart(); + if ( !collection.needsUpdating( entry, entryPosition, attribute ) ) { + return false; + } + + rowMutationOperations.getUpdateRowValues().applyValues( + collection, + key, + entry, + entryPosition, + session, + (jdbcValue, jdbcValueMapping, usage) -> mutationExecutor.getJdbcValueBindings().bindValue( + jdbcValue, + jdbcValueMapping, + usage, + session + ) + ); + + rowMutationOperations.getUpdateRowRestrictions().applyRestrictions( + collection, + key, + entry, + entryPosition, + session, + (jdbcValue, jdbcValueMapping) -> mutationExecutor.getJdbcValueBindings().bindValue( + jdbcValue, + jdbcValueMapping, + ParameterUsage.RESTRICT, + session + ) + ); + + mutationExecutor.execute( collection, null, null, null, session ); + return true; + } + + protected MutationOperationGroupSingle getOperationGroup() { + if ( operationGroup == null ) { + operationGroup = new MutationOperationGroupSingle( + MutationType.UPDATE, + getMutationTarget(), + rowMutationOperations.getUpdateRowOperation() + ); + } + + return operationGroup; + } + + +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/package-info.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/package-info.java new file mode 100644 index 0000000000..590a404c77 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/package-info.java @@ -0,0 +1,18 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ + +/** + * Defines support for performing mutation operations against collections. + *

+ * The names used here are logical. E.g. "inserting a row" may actually + * execute an UPDATE statement instead of an INSERT. This is generally + * delineated based on whether there is a collection table involved or + * not. In standard Hibernate terms, this breaks down to the distinction + * between {@link org.hibernate.persister.collection.BasicCollectionPersister} + * and {@link org.hibernate.persister.collection.OneToManyPersister}. + */ +package org.hibernate.persister.collection.mutation; diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java index 692cb95211..d8aabe8a47 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java @@ -15,7 +15,6 @@ import java.util.Arrays; import java.util.BitSet; import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.IdentityHashMap; @@ -35,13 +34,14 @@ import org.hibernate.AssertionFailure; import org.hibernate.FetchMode; import org.hibernate.Filter; import org.hibernate.HibernateException; +import org.hibernate.Internal; import org.hibernate.JDBCException; import org.hibernate.LazyInitializationException; import org.hibernate.LockMode; import org.hibernate.LockOptions; import org.hibernate.MappingException; import org.hibernate.QueryException; -import org.hibernate.Session; +import org.hibernate.Remove; import org.hibernate.StaleObjectStateException; import org.hibernate.StaleStateException; import org.hibernate.boot.Metadata; @@ -73,9 +73,8 @@ import org.hibernate.engine.internal.CacheHelper; import org.hibernate.engine.internal.ImmutableEntityEntryFactory; import org.hibernate.engine.internal.MutableEntityEntryFactory; import org.hibernate.engine.internal.StatefulPersistenceContext; -import org.hibernate.engine.internal.Versioning; -import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.spi.CachedNaturalIdValueSource; import org.hibernate.engine.spi.CascadeStyle; @@ -83,7 +82,6 @@ import org.hibernate.engine.spi.CollectionKey; import org.hibernate.engine.spi.EntityEntry; import org.hibernate.engine.spi.EntityEntryFactory; import org.hibernate.engine.spi.EntityKey; -import org.hibernate.engine.spi.ExecuteUpdateResultCheckStyle; import org.hibernate.engine.spi.LoadQueryInfluencers; import org.hibernate.engine.spi.NaturalIdResolutions; import org.hibernate.engine.spi.PersistenceContext; @@ -102,7 +100,6 @@ import org.hibernate.id.OptimizableGenerator; import org.hibernate.id.PostInsertIdentifierGenerator; import org.hibernate.id.PostInsertIdentityPersister; import org.hibernate.id.enhanced.Optimizer; -import org.hibernate.id.insert.Binder; import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; @@ -114,7 +111,6 @@ import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.internal.util.collections.CollectionHelper; import org.hibernate.internal.util.collections.LockModeEnumMap; import org.hibernate.jdbc.Expectation; -import org.hibernate.jdbc.Expectations; import org.hibernate.jdbc.TooManyRowsAffectedException; import org.hibernate.loader.ast.internal.LoaderSelectBuilder; import org.hibernate.loader.ast.internal.LoaderSqlAstCreationState; @@ -193,24 +189,30 @@ import org.hibernate.metamodel.spi.EntityRepresentationStrategy; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.collection.QueryableCollection; +import org.hibernate.persister.entity.mutation.DeleteCoordinator; +import org.hibernate.persister.entity.mutation.EntityMutationTarget; +import org.hibernate.persister.entity.mutation.EntityTableMapping; +import org.hibernate.persister.entity.mutation.InsertCoordinator; +import org.hibernate.persister.entity.mutation.UpdateCoordinator; +import org.hibernate.persister.entity.mutation.UpdateCoordinatorNoOp; +import org.hibernate.persister.entity.mutation.UpdateCoordinatorStandard; import org.hibernate.persister.internal.SqlFragmentPredicate; import org.hibernate.persister.spi.PersisterCreationContext; import org.hibernate.pretty.MessageHelper; import org.hibernate.property.access.spi.PropertyAccess; import org.hibernate.property.access.spi.Setter; -import org.hibernate.query.sqm.ComparisonOperator; -import org.hibernate.spi.NavigablePath; import org.hibernate.query.SemanticException; import org.hibernate.query.named.NamedQueryMemento; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.sql.internal.SQLQueryParser; +import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.sqm.function.SqmFunctionRegistry; import org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy; +import org.hibernate.spi.NavigablePath; import org.hibernate.sql.Alias; import org.hibernate.sql.Delete; -import org.hibernate.sql.Insert; import org.hibernate.sql.SimpleSelect; import org.hibernate.sql.Template; import org.hibernate.sql.Update; @@ -234,12 +236,16 @@ import org.hibernate.sql.ast.tree.from.StandardTableGroup; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.ast.tree.from.TableReferenceJoin; +import org.hibernate.sql.ast.tree.insert.InsertSelectStatement; import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate; import org.hibernate.sql.ast.tree.predicate.Junction; import org.hibernate.sql.ast.tree.predicate.Predicate; import org.hibernate.sql.ast.tree.select.QuerySpec; import org.hibernate.sql.ast.tree.select.SelectClause; import org.hibernate.sql.ast.tree.select.SelectStatement; +import org.hibernate.sql.exec.spi.JdbcOperation; +import org.hibernate.sql.model.MutationOperationGroup; +import org.hibernate.sql.model.ast.builder.MutationGroupBuilder; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.DomainResultCreationState; import org.hibernate.sql.results.graph.Fetch; @@ -251,8 +257,6 @@ import org.hibernate.sql.results.graph.entity.internal.EntityResultImpl; import org.hibernate.sql.results.internal.SqlSelectionImpl; import org.hibernate.stat.spi.StatisticsImplementor; import org.hibernate.tuple.GenerationTiming; -import org.hibernate.tuple.InDatabaseValueGenerationStrategy; -import org.hibernate.tuple.InMemoryValueGenerationStrategy; import org.hibernate.tuple.NonIdentifierAttribute; import org.hibernate.tuple.ValueGeneration; import org.hibernate.tuple.entity.EntityBasedAssociationAttribute; @@ -270,6 +274,8 @@ import org.hibernate.type.descriptor.java.MutabilityPlan; import static org.hibernate.engine.internal.ManagedTypeHelper.isPersistentAttributeInterceptable; import static org.hibernate.engine.internal.ManagedTypeHelper.processIfPersistentAttributeInterceptable; import static org.hibernate.engine.internal.ManagedTypeHelper.processIfSelfDirtinessTracker; +import static org.hibernate.engine.internal.Versioning.isVersionIncrementRequired; +import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey; /** * Basic functionality for persisting an entity via JDBC @@ -280,13 +286,20 @@ import static org.hibernate.engine.internal.ManagedTypeHelper.processIfSelfDirti public abstract class AbstractEntityPersister implements OuterJoinLoadable, Queryable, ClassMetadata, UniqueKeyLoadable, SQLLoadable, LazyPropertyInitializer, PostInsertIdentityPersister, Lockable, - org.hibernate.persister.entity.Queryable, InFlightEntityMappingType { + org.hibernate.persister.entity.Queryable, InFlightEntityMappingType, EntityMutationTarget { private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AbstractEntityPersister.class ); public static final String ENTITY_CLASS = "class"; public static final String VERSION_COLUMN_ALIAS = "version_"; + private final SessionFactoryImplementor factory; + + private final NavigableRole navigableRole; + + private final EntityMetamodel entityMetamodel; + private final EntityEntryFactory entityEntryFactory; + private final String sqlAliasStem; private final SingleIdEntityLoader singleIdEntityLoader; @@ -297,20 +310,14 @@ public abstract class AbstractEntityPersister private SqmMultiTableMutationStrategy sqmMultiTableMutationStrategy; private SqmMultiTableInsertStrategy sqmMultiTableInsertStrategy; - private final NavigableRole navigableRole; - - // moved up from AbstractEntityPersister ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - private final SessionFactoryImplementor factory; + private final EntityDataAccess cacheAccessStrategy; + private final NaturalIdDataAccess naturalIdRegionAccessStrategy; + private final CacheEntryHelper cacheEntryHelper; private final boolean canReadFromCache; private final boolean canWriteToCache; private final boolean invalidateCache; - private final EntityDataAccess cacheAccessStrategy; - private final NaturalIdDataAccess naturalIdRegionAccessStrategy; private final boolean isLazyPropertiesCacheable; - private final CacheEntryHelper cacheEntryHelper; - private final EntityMetamodel entityMetamodel; - private final EntityEntryFactory entityEntryFactory; - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + private final boolean useReferenceCacheEntries; private final String[] rootTableKeyColumnNames; private final String[] rootTableKeyColumnReaders; @@ -331,15 +338,12 @@ public abstract class AbstractEntityPersister //including inherited properties //(only really needed for updatable/insertable properties) private final int[] propertyColumnSpans; -// private final String[] propertySubclassNames; private final String[][] propertyColumnAliases; private final String[][] propertyColumnNames; private final String[][] propertyColumnFormulaTemplates; -// private final String[][] propertyColumnReaderTemplates; private final String[][] propertyColumnWriters; private final boolean[][] propertyColumnUpdateable; private final boolean[][] propertyColumnInsertable; -// private final boolean[] propertyUniqueness; private final boolean[] propertySelectable; private final List lobProperties; @@ -352,7 +356,6 @@ public abstract class AbstractEntityPersister //information about all properties in class hierarchy private final String[] subclassPropertyNameClosure; -// private final String[] subclassPropertySubclassNameClosure; private final Type[] subclassPropertyTypeClosure; private final String[][] subclassPropertyFormulaTemplateClosure; private final String[][] subclassPropertyColumnNameClosure; @@ -361,41 +364,35 @@ public abstract class AbstractEntityPersister private final FetchMode[] subclassPropertyFetchModeClosure; private final boolean[] subclassPropertyNullabilityClosure; private final boolean[] propertyDefinedOnSubclass; -// private final int[][] subclassPropertyColumnNumberClosure; -// private final int[][] subclassPropertyFormulaNumberClosure; private final CascadeStyle[] subclassPropertyCascadeStyleClosure; //information about all columns/formulas in class hierarchy -// private final String[] subclassColumnClosure; -// private final boolean[] subclassColumnLazyClosure; private final String[] subclassColumnAliasClosure; -// private final String[] subclassColumnReaderTemplateClosure; -// private final String[] subclassFormulaClosure; -// private final String[] subclassFormulaTemplateClosure; private final String[] subclassFormulaAliasClosure; -// private final boolean[] subclassFormulaLazyClosure; // dynamic filters attached to the class-level private final FilterHelper filterHelper; - private volatile Set affectingFetchProfileNames; private final LockModeEnumMap lockers = new LockModeEnumMap<>(); + private EntityTableMapping[] tableMappings; + private InsertCoordinator insertCoordinator; + private UpdateCoordinator updateCoordinator; + private DeleteCoordinator deleteCoordinator; + + protected Expectation[] insertExpectations; + protected Expectation[] updateExpectations; + protected Expectation[] deleteExpectations; + // SQL strings private String sqlVersionSelectString; private Map sqlLazySelectStringsByFetchGroup; - private String sqlIdentityInsertString; + private String[] sqlLazyUpdateStrings; private String sqlUpdateByRowIdString; private String sqlLazyUpdateByRowIdString; - private String[] sqlDeleteStrings; - private String[] sqlDeleteNoVersionCheckStrings; - private String[] sqlInsertStrings; - private String[] sqlUpdateStrings; - private String[] sqlLazyUpdateStrings; - private GeneratedValuesProcessor insertGeneratedValuesProcessor; private GeneratedValuesProcessor updateGeneratedValuesProcessor; @@ -406,9 +403,6 @@ public abstract class AbstractEntityPersister protected String[] customSQLInsert; protected String[] customSQLUpdate; protected String[] customSQLDelete; - protected ExecuteUpdateResultCheckStyle[] insertResultCheckStyles; - protected ExecuteUpdateResultCheckStyle[] updateResultCheckStyles; - protected ExecuteUpdateResultCheckStyle[] deleteResultCheckStyles; private InsertGeneratedIdentifierDelegate identityDelegate; @@ -417,6 +411,25 @@ public abstract class AbstractEntityPersister private final Map subclassPropertyAliases = new HashMap<>(); private final Map subclassPropertyColumnNames = new HashMap<>(); + + private final JavaType javaType; + private final EntityRepresentationStrategy representationStrategy; + + private EntityMappingType superMappingType; + private SortedMap subclassMappingTypes; + + private EntityIdentifierMapping identifierMapping; + private NaturalIdMapping naturalIdMapping; + private EntityVersionMapping versionMapping; + private EntityRowIdMapping rowIdMapping; + private EntityDiscriminatorMapping discriminatorMapping; + + private List attributeMappings; + protected Map declaredAttributeMappings = new LinkedHashMap<>(); + protected List staticFetchableList; + + protected ReflectionOptimizer.AccessOptimizer accessOptimizer; + /** * Warning: * When there are duplicated property names in the subclasses @@ -427,263 +440,6 @@ public abstract class AbstractEntityPersister */ protected final BasicEntityPropertyMapping propertyMapping; - private final boolean useReferenceCacheEntries; - - protected void addDiscriminatorToInsert(Insert insert) { - } - - @Override - public abstract String getSubclassTableName(int j); - - protected abstract String[] getSubclassTableNames(); - - protected abstract String[] getSubclassTableKeyColumns(int j); - - protected abstract boolean isClassOrSuperclassTable(int j); - - protected boolean isClassOrSuperclassJoin(int j) { - /* - * TODO: - * SingleTableEntityPersister incorrectly used isClassOrSuperclassJoin == isClassOrSuperclassTable, - * this caused HHH-12895, as this resulted in the subclass tables always being joined, even if no - * property on these tables was accessed. - * - * JoinedTableEntityPersister does not use isClassOrSuperclassJoin at all, probably incorrectly so. - * I however haven't been able to reproduce any quirks regarding s, secondary tables or - * @JoinTable's. - * - * Probably this method needs to be properly implemented for the various entity persisters, - * but this at least fixes the SingleTableEntityPersister, while maintaining the previous - * behaviour for other persisters. - */ - return isClassOrSuperclassTable( j ); - } - - public abstract int getSubclassTableSpan(); - - public abstract int getTableSpan(); - - public abstract boolean isTableCascadeDeleteEnabled(int j); - - public abstract boolean hasDuplicateTables(); - - public abstract String getTableName(int j); - - public abstract String[] getKeyColumns(int j); - - public abstract boolean isPropertyOfTable(int property, int j); - - protected abstract int[] getPropertyTableNumbers(); - - protected abstract int getSubclassPropertyTableNumber(int i); - - private static final String DISCRIMINATOR_ALIAS = "clazz_"; - - @Override - public String getDiscriminatorColumnName() { - return DISCRIMINATOR_ALIAS; - } - - public String getDiscriminatorColumnReaders() { - return DISCRIMINATOR_ALIAS; - } - - public String getDiscriminatorColumnReaderTemplate() { - if ( getEntityMetamodel().getSubclassEntityNames().size() == 1 ) { - return getDiscriminatorSQLValue(); - } - else { - return Template.TEMPLATE + "." + DISCRIMINATOR_ALIAS; - } - } - - public String getDiscriminatorAlias() { - return DISCRIMINATOR_ALIAS; - } - - public String getDiscriminatorFormulaTemplate() { - return null; - } - - public boolean isInverseTable(int j) { - return false; - } - - public boolean isNullableTable(int j) { - return false; - } - - protected boolean isNullableSubclassTable(int j) { - return false; - } - - protected boolean isInverseSubclassTable(int j) { - return false; - } - - @Override - public boolean isSubclassEntityName(String entityName) { - return entityMetamodel.getSubclassEntityNames().contains( entityName ); - } - - protected boolean[] getTableHasColumns() { - return tableHasColumns; - } - - @Override - public String[] getRootTableKeyColumnNames() { - return rootTableKeyColumnNames; - } - - public String[] getSQLUpdateByRowIdStrings() { - if ( sqlUpdateByRowIdString == null ) { - throw new AssertionFailure( "no update by row id" ); - } - String[] result = new String[getTableSpan() + 1]; - result[0] = sqlUpdateByRowIdString; - System.arraycopy( sqlUpdateStrings, 0, result, 1, getTableSpan() ); - return result; - } - - public String[] getSQLLazyUpdateByRowIdStrings() { - if ( sqlLazyUpdateByRowIdString == null ) { - throw new AssertionFailure( "no update by row id" ); - } - String[] result = new String[getTableSpan()]; - result[0] = sqlLazyUpdateByRowIdString; - System.arraycopy( sqlLazyUpdateStrings, 1, result, 1, getTableSpan() - 1 ); - return result; - } - - SingleIdArrayLoadPlan getSQLLazySelectLoadPlan(String fetchGroup) { - return sqlLazySelectStringsByFetchGroup.get( fetchGroup ); - } - - public String[] getSQLDeleteStrings() { - return sqlDeleteStrings; - } - - public String[] getSQLDeleteNoVersionCheckStrings() { - return sqlDeleteNoVersionCheckStrings; - } - - public String[] getSQLInsertStrings() { - return sqlInsertStrings; - } - - public String[] getSQLUpdateStrings() { - return sqlUpdateStrings; - } - - public String[] getSQLLazyUpdateStrings() { - return sqlLazyUpdateStrings; - } - - public ExecuteUpdateResultCheckStyle[] getInsertResultCheckStyles() { - return insertResultCheckStyles; - } - - public ExecuteUpdateResultCheckStyle[] getUpdateResultCheckStyles() { - return updateResultCheckStyles; - } - - public ExecuteUpdateResultCheckStyle[] getDeleteResultCheckStyles() { - return deleteResultCheckStyles; - } - - /** - * The query that inserts a row, letting the database generate an id - * - * @return The IDENTITY-based insertion query. - */ - public String getSQLIdentityInsertString() { - return sqlIdentityInsertString; - } - - public String getVersionSelectString() { - return sqlVersionSelectString; - } - - public boolean isInsertCallable(int j) { - return insertCallable[j]; - } - - public boolean isUpdateCallable(int j) { - return updateCallable[j]; - } - - public boolean isDeleteCallable(int j) { - return deleteCallable[j]; - } - -// protected boolean isSubclassTableSequentialSelect(int j) { -// return false; -// } - - /** - * Decide which tables need to be updated. - *

- * The return here is an array of boolean values with each index corresponding - * to a given table in the scope of this persister. - * - * @param dirtyProperties The indices of all the entity properties considered dirty. - * @param hasDirtyCollection Whether any collections owned by the entity which were considered dirty. - * - * @return Array of booleans indicating which table require updating. - */ - public boolean[] getTableUpdateNeeded(final int[] dirtyProperties, boolean hasDirtyCollection) { - if ( dirtyProperties == null ) { - return getTableHasColumns(); // for objects that came in via update() - } - else { - boolean[] updateability = getPropertyUpdateability(); - int[] propertyTableNumbers = getPropertyTableNumbers(); - boolean[] tableUpdateNeeded = new boolean[getTableSpan()]; - for ( int property : dirtyProperties ) { - int table = propertyTableNumbers[property]; - tableUpdateNeeded[table] = tableUpdateNeeded[table] || - ( getPropertyColumnSpan( property ) > 0 && updateability[property] ); - - if ( getPropertyColumnSpan( property ) > 0 && !updateability[property] ) { - LOG.ignoreImmutablePropertyModification( getPropertyNames()[property], getEntityName() ); - } - } - if ( isVersioned() ) { - tableUpdateNeeded[0] = tableUpdateNeeded[0] || - Versioning.isVersionIncrementRequired( - dirtyProperties, - hasDirtyCollection, - getPropertyVersionability() - ); - } - return tableUpdateNeeded; - } - } - - @Override - public boolean hasRowId() { - return rowIdName != null; - } - - //used by Hibernate Reactive - @SuppressWarnings("unused") - public boolean[][] getPropertyColumnUpdateable() { - return propertyColumnUpdateable; - } - - //used by Hibernate Reactive - @SuppressWarnings("unused") - public boolean[][] getPropertyColumnInsertable() { - return propertyColumnInsertable; - } - - public String[] getTableNames() { - String[] tableNames = new String[getTableSpan()]; - for ( int i = 0; i < tableNames.length; i++ ) { - tableNames[i] = getTableName( i ); - } - return tableNames; - } @Deprecated(since = "6.0") public AbstractEntityPersister( @@ -824,49 +580,45 @@ public abstract class AbstractEntityPersister functionRegistry ); } - // PROPERTIES - int hydrateSpan = entityMetamodel.getPropertySpan(); + // PROPERTIES + final int hydrateSpan = entityMetamodel.getPropertySpan(); propertyColumnSpans = new int[hydrateSpan]; -// propertySubclassNames = new String[hydrateSpan]; propertyColumnAliases = new String[hydrateSpan][]; propertyColumnNames = new String[hydrateSpan][]; propertyColumnFormulaTemplates = new String[hydrateSpan][]; -// propertyColumnReaderTemplates = new String[hydrateSpan][]; propertyColumnWriters = new String[hydrateSpan][]; -// propertyUniqueness = new boolean[hydrateSpan]; propertySelectable = new boolean[hydrateSpan]; propertyColumnUpdateable = new boolean[hydrateSpan][]; propertyColumnInsertable = new boolean[hydrateSpan][]; - HashSet thisClassProperties = new HashSet<>(); - ArrayList lazyNames = new ArrayList<>(); - ArrayList lazyNumbers = new ArrayList<>(); - ArrayList lazyTypes = new ArrayList<>(); - ArrayList lazyColAliases = new ArrayList<>(); + final HashSet thisClassProperties = new HashSet<>(); + final ArrayList lazyNames = new ArrayList<>(); + final ArrayList lazyNumbers = new ArrayList<>(); + final ArrayList lazyTypes = new ArrayList<>(); + final ArrayList lazyColAliases = new ArrayList<>(); final ArrayList lobPropertiesLocalCollector = new ArrayList<>(); + final List propertyClosure = bootDescriptor.getPropertyClosure(); boolean foundFormula = false; - List propertyClosure = bootDescriptor.getPropertyClosure(); for ( int i = 0; i < propertyClosure.size(); i++ ) { - Property prop = propertyClosure.get(i); + final Property prop = propertyClosure.get(i); thisClassProperties.add( prop ); - int span = prop.getColumnSpan(); + final int span = prop.getColumnSpan(); propertyColumnSpans[i] = span; -// propertySubclassNames[i] = prop.getPersistentClass().getEntityName(); - String[] colNames = new String[span]; - String[] colAliases = new String[span]; -// String[] colReaderTemplates = new String[span]; - String[] colWriters = new String[span]; - String[] formulaTemplates = new String[span]; - List selectables = prop.getSelectables(); + + final String[] colNames = new String[span]; + final String[] colAliases = new String[span]; + final String[] colWriters = new String[span]; + final String[] formulaTemplates = new String[span]; + final List selectables = prop.getSelectables(); for ( int k = 0; k < selectables.size(); k++ ) { - Selectable selectable = selectables.get(k); + final Selectable selectable = selectables.get(k); colAliases[k] = selectable.getAlias( dialect, prop.getValue().getTable() ); if ( selectable.isFormula() ) { foundFormula = true; - Formula formula = (Formula) selectable; + final Formula formula = (Formula) selectable; formula.setFormula( substituteBrackets( formula.getFormula() ) ); formulaTemplates[k] = selectable.getTemplate( dialect, @@ -875,15 +627,13 @@ public abstract class AbstractEntityPersister ); } else { - Column column = (Column) selectable; + final Column column = (Column) selectable; colNames[k] = column.getQuotedName( dialect ); -// colReaderTemplates[k] = column.getTemplate( dialect, factory.getQueryEngine().getSqmFunctionRegistry() ); colWriters[k] = column.getWriteExpr(); } } propertyColumnNames[i] = colNames; propertyColumnFormulaTemplates[i] = formulaTemplates; -// propertyColumnReaderTemplates[i] = colReaderTemplates; propertyColumnWriters[i] = colWriters; propertyColumnAliases[i] = colAliases; @@ -891,8 +641,9 @@ public abstract class AbstractEntityPersister prop, entityMetamodel.isInstrumented(), entityName -> { - final PersistentClass entityBinding = - creationContext.getMetadata().getEntityBinding( entityName ); + final PersistentClass entityBinding = creationContext + .getMetadata() + .getEntityBinding( entityName ); assert entityBinding != null; return entityBinding.hasSubclasses(); }, @@ -911,8 +662,6 @@ public abstract class AbstractEntityPersister propertySelectable[i] = prop.isSelectable(); -// propertyUniqueness[i] = prop.getValue().isAlternateUniqueKey(); - if ( prop.isLob() && dialect.forceLobAsLastValue() ) { lobPropertiesLocalCollector.add( i ); } @@ -925,88 +674,55 @@ public abstract class AbstractEntityPersister lazyPropertyTypes = ArrayHelper.toTypeArray( lazyTypes ); // SUBCLASS PROPERTY CLOSURE - -// ArrayList columns = new ArrayList<>(); -// ArrayList columnsLazy = new ArrayList<>(); -// ArrayList columnReaderTemplates = new ArrayList<>(); - ArrayList aliases = new ArrayList<>(); -// ArrayList formulas = new ArrayList<>(); - ArrayList formulaAliases = new ArrayList<>(); -// ArrayList formulaTemplates = new ArrayList<>(); -// ArrayList formulasLazy = new ArrayList<>(); - ArrayList types = new ArrayList<>(); - ArrayList names = new ArrayList<>(); -// ArrayList classes = new ArrayList<>(); - ArrayList templates = new ArrayList<>(); - ArrayList propColumns = new ArrayList<>(); - ArrayList propColumnReaders = new ArrayList<>(); - ArrayList propColumnReaderTemplates = new ArrayList<>(); - ArrayList joinedFetchesList = new ArrayList<>(); - ArrayList cascades = new ArrayList<>(); - ArrayList definedBySubclass = new ArrayList<>(); -// ArrayList propColumnNumbers = new ArrayList<>(); -// ArrayList propFormulaNumbers = new ArrayList<>(); - ArrayList propNullables = new ArrayList<>(); + final ArrayList aliases = new ArrayList<>(); + final ArrayList formulaAliases = new ArrayList<>(); + final ArrayList types = new ArrayList<>(); + final ArrayList names = new ArrayList<>(); + final ArrayList templates = new ArrayList<>(); + final ArrayList propColumns = new ArrayList<>(); + final ArrayList propColumnReaders = new ArrayList<>(); + final ArrayList propColumnReaderTemplates = new ArrayList<>(); + final ArrayList joinedFetchesList = new ArrayList<>(); + final ArrayList cascades = new ArrayList<>(); + final ArrayList definedBySubclass = new ArrayList<>(); + final ArrayList propNullables = new ArrayList<>(); for ( Property prop : bootDescriptor.getSubclassPropertyClosure() ) { names.add( prop.getName() ); -// classes.add( prop.getPersistentClass().getEntityName() ); types.add( prop.getType() ); final boolean isDefinedBySubclass = !thisClassProperties.contains( prop ); definedBySubclass.add( isDefinedBySubclass ); propNullables.add( prop.isOptional() || isDefinedBySubclass ); //TODO: is this completely correct? - String[] cols = new String[ prop.getColumnSpan() ]; - String[] readers = new String[ prop.getColumnSpan() ]; - String[] readerTemplates = new String[ prop.getColumnSpan() ]; - String[] forms = new String[ prop.getColumnSpan() ]; -// int[] colnos = new int[ prop.getColumnSpan() ]; -// int[] formnos = new int[ prop.getColumnSpan() ]; + final String[] cols = new String[ prop.getColumnSpan() ]; + final String[] readers = new String[ prop.getColumnSpan() ]; + final String[] readerTemplates = new String[ prop.getColumnSpan() ]; + final String[] forms = new String[ prop.getColumnSpan() ]; -// final boolean lazy = ! EnhancementHelper.includeInBaseFetchGroup( -// prop, -// entityMetamodel.isInstrumented(), -// entityName -> { -// final MetadataImplementor metadata = creationContext.getMetadata(); -// final PersistentClass entityBinding = metadata.getEntityBinding( entityName ); -// assert entityBinding != null; -// return entityBinding.hasSubclasses(); -// }, -// sessionFactoryOptions.isCollectionsInDefaultFetchGroupEnabled() -// ); - List selectables = prop.getSelectables(); + final List selectables = prop.getSelectables(); for ( int i = 0; i < selectables.size(); i++ ) { - Selectable selectable = selectables.get(i); + final Selectable selectable = selectables.get(i); if ( selectable.isFormula() ) { - String template = selectable.getTemplate( + final String template = selectable.getTemplate( dialect, factory.getTypeConfiguration(), functionRegistry ); -// formnos[l] = formulaTemplates.size(); -// colnos[l] = -1; -// formulaTemplates.add( template ); forms[i] = template; -// formulas.add( selectable.getText( dialect ) ); final String formulaAlias = selectable.getAlias( dialect ); if ( prop.isSelectable() && !formulaAliases.contains( formulaAlias ) ) { formulaAliases.add( formulaAlias ); } -// formulasLazy.add( lazy ); } else { - Column column = (Column) selectable; - String colName = column.getQuotedName(dialect); -// colnos[l] = columns.size(); //before add :-) -// formnos[l] = -1; -// columns.add( colName ); + final Column column = (Column) selectable; + final String colName = column.getQuotedName(dialect); cols[i] = colName; final String columnAlias = selectable.getAlias( dialect, prop.getValue().getTable() ); if ( prop.isSelectable() && !aliases.contains( columnAlias ) ) { aliases.add( columnAlias ); } -// columnsLazy.add( lazy ); readers[i] = column.getReadExpr( dialect ); readerTemplates[i] = column.getTemplate( @@ -1014,39 +730,26 @@ public abstract class AbstractEntityPersister factory.getTypeConfiguration(), functionRegistry ); -// columnReaderTemplates.add( readerTemplate ); } } propColumns.add( cols ); propColumnReaders.add( readers ); propColumnReaderTemplates.add( readerTemplates ); templates.add( forms ); -// propColumnNumbers.add( colnos ); -// propFormulaNumbers.add( formnos ); joinedFetchesList.add( prop.getValue().getFetchMode() ); cascades.add( prop.getCascadeStyle() ); } -// subclassColumnClosure = ArrayHelper.toStringArray( columns ); subclassColumnAliasClosure = ArrayHelper.toStringArray( aliases ); -// subclassColumnLazyClosure = ArrayHelper.toBooleanArray( columnsLazy ); -// subclassColumnReaderTemplateClosure = ArrayHelper.toStringArray( columnReaderTemplates ); - -// subclassFormulaClosure = ArrayHelper.toStringArray( formulas ); -// subclassFormulaTemplateClosure = ArrayHelper.toStringArray( formulaTemplates ); subclassFormulaAliasClosure = ArrayHelper.toStringArray( formulaAliases ); -// subclassFormulaLazyClosure = ArrayHelper.toBooleanArray( formulasLazy ); subclassPropertyNameClosure = ArrayHelper.toStringArray( names ); -// subclassPropertySubclassNameClosure = ArrayHelper.toStringArray( classes ); subclassPropertyTypeClosure = ArrayHelper.toTypeArray( types ); subclassPropertyNullabilityClosure = ArrayHelper.toBooleanArray( propNullables ); subclassPropertyFormulaTemplateClosure = ArrayHelper.to2DStringArray( templates ); subclassPropertyColumnNameClosure = ArrayHelper.to2DStringArray( propColumns ); subclassPropertyColumnReaderClosure = ArrayHelper.to2DStringArray( propColumnReaders ); subclassPropertyColumnReaderTemplateClosure = ArrayHelper.to2DStringArray( propColumnReaderTemplates ); -// subclassPropertyColumnNumberClosure = ArrayHelper.to2DIntArray( propColumnNumbers ); -// subclassPropertyFormulaNumberClosure = ArrayHelper.to2DIntArray( propFormulaNumbers ); subclassPropertyCascadeStyleClosure = new CascadeStyle[cascades.size()]; int j = 0; @@ -1066,17 +769,15 @@ public abstract class AbstractEntityPersister ? new FilterHelper(bootDescriptor.getFilters(), factory) : null; - useReferenceCacheEntries = useReferenceCacheEntries(); - + useReferenceCacheEntries = shouldUseReferenceCacheEntries(); cacheEntryHelper = buildCacheEntryHelper(); - invalidateCache = sessionFactoryOptions.isSecondLevelCacheEnabled() && canWriteToCache && shouldInvalidateCache(bootDescriptor, creationContext); } - private boolean useReferenceCacheEntries() { + private boolean shouldUseReferenceCacheEntries() { // Check if we can use Reference Cached entities in 2lc // todo : should really validate that the cache access type is read-only if ( !factory.getSessionFactoryOptions().isDirectReferenceCacheEntriesEnabled() ) { @@ -1100,6 +801,167 @@ public abstract class AbstractEntityPersister } } + @Override + public abstract String getSubclassTableName(int j); + + protected abstract String[] getSubclassTableNames(); + + protected abstract String[] getSubclassTableKeyColumns(int j); + + protected abstract boolean isClassOrSuperclassTable(int j); + + protected boolean isClassOrSuperclassJoin(int j) { + /* + * TODO: + * SingleTableEntityPersister incorrectly used isClassOrSuperclassJoin == isClassOrSuperclassTable, + * this caused HHH-12895, as this resulted in the subclass tables always being joined, even if no + * property on these tables was accessed. + * + * JoinedTableEntityPersister does not use isClassOrSuperclassJoin at all, probably incorrectly so. + * I however haven't been able to reproduce any quirks regarding s, secondary tables or + * @JoinTable's. + * + * Probably this method needs to be properly implemented for the various entity persisters, + * but this at least fixes the SingleTableEntityPersister, while maintaining the previous + * behaviour for other persisters. + */ + return isClassOrSuperclassTable( j ); + } + + public abstract int getSubclassTableSpan(); + + public abstract int getTableSpan(); + + public abstract boolean hasDuplicateTables(); + + /** + * @deprecated Only ever used from places where we really want to use

    + *
  • {@link SelectStatement} (select generator)
    • + *
  • {@link InsertSelectStatement}
    • + *
  • {@link org.hibernate.sql.ast.tree.update.UpdateStatement}
    • + *
  • {@link org.hibernate.sql.ast.tree.delete.DeleteStatement}
    • + *
+ */ + @Deprecated( since = "6.2" ) + public abstract String getTableName(int j); + + public abstract String[] getKeyColumns(int j); + + public abstract boolean isPropertyOfTable(int property, int j); + + protected abstract int[] getPropertyTableNumbers(); + + protected abstract int getSubclassPropertyTableNumber(int i); + + private static final String DISCRIMINATOR_ALIAS = "clazz_"; + + @Override + public String getDiscriminatorColumnName() { + return DISCRIMINATOR_ALIAS; + } + + public String getDiscriminatorColumnReaders() { + return DISCRIMINATOR_ALIAS; + } + + public String getDiscriminatorColumnReaderTemplate() { + if ( getEntityMetamodel().getSubclassEntityNames().size() == 1 ) { + return getDiscriminatorSQLValue(); + } + else { + return Template.TEMPLATE + "." + DISCRIMINATOR_ALIAS; + } + } + + public String getDiscriminatorAlias() { + return DISCRIMINATOR_ALIAS; + } + + public String getDiscriminatorFormulaTemplate() { + return null; + } + + public boolean isInverseTable(int j) { + return false; + } + + public boolean isNullableTable(int j) { + return false; + } + + protected boolean isNullableSubclassTable(int j) { + return false; + } + + @Override + public boolean isSubclassEntityName(String entityName) { + return entityMetamodel.getSubclassEntityNames().contains( entityName ); + } + + protected boolean[] getTableHasColumns() { + return tableHasColumns; + } + + @Override + public String[] getRootTableKeyColumnNames() { + return rootTableKeyColumnNames; + } + + SingleIdArrayLoadPlan getSQLLazySelectLoadPlan(String fetchGroup) { + return sqlLazySelectStringsByFetchGroup.get( fetchGroup ); + } + + @Internal + public InsertCoordinator getInsertCoordinator() { + return insertCoordinator; + } + + @Internal + public UpdateCoordinator getUpdateCoordinator() { + return updateCoordinator; + } + + @Internal + public DeleteCoordinator getDeleteCoordinator() { + return deleteCoordinator; + } + + public String[] getSQLLazyUpdateStrings() { + return sqlLazyUpdateStrings; + } + + public String getVersionSelectString() { + return sqlVersionSelectString; + } + + @Override + public boolean hasRowId() { + return rowIdName != null; + } + + //used by Hibernate Reactive + @SuppressWarnings("unused") + public boolean[][] getPropertyColumnUpdateable() { + return propertyColumnUpdateable; + } + + //used by Hibernate Reactive + @SuppressWarnings("unused") + public boolean[][] getPropertyColumnInsertable() { + return propertyColumnInsertable; + } + + public String[] getTableNames() { + String[] tableNames = new String[getTableSpan()]; + for ( int i = 0; i < tableNames.length; i++ ) { + tableNames[i] = getTableName( i ); + } + return tableNames; + } + + + + private static SingleIdEntityLoader createBatchingIdEntityLoader( EntityMappingType entityDescriptor, int batchSize, @@ -1331,11 +1193,6 @@ public abstract class AbstractEntityPersister return naturalIdMapping; } - @Override - public EntityMappingType getEntityMappingType() { - return this; - } - @Override public TableGroup createRootTableGroup( boolean canUseInnerJoins, @@ -1368,8 +1225,7 @@ public abstract class AbstractEntityPersister final NamedTableReference joinedTableReference = new NamedTableReference( tableExpression, sqlAliasBase.generateNewAlias(), - isNullableSubclassTable( i ), - getFactory() + isNullableSubclassTable( i ) ); return new TableReferenceJoin( @@ -1436,8 +1292,7 @@ public abstract class AbstractEntityPersister final NamedTableReference joinedTableReference = new NamedTableReference( joinTableExpression, sqlAliasBase.generateNewAlias(), - !innerJoin, - getFactory() + !innerJoin ); return new TableReferenceJoin( @@ -1456,8 +1311,7 @@ public abstract class AbstractEntityPersister return new NamedTableReference( getTableName(), sqlAliasBase.generateNewAlias(), - false, - getFactory() + false ); } @@ -1479,10 +1333,7 @@ public abstract class AbstractEntityPersister (columnIndex, selection) -> { final String rootPkColumnName = rootPkColumnNames[ columnIndex ]; final Expression pkColumnExpression = sqlExpressionResolver.resolveSqlExpression( - SqlExpressionResolver.createColumnReferenceKey( - rootTableReference, - rootPkColumnName - ), + createColumnReferenceKey( rootTableReference, rootPkColumnName ), sqlAstProcessingState -> new ColumnReference( rootTableReference.getIdentificationVariable(), rootPkColumnName, @@ -1495,10 +1346,7 @@ public abstract class AbstractEntityPersister final String fkColumnName = fkColumnNames[ columnIndex ]; final Expression fkColumnExpression = sqlExpressionResolver.resolveSqlExpression( - SqlExpressionResolver.createColumnReferenceKey( - joinedTableReference, - fkColumnName - ), + createColumnReferenceKey( joinedTableReference, fkColumnName ), sqlAstProcessingState -> new ColumnReference( joinedTableReference.getIdentificationVariable(), fkColumnName, @@ -1516,19 +1364,6 @@ public abstract class AbstractEntityPersister return conjunction; } - protected Predicate generateJoinPredicate( - TableReference rootTableReference, - TableReference joinedTableReference, - int subClassTablePosition, - SqlExpressionResolver sqlExpressionResolver) { - return generateJoinPredicate( - rootTableReference, - joinedTableReference, - getSubclassTableKeyColumns( subClassTablePosition ), - sqlExpressionResolver - ); - } - @Override public Object initializeLazyProperty(String fieldName, Object entity, SharedSessionContractImplementor session) { final PersistenceContext persistenceContext = session.getPersistenceContextInternal(); @@ -1720,7 +1555,7 @@ public abstract class AbstractEntityPersister throw session.getJdbcServices().getSqlExceptionHelper().convert( ex.getSQLException(), "could not initialize lazy properties: " + MessageHelper.infoString( this, id, getFactory() ), - lazySelect.getJdbcSelect().getSql() + lazySelect.getJdbcSelect().getSqlString() ); } } @@ -1782,12 +1617,6 @@ public abstract class AbstractEntityPersister return fieldName.equals( lazyPropertyNames[index] ); } - public boolean isBatchable() { - return optimisticLockStyle().isNone() - || !isVersioned() && optimisticLockStyle().isVersion() - || getFactory().getSessionFactoryOptions().isJdbcBatchVersionedData(); - } - @Override public NavigableRole getNavigableRole() { return navigableRole; @@ -1956,7 +1785,7 @@ public abstract class AbstractEntityPersister .getSqlAstTranslatorFactory() .buildSelectTranslator( getFactory(), new SelectStatement( rootQuerySpec ) ) .translate( null, QueryOptions.NONE ) - .getSql(); + .getSqlString(); final int fromIndex = sql.lastIndexOf( " from" ); final String expression; if ( fromIndex != -1 ) { @@ -2165,7 +1994,7 @@ public abstract class AbstractEntityPersister } private String generateVersionIncrementUpdateString() { - Update update = createUpdate().setTableName( getTableName( 0 ) ); + final Update update = new Update( getFactory().getJdbcServices().getDialect() ).setTableName( getTableName( 0 ) ); if ( getFactory().getSessionFactoryOptions().isCommentsEnabled() ) { update.setComment( "forced version increment" ); } @@ -2907,11 +2736,11 @@ public abstract class AbstractEntityPersister final int j, final Object[] oldFields, final boolean useRowId) { - final Update update = createUpdate().setTableName( getTableName( j ) ); + final Update update = new Update( getFactory().getJdbcServices().getDialect() ).setTableName( getTableName( j ) ); boolean hasColumns = false; - for ( int index = 0; index < attributeMappings.length; index++ ) { - final AttributeMapping attributeMapping = attributeMappings[index]; + for ( int index = 0; index < attributeMappings.size(); index++ ) { + final AttributeMapping attributeMapping = attributeMappings.get( index ); if ( isPropertyOfTable( index, j ) ) { // `attributeMapping` is an attribute of the table we are updating @@ -3023,296 +2852,10 @@ public abstract class AbstractEntityPersister || entityMetamodel.isVersionGenerated(); } - public String generateInsertString(boolean[] includeProperty) { - return generateInsertString( includeProperty, 0 ); - } - - /** - * Generate the SQL that inserts a row - */ - public String generateInsertString(boolean[] includeProperty, int j) { - - final Insert insert = createInsert().setTableName( getTableName( j ) ); - - for ( int index = 0; index < attributeMappings.length; index++ ) { - final AttributeMapping attributeMapping = attributeMappings[index]; - if ( isPropertyOfTable( index, j ) ) { - // `attributeMapping` is an attribute of the table we are updating - - if ( ! lobProperties.contains( index ) ) { - // HHH-4635 - // Oracle expects all Lob properties to be last in inserts - // and updates. Insert them at the end - see below - - if ( includeProperty[ index ] ) { - insert.addColumns( - getPropertyColumnNames( index ), - propertyColumnInsertable[index ], - propertyColumnWriters[index] - ); - } - else { - final ValueGeneration valueGeneration = attributeMapping.getValueGeneration(); - if ( valueGeneration.getGenerationTiming().includesInsert() - && valueGeneration.generatedByDatabase() - && valueGeneration.referenceColumnInSql() ) { - final Dialect dialect = getFactory().getJdbcServices().getDialect(); - insert.addColumns( - getPropertyColumnNames( index ), - SINGLE_TRUE, - new String[] { valueGeneration.getDatabaseGeneratedReferencedColumnValue(dialect) } - ); - } - } - } - } - } - - // add the discriminator - if ( j == 0 ) { - addDiscriminatorToInsert( insert ); - } - - // add the primary key - insert.addColumns( getKeyColumns( j ) ); - - if ( getFactory().getSessionFactoryOptions().isCommentsEnabled() ) { - insert.setComment( "insert " + getEntityName() ); - } - - // HHH-4635 - // Oracle expects all Lob properties to be last in inserts - // and updates. Insert them at the end. - for ( int i : lobProperties ) { - if ( includeProperty[i] && isPropertyOfTable( i, j ) ) { - // this property belongs on the table and is to be inserted - insert.addColumns( - getPropertyColumnNames( i ), - propertyColumnInsertable[i], - propertyColumnWriters[i] - ); - } - } - - return insert.toStatementString(); - } - - /** - * Used to generate an insert statement against the root table in the - * case of identifier generation strategies where the insert statement - * executions actually generates the identifier value. - * - * @param includeProperty indices of the properties to include in the - * insert statement. - * - * @return The insert SQL statement string - */ - public String generateIdentityInsertString(boolean[] includeProperty) { - Insert insert = identityDelegate.prepareIdentifierGeneratingInsert( factory.getSqlStringGenerationContext() ); - insert.setTableName( getTableName( 0 ) ); - - // add normal properties except lobs - for ( int i = 0; i < entityMetamodel.getPropertySpan(); i++ ) { - if ( isPropertyOfTable( i, 0 ) && !lobProperties.contains( i ) ) { - final InDatabaseValueGenerationStrategy generationStrategy = entityMetamodel.getInDatabaseValueGenerationStrategies()[i]; - - if ( includeProperty[i] ) { - insert.addColumns( - getPropertyColumnNames( i ), - propertyColumnInsertable[i], - propertyColumnWriters[i] - ); - } - else if ( generationStrategy != null && - generationStrategy.getGenerationTiming().includesInsert() && - generationStrategy.referenceColumnsInSql() ) { - - final String[] values; - - if ( generationStrategy.getReferencedColumnValues() == null ) { - values = propertyColumnWriters[i]; - } - else { - values = new String[propertyColumnWriters[i].length]; - - for ( int j = 0; j < values.length; j++ ) { - values[j] = ( generationStrategy.getReferencedColumnValues()[j] != null ) ? - generationStrategy.getReferencedColumnValues()[j] : - propertyColumnWriters[i][j]; - } - } - insert.addColumns( - getPropertyColumnNames( i ), - propertyColumnInsertable[i], - values - ); - } - } - } - - // HHH-4635 & HHH-8103 - // Oracle expects all Lob properties to be last in inserts - // and updates. Insert them at the end. - for ( int i : lobProperties ) { - if ( includeProperty[i] && isPropertyOfTable( i, 0 ) ) { - insert.addColumns( getPropertyColumnNames( i ), propertyColumnInsertable[i], propertyColumnWriters[i] ); - } - } - - // add the discriminator - addDiscriminatorToInsert( insert ); - - // delegate already handles PK columns - - if ( getFactory().getSessionFactoryOptions().isCommentsEnabled() ) { - insert.setComment( "insert " + getEntityName() ); - } - - return insert.toStatementString(); - } - - /** - * Generate the SQL that deletes a row by id (and version) - */ - public String generateDeleteString(int j, boolean includeVersion) { - final Delete delete = createDelete().setTableName( getTableName( j ) ) - .addPrimaryKeyColumns( getKeyColumns( j ) ); - if ( includeVersion && j == 0 ) { - delete.setVersionColumnName( getVersionColumnName() ); - } - if ( getFactory().getSessionFactoryOptions().isCommentsEnabled() ) { - delete.setComment( "delete " + getEntityName() ); - } - return delete.toStatementString(); - } - - public int dehydrate( - Object id, - Object[] fields, - boolean[] includeProperty, - boolean[][] includeColumns, - int j, - PreparedStatement st, - SharedSessionContractImplementor session, - boolean isUpdate) throws HibernateException, SQLException { - return dehydrate( id, fields, null, includeProperty, includeColumns, j, st, session, 1, isUpdate ); - } - - /** - * Marshall the fields of a persistent instance to a prepared statement - */ - public int dehydrate( - final Object id, - final Object[] fields, - final Object rowId, - final boolean[] includeProperty, - final boolean[][] includeColumns, - final int j, - final PreparedStatement ps, - final SharedSessionContractImplementor session, - int index, - boolean isUpdate) throws SQLException, HibernateException { - - if ( LOG.isTraceEnabled() ) { - LOG.tracev( "Dehydrating entity: {0}", MessageHelper.infoString( this, id, getFactory() ) ); - } - - for ( int i = 0; i < entityMetamodel.getPropertySpan(); i++ ) { - if ( includeProperty[i] && isPropertyOfTable( i, j ) - && !lobProperties.contains( i ) ) { - getPropertyTypes()[i].nullSafeSet( ps, fields[i], index, includeColumns[i], session ); - index += ArrayHelper.countTrue( includeColumns[i] ); //TODO: this is kinda slow... - } - } - - if ( !isUpdate ) { - index += dehydrateId( id, rowId, ps, session, index ); - } - - // HHH-4635 - // Oracle expects all Lob properties to be last in inserts - // and updates. Insert them at the end. - for ( int i : lobProperties ) { - if ( includeProperty[i] && isPropertyOfTable( i, j ) ) { - getPropertyTypes()[i].nullSafeSet( ps, fields[i], index, includeColumns[i], session ); - index += ArrayHelper.countTrue( includeColumns[i] ); //TODO: this is kinda slow... - } - } - - if ( isUpdate ) { - index += dehydrateId( id, rowId, ps, session, index ); - } - - return index; - - } - - private int dehydrateId( - final Object id, - final Object rowId, - final PreparedStatement ps, - final SharedSessionContractImplementor session, - int index) throws SQLException { - if ( rowId != null ) { - if ( LOG.isTraceEnabled() ) { - LOG.tracev( - String.format( - "binding parameter [%s] as ROWID - [%s]", - index, - rowId - ) - ); - } - - ps.setObject( index, rowId ); - return 1; - } - else if ( id != null ) { - getIdentifierType().nullSafeSet( ps, id, index, session ); - return getIdentifierColumnSpan(); - } - return 0; - } - public boolean useGetGeneratedKeys() { return getFactory().getSessionFactoryOptions().isGetGeneratedKeysEnabled(); } - /** - * Perform an SQL INSERT, and then retrieve a generated identifier. - *

- * This form is used for PostInsertIdentifierGenerator-style ids (IDENTITY, - * select, etc). - */ - public Object insert( - final Object[] fields, - final boolean[] notNull, - String sql, - final Object object, - final SharedSessionContractImplementor session) throws HibernateException { - - if ( LOG.isTraceEnabled() ) { - LOG.tracev( "Inserting entity: {0} (native id)", getEntityName() ); - if ( isVersioned() ) { - LOG.tracev( "Version: {0}", Versioning.getVersion( fields, this ) ); - } - } - - Binder binder = new Binder() { - @Override - public void bindValues(PreparedStatement ps) throws SQLException { - dehydrate( null, fields, notNull, propertyColumnInsertable, 0, ps, session, false ); - } - - @Override - public Object getEntity() { - return object; - } - }; - - return identityDelegate.performInsert( sql, session, binder ); - } - @Override public String getIdentitySelectString() { //TODO: cache this in an instvar @@ -3333,594 +2876,35 @@ public abstract class AbstractEntityPersister .toStatementString(); } - private BasicBatchKey insertBatchKey; - - /** - * Perform an SQL INSERT. - *

- * This for is used for all non-root tables as well as the root table - * in cases where the identifier value is known before the insert occurs. - */ - public void insert( - final Object id, - final Object[] fields, - final boolean[] notNull, - final int j, - final String sql, - final Object object, - final SharedSessionContractImplementor session) throws HibernateException { - - if ( isInverseTable( j ) ) { - return; - } - - //note: it is conceptually possible that a UserType could map null to - // a non-null value, so the following is arguable: - if ( isNullableTable( j ) && isAllNull( fields, j ) ) { - return; - } - - if ( LOG.isTraceEnabled() ) { - LOG.tracev( "Inserting entity: {0}", MessageHelper.infoString( this, id, getFactory() ) ); - if ( j == 0 && isVersioned() ) { - LOG.tracev( "Version: {0}", Versioning.getVersion( fields, this ) ); - } - } - - // TODO : shouldn't inserts be Expectations.NONE? - final Expectation expectation = Expectations.appropriateExpectation( insertResultCheckStyles[j] ); - final boolean useBatch = expectation.canBeBatched() - && session.getConfiguredJdbcBatchSize() > 1 - && getIdentifierGenerator().supportsJdbcBatchInserts(); - if ( useBatch && insertBatchKey == null ) { - insertBatchKey = new BasicBatchKey( - getEntityName() + "#INSERT", - expectation - ); - } - final boolean callable = isInsertCallable( j ); - - try { - // Render the SQL query - final PreparedStatement insert; - if ( useBatch ) { - insert = session - .getJdbcCoordinator() - .getBatch( insertBatchKey ) - .getBatchStatement( sql, callable ); - } - else { - insert = session - .getJdbcCoordinator() - .getStatementPreparer() - .prepareStatement( sql, callable ); - } - - try { - int index = 1; - index += expectation.prepare( insert ); - - // Write the values of fields onto the prepared statement - we MUST use the state at the time the - // insert was issued (cos of foreign key constraints). Not necessarily the object's current state - - dehydrate( id, fields, null, notNull, propertyColumnInsertable, j, insert, session, index, false ); - - if ( useBatch ) { - session.getJdbcCoordinator().getBatch( insertBatchKey ).addToBatch(); - } - else { - expectation.verifyOutcome( - session.getJdbcCoordinator() - .getResultSetReturn() - .executeUpdate( insert ), insert, -1, sql - ); - } - } - catch (SQLException | RuntimeException e) { - if ( useBatch ) { - session.getJdbcCoordinator().abortBatch(); - } - throw e; - } - finally { - if ( !useBatch ) { - session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( insert ); - session.getJdbcCoordinator().afterStatementExecution(); - } - } - } - catch (SQLException e) { - throw getFactory().getJdbcServices().getSqlExceptionHelper().convert( - e, - "could not insert: " + MessageHelper.infoString( this ), - sql - ); - } - - } - - /** - * Perform an SQL UPDATE or SQL INSERT - */ - public void updateOrInsert( - final Object id, - final Object[] fields, - final Object[] oldFields, - final Object rowId, - final boolean[] includeProperty, - final int j, - final Object oldVersion, - final Object object, - final String sql, - final SharedSessionContractImplementor session) throws HibernateException { - - if ( !isInverseTable( j ) ) { - - final boolean isRowToUpdate; - if ( isNullableTable( j ) && oldFields != null && isAllNull( oldFields, j ) ) { - //don't bother trying to update, we know there is no row there yet - isRowToUpdate = false; - } - else if ( isNullableTable( j ) && isAllNull( fields, j ) ) { - //if all fields are null, we might need to delete existing row - isRowToUpdate = true; - delete( id, oldVersion, j, object, getSQLDeleteStrings()[j], session, null ); - } - else { - //there is probably a row there, so try to update - //if no rows were updated, we will find out - isRowToUpdate = update( - id, - fields, - oldFields, - rowId, - includeProperty, - j, - oldVersion, - object, - sql, - session - ); - } - - if ( !isRowToUpdate && !isAllNull( fields, j ) ) { - // assume that the row was not there since it previously had only null - // values, so do an INSERT instead - //TODO: does not respect dynamic-insert - insert( id, fields, getPropertyInsertability(), j, getSQLInsertStrings()[j], object, session ); - } - - } - - } - - private BasicBatchKey updateBatchKey; - - public boolean update( - final Object id, - final Object[] fields, - final Object[] oldFields, - final Object rowId, - final boolean[] includeProperty, - final int j, - final Object oldVersion, - final Object object, - final String sql, - final SharedSessionContractImplementor session) throws HibernateException { - - final Expectation expectation = Expectations.appropriateExpectation( updateResultCheckStyles[j] ); - // IMPLEMENTATION NOTE: If Session#saveOrUpdate or #update is used to update an entity, then - // Hibernate does not have a database snapshot of the existing entity. - // As a result, oldFields will be null. - // Don't use a batch if oldFields == null and the jth table is optional (isNullableTable( j ), - // because there is no way to know that there is actually a row to update. If the update - // was batched in this case, the batch update would fail and there is no way to fallback to - // an insert. - final boolean useBatch = expectation.canBeBatched() - && isBatchable() - && session.getConfiguredJdbcBatchSize() > 1 - && ( oldFields != null || !isNullableTable( j ) ); - if ( useBatch && updateBatchKey == null ) { - updateBatchKey = new BasicBatchKey( - getEntityName() + "#UPDATE", - expectation - ); - } - final boolean callable = isUpdateCallable( j ); - final boolean useVersion = j == 0 && isVersioned(); - - if ( LOG.isTraceEnabled() ) { - LOG.tracev( "Updating entity: {0}", MessageHelper.infoString( this, id, getFactory() ) ); - if ( useVersion ) { - LOG.tracev( "Existing version: {0} -> New version:{1}", oldVersion, fields[getVersionProperty()] ); - } - } - - try { - int index = 1; // starting index - final PreparedStatement update; - if ( useBatch ) { - update = session - .getJdbcCoordinator() - .getBatch( updateBatchKey ) - .getBatchStatement( sql, callable ); - } - else { - update = session - .getJdbcCoordinator() - .getStatementPreparer() - .prepareStatement( sql, callable ); - } - - try { - index += expectation.prepare( update ); - - //Now write the values of fields onto the prepared statement - index = dehydrate( - id, - fields, - rowId, - includeProperty, - propertyColumnUpdateable, - j, - update, - session, - index, - true - ); - - // Write any appropriate versioning conditional parameters - if ( useVersion && entityMetamodel.getOptimisticLockStyle().isVersion()) { - if ( checkVersion( includeProperty ) ) { - getVersionType().nullSafeSet( update, oldVersion, index, session ); - } - } - else if ( isAllOrDirtyOptLocking() && oldFields != null ) { - boolean[] versionability = getPropertyVersionability(); //TODO: is this really necessary???? - boolean[] includeOldField = entityMetamodel.getOptimisticLockStyle().isAll() - ? getPropertyUpdateability() - : includeProperty; - Type[] types = getPropertyTypes(); - for ( int i = 0; i < entityMetamodel.getPropertySpan(); i++ ) { - boolean include = includeOldField[i] && - isPropertyOfTable( i, j ) && - versionability[i]; //TODO: is this really necessary???? - if ( include ) { - boolean[] settable = types[i].toColumnNullness( oldFields[i], getFactory() ); - types[i].nullSafeSet( - update, - oldFields[i], - index, - settable, - session - ); - index += ArrayHelper.countTrue( settable ); - } - } - } - - if ( useBatch ) { - session.getJdbcCoordinator().getBatch( updateBatchKey ).addToBatch(); - return true; - } - else { - return check( - session.getJdbcCoordinator().getResultSetReturn().executeUpdate( update ), - id, - j, - expectation, - update, - sql - ); - } - - } - catch (SQLException | RuntimeException e) { - if ( useBatch ) { - session.getJdbcCoordinator().abortBatch(); - } - throw e; - } - finally { - if ( !useBatch ) { - session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( update ); - session.getJdbcCoordinator().afterStatementExecution(); - } - } - - } - catch (SQLException e) { - throw getFactory().getJdbcServices().getSqlExceptionHelper().convert( - e, - "could not update: " + MessageHelper.infoString( this, id, getFactory() ), - sql - ); - } - } - - private BasicBatchKey deleteBatchKey; - - /** - * Perform an SQL DELETE - */ - public void delete( - final Object id, - final Object version, - final int j, - final Object object, - final String sql, - final SharedSessionContractImplementor session, - final Object[] loadedState) throws HibernateException { - - if ( isInverseTable( j ) ) { - return; - } - - final boolean useVersion = j == 0 && isVersioned() - && object != null; // null object signals that we're deleting an unloaded proxy - final boolean callable = isDeleteCallable( j ); - final Expectation expectation = Expectations.appropriateExpectation( deleteResultCheckStyles[j] ); - final boolean useBatch = j == 0 - && isBatchable() - && expectation.canBeBatched() - && session.getConfiguredJdbcBatchSize() > 1; - if ( useBatch && deleteBatchKey == null ) { - deleteBatchKey = new BasicBatchKey( - getEntityName() + "#DELETE", - expectation - ); - } - - if ( LOG.isTraceEnabled() ) { - LOG.tracev( "Deleting entity: {0}", MessageHelper.infoString( this, id, getFactory() ) ); - if ( useVersion ) { - LOG.tracev( "Version: {0}", version ); - } - } - - if ( isTableCascadeDeleteEnabled( j ) ) { - if ( LOG.isTraceEnabled() ) { - LOG.tracev( "Delete handled by foreign key constraint: {0}", getTableName( j ) ); - } - return; //EARLY EXIT! - } - - try { - //Render the SQL query - PreparedStatement delete; - int index = 1; - if ( useBatch ) { - delete = session - .getJdbcCoordinator() - .getBatch( deleteBatchKey ) - .getBatchStatement( sql, callable ); - } - else { - delete = session - .getJdbcCoordinator() - .getStatementPreparer() - .prepareStatement( sql, callable ); - } - - try { - - index += expectation.prepare( delete ); - - // Do the key. The key is immutable, so we can use the _current_ object state, - // not necessarily the state at the time the delete operation was issued - getIdentifierType().nullSafeSet( delete, id, index, session ); - index += getIdentifierColumnSpan(); - - // We should use the _current_ object state (after any updates that occurred during flush) - - if ( useVersion ) { - getVersionType().nullSafeSet( delete, version, index, session ); - } - else if ( isAllOrDirtyOptLocking() && loadedState != null ) { - boolean[] versionability = getPropertyVersionability(); - Type[] types = getPropertyTypes(); - for ( int i = 0; i < entityMetamodel.getPropertySpan(); i++ ) { - if ( isPropertyOfTable( i, j ) && versionability[i] ) { - // this property belongs to the table and it is not specifically - // excluded from optimistic locking by optimistic-lock="false" - boolean[] settable = types[i].toColumnNullness( loadedState[i], getFactory() ); - types[i].nullSafeSet( delete, loadedState[i], index, settable, session ); - index += ArrayHelper.countTrue( settable ); - } - } - } - - if ( useBatch ) { - session.getJdbcCoordinator().getBatch( deleteBatchKey ).addToBatch(); - } - else { - check( - session.getJdbcCoordinator().getResultSetReturn().executeUpdate( delete ), - id, - j, - expectation, - delete, - sql - ); - } - - } - catch (SQLException | RuntimeException e) { - if ( useBatch ) { - session.getJdbcCoordinator().abortBatch(); - } - throw e; - } - finally { - if ( !useBatch ) { - session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( delete ); - session.getJdbcCoordinator().afterStatementExecution(); - } - } - - } - catch (SQLException sqle) { - throw getFactory().getJdbcServices().getSqlExceptionHelper().convert( - sqle, - "could not delete: " + - MessageHelper.infoString( this, id, getFactory() ), - sql - ); - - } - - } - - protected String[] getUpdateStrings(boolean byRowId, boolean lazy) { - if ( byRowId ) { - return lazy ? getSQLLazyUpdateByRowIdStrings() : getSQLUpdateByRowIdStrings(); - } - else { - return lazy ? getSQLLazyUpdateStrings() : getSQLUpdateStrings(); - } - } - /** * Update an object */ @Override public void update( final Object id, - final Object[] fields, - int[] dirtyFields, + final Object[] values, + int[] dirtyAttributeIndexes, final boolean hasDirtyCollection, - final Object[] oldFields, + final Object[] oldValues, final Object oldVersion, final Object object, final Object rowId, final SharedSessionContractImplementor session) throws HibernateException { - - // apply any pre-update in-memory value generation - if ( getEntityMetamodel().hasPreUpdateGeneratedValues() ) { - final InMemoryValueGenerationStrategy[] valueGenerationStrategies = getEntityMetamodel().getInMemoryValueGenerationStrategies(); - int valueGenerationStrategiesSize = valueGenerationStrategies.length; - if ( valueGenerationStrategiesSize != 0 ) { - int[] fieldsPreUpdateNeeded = new int[valueGenerationStrategiesSize]; - int count = 0; - for ( int i = 0; i < valueGenerationStrategiesSize; i++ ) { - if ( valueGenerationStrategies[i] != null && valueGenerationStrategies[i].getGenerationTiming() - .includesUpdate() ) { - fields[i] = valueGenerationStrategies[i].getValueGenerator().generateValue( - (Session) session, - object - ); - setPropertyValue( object, i, fields[i] ); - fieldsPreUpdateNeeded[count++] = i; - } - } -// if ( fieldsPreUpdateNeeded.length != 0 ) { -// if ( dirtyFields != null ) { -// dirtyFields = ArrayHelper.join( fieldsPreUpdateNeeded, dirtyFields ); -// } -// else if ( hasDirtyCollection ) { -// dirtyFields = fieldsPreUpdateNeeded; -// } -// // no dirty fields and no dirty collections so no update needed ??? -// } - if ( dirtyFields != null ) { - dirtyFields = ArrayHelper.join( dirtyFields, ArrayHelper.trim( fieldsPreUpdateNeeded, count ) ); - } - } - } - - //note: dirtyFields==null means we had no snapshot, and we couldn't get one using select-before-update - // oldFields==null just means we had no snapshot to begin with (we might have used select-before-update to get the dirtyFields) - - final boolean[] tableUpdateNeeded = getTableUpdateNeeded( dirtyFields, hasDirtyCollection ); - final int span = getTableSpan(); - - final boolean[] propsToUpdate; - final String[] updateStrings; - EntityEntry entry = session.getPersistenceContextInternal().getEntry( object ); - - // Ensure that an immutable or non-modifiable entity is not being updated unless it is - // in the process of being deleted. - if ( entry == null && !isMutable() ) { - throw new IllegalStateException( "Updating immutable entity that is not in session yet" ); - } - if ( dirtyFields != null && entityMetamodel.isDynamicUpdate() ) { - // We need to generate the UPDATE SQL when dynamic-update="true" - propsToUpdate = getPropertiesToUpdate( dirtyFields, hasDirtyCollection ); - // don't need to check laziness (dirty checking algorithm handles that) - updateStrings = new String[span]; - for ( int j = 0; j < span; j++ ) { - updateStrings[j] = tableUpdateNeeded[j] ? - generateUpdateString( propsToUpdate, j, oldFields, j == 0 && rowId != null ) : - null; - } - } - else if ( dirtyFields != null && hasUninitializedLazyProperties( object ) && hasLazyDirtyFields( dirtyFields ) ) { - // We need to generate the UPDATE SQL when there are dirty lazy fields - propsToUpdate = getPropertiesToUpdate( dirtyFields, hasDirtyCollection ); - // don't need to check laziness (dirty checking algorithm handles that) - final boolean[] propertyLaziness = getPropertyLaziness(); - // we add also all the non lazy properties because dynamic update is false - for ( int i = 0; i < propertyLaziness.length; i++ ) { - if ( propertyLaziness[i] == false ) { - propsToUpdate[i] = true; - } - } - updateStrings = new String[span]; - for ( int j = 0; j < span; j++ ) { - updateStrings[j] = tableUpdateNeeded[j] ? - generateUpdateString( propsToUpdate, j, oldFields, j == 0 && rowId != null ) : - null; - } - } - else if ( !isModifiableEntity( entry ) ) { - // We need to generate UPDATE SQL when a non-modifiable entity (e.g., read-only or immutable) - // needs: - // - to have references to transient entities set to null before being deleted - // - to have version incremented do to a "dirty" association - // If dirtyFields == null, then that means that there are no dirty properties to - // to be updated; an empty array for the dirty fields needs to be passed to - // getPropertiesToUpdate() instead of null. - propsToUpdate = getPropertiesToUpdate( - ( dirtyFields == null ? ArrayHelper.EMPTY_INT_ARRAY : dirtyFields ), - hasDirtyCollection - ); - // don't need to check laziness (dirty checking algorithm handles that) - updateStrings = new String[span]; - for ( int j = 0; j < span; j++ ) { - updateStrings[j] = tableUpdateNeeded[j] ? - generateUpdateString( propsToUpdate, j, oldFields, j == 0 && rowId != null ) : - null; - } - } - else { - // For the case of dynamic-update="false", or no snapshot, we use the static SQL - updateStrings = getUpdateStrings( - rowId != null, - hasUninitializedLazyProperties( object ) - ); - propsToUpdate = getPropertyUpdateability( object ); - } - - for ( int j = 0; j < span; j++ ) { - // Now update only the tables with dirty properties (and the table with the version number) - if ( tableUpdateNeeded[j] ) { - updateOrInsert( - id, - fields, - oldFields, - j == 0 ? rowId : null, - propsToUpdate, - j, - oldVersion, - object, - updateStrings[j], - session - ); - } - } + updateCoordinator.coordinateUpdate( + object, + id, + rowId, + values, + oldVersion, + oldValues, + dirtyAttributeIndexes, + hasDirtyCollection, + session + ); } - private boolean hasLazyDirtyFields(int[] dirtyFields) { + @Internal + public boolean hasLazyDirtyFields(int[] dirtyFields) { final boolean[] propertyLaziness = getPropertyLaziness(); for ( int i = 0; i < dirtyFields.length; i++ ) { if ( propertyLaziness[dirtyFields[i]] ) { @@ -3931,232 +2915,147 @@ public abstract class AbstractEntityPersister } @Override - public Object insert(Object[] fields, Object object, SharedSessionContractImplementor session) - throws HibernateException { - // apply any pre-insert in-memory value generation - preInsertInMemoryValueGeneration( fields, object, session ); + public InsertGeneratedIdentifierDelegate getIdentityInsertDelegate() { + return identityDelegate; + } - final int span = getTableSpan(); - final Object id; - if ( entityMetamodel.isDynamicInsert() ) { - // For the case of dynamic-insert="true", we need to generate the INSERT SQL - boolean[] notNull = getPropertiesToInsert( fields ); - id = insert( fields, notNull, generateIdentityInsertString( notNull ), object, session ); - for ( int j = 1; j < span; j++ ) { - insert( id, fields, notNull, j, generateInsertString( notNull, j ), object, session ); - } - } - else { - // For the case of dynamic-insert="false", use the static SQL - id = insert( fields, getPropertyInsertability(), getSQLIdentityInsertString(), object, session ); - for ( int j = 1; j < span; j++ ) { - insert( id, fields, getPropertyInsertability(), j, getSQLInsertStrings()[j], object, session ); - } - } - return id; + @Override + public Object insert(Object[] fields, Object object, SharedSessionContractImplementor session) { + return insertCoordinator.coordinateInsert( null, fields, object, session ); } @Override public void insert(Object id, Object[] fields, Object object, SharedSessionContractImplementor session) { - // apply any pre-insert in-memory value generation - preInsertInMemoryValueGeneration( fields, object, session ); + insertCoordinator.coordinateInsert( id, fields, object, session ); + } - final int span = getTableSpan(); - if ( entityMetamodel.isDynamicInsert() ) { - // For the case of dynamic-insert="true", we need to generate the INSERT SQL - boolean[] notNull = getPropertiesToInsert( fields ); - if ( hasDuplicateTables() ) { - final String[] insertedTables = new String[span]; - for ( int j = 0; j < span; j++ ) { - if ( isInverseTable( j ) ) { - continue; - } - //note: it is conceptually possible that a UserType could map null to - // a non-null value, so the following is arguable: - if ( isNullableTable( j ) && isAllNull( fields, j ) ) { - continue; - } - final String tableName = getTableName( j ); - insertedTables[j] = tableName; - if ( ArrayHelper.indexOf( insertedTables, j, tableName ) != -1 ) { - update( - id, - fields, - null, - null, - notNull, - j, - null, - object, - generateUpdateString( notNull, j, false ), - session - ); - } - else { - insert( id, fields, notNull, j, generateInsertString( notNull, j ), object, session ); - } - } - } - else { - for ( int j = 0; j < span; j++ ) { - insert( id, fields, notNull, j, generateInsertString( notNull, j ), object, session ); - } + /** + * Unfortunately we cannot directly use `SelectableMapping#getContainingTableExpression()` + * as that blows up for attributes declared on super-type for union-subclass mappings + */ + public String physicalTableNameForMutation(SelectableMapping selectableMapping) { + assert !selectableMapping.isFormula(); + return selectableMapping.getContainingTableExpression(); + } + + public EntityTableMapping getPhysicalTableMappingForMutation(SelectableMapping selectableMapping) { + final String tableNameForMutation = physicalTableNameForMutation( selectableMapping ); + for ( int i = 0; i < tableMappings.length; i++ ) { + if ( tableNameForMutation.equals( tableMappings[i].getTableName() ) ) { + return tableMappings[i]; } } - else { - // For the case of dynamic-insert="false", use the static SQL - if ( hasDuplicateTables() ) { - final String[] insertedTables = new String[span]; - for ( int j = 0; j < span; j++ ) { - if ( isInverseTable( j ) ) { - continue; - } - //note: it is conceptually possible that a UserType could map null to - // a non-null value, so the following is arguable: - if ( isNullableTable( j ) && isAllNull( fields, j ) ) { - continue; - } - final String tableName = getTableName( j ); - insertedTables[j] = tableName; - if ( ArrayHelper.indexOf( insertedTables, j, tableName ) != -1 ) { - update( - id, - fields, - null, - null, - getPropertyInsertability(), - j, - null, - object, - getSQLUpdateStrings()[j], - session - ); - } - else { - insert( id, fields, getPropertyInsertability(), j, getSQLInsertStrings()[j], object, session ); - } - } - } - else { - for ( int j = 0; j < span; j++ ) { - insert( id, fields, getPropertyInsertability(), j, getSQLInsertStrings()[j], object, session ); - } + throw new IllegalArgumentException( "Unable to resolve TableMapping for selectable - " + selectableMapping ); + } + + @Override + public EntityMappingType getTargetPart() { + return this; + } + + @Override + public void forEachMutableTable(Consumer consumer) { + for ( int i = 0; i < tableMappings.length; i++ ) { + if ( tableMappings[i].isInverse() ) { + // inverse tables are not mutable from this mapping + continue; } + consumer.accept( tableMappings[i] ); } } - protected void preInsertInMemoryValueGeneration(Object[] fields, Object object, SharedSessionContractImplementor session) { - if ( getEntityMetamodel().hasPreInsertGeneratedValues() ) { - final InMemoryValueGenerationStrategy[] strategies = getEntityMetamodel().getInMemoryValueGenerationStrategies(); - for ( int i = 0; i < strategies.length; i++ ) { - if ( strategies[i] != null && strategies[i].getGenerationTiming().includesInsert() ) { - fields[i] = strategies[i].getValueGenerator().generateValue( (Session) session, object, fields[i] ); - setPropertyValue( object, i, fields[i] ); - } + @Override + public void forEachMutableTableReverse(Consumer consumer) { + for ( int i = tableMappings.length - 1; i >= 0; i-- ) { + if ( tableMappings[i].isInverse() ) { + // inverse tables are not mutable from this mapping + continue; + } + consumer.accept( tableMappings[i] ); + } + } + + @Override + public String getIdentifierTableName() { + return getTableName( 0 ); + } + + @Override + public EntityTableMapping getIdentifierTableMapping() { + return tableMappings[0]; + } + + @Override + public ModelPart getIdentifierDescriptor() { + return identifierMapping; + } + + @Override + public boolean hasSkippableTables() { + return false; + } + + protected boolean hasAnySkippableTables(boolean[] optionalTables, boolean[] inverseTables) { + // todo (6.x) : cache this? + for ( int i = 0; i < optionalTables.length; i++ ) { + if ( optionalTables[i] ) { + return true; } } + + for ( int i = 0; i < inverseTables.length; i++ ) { + if ( inverseTables[i] ) { + return true; + } + } + + return false; } /** * Delete an object */ @Override - public void delete(Object id, Object version, Object object, SharedSessionContractImplementor session) - throws HibernateException { - boolean isImpliedOptimisticLocking = !entityMetamodel.isVersioned() && isAllOrDirtyOptLocking() - && object != null; // null object signals that we're deleting an unloaded proxy - - Object[] loadedState = null; - if ( isImpliedOptimisticLocking ) { - // need to treat this as if it where optimistic-lock="all" (dirty does *not* make sense); - // first we need to locate the "loaded" state - // - // Note, it potentially could be a proxy, so doAfterTransactionCompletion the location the safe way... - final PersistenceContext persistenceContext = session.getPersistenceContextInternal(); - Object entity = persistenceContext.getEntity( session.generateEntityKey( id, this ) ); - if ( entity != null ) { - EntityEntry entry = persistenceContext.getEntry( entity ); - loadedState = entry.getLoadedState(); - } - } - - final String[] deleteStrings = getSQLDeleteStrings( object, isImpliedOptimisticLocking, loadedState ); - for ( int j = getTableSpan() - 1; j >= 0; j-- ) { - delete( id, version, j, object, deleteStrings[j], session, loadedState ); - } - } - - private String[] getSQLDeleteStrings(Object object, boolean isImpliedOptimisticLocking, Object[] loadedState) { - if ( isImpliedOptimisticLocking && loadedState != null ) { - // we need to utilize dynamic delete statements - return generateSQLDeleteStrings(loadedState); - } - else if ( object != null ) { - // otherwise, utilize the static delete statements - return getSQLDeleteStrings(); - } - else { - // deleting an unloaded proxy - return getSQLDeleteNoVersionCheckStrings(); - } + public void delete(Object id, Object version, Object object, SharedSessionContractImplementor session) { + deleteCoordinator.coordinateDelete( object, id, version, session ); } protected boolean isAllOrDirtyOptLocking() { return entityMetamodel.getOptimisticLockStyle().isAllOrDirty(); } - protected String[] generateSQLDeleteStrings(Object[] loadedState) { - int span = getTableSpan(); - String[] deleteStrings = new String[span]; - for ( int j = span - 1; j >= 0; j-- ) { - Delete delete = createDelete().setTableName( getTableName( j ) ) - .addPrimaryKeyColumns( getKeyColumns( j ) ); - if ( getFactory().getSessionFactoryOptions().isCommentsEnabled() ) { - delete.setComment( "delete " + getEntityName() + " [" + j + "]" ); - } - - boolean[] versionability = getPropertyVersionability(); - Type[] types = getPropertyTypes(); - for ( int i = 0; i < entityMetamodel.getPropertySpan(); i++ ) { - if ( isPropertyOfTable( i, j ) && versionability[i] ) { - // This property belongs to the table, and it's not explicitly - // excluded from optimistic locking by optimistic-lock="false" - String[] propertyColumnNames = getPropertyColumnNames( i ); - boolean[] propertyNullness = types[i].toColumnNullness( loadedState[i], getFactory() ); - for ( int k = 0; k < propertyNullness.length; k++ ) { - if ( propertyNullness[k] ) { - delete.addWhereFragment( propertyColumnNames[k] + " = ?" ); - } - else { - delete.addWhereFragment( propertyColumnNames[k] + " is null" ); - } - } - } - } - deleteStrings[j] = delete.toStatementString(); - } - return deleteStrings; - } - protected void logStaticSQL() { if ( LOG.isDebugEnabled() ) { LOG.debugf( "Static SQL for entity: %s", getEntityName() ); for ( Map.Entry entry : sqlLazySelectStringsByFetchGroup.entrySet() ) { - LOG.debugf( " Lazy select (%s) : %s", entry.getKey(), entry.getValue().getJdbcSelect().getSql() ); + LOG.debugf( " Lazy select (%s) : %s", entry.getKey(), entry.getValue().getJdbcSelect().getSqlString() ); } if ( sqlVersionSelectString != null ) { LOG.debugf( " Version select: %s", sqlVersionSelectString ); } - for ( int j = 0; j < getTableSpan(); j++ ) { - LOG.debugf( " Insert %s: %s", j, getSQLInsertStrings()[j] ); - LOG.debugf( " Update %s: %s", j, getSQLUpdateStrings()[j] ); - LOG.debugf( " Delete %s: %s", j, getSQLDeleteStrings()[j] ); - } - if ( sqlIdentityInsertString != null ) { - LOG.debugf( " Identity insert: %s", sqlIdentityInsertString ); + + if ( insertCoordinator.getStaticInsertGroup() != null ) { + insertCoordinator.getStaticInsertGroup().forEachOperation( (tablePosition, mutation) -> { + if ( mutation instanceof JdbcOperation ) { + LOG.debugf( " Insert (%s): %s", tablePosition, ( (JdbcOperation) mutation ).getSqlString() ); + } + } ); } + + updateCoordinator.getStaticUpdateGroup().forEachOperation( (tablePosition, mutation) -> { + if ( mutation instanceof JdbcOperation ) { + LOG.debugf( " Update (%s): %s", tablePosition, ( (JdbcOperation) mutation ).getSqlString() ); + } + } ); + + deleteCoordinator.getStaticDeleteGroup().forEachOperation( (tablePosition, mutation) -> { + if ( mutation instanceof JdbcOperation ) { + LOG.debugf( " Delete (%s): %s", tablePosition, ( (JdbcOperation) mutation ).getSqlString() ); + } + } ); + if ( sqlUpdateByRowIdString != null ) { LOG.debugf( " Update by row id (all fields): %s", sqlUpdateByRowIdString ); } @@ -4232,11 +3131,10 @@ public abstract class AbstractEntityPersister int subclassTableNumber, Set treatAsDeclarations) { if ( isClassOrSuperclassJoin( subclassTableNumber ) ) { - final boolean shouldInnerJoin = !isInverseTable( subclassTableNumber ) - && !isNullableTable( subclassTableNumber ); // the table is either this persister's driving table or (one of) its super class persister's driving // tables which can be inner joined as long as the `shouldInnerJoin` condition resolves to true - return shouldInnerJoin; + return !isInverseTable( subclassTableNumber ) + && !isNullableTable( subclassTableNumber ); } // otherwise we have a subclass table and need to look a little deeper... @@ -4265,17 +3163,24 @@ public abstract class AbstractEntityPersister */ protected void postConstruct(Metadata mapping) throws MappingException { initPropertyPaths( mapping ); - - //doLateInit(); } private void doLateInit() { - //insert/update/delete SQL + if ( isIdentifierAssignedByInsert() ) { + final PostInsertIdentifierGenerator idGenerator = (PostInsertIdentifierGenerator) getIdentifierGenerator(); + identityDelegate = idGenerator.getInsertGeneratedIdentifierDelegate( + this, + getFactory().getJdbcServices().getDialect(), + useGetGeneratedKeys() + ); + } + + tableMappings = buildTableMappings(); + insertCoordinator = buildInsertCoordinator(); + updateCoordinator = buildUpdateCoordinator(); + deleteCoordinator = buildDeleteCoordinator(); + final int joinSpan = getTableSpan(); - sqlDeleteStrings = new String[joinSpan]; - sqlDeleteNoVersionCheckStrings = new String[joinSpan]; - sqlInsertStrings = new String[joinSpan]; - sqlUpdateStrings = new String[joinSpan]; sqlLazyUpdateStrings = new String[joinSpan]; sqlUpdateByRowIdString = rowIdName == null ? @@ -4286,50 +3191,226 @@ public abstract class AbstractEntityPersister generateUpdateString( getNonLazyPropertyUpdateability(), 0, true ); for ( int j = 0; j < joinSpan; j++ ) { - sqlInsertStrings[j] = customSQLInsert[j] == null - ? generateInsertString( getPropertyInsertability(), j ) - : substituteBrackets( customSQLInsert[j] ); - sqlUpdateStrings[j] = customSQLUpdate[j] == null - ? generateUpdateString( getPropertyUpdateability(), j, false ) - : substituteBrackets( customSQLUpdate[j] ); sqlLazyUpdateStrings[j] = customSQLUpdate[j] == null ? generateUpdateString( getNonLazyPropertyUpdateability(), j, false ) : substituteBrackets( customSQLUpdate[j] ); - sqlDeleteStrings[j] = customSQLDelete[j] == null - ? generateDeleteString( j, true ) - : substituteBrackets( customSQLDelete[j] ); - sqlDeleteNoVersionCheckStrings[j] = customSQLDelete[j] == null - ? generateDeleteString( j, false ) - : substituteBrackets( customSQLDelete[j] ); //TODO: oops, fix! } + // todo (mutation) : `tableHasColumns` is only used from a now-deprecated method we + // no longer use internally. See `#getTableHasColumns` tableHasColumns = new boolean[joinSpan]; for ( int j = 0; j < joinSpan; j++ ) { - tableHasColumns[j] = sqlUpdateStrings[j] != null; + final String tableName = getTableName( j ); + final EntityTableMapping tableMapping = findTableMapping( tableName ); + tableHasColumns[j] = tableMapping.hasColumns(); } //select SQL sqlLazySelectStringsByFetchGroup = generateLazySelectStringsByFetchGroup(); sqlVersionSelectString = generateSelectVersionString(); - if ( isIdentifierAssignedByInsert() ) { - identityDelegate = ( (PostInsertIdentifierGenerator) getIdentifierGenerator() ) - .getInsertGeneratedIdentifierDelegate( - this, - getFactory().getJdbcServices().getDialect(), - useGetGeneratedKeys() - ); - sqlIdentityInsertString = customSQLInsert[0] == null - ? generateIdentityInsertString( getPropertyInsertability() ) - : substituteBrackets( customSQLInsert[0] ); - } - else { - sqlIdentityInsertString = null; - } logStaticSQL(); } - private String substituteBrackets(String sql) { + private EntityTableMapping findTableMapping(String tableName) { + for ( int i = 0; i < tableMappings.length; i++ ) { + if ( tableMappings[i].getTableName().equals( tableName ) ) { + return tableMappings[i]; + } + } + throw new IllegalArgumentException( "Unknown table : " + tableName ); + } + + private static class TableMappingBuilder { + private final String tableName; + private final int relativePosition; + private final EntityTableMapping.KeyMapping keyMapping; + private final boolean isOptional; + private final boolean isInverse; + private final boolean isIdentifierTable; + + private final Expectation insertExpectation; + private final String customInsertSql; + private final boolean insertCallable; + + private final Expectation updateExpectation; + private final String customUpdateSql; + private final boolean updateCallable; + + private final boolean cascadeDeleteEnabled; + private final Expectation deleteExpectation; + private final String customDeleteSql; + private final boolean deleteCallable; + + private final List attributeIndexes = new ArrayList<>(); + + public TableMappingBuilder( + String tableName, + int relativePosition, + EntityTableMapping.KeyMapping keyMapping, + boolean isOptional, + boolean isInverse, + boolean isIdentifierTable, + Expectation insertExpectation, + String customInsertSql, + boolean insertCallable, + Expectation updateExpectation, + String customUpdateSql, + boolean updateCallable, + boolean cascadeDeleteEnabled, + Expectation deleteExpectation, + String customDeleteSql, + boolean deleteCallable) { + this.tableName = tableName; + this.relativePosition = relativePosition; + this.keyMapping = keyMapping; + this.isOptional = isOptional; + this.isInverse = isInverse; + this.isIdentifierTable = isIdentifierTable; + this.insertExpectation = insertExpectation; + this.customInsertSql = customInsertSql; + this.insertCallable = insertCallable; + this.updateExpectation = updateExpectation; + this.customUpdateSql = customUpdateSql; + this.updateCallable = updateCallable; + this.cascadeDeleteEnabled = cascadeDeleteEnabled; + this.deleteExpectation = deleteExpectation; + this.customDeleteSql = customDeleteSql; + this.deleteCallable = deleteCallable; + } + + private EntityTableMapping build() { + return new EntityTableMapping( + tableName, + relativePosition, + keyMapping, + isOptional, + isInverse, + isIdentifierTable, + ArrayHelper.toIntArray( attributeIndexes ), + insertExpectation, + customInsertSql, + insertCallable, + updateExpectation, + customUpdateSql, + updateCallable, + cascadeDeleteEnabled, + deleteExpectation, + customDeleteSql, + deleteCallable + ); + } + } + + protected EntityTableMapping[] buildTableMappings() { + final LinkedHashMap tableBuilderMap = new LinkedHashMap<>(); + + visitMutabilityOrderedTables( (tableExpression, relativePosition, tableKeyColumnVisitationSupplier) -> { + final TableMappingBuilder tableMappingBuilder; + + final TableMappingBuilder existing = tableBuilderMap.get( tableExpression ); + if ( existing == null ) { + final Consumer selectableConsumerConsumer = tableKeyColumnVisitationSupplier.get(); + final List keyColumns = new ArrayList<>(); + selectableConsumerConsumer.accept( (selectionIndex, selectableMapping) -> { + keyColumns.add( new EntityTableMapping.KeyColumn( + tableExpression, + selectableMapping.getSelectionExpression(), + selectableMapping.getWriteExpression(), + selectableMapping.isFormula(), + selectableMapping.getJdbcMapping() + ) ); + } ); + + final boolean isIdentifierTable = isIdentifierTable( tableExpression ); + + final String customInsertSql = customSQLInsert[ relativePosition ] == null + ? null + : substituteBrackets( customSQLInsert[ relativePosition ] ); + final String customUpdateSql = customSQLUpdate[ relativePosition ] == null + ? null + : substituteBrackets( customSQLUpdate[ relativePosition ] ); + final String customDeleteSql = customSQLDelete[ relativePosition ] == null + ? null + : substituteBrackets( customSQLDelete[ relativePosition ] ); + + tableMappingBuilder = new TableMappingBuilder( + tableExpression, + relativePosition, + new EntityTableMapping.KeyMapping( keyColumns, identifierMapping ), + !isIdentifierTable && isNullableTable( relativePosition ), + isInverseTable( relativePosition ), + isIdentifierTable, + insertExpectations[ relativePosition ], + customInsertSql, + insertCallable[ relativePosition ], + updateExpectations[ relativePosition ], + customUpdateSql, + updateCallable[ relativePosition ], + isTableCascadeDeleteEnabled( relativePosition ), + deleteExpectations[ relativePosition ], + customDeleteSql, + deleteCallable[ relativePosition ] + ); + + tableBuilderMap.put( tableExpression, tableMappingBuilder ); + } + else { + tableMappingBuilder = existing; + } + + collectAttributesIndexesForTable( relativePosition, tableMappingBuilder.attributeIndexes::add ); + } ); + + final EntityTableMapping[] list = new EntityTableMapping[tableBuilderMap.size()]; + int i = 0; + for ( Map.Entry entry : tableBuilderMap.entrySet() ) { + list[i++] = entry.getValue().build(); + } + + return list; + } + + protected abstract void visitMutabilityOrderedTables(MutabilityOrderedTableConsumer consumer); + + interface MutabilityOrderedTableConsumer { + void consume(String tableExpression, int relativePosition, Supplier> tableKeyColumnVisitationSupplier); + } + + private void collectAttributesIndexesForTable(int naturalTableIndex, Consumer indexConsumer) { + forEachAttributeMapping( (attributeIndex, attributeMapping) -> { + if ( isPropertyOfTable( attributeIndex, naturalTableIndex ) ) { + indexConsumer.accept( attributeIndex ); + } + } ); + } + + protected abstract boolean isIdentifierTable(String tableExpression); + + private InsertCoordinator buildInsertCoordinator() { + return new InsertCoordinator( this, factory ); + } + + private UpdateCoordinator buildUpdateCoordinator() { + // we only have updates to issue for entities with one or more singular attributes + for ( AttributeMapping attributeMapping : attributeMappings ) { + if ( attributeMapping instanceof SingularAttributeMapping ) { + return new UpdateCoordinatorStandard( this, factory ); + } + } + + // otherwise, nothing to update + return new UpdateCoordinatorNoOp( this ); + } + + private DeleteCoordinator buildDeleteCoordinator() { + return new DeleteCoordinator( this, factory ); + } + + public void addDiscriminatorToInsertGroup(MutationGroupBuilder insertGroupBuilder) { + } + + protected String substituteBrackets(String sql) { return new SQLQueryParser( sql, null, getFactory() ).process(); } @@ -4513,56 +3594,11 @@ public abstract class AbstractEntityPersister return false; } - public final boolean isAllNull(Object[] array, int tableNumber) { - for ( int i = 0; i < array.length; i++ ) { - if ( isPropertyOfTable( i, tableNumber ) && array[i] != null ) { - return false; - } - } - return true; - } - @Override public boolean isSubclassPropertyNullable(int i) { return subclassPropertyNullabilityClosure[i]; } - /** - * Transform the array of property indexes to an array of booleans, - * true when the property is dirty - */ - public final boolean[] getPropertiesToUpdate(final int[] dirtyProperties, final boolean hasDirtyCollection) { - final boolean[] propsToUpdate = new boolean[entityMetamodel.getPropertySpan()]; - final boolean[] updateability = getPropertyUpdateability(); //no need to check laziness, dirty checking handles that - for ( int property: dirtyProperties ) { - if (updateability[property]) { - propsToUpdate[property] = true; - } - } - if ( isVersioned() && updateability[getVersionProperty()] ) { - propsToUpdate[getVersionProperty()] = - Versioning.isVersionIncrementRequired( - dirtyProperties, - hasDirtyCollection, - getPropertyVersionability() - ); - } - return propsToUpdate; - } - - /** - * Transform the array of property indexes to an array of booleans, - * true when the property is insertable and non-null - */ - public boolean[] getPropertiesToInsert(Object[] fields) { - boolean[] notNull = new boolean[fields.length]; - boolean[] insertable = getPropertyInsertability(); - for ( int i = 0; i < fields.length; i++ ) { - notNull[i] = insertable[i] && fields[i] != null; - } - return notNull; - } - /** * Locate the property-indices of all properties considered to be dirty. * @@ -4693,9 +3729,6 @@ public abstract class AbstractEntityPersister return naturalIdRegionAccessStrategy; } - public Comparator getVersionComparator() { - return isVersioned() ? getVersionType().getJavaTypeDescriptor().getComparator() : null; - } // temporary ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @Override @@ -4879,10 +3912,6 @@ public abstract class AbstractEntityPersister return entityMetamodel.isMutable(); } - public final boolean isModifiableEntity(EntityEntry entry) { - return ( entry == null ? isMutable() : entry.isModifiableEntity() ); - } - @Override public boolean isAbstract() { return entityMetamodel.isAbstract(); @@ -4981,7 +4010,7 @@ public abstract class AbstractEntityPersister return entityMetamodel.isSelectBeforeUpdate(); } - protected final OptimisticLockStyle optimisticLockStyle() { + public final OptimisticLockStyle optimisticLockStyle() { return entityMetamodel.getOptimisticLockStyle(); } @@ -5112,10 +4141,10 @@ public abstract class AbstractEntityPersister } else { if ( hasSubclasses() ) { - for ( int i = 0; i < attributeMappings.length; i++ ) { + for ( int i = 0; i < attributeMappings.size(); i++ ) { final Object value = values[i]; if ( value != UNFETCHED_PROPERTY ) { - final Setter setter = attributeMappings[i].getPropertyAccess().getSetter(); + final Setter setter = attributeMappings.get( i ).getPropertyAccess().getSetter(); setter.set( object, value ); } } @@ -5148,8 +4177,8 @@ public abstract class AbstractEntityPersister final BytecodeEnhancementMetadata enhancementMetadata = entityMetamodel.getBytecodeEnhancementMetadata(); final LazyAttributesMetadata lazyAttributesMetadata = enhancementMetadata.getLazyAttributesMetadata(); final Object[] values = new Object[ getNumberOfAttributeMappings() ]; - for ( int i = 0; i < attributeMappings.length; i++ ) { - final AttributeMapping attributeMapping = attributeMappings[i]; + for ( int i = 0; i < attributeMappings.size(); i++ ) { + final AttributeMapping attributeMapping = attributeMappings.get( i ); final AttributeMetadataAccess attributeMetadataAccess = attributeMapping.getAttributeMetadataAccess(); if ( ! lazyAttributesMetadata.isLazyAttribute( attributeMapping.getAttributeName() ) || enhancementMetadata.isAttributeLoaded( object, attributeMapping.getAttributeName() ) ) { @@ -5170,7 +4199,7 @@ public abstract class AbstractEntityPersister @Override public Object getPropertyValue(Object object, int i) { - return attributeMappings[i].getAttributeMetadataAccess() + return attributeMappings.get( i ).getAttributeMetadataAccess() .resolveAttributeMetadata( this ) .getPropertyAccess() .getGetter() @@ -5365,9 +4394,9 @@ public abstract class AbstractEntityPersister return accessOptimizer.getPropertyValues( entity ); } - final Object[] result = new Object[this.attributeMappings.length]; - for ( int i = 0; i < this.attributeMappings.length; i++ ) { - result[i] = this.attributeMappings[i].getPropertyAccess().getGetter().getForInsert( + final Object[] result = new Object[this.attributeMappings.size()]; + for ( int i = 0; i < this.attributeMappings.size(); i++ ) { + result[i] = this.attributeMappings.get( i ).getPropertyAccess().getGetter().getForInsert( entity, mergeMap, session @@ -5651,24 +4680,6 @@ public abstract class AbstractEntityPersister // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // org.hibernate.metamodel.mapping.EntityMappingType - private final JavaType javaType; - private final EntityRepresentationStrategy representationStrategy; - - private EntityMappingType superMappingType; - private SortedMap subclassMappingTypes; - - private EntityIdentifierMapping identifierMapping; - private NaturalIdMapping naturalIdMapping; - private EntityVersionMapping versionMapping; - private EntityRowIdMapping rowIdMapping; - private EntityDiscriminatorMapping discriminatorMapping; - - private AttributeMapping[] attributeMappings; - protected Map declaredAttributeMappings = new LinkedHashMap<>(); - protected List staticFetchableList; - - protected ReflectionOptimizer.AccessOptimizer accessOptimizer; - @Override public void visitAttributeMappings(Consumer action) { for ( AttributeMapping attributeMapping : attributeMappings ) { @@ -5678,8 +4689,8 @@ public abstract class AbstractEntityPersister @Override public void forEachAttributeMapping(IndexedConsumer consumer) { - for ( int i = 0; i < attributeMappings.length; i++ ) { - consumer.accept( i, attributeMappings[i] ); + for ( int i = 0; i < attributeMappings.size(); i++ ) { + consumer.accept( i, attributeMappings.get( i ) ); } } @@ -5767,7 +4778,7 @@ public abstract class AbstractEntityPersister if ( hasUpdateGeneratedProperties() ) { updateGeneratedValuesProcessor = createGeneratedValuesProcessor( GenerationTiming.UPDATE ); } - staticFetchableList = new ArrayList<>( attributeMappings.length ); + staticFetchableList = new ArrayList<>( attributeMappings.size() ); visitSubTypeAttributeMappings( attributeMapping -> staticFetchableList.add( attributeMapping ) ); return true; } @@ -5881,6 +4892,7 @@ public abstract class AbstractEntityPersister } private NaturalIdMapping generateNaturalIdMapping(MappingModelCreationProcess creationProcess, PersistentClass bootEntityDescriptor) { + //noinspection AssertWithSideEffects assert bootEntityDescriptor.hasNaturalId(); final int[] naturalIdAttributeIndexes = entityMetamodel.getNaturalIdentifierProperties(); @@ -6101,12 +5113,12 @@ public abstract class AbstractEntityPersister // force calculation of `attributeMappings` getAttributeMappings(); } - return attributeMappings.length; + return attributeMappings.size(); } @Override public AttributeMapping getAttributeMapping(int position) { - return attributeMappings[position]; + return attributeMappings.get( position ); } @Override @@ -6205,6 +5217,7 @@ public abstract class AbstractEntityPersister scale = column.getScale(); } + final Value value = bootEntityDescriptor.getIdentifierProperty().getValue(); return new BasicEntityIdentifierMappingImpl( this, templateInstanceCreator, @@ -6215,6 +5228,8 @@ public abstract class AbstractEntityPersister length, precision, scale, + value.isColumnInsertable( 0 ), + value.isColumnUpdateable( 0 ), (BasicType) idType, creationProcess ); @@ -6287,8 +5302,9 @@ public abstract class AbstractEntityPersister final PropertyAccess propertyAccess = getRepresentationStrategy().resolvePropertyAccess( bootProperty ); + final Value value = bootProperty.getValue(); if ( propertyIndex == getVersionProperty() ) { - Column column = bootProperty.getValue().getColumns().get( 0 ); + Column column = value.getColumns().get( 0 ); return MappingModelCreationHelper.buildBasicAttributeMapping( attrName, getNavigableRole().append( bootProperty.getName() ), @@ -6305,6 +5321,9 @@ public abstract class AbstractEntityPersister column.getLength(), column.getPrecision(), column.getScale(), + column.isNullable(), + value.isColumnInsertable( 0 ), + value.isColumnUpdateable( 0 ), propertyAccess, tupleAttrDefinition.getCascadeStyle(), creationProcess @@ -6312,8 +5331,6 @@ public abstract class AbstractEntityPersister } if ( attrType instanceof BasicType ) { - final Value bootValue = bootProperty.getValue(); - final String attrColumnExpression; final boolean isAttrColumnExpressionFormula; final String customReadExpr; @@ -6322,20 +5339,22 @@ public abstract class AbstractEntityPersister final Long length; final Integer precision; final Integer scale; + final boolean nullable; - if ( bootValue instanceof DependantValue ) { + if ( value instanceof DependantValue ) { attrColumnExpression = attrColumnNames[0]; isAttrColumnExpressionFormula = false; customReadExpr = null; customWriteExpr = null; - Column column = bootValue.getColumns().get( 0 ); + Column column = value.getColumns().get( 0 ); columnDefinition = column.getSqlType(); length = column.getLength(); precision = column.getPrecision(); scale = column.getScale(); + nullable = column.isNullable(); } else { - final BasicValue basicBootValue = (BasicValue) bootValue; + final BasicValue basicBootValue = (BasicValue) value; if ( attrColumnNames[ 0 ] != null ) { attrColumnExpression = attrColumnNames[ 0 ]; @@ -6353,11 +5372,12 @@ public abstract class AbstractEntityPersister sessionFactory.getQueryEngine().getSqmFunctionRegistry() ); customWriteExpr = selectable.getCustomWriteExpression(); - Column column = bootValue.getColumns().get( 0 ); + Column column = value.getColumns().get( 0 ); columnDefinition = column.getSqlType(); length = column.getLength(); precision = column.getPrecision(); scale = column.getScale(); + nullable = column.isNullable(); } else { final String[] attrColumnFormulaTemplate = propertyColumnFormulaTemplates[ propertyIndex ]; @@ -6369,6 +5389,7 @@ public abstract class AbstractEntityPersister length = null; precision = null; scale = null; + nullable = true; } } @@ -6388,6 +5409,9 @@ public abstract class AbstractEntityPersister length, precision, scale, + nullable, + value.isColumnInsertable( 0 ), + value.isColumnUpdateable( 0 ), propertyAccess, tupleAttrDefinition.getCascadeStyle(), creationProcess @@ -6454,7 +5478,7 @@ public abstract class AbstractEntityPersister propertyAccess, bootProperty, (AnyType) attrType, - (Any) bootProperty.getValue(), + (Any) value, creationProcess ); } @@ -6544,11 +5568,11 @@ public abstract class AbstractEntityPersister } attributeMappings.addAll( declaredAttributeMappings.values() ); - this.attributeMappings = attributeMappings.toArray(new AttributeMapping[0]); + this.attributeMappings = attributeMappings; // subclasses? it depends on the usage } - return Arrays.asList( attributeMappings ); + return attributeMappings; } @Override @@ -6790,9 +5814,9 @@ public abstract class AbstractEntityPersister return; } - final int size = attributeMappings.length; + final int size = attributeMappings.size(); for ( int i = 0; i < size; i++ ) { - fetchableConsumer.accept( i, attributeMappings[i] ); + fetchableConsumer.accept( i, attributeMappings.get( i ) ); } if ( treatTargetType.isTypeOrSuperType( this ) ) { if ( subclassMappingTypes != null ) { @@ -6909,15 +5933,305 @@ public abstract class AbstractEntityPersister ); } - protected Insert createInsert() { - return new Insert( getFactory().getJdbcServices().getDialect() ); + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Deprecations + + /** + * @deprecated With no replacement + * + * @see #getInsertCoordinator() + * @see #tableMappings + * @see EntityTableMapping#isInsertCallable() + */ + @Deprecated( since = "6", forRemoval = true ) + public boolean isInsertCallable(int j) { + return tableMappings[j].isInsertCallable(); } - protected Update createUpdate() { - return new Update( getFactory().getJdbcServices().getDialect() ); + /** + * @deprecated With no replacement + * + * @see #getUpdateCoordinator() + * @see #tableMappings + * @see EntityTableMapping#isUpdateCallable() + */ + @Deprecated( since = "6", forRemoval = true ) + public boolean isUpdateCallable(int j) { + return tableMappings[j].isUpdateCallable(); } - protected Delete createDelete() { - return new Delete(); + /** + * @deprecated With no replacement + * + * @see #getDeleteCoordinator() + * @see #tableMappings + * @see EntityTableMapping#isDeleteCallable() + */ + @Deprecated( since = "6", forRemoval = true ) + public boolean isDeleteCallable(int j) { + return tableMappings[j].isDeleteCallable(); + } + + /** + * @deprecated With no replacement + */ + @Deprecated( since = "6", forRemoval = true ) + protected boolean isSubclassTableSequentialSelect(int j) { + return false; + } + + /** + * @deprecated With no replacement. + */ + @Deprecated( since = "6", forRemoval = true ) + public EntityMappingType getElementTypeDescriptor() { + return this; + } + + + + /** + * @deprecated No longer used + */ + @Deprecated( forRemoval = true ) + @Remove + public abstract boolean isTableCascadeDeleteEnabled(int j); + + /** + * @deprecated No longer used + */ + @Deprecated(forRemoval = true) + @Remove + protected boolean isInverseSubclassTable(int j) { + return false; + } + + /** + * @deprecated No longer used. See {@link #getDeleteCoordinator()} + */ + @Deprecated(forRemoval = true) + @Remove + public String[] getSQLDeleteStrings() { + return extractSqlStrings( deleteCoordinator.getStaticDeleteGroup() ); + } + + private String[] extractSqlStrings(MutationOperationGroup operationGroup) { + final String[] strings = new String[operationGroup.getNumberOfOperations()]; + operationGroup.forEachOperation( (tableIndex, mutation) -> { + if ( mutation instanceof JdbcOperation ) { + strings[tableIndex] = ( (JdbcOperation) mutation ).getSqlString(); + } + } ); + return strings; + } + + + /** + * @deprecated No longer used. See {@link #getUpdateCoordinator()} + */ + @Deprecated(forRemoval = true) + @Remove + public String[] getSQLUpdateStrings() { + return extractSqlStrings( updateCoordinator.getStaticUpdateGroup() ); + } + + /** + * Decide which tables need to be updated. + *

+ * The return here is an array of boolean values with each index corresponding + * to a given table in the scope of this persister. + * + * @param dirtyProperties The indices of all the entity properties considered dirty. + * @param hasDirtyCollection Whether any collections owned by the entity which were considered dirty. + * + * @return Array of booleans indicating which table require updating. + * + * @deprecated No longer used. See {@link UpdateCoordinator} + */ + @Deprecated(forRemoval = true) + @Remove + public boolean[] getTableUpdateNeeded(final int[] dirtyProperties, boolean hasDirtyCollection) { + + if ( dirtyProperties == null ) { + return getTableHasColumns(); // for objects that came in via update() + } + else { + boolean[] updateability = getPropertyUpdateability(); + int[] propertyTableNumbers = getPropertyTableNumbers(); + boolean[] tableUpdateNeeded = new boolean[getTableSpan()]; + for ( int property : dirtyProperties ) { + int table = propertyTableNumbers[property]; + tableUpdateNeeded[table] = tableUpdateNeeded[table] || + ( getPropertyColumnSpan( property ) > 0 && updateability[property] ); + + if ( getPropertyColumnSpan( property ) > 0 && !updateability[property] ) { + LOG.ignoreImmutablePropertyModification( getPropertyNames()[property], getEntityName() ); + } + } + if ( isVersioned() ) { + tableUpdateNeeded[0] = tableUpdateNeeded[0] + || isVersionIncrementRequired( dirtyProperties, hasDirtyCollection, getPropertyVersionability() ); + } + return tableUpdateNeeded; + } + } + + /** + * @deprecated No longer used. See {@link MutationExecutorService} + */ + @Deprecated(forRemoval = true) + @Remove + public boolean isBatchable() { + return optimisticLockStyle().isNone() + || !isVersioned() && optimisticLockStyle().isVersion() + || getFactory().getSessionFactoryOptions().isJdbcBatchVersionedData(); + } + + /** + * Generate the SQL that deletes a row by id (and version) + * + * @deprecated No longer used. See {@link DeleteCoordinator} + */ + @Deprecated(forRemoval = true) + @Remove + public String generateDeleteString(int j) { + final Delete delete = new Delete() + .setTableName( getTableName( j ) ) + .addPrimaryKeyColumns( getKeyColumns( j ) ); + if ( j == 0 ) { + delete.setVersionColumnName( getVersionColumnName() ); + } + if ( getFactory().getSessionFactoryOptions().isCommentsEnabled() ) { + delete.setComment( "delete " + getEntityName() ); + } + return delete.toStatementString(); + } + + /** + * Marshall the fields of a persistent instance to a prepared statement + * + * @deprecated No longer used. + */ + @Deprecated(forRemoval = true) + @Remove + public int dehydrate( + final Object id, + final Object[] fields, + final Object rowId, + final boolean[] includeProperty, + final boolean[][] includeColumns, + final int j, + final PreparedStatement ps, + final SharedSessionContractImplementor session, + int index, + boolean isUpdate) throws SQLException, HibernateException { + + if ( LOG.isTraceEnabled() ) { + LOG.tracev( "Dehydrating entity: {0}", MessageHelper.infoString( this, id, getFactory() ) ); + } + + for ( int i = 0; i < entityMetamodel.getPropertySpan(); i++ ) { + if ( includeProperty[i] && isPropertyOfTable( i, j ) + && !lobProperties.contains( i ) ) { + getPropertyTypes()[i].nullSafeSet( ps, fields[i], index, includeColumns[i], session ); + index += ArrayHelper.countTrue( includeColumns[i] ); //TODO: this is kinda slow... + } + } + + if ( !isUpdate ) { + index += dehydrateId( id, rowId, ps, session, index ); + } + + // HHH-4635 + // Oracle expects all Lob properties to be last in inserts + // and updates. Insert them at the end. + for ( int i : lobProperties ) { + if ( includeProperty[i] && isPropertyOfTable( i, j ) ) { + getPropertyTypes()[i].nullSafeSet( ps, fields[i], index, includeColumns[i], session ); + index += ArrayHelper.countTrue( includeColumns[i] ); //TODO: this is kinda slow... + } + } + + if ( isUpdate ) { + index += dehydrateId( id, rowId, ps, session, index ); + } + + return index; + + } + + private int dehydrateId( + final Object id, + final Object rowId, + final PreparedStatement ps, + final SharedSessionContractImplementor session, + int index) throws SQLException { + if ( rowId != null ) { + if ( LOG.isTraceEnabled() ) { + LOG.tracev( + String.format( + "binding parameter [%s] as ROWID - [%s]", + index, + rowId + ) + ); + } + + ps.setObject( index, rowId ); + return 1; + } + else if ( id != null ) { + getIdentifierType().nullSafeSet( ps, id, index, session ); + return getIdentifierColumnSpan(); + } + return 0; + } + + @Deprecated( since = "6.2", forRemoval = true ) + @Remove + protected String[] generateSQLDeleteStrings(Object[] loadedState) { + int span = getTableSpan(); + String[] deleteStrings = new String[span]; + for ( int j = span - 1; j >= 0; j-- ) { + final Delete delete = new Delete() + .setTableName( getTableName( j ) ) + .addPrimaryKeyColumns( getKeyColumns( j ) ); + if ( getFactory().getSessionFactoryOptions().isCommentsEnabled() ) { + delete.setComment( "delete " + getEntityName() + " [" + j + "]" ); + } + + boolean[] versionability = getPropertyVersionability(); + Type[] types = getPropertyTypes(); + for ( int i = 0; i < entityMetamodel.getPropertySpan(); i++ ) { + if ( isPropertyOfTable( i, j ) && versionability[i] ) { + // this property belongs to the table and it is not specifically + // excluded from optimistic locking by optimistic-lock="false" + String[] propertyColumnNames = getPropertyColumnNames( i ); + boolean[] propertyNullness = types[i].toColumnNullness( loadedState[i], getFactory() ); + for ( int k = 0; k < propertyNullness.length; k++ ) { + if ( propertyNullness[k] ) { + delete.addWhereFragment( propertyColumnNames[k] + " = ?" ); + } + else { + delete.addWhereFragment( propertyColumnNames[k] + " is null" ); + } + } + } + } + deleteStrings[j] = delete.toStatementString(); + } + return deleteStrings; + } + + @Deprecated( since = "6.2", forRemoval = true ) + @Remove + public final boolean isAllNull(Object[] array, int tableNumber) { + for ( int i = 0; i < array.length; i++ ) { + if ( isPropertyOfTable( i, tableNumber ) && array[i] != null ) { + return false; + } + } + return true; } } diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java index 7c8fe0ce0e..8bc2a17cb9 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java @@ -29,6 +29,8 @@ import org.hibernate.internal.DynamicFilterAliasGenerator; import org.hibernate.internal.FilterAliasGenerator; import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.internal.util.collections.CollectionHelper; +import org.hibernate.jdbc.Expectation; +import org.hibernate.jdbc.Expectations; import org.hibernate.mapping.Column; import org.hibernate.mapping.Formula; import org.hibernate.mapping.Join; @@ -51,14 +53,15 @@ import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess; import org.hibernate.metamodel.spi.MappingMetamodelImplementor; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.persister.spi.PersisterCreationContext; -import org.hibernate.spi.NavigablePath; import org.hibernate.query.sqm.function.SqmFunctionRegistry; -import org.hibernate.sql.Insert; +import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.tree.from.NamedTableReference; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.ast.tree.from.TableReferenceJoin; +import org.hibernate.sql.model.ast.builder.MutationGroupBuilder; +import org.hibernate.sql.model.ast.builder.TableInsertBuilder; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.DomainResultCreationState; import org.hibernate.sql.results.graph.entity.internal.EntityResultJoinedSubclassImpl; @@ -70,6 +73,8 @@ import org.hibernate.type.Type; import org.jboss.logging.Logger; import static java.util.Collections.emptyMap; +import static org.hibernate.persister.entity.DiscriminatorHelper.NOT_NULL_DISCRIMINATOR; +import static org.hibernate.persister.entity.DiscriminatorHelper.NULL_DISCRIMINATOR; /** * An {@link EntityPersister} implementing the normalized @@ -398,30 +403,41 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister { insertCallable = new boolean[tableSpan]; updateCallable = new boolean[tableSpan]; deleteCallable = new boolean[tableSpan]; - insertResultCheckStyles = new ExecuteUpdateResultCheckStyle[tableSpan]; - updateResultCheckStyles = new ExecuteUpdateResultCheckStyle[tableSpan]; - deleteResultCheckStyles = new ExecuteUpdateResultCheckStyle[tableSpan]; + + insertExpectations = new Expectation[tableSpan]; + updateExpectations = new Expectation[tableSpan]; + deleteExpectations = new Expectation[tableSpan]; PersistentClass pc = persistentClass; int jk = coreTableSpan - 1; while ( pc != null ) { isNullableTable[jk] = false; isInverseTable[jk] = false; + customSQLInsert[jk] = pc.getCustomSQLInsert(); insertCallable[jk] = customSQLInsert[jk] != null && pc.isCustomInsertCallable(); - insertResultCheckStyles[jk] = pc.getCustomSQLInsertCheckStyle() == null - ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLInsert[jk], insertCallable[jk] ) - : pc.getCustomSQLInsertCheckStyle(); + insertExpectations[jk] = Expectations.appropriateExpectation( + pc.getCustomSQLInsertCheckStyle() == null + ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLInsert[jk], insertCallable[jk] ) + : pc.getCustomSQLInsertCheckStyle() + ); + customSQLUpdate[jk] = pc.getCustomSQLUpdate(); updateCallable[jk] = customSQLUpdate[jk] != null && pc.isCustomUpdateCallable(); - updateResultCheckStyles[jk] = pc.getCustomSQLUpdateCheckStyle() == null - ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLUpdate[jk], updateCallable[jk] ) - : pc.getCustomSQLUpdateCheckStyle(); + updateExpectations[jk] = Expectations.appropriateExpectation( + pc.getCustomSQLUpdateCheckStyle() == null + ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLUpdate[jk], updateCallable[jk] ) + : pc.getCustomSQLUpdateCheckStyle() + ); + customSQLDelete[jk] = pc.getCustomSQLDelete(); deleteCallable[jk] = customSQLDelete[jk] != null && pc.isCustomDeleteCallable(); - deleteResultCheckStyles[jk] = pc.getCustomSQLDeleteCheckStyle() == null + deleteExpectations[jk] = Expectations.appropriateExpectation( + pc.getCustomSQLDeleteCheckStyle() == null ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLDelete[jk], deleteCallable[jk] ) - : pc.getCustomSQLDeleteCheckStyle(); + : pc.getCustomSQLDeleteCheckStyle() + ); + jk--; pc = pc.getSuperclass(); } @@ -437,19 +453,28 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister { customSQLInsert[j] = join.getCustomSQLInsert(); insertCallable[j] = customSQLInsert[j] != null && join.isCustomInsertCallable(); - insertResultCheckStyles[j] = join.getCustomSQLInsertCheckStyle() == null - ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLInsert[j], insertCallable[j] ) - : join.getCustomSQLInsertCheckStyle(); + insertExpectations[j] = Expectations.appropriateExpectation( + join.getCustomSQLInsertCheckStyle() == null + ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLInsert[j], insertCallable[j] ) + : join.getCustomSQLInsertCheckStyle() + ); + customSQLUpdate[j] = join.getCustomSQLUpdate(); updateCallable[j] = customSQLUpdate[j] != null && join.isCustomUpdateCallable(); - updateResultCheckStyles[j] = join.getCustomSQLUpdateCheckStyle() == null - ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLUpdate[j], updateCallable[j] ) - : join.getCustomSQLUpdateCheckStyle(); + updateExpectations[j] = Expectations.appropriateExpectation( + join.getCustomSQLUpdateCheckStyle() == null + ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLUpdate[j], updateCallable[j] ) + : join.getCustomSQLUpdateCheckStyle() + ); + customSQLDelete[j] = join.getCustomSQLDelete(); deleteCallable[j] = customSQLDelete[j] != null && join.isCustomDeleteCallable(); - deleteResultCheckStyles[j] = join.getCustomSQLDeleteCheckStyle() == null - ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLDelete[j], deleteCallable[j] ) - : join.getCustomSQLDeleteCheckStyle(); + deleteExpectations[j] = Expectations.appropriateExpectation( + join.getCustomSQLDeleteCheckStyle() == null + ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLDelete[j], deleteCallable[j] ) + : join.getCustomSQLDeleteCheckStyle() + ); + j++; } @@ -724,6 +749,35 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister { return isNullableTable[j]; } + @Override + protected void visitMutabilityOrderedTables(MutabilityOrderedTableConsumer consumer) { + for ( int i = 0; i < naturalOrderTableNames.length; i++ ) { + final String tableName = naturalOrderTableNames[i]; + final int tableIndex = i; + + consumer.consume( + tableName, + tableIndex, + () -> (columnConsumer) -> columnConsumer.accept( + tableName, + getIdentifierMapping(), + naturalOrderTableKeyColumns[tableIndex] + ) + ); + } + } + + @Override + protected boolean isIdentifierTable(String tableExpression) { + return tableExpression.equals( getRootTableName() ); + } + + @Override + public boolean hasSkippableTables() { + // todo (6.x) : cache this? + return hasAnySkippableTables( isNullableTable, isInverseTable ); + } + @Override public boolean isInverseTable(int j) { return isInverseTable[j]; @@ -807,9 +861,24 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister { } @Override - protected void addDiscriminatorToInsert(Insert insert) { + public void addDiscriminatorToInsertGroup(MutationGroupBuilder insertGroupBuilder) { if ( explicitDiscriminatorColumnName != null ) { - insert.addColumn( explicitDiscriminatorColumnName, getDiscriminatorSQLValue() ); + final TableInsertBuilder tableInsertBuilder = insertGroupBuilder.getTableDetailsBuilder( getRootTableName() ); + final String discriminatorValueToUse; + if ( discriminatorValue == NULL_DISCRIMINATOR ) { + discriminatorValueToUse = "null"; + } + else if ( discriminatorValue == NOT_NULL_DISCRIMINATOR ) { + discriminatorValueToUse = "not null"; + } + else { + discriminatorValueToUse = discriminatorSQLString; + } + tableInsertBuilder.addValueColumn( + explicitDiscriminatorColumnName, + discriminatorValueToUse, + getDiscriminatorMapping().getJdbcMapping() + ); } } @@ -1051,7 +1120,9 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister { } } } - throw new HibernateException( "Could not locate table which owns column [" + columnName + "] referenced in order-by mapping" ); + throw new HibernateException( + "Could not locate table which owns column [" + columnName + "] referenced in order-by mapping - " + getEntityName() + ); } @Override @@ -1132,6 +1203,7 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister { precision = column.getPrecision(); scale = column.getScale(); } + final Value value = bootEntityDescriptor.getIdentifierProperty().getValue(); return new BasicEntityIdentifierMappingImpl( this, templateInstanceCreator, @@ -1142,6 +1214,8 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister { length, precision, scale, + value.isColumnInsertable( 0 ), + value.isColumnUpdateable( 0 ), (BasicType) idType, creationProcess ); diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/OuterJoinLoadable.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/OuterJoinLoadable.java index c21762337c..4bd43722c8 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/OuterJoinLoadable.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/OuterJoinLoadable.java @@ -68,6 +68,15 @@ public interface OuterJoinLoadable extends Loadable, Joinable { * class or a subclass. */ String getSubclassPropertyTableName(int i); + + /** + * The name of the table to use when performing mutations (INSERT,UPDATE,DELETE) + * for the given attribute + */ + default String getAttributeMutationTableName(int attributeIndex) { + return getSubclassPropertyTableName( attributeIndex ); + } + /** * Given the number of a property of a subclass, and a table alias, * return the aliased column names. diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java index ed89822e35..7788faa4cc 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java @@ -17,6 +17,7 @@ import java.util.function.Supplier; import org.hibernate.HibernateException; import org.hibernate.MappingException; +import org.hibernate.Remove; import org.hibernate.cache.spi.access.EntityDataAccess; import org.hibernate.cache.spi.access.NaturalIdDataAccess; import org.hibernate.dialect.Dialect; @@ -27,6 +28,8 @@ import org.hibernate.internal.FilterAliasGenerator; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.internal.util.collections.CollectionHelper; +import org.hibernate.jdbc.Expectation; +import org.hibernate.jdbc.Expectations; import org.hibernate.mapping.Column; import org.hibernate.mapping.Formula; import org.hibernate.mapping.Join; @@ -40,10 +43,9 @@ import org.hibernate.metamodel.spi.MappingMetamodelImplementor; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.persister.spi.PersisterCreationContext; import org.hibernate.query.sqm.ComparisonOperator; -import org.hibernate.spi.NavigablePath; import org.hibernate.query.sqm.function.SqmFunctionRegistry; +import org.hibernate.spi.NavigablePath; import org.hibernate.sql.InFragment; -import org.hibernate.sql.Insert; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.spi.SqlAliasBase; import org.hibernate.sql.ast.spi.SqlAstCreationContext; @@ -60,9 +62,13 @@ import org.hibernate.sql.ast.tree.predicate.Junction; import org.hibernate.sql.ast.tree.predicate.NegatedPredicate; import org.hibernate.sql.ast.tree.predicate.NullnessPredicate; import org.hibernate.sql.ast.tree.predicate.Predicate; +import org.hibernate.sql.model.ast.builder.MutationGroupBuilder; +import org.hibernate.sql.model.ast.builder.TableInsertBuilder; import org.hibernate.type.BasicType; import org.hibernate.type.Type; +import static org.hibernate.persister.entity.DiscriminatorHelper.NULL_DISCRIMINATOR; + /** * The default implementation of the {@link EntityPersister} interface. * Implements the {@link jakarta.persistence.InheritanceType#SINGLE_TABLE} @@ -79,7 +85,13 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { // the class hierarchy structure private final int joinSpan; private final boolean hasDuplicateTables; + + + /** + * todo (6.2) - this assumes duplicates are included which we are trying to do away wi + */ private final String[] qualifiedTableNames; + private final boolean[] isInverseTable; private final boolean[] isNullableTable; private final String[][] keyColumnNames; @@ -90,7 +102,7 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { private final String[] subclassClosure; private final String[] subclassTableNameClosure; -// private final boolean[] subclassTableIsLazyClosure; + // private final boolean[] subclassTableIsLazyClosure; private final boolean[] isInverseSubclassTable; private final boolean[] isNullableSubclassTable; // private final boolean[] subclassTableSequentialSelect; @@ -105,16 +117,12 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { // subclasses and superclasses of this class private final int[] subclassPropertyTableNumberClosure; -// private final int[] subclassColumnTableNumberClosure; -// private final int[] subclassFormulaTableNumberClosure; - // discriminator column private final Map subclassesByDiscriminatorValue; private final boolean forceDiscriminator; private final String discriminatorColumnName; private final String discriminatorColumnReaders; private final String discriminatorColumnReaderTemplate; -// private final String discriminatorFormula; private final String discriminatorFormulaTemplate; private final String discriminatorAlias; private final BasicType discriminatorType; @@ -139,8 +147,7 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { final EntityDataAccess cacheAccessStrategy, final NaturalIdDataAccess naturalIdRegionAccessStrategy, final PersisterCreationContext creationContext) throws HibernateException { - this( persistentClass,cacheAccessStrategy,naturalIdRegionAccessStrategy, - (RuntimeModelCreationContext) creationContext ); + this( persistentClass, cacheAccessStrategy, naturalIdRegionAccessStrategy, (RuntimeModelCreationContext) creationContext ); } public SingleTableEntityPersister( @@ -157,12 +164,16 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { // CLASS + TABLE joinSpan = persistentClass.getJoinClosureSpan() + 1; + // todo (6.2) : see note on AbstractEntityPersister#getTableName(int) qualifiedTableNames = new String[joinSpan]; + + final Table table = persistentClass.getRootTable(); + final String rootTableName = determineTableName( table ); + qualifiedTableNames[0] = rootTableName; + isInverseTable = new boolean[joinSpan]; isNullableTable = new boolean[joinSpan]; keyColumnNames = new String[joinSpan][]; - final Table table = persistentClass.getRootTable(); - qualifiedTableNames[0] = determineTableName( table ); isInverseTable[0] = false; isNullableTable[0] = false; @@ -176,32 +187,41 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { insertCallable = new boolean[joinSpan]; updateCallable = new boolean[joinSpan]; deleteCallable = new boolean[joinSpan]; - insertResultCheckStyles = new ExecuteUpdateResultCheckStyle[joinSpan]; - updateResultCheckStyles = new ExecuteUpdateResultCheckStyle[joinSpan]; - deleteResultCheckStyles = new ExecuteUpdateResultCheckStyle[joinSpan]; + + insertExpectations = new Expectation[joinSpan]; + updateExpectations = new Expectation[joinSpan]; + deleteExpectations = new Expectation[joinSpan]; customSQLInsert[0] = persistentClass.getCustomSQLInsert(); insertCallable[0] = customSQLInsert[0] != null && persistentClass.isCustomInsertCallable(); - insertResultCheckStyles[0] = persistentClass.getCustomSQLInsertCheckStyle() == null - ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLInsert[0], insertCallable[0] ) - : persistentClass.getCustomSQLInsertCheckStyle(); + insertExpectations[0] = Expectations.appropriateExpectation( + persistentClass.getCustomSQLInsertCheckStyle() == null + ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLInsert[0], insertCallable[0] ) + : persistentClass.getCustomSQLInsertCheckStyle() + ); + customSQLUpdate[0] = persistentClass.getCustomSQLUpdate(); updateCallable[0] = customSQLUpdate[0] != null && persistentClass.isCustomUpdateCallable(); - updateResultCheckStyles[0] = persistentClass.getCustomSQLUpdateCheckStyle() == null - ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLUpdate[0], updateCallable[0] ) - : persistentClass.getCustomSQLUpdateCheckStyle(); + updateExpectations[0] = Expectations.appropriateExpectation( + persistentClass.getCustomSQLUpdateCheckStyle() == null + ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLUpdate[0], updateCallable[0] ) + : persistentClass.getCustomSQLUpdateCheckStyle() + ); + customSQLDelete[0] = persistentClass.getCustomSQLDelete(); deleteCallable[0] = customSQLDelete[0] != null && persistentClass.isCustomDeleteCallable(); - deleteResultCheckStyles[0] = persistentClass.getCustomSQLDeleteCheckStyle() == null - ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLDelete[0], deleteCallable[0] ) - : persistentClass.getCustomSQLDeleteCheckStyle(); + deleteExpectations[0] = Expectations.appropriateExpectation( + persistentClass.getCustomSQLDeleteCheckStyle() == null + ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLDelete[0], deleteCallable[0] ) + : persistentClass.getCustomSQLDeleteCheckStyle() + ); // JOINS List joinClosure = persistentClass.getJoinClosure(); boolean hasDuplicateTableName = false; - for ( int j = 1; j-1 < joinClosure.size(); j++ ) { - Join join = joinClosure.get(j-1); + for ( int j = 1; j - 1 < joinClosure.size(); j++ ) { + Join join = joinClosure.get( j - 1 ); qualifiedTableNames[j] = determineTableName( join.getTable() ); hasDuplicateTableName = hasDuplicateTableName || ArrayHelper.indexOf( qualifiedTableNames, j, qualifiedTableNames[j] ) != -1; @@ -211,25 +231,33 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { customSQLInsert[j] = join.getCustomSQLInsert(); insertCallable[j] = customSQLInsert[j] != null && join.isCustomInsertCallable(); - insertResultCheckStyles[j] = join.getCustomSQLInsertCheckStyle() == null - ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLInsert[j], insertCallable[j] ) - : join.getCustomSQLInsertCheckStyle(); + insertExpectations[j] = Expectations.appropriateExpectation( + join.getCustomSQLInsertCheckStyle() == null + ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLInsert[j], insertCallable[j] ) + : join.getCustomSQLInsertCheckStyle() + ); + customSQLUpdate[j] = join.getCustomSQLUpdate(); updateCallable[j] = customSQLUpdate[j] != null && join.isCustomUpdateCallable(); - updateResultCheckStyles[j] = join.getCustomSQLUpdateCheckStyle() == null - ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLUpdate[j], updateCallable[j] ) - : join.getCustomSQLUpdateCheckStyle(); + updateExpectations[j] = Expectations.appropriateExpectation( + join.getCustomSQLUpdateCheckStyle() == null + ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLUpdate[j], updateCallable[j] ) + : join.getCustomSQLUpdateCheckStyle() + ); + customSQLDelete[j] = join.getCustomSQLDelete(); deleteCallable[j] = customSQLDelete[j] != null && join.isCustomDeleteCallable(); - deleteResultCheckStyles[j] = join.getCustomSQLDeleteCheckStyle() == null - ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLDelete[j], deleteCallable[j] ) - : join.getCustomSQLDeleteCheckStyle(); + deleteExpectations[j] = Expectations.appropriateExpectation( + join.getCustomSQLDeleteCheckStyle() == null + ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLDelete[j], deleteCallable[j] ) + : join.getCustomSQLDeleteCheckStyle() + ); keyColumnNames[j] = new String[join.getKey().getColumnSpan()]; List columns = join.getKey().getColumns(); for ( int i = 0; i < columns.size(); i++ ) { - keyColumnNames[j][i] = columns.get(i).getQuotedName( dialect ); + keyColumnNames[j][i] = columns.get( i ).getQuotedName( dialect ); } } @@ -271,7 +299,7 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { isNullables.add( join.isOptional() ); // isLazies.add( lazyAvailable && join.isLazy() ); -// boolean isDeferred = join.isSequentialSelect() && !persistentClass.isClassOrSuperclassJoin( join ) ; +// boolean isDeferred = join.isSequentialSelect() && !persistentClass.isClassOrSuperclassJoin( join ); // isDeferreds.add( isDeferred ); String joinTableName = determineTableName( join.getTable() ); @@ -280,8 +308,8 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { String[] keyCols = new String[join.getKey().getColumnSpan()]; List columns = join.getKey().getColumns(); for ( int i = 0; i < columns.size(); i++ ) { - Column col = columns.get(i); - keyCols[i] = col.getQuotedName(dialect); + Column col = columns.get( i ); + keyCols[i] = col.getQuotedName( dialect ); } joinKeyColumns.add( keyCols ); } @@ -303,8 +331,12 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { throw new MappingException( "discriminator mapping required for single table polymorphic persistence" ); } forceDiscriminator = persistentClass.isForceDiscriminator(); - Selectable selectable = discriminator.getSelectables().get(0); + Selectable selectable = discriminator.getSelectables().get( 0 ); SqmFunctionRegistry functionRegistry = factory.getQueryEngine().getSqmFunctionRegistry(); + discriminatorType = DiscriminatorHelper.getDiscriminatorType( persistentClass ); + discriminatorValue = DiscriminatorHelper.getDiscriminatorValue( persistentClass ); + discriminatorSQLValue = DiscriminatorHelper.getDiscriminatorSQLValue( persistentClass, dialect, factory ); + discriminatorInsertable = isDiscriminatorInsertable( persistentClass ); if ( discriminator.hasFormula() ) { Formula formula = (Formula) selectable; // discriminatorFormula = formula.getFormula(); @@ -331,10 +363,6 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { // discriminatorFormula = null; discriminatorFormulaTemplate = null; } - discriminatorType = DiscriminatorHelper.getDiscriminatorType( persistentClass ); - discriminatorValue = DiscriminatorHelper.getDiscriminatorValue( persistentClass ); - discriminatorSQLValue = DiscriminatorHelper.getDiscriminatorSQLValue( persistentClass, dialect, factory ); - discriminatorInsertable = isDiscriminatorInsertable( persistentClass ); } else { forceDiscriminator = false; @@ -355,7 +383,7 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { propertyTableNumbers = new int[getPropertySpan()]; List propertyClosure = persistentClass.getPropertyClosure(); for ( int k = 0; k < propertyClosure.size(); k++ ) { - propertyTableNumbers[k] = persistentClass.getJoinNumber( propertyClosure.get(k) ); + propertyTableNumbers[k] = persistentClass.getJoinNumber( propertyClosure.get( k ) ); } //TODO: code duplication with JoinedSubclassEntityPersister @@ -370,27 +398,8 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { for ( Property property : persistentClass.getSubclassPropertyClosure() ) { Integer join = persistentClass.getJoinNumber( property ); propertyJoinNumbers.add( join ); - - //propertyTableNumbersByName.put( prop.getName(), join ); -// propertyTableNumbersByNameAndSubclassLocal.put( -// property.getPersistentClass().getEntityName() + '.' + property.getName(), -// join -// ); - -// for ( Selectable selectable : property.getSelectables() ) { -// if ( selectable.isFormula() ) { -// formulaJoinedNumbers.add( join ); -// } -// else { -// columnJoinNumbers.add( join ); -// } -// } } -// propertyTableNumbersByNameAndSubclass = CollectionHelper.toSmallMap( propertyTableNumbersByNameAndSubclassLocal ); - -// subclassColumnTableNumberClosure = ArrayHelper.toIntArray( columnJoinNumbers ); -// subclassFormulaTableNumberClosure = ArrayHelper.toIntArray( formulaJoinedNumbers ); subclassPropertyTableNumberClosure = ArrayHelper.toIntArray( propertyJoinNumbers ); final List values = new ArrayList<>(); @@ -413,7 +422,7 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { // SUBCLASSES List subclasses = persistentClass.getSubclasses(); for ( int k = 0; k < subclasses.size(); k++ ) { - Subclass subclass = subclasses.get(k); + Subclass subclass = subclasses.get( k ); subclassClosure[k] = subclass.getEntityName(); Object subclassDiscriminatorValue = DiscriminatorHelper.getDiscriminatorValue( subclass ); addSubclassByDiscriminatorValue( @@ -446,12 +455,15 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { private static boolean isDiscriminatorInsertable(PersistentClass persistentClass) { return !persistentClass.isDiscriminatorValueNull() - && !persistentClass.isDiscriminatorValueNotNull() - && persistentClass.isDiscriminatorInsertable() - && !persistentClass.getDiscriminator().hasFormula(); + && !persistentClass.isDiscriminatorValueNotNull() + && persistentClass.isDiscriminatorInsertable() + && !persistentClass.getDiscriminator().hasFormula(); } - private static void addSubclassByDiscriminatorValue(Map subclassesByDiscriminatorValue, Object discriminatorValue, String entityName) { + private static void addSubclassByDiscriminatorValue( + Map subclassesByDiscriminatorValue, + Object discriminatorValue, + String entityName) { String mappedEntityName = subclassesByDiscriminatorValue.put( discriminatorValue, entityName ); if ( mappedEntityName != null ) { throw new MappingException( @@ -516,6 +528,11 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { return discriminatorSQLValue; } + /** + * @deprecated No longer used. + */ + @Deprecated(forRemoval = true) + @Remove public String[] getSubclassClosure() { return subclassClosure; } @@ -523,7 +540,7 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { @Override public String getSubclassForDiscriminatorValue(Object value) { if ( value == null ) { - return subclassesByDiscriminatorValue.get( DiscriminatorHelper.NULL_DISCRIMINATOR ); + return subclassesByDiscriminatorValue.get( NULL_DISCRIMINATOR ); } else { String result = subclassesByDiscriminatorValue.get( value ); @@ -600,12 +617,15 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { } @Override - protected void addDiscriminatorToInsert(Insert insert) { - + public void addDiscriminatorToInsertGroup(MutationGroupBuilder insertGroupBuilder) { if ( discriminatorInsertable ) { - insert.addColumn( getDiscriminatorColumnName(), discriminatorSQLValue ); + final TableInsertBuilder tableInsertBuilder = insertGroupBuilder.getTableDetailsBuilder( getRootTableName() ); + tableInsertBuilder.addValueColumn( + discriminatorColumnName, + discriminatorValue == NULL_DISCRIMINATOR ? null : discriminatorSQLValue, + getDiscriminatorMapping().getJdbcMapping() + ); } - } @Override @@ -648,6 +668,17 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { return isNullableTable[j]; } + @Override + protected boolean isIdentifierTable(String tableExpression) { + return tableExpression.equals( getRootTableName() ); + } + + @Override + public boolean hasSkippableTables() { + // todo (6.x) : cache this? + return hasAnySkippableTables( isNullableTable, isInverseTable ); + } + @Override protected boolean isNullableSubclassTable(int j) { return isNullableSubclassTable[j]; @@ -761,8 +792,8 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { if ( hasSubclasses() ) { final List values = new ArrayList<>( fullDiscriminatorValues.length ); boolean hasNull = false, hasNonNull = false; - for ( Object discriminatorValue : fullDiscriminatorValues) { - if ( discriminatorValue == DiscriminatorHelper.NULL_DISCRIMINATOR ) { + for ( Object discriminatorValue : fullDiscriminatorValues ) { + if ( discriminatorValue == NULL_DISCRIMINATOR ) { hasNull = true; } else if ( discriminatorValue == DiscriminatorHelper.NOT_NULL_DISCRIMINATOR ) { @@ -793,7 +824,7 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { final Object value = getDiscriminatorValue(); final boolean hasNotNullDiscriminator = value == DiscriminatorHelper.NOT_NULL_DISCRIMINATOR; - final boolean hasNullDiscriminator = value == DiscriminatorHelper.NULL_DISCRIMINATOR; + final boolean hasNullDiscriminator = value == NULL_DISCRIMINATOR; if ( hasNotNullDiscriminator || hasNullDiscriminator ) { final NullnessPredicate nullnessPredicate = new NullnessPredicate( sqlExpression ); if ( hasNotNullDiscriminator ) { @@ -863,7 +894,28 @@ public class SingleTableEntityPersister extends AbstractEntityPersister { consumer.consume( tableName, - () -> columnConsumer -> columnConsumer.accept( tableName, constraintOrderedKeyColumnNames[tablePosition] ) + () -> columnConsumer -> columnConsumer.accept( + tableName, + constraintOrderedKeyColumnNames[tablePosition] + ) + ); + } + } + + @Override + protected void visitMutabilityOrderedTables(MutabilityOrderedTableConsumer consumer) { + for ( int i = 0; i < qualifiedTableNames.length; i++ ) { + final String tableName = qualifiedTableNames[i]; + final int tableIndex = i; + + consumer.consume( + tableName, + tableIndex, + () -> (columnConsumer) -> columnConsumer.accept( + tableName, + getIdentifierMapping(), + keyColumnNames[tableIndex] + ) ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java index 47709045ed..f2fcd6bb72 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java @@ -35,6 +35,8 @@ import org.hibernate.internal.FilterAliasGenerator; import org.hibernate.internal.StaticFilterAliasGenerator; import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.internal.util.collections.JoinedList; +import org.hibernate.jdbc.Expectation; +import org.hibernate.jdbc.Expectations; import org.hibernate.mapping.Column; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Subclass; @@ -138,7 +140,7 @@ public class UnionSubclassEntityPersister extends AbstractEntityPersister { : persistentClass.getCustomSQLInsertCheckStyle(); customSQLInsert = new String[] {sql}; insertCallable = new boolean[] {callable}; - insertResultCheckStyles = new ExecuteUpdateResultCheckStyle[] {checkStyle}; + insertExpectations = new Expectation[] { Expectations.appropriateExpectation( checkStyle ) }; sql = persistentClass.getCustomSQLUpdate(); callable = sql != null && persistentClass.isCustomUpdateCallable(); @@ -149,7 +151,7 @@ public class UnionSubclassEntityPersister extends AbstractEntityPersister { : persistentClass.getCustomSQLUpdateCheckStyle(); customSQLUpdate = new String[] {sql}; updateCallable = new boolean[] {callable}; - updateResultCheckStyles = new ExecuteUpdateResultCheckStyle[] {checkStyle}; + updateExpectations = new Expectation[] { Expectations.appropriateExpectation( checkStyle ) }; sql = persistentClass.getCustomSQLDelete(); callable = sql != null && persistentClass.isCustomDeleteCallable(); @@ -160,7 +162,7 @@ public class UnionSubclassEntityPersister extends AbstractEntityPersister { : persistentClass.getCustomSQLDeleteCheckStyle(); customSQLDelete = new String[] {sql}; deleteCallable = new boolean[] {callable}; - deleteResultCheckStyles = new ExecuteUpdateResultCheckStyle[] {checkStyle}; + deleteExpectations = new Expectation[] { Expectations.appropriateExpectation( checkStyle ) }; discriminatorValue = persistentClass.getSubclassId(); discriminatorSQLValue = String.valueOf( persistentClass.getSubclassId() ); @@ -275,8 +277,7 @@ public class UnionSubclassEntityPersister extends AbstractEntityPersister { getTableName(), subclassTableExpressions, sqlAliasBase.generateNewAlias(), - false, - getFactory() + false ); } @@ -362,6 +363,11 @@ public class UnionSubclassEntityPersister extends AbstractEntityPersister { return getTableName();//ie. the subquery! yuck! } + @Override + public String getAttributeMutationTableName(int attributeIndex) { + return getRootTableName(); + } + @Override protected int getSubclassPropertyTableNumber(int i) { return 0; @@ -372,6 +378,17 @@ public class UnionSubclassEntityPersister extends AbstractEntityPersister { return 0; } + @Override + public String physicalTableNameForMutation(SelectableMapping selectableMapping) { + assert !selectableMapping.isFormula(); + return tableName; + } + + @Override + protected boolean isIdentifierTable(String tableExpression) { + return tableExpression.equals( getRootTableName() ); + } + @Override protected boolean hasMultipleTables() { // This could also just be true all the time... @@ -398,6 +415,15 @@ public class UnionSubclassEntityPersister extends AbstractEntityPersister { } } + @Override + protected void visitMutabilityOrderedTables(MutabilityOrderedTableConsumer consumer) { + consumer.consume( + tableName, + 0, + () -> (columnConsumer) -> columnConsumer.accept( tableName, getIdentifierMapping(), getIdentifierColumnNames() ) + ); + } + @Override protected boolean isPhysicalDiscriminator() { return false; diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractMutationCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractMutationCoordinator.java new file mode 100644 index 0000000000..ebc1fbc283 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractMutationCoordinator.java @@ -0,0 +1,88 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.entity.mutation; + +import java.util.List; + +import org.hibernate.Internal; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.internal.util.collections.CollectionHelper; +import org.hibernate.persister.entity.AbstractEntityPersister; +import org.hibernate.sql.model.ModelMutationLogging; +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationOperationGroup; +import org.hibernate.sql.model.ValuesAnalysis; +import org.hibernate.sql.model.ast.MutationGroup; +import org.hibernate.sql.model.internal.MutationOperationGroupNone; +import org.hibernate.sql.model.internal.MutationOperationGroupSingle; +import org.hibernate.sql.model.internal.MutationOperationGroupStandard; + +/** + * Base support for coordinating mutations against an entity + * + * @implNote Split simply to help minimize the size of {@link AbstractEntityPersister} + * + * @author Steve Ebersole + */ +@Internal +public abstract class AbstractMutationCoordinator { + private final AbstractEntityPersister entityPersister; + private final SessionFactoryImplementor factory; + + public AbstractMutationCoordinator(AbstractEntityPersister entityPersister, SessionFactoryImplementor factory) { + this.entityPersister = entityPersister; + this.factory = factory; + } + + protected AbstractEntityPersister entityPersister() { + return entityPersister; + } + + protected SessionFactoryImplementor factory() { + return factory; + } + + protected MutationOperationGroup createOperationGroup(ValuesAnalysis valuesAnalysis, MutationGroup mutationGroup) { + if ( mutationGroup.getNumberOfTableMutations() == 0 ) { + return new MutationOperationGroupNone( mutationGroup.getMutationType(), mutationGroup.getMutationTarget() ); + } + + if ( mutationGroup.getNumberOfTableMutations() == 1 ) { + final MutationOperation operation = mutationGroup.getSingleTableMutation().createMutationOperation( valuesAnalysis, factory() ); + if ( operation == null ) { + return new MutationOperationGroupNone( mutationGroup.getMutationType(), mutationGroup.getMutationTarget() ); + } + return new MutationOperationGroupSingle( + mutationGroup.getMutationType(), + mutationGroup.getMutationTarget(), + operation + ); + } + + final List operations = CollectionHelper.arrayList( mutationGroup.getNumberOfTableMutations() ); + mutationGroup.forEachTableMutation( (integer, tableMutation) -> { + final MutationOperation operation = tableMutation.createMutationOperation( valuesAnalysis, factory ); + if ( operation != null ) { + operations.add( operation ); + } + else { + ModelMutationLogging.MODEL_MUTATION_LOGGER.debugf( + "Skipping table update - %s", + tableMutation.getTableName() + ); + } + } ); + + return new MutationOperationGroupStandard( + mutationGroup.getMutationType(), + entityPersister, + operations + ); + } + + +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AttributeAnalysis.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AttributeAnalysis.java new file mode 100644 index 0000000000..fda14c3596 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AttributeAnalysis.java @@ -0,0 +1,51 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.entity.mutation; + +import org.hibernate.Incubating; +import org.hibernate.metamodel.mapping.AttributeMapping; + +/** + * Results of analyzing an {@linkplain #getAttribute() attribute} in terms of + * handling update operations + * + * @author Steve Ebersole + */ +@Incubating +public interface AttributeAnalysis { + /** + * The attribute analyzed here + */ + AttributeMapping getAttribute(); + + /** + * Whether the attribute should be included in setting the + * values on the database. + */ + boolean includeInSet(); + + /** + * Whether the attribute should be included in + * optimistic locking (where-clause restriction) + */ + boolean includeInLocking(); + + /** + * Whether the attribute is considered dirty + */ + boolean isDirty(); + + /** + * Whether the attribute be skipped completely. + * + * @see #includeInSet + * @see #includeInLocking + */ + default boolean isSkipped() { + return !includeInSet() && !includeInLocking(); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinator.java new file mode 100644 index 0000000000..382b22a8d1 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinator.java @@ -0,0 +1,462 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.entity.mutation; + +import org.hibernate.engine.OptimisticLockStyle; +import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey; +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.MutationExecutor; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.jdbc.mutation.internal.ModelMutationHelper; +import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService; +import org.hibernate.engine.spi.EntityEntry; +import org.hibernate.engine.spi.PersistenceContext; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.metamodel.mapping.EntityRowIdMapping; +import org.hibernate.metamodel.mapping.SingularAttributeMapping; +import org.hibernate.persister.entity.AbstractEntityPersister; +import org.hibernate.sql.model.MutationOperationGroup; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.ast.builder.MutationGroupBuilder; +import org.hibernate.sql.model.ast.builder.RestrictedTableMutationBuilder; +import org.hibernate.sql.model.ast.builder.TableDeleteBuilder; +import org.hibernate.sql.model.ast.builder.TableDeleteBuilderSkipped; +import org.hibernate.sql.model.ast.builder.TableDeleteBuilderStandard; + +/** + * Coordinates the deleting of an entity. + * + * @see #coordinateDelete + * + * @author Steve Ebersole + */ +public class DeleteCoordinator extends AbstractMutationCoordinator { + private final MutationOperationGroup staticOperationGroup; + private final BasicBatchKey batchKey; + + private MutationOperationGroup noVersionDeleteGroup; + + public DeleteCoordinator(AbstractEntityPersister entityPersister, SessionFactoryImplementor factory) { + super( entityPersister, factory ); + + this.staticOperationGroup = generateOperationGroup( null, true, null ); + this.batchKey = new BasicBatchKey( entityPersister.getEntityName() + "#DELETE" ); + + if ( !entityPersister.isVersioned() ) { + noVersionDeleteGroup = staticOperationGroup; + } + } + + public MutationOperationGroup getStaticDeleteGroup() { + return staticOperationGroup; + } + + public MutationOperationGroup getNoVersionDeleteGroup() { + if ( noVersionDeleteGroup == null ) { + generateOperationGroup( null, false, null ); + } + return noVersionDeleteGroup; + } + + @SuppressWarnings("unused") + public BasicBatchKey getBatchKey() { + return batchKey; + } + + public void coordinateDelete( + Object entity, + Object id, + Object version, + SharedSessionContractImplementor session) { + + boolean isImpliedOptimisticLocking = entityPersister().optimisticLockStyle().isAllOrDirty(); + + final PersistenceContext persistenceContext = session.getPersistenceContextInternal(); + final EntityEntry entry = persistenceContext.getEntry( entity ); + final Object[] loadedState = entry != null && isImpliedOptimisticLocking ? entry.getLoadedState() : null; + final Object rowId = entry != null && entityPersister().hasRowId() ? entry.getRowId() : null; + + if ( ( isImpliedOptimisticLocking && loadedState != null ) || rowId != null ) { + doDynamicDelete( entity, id, rowId, loadedState, session ); + } + else { + doStaticDelete( entity, id, version, session ); + } + } + + private void doDynamicDelete( + Object entity, + Object id, + Object rowId, + Object[] loadedState, + SharedSessionContractImplementor session) { + final MutationOperationGroup operationGroup = generateOperationGroup( loadedState, true, session ); + + final MutationExecutorService mutationExecutorService = session + .getFactory() + .getServiceRegistry() + .getService( MutationExecutorService.class ); + + + // todo (mutation) : here is where we need to hook in the MutationExecutor and consider "caching". a few options: + // 1) cache stuff on the coordinators and somehow pass access to that to the executor + // 2) create a "cache" delegate + + // PreparedStatementGroup - + // - previously was "all inclusive". we expected all to be batched or none to be batched + // - now we have a mix + + + final MutationExecutor mutationExecutor = mutationExecutorService.createExecutor( + () -> batchKey, + operationGroup, + session + ); + + operationGroup.forEachOperation( (position, mutation) -> { + if ( mutation != null ) { + final String tableName = mutation.getTableDetails().getTableName(); + mutationExecutor.getPreparedStatementDetails( tableName ); + } + } ); + + applyLocking( null, loadedState, mutationExecutor, session ); + + applyId( id, rowId, mutationExecutor, operationGroup, session ); + + try { + mutationExecutor.execute( + entity, + null, + null, + (statementDetails, affectedRowCount, batchPosition) -> ModelMutationHelper.identifiedResultsCheck( + statementDetails, + affectedRowCount, + batchPosition, + entityPersister(), + id, + factory() + ), + session + ); + } + finally { + mutationExecutor.release(); + } + } + + private void applyLocking( + Object version, + Object[] loadedState, + MutationExecutor mutationExecutor, + SharedSessionContractImplementor session) { + final OptimisticLockStyle optimisticLockStyle = entityPersister().optimisticLockStyle(); + if ( optimisticLockStyle == OptimisticLockStyle.NONE ) { + return; + } + + final JdbcValueBindings jdbcValueBindings = mutationExecutor.getJdbcValueBindings(); + + if ( version != null + && optimisticLockStyle.isVersion() + && entityPersister().getVersionMapping() != null ) { + jdbcValueBindings.bindValue( + version, + entityPersister().getIdentifierTableMapping().getTableName(), + entityPersister().getVersionMapping().getSelectionExpression(), + ParameterUsage.RESTRICT, + session + ); + + return; + } + + if ( loadedState == null ) { + return; + } + + if ( optimisticLockStyle.isAllOrDirty() ) { + final boolean[] versionability = entityPersister().getPropertyVersionability(); + + entityPersister().forEachAttributeMapping( (attributeIndex, attribute) -> { + if ( ! versionability[attributeIndex] ) { + return; + } + + if ( !( attribute instanceof SingularAttributeMapping ) ) { + return; + } + + final Object loadedValue = loadedState[ attributeIndex ]; + if ( loadedValue == null ) { + return; + } + + attribute.breakDownJdbcValues( + loadedValue, + (jdbcValue, jdbcValueMapping) -> { + if ( jdbcValue == null ) { + // presumably the SQL was generated with `is null` + return; + } + + final String physicalTableName = entityPersister().getAttributeMutationTableName( attributeIndex ); + + jdbcValueBindings.bindValue( + jdbcValue, + physicalTableName, + jdbcValueMapping.getSelectionExpression(), + ParameterUsage.RESTRICT, + session + ); + }, + session + ); + } ); + } + } + + private void applyId( + Object id, + Object rowId, + MutationExecutor mutationExecutor, + MutationOperationGroup operationGroup, + SharedSessionContractImplementor session) { + final JdbcValueBindings jdbcValueBindings = mutationExecutor.getJdbcValueBindings(); + final EntityRowIdMapping rowIdMapping = entityPersister().getRowIdMapping(); + + operationGroup.forEachOperation( (position, jdbcMutation) -> { + final EntityTableMapping tableDetails = (EntityTableMapping) jdbcMutation.getTableDetails(); + if ( rowId != null + && rowIdMapping != null + && tableDetails.isIdentifierTable() ) { + jdbcValueBindings.bindValue( + rowId, + tableDetails.getTableName(), + rowIdMapping.getRowIdName(), + ParameterUsage.RESTRICT, + session + ); + } + else { + tableDetails.getKeyMapping().breakDownKeyJdbcValues( + id, + (jdbcValue, columnMapping) -> jdbcValueBindings.bindValue( + jdbcValue, + tableDetails.getTableName(), + columnMapping.getColumnName(), + ParameterUsage.RESTRICT, + session + ), + session + ); + } + + final PreparedStatementDetails statementDetails = mutationExecutor.getPreparedStatementDetails( tableDetails.getTableName() ); + if ( statementDetails != null ) { + // force creation of the PreparedStatement + //noinspection resource + statementDetails.resolveStatement(); + } + } ); + } + + private void doStaticDelete( + Object entity, + Object id, + Object version, + SharedSessionContractImplementor session) { + final MutationExecutorService mutationExecutorService = session + .getFactory() + .getServiceRegistry() + .getService( MutationExecutorService.class ); + + final boolean applyVersion; + final MutationOperationGroup operationGroupToUse; + if ( entity == null ) { + applyVersion = false; + operationGroupToUse = resolveNoVersionDeleteGroup( session ); + } + else { + applyVersion = true; + operationGroupToUse = staticOperationGroup; + } + + final MutationExecutor mutationExecutor = mutationExecutorService.createExecutor( + () -> batchKey, + operationGroupToUse, + session + ); + + staticOperationGroup.forEachOperation( (position, mutation) -> { + if ( mutation != null ) { + final String tableName = mutation.getTableDetails().getTableName(); + mutationExecutor.getPreparedStatementDetails( tableName ); + } + } ); + + if ( applyVersion ) { + applyLocking( version, null, mutationExecutor, session ); + } + + applyId( id, null, mutationExecutor, staticOperationGroup, session ); + + mutationExecutor.execute( + entity, + null, + null, + (statementDetails, affectedRowCount, batchPosition) -> ModelMutationHelper.identifiedResultsCheck( + statementDetails, + affectedRowCount, + batchPosition, + entityPersister(), + id, + factory() + ), + session + ); + + mutationExecutor.release(); + } + + private MutationOperationGroup resolveNoVersionDeleteGroup(SharedSessionContractImplementor session) { + if ( noVersionDeleteGroup == null ) { + noVersionDeleteGroup = generateOperationGroup( null, false, session ); + } + + return noVersionDeleteGroup; + } + + private MutationOperationGroup generateOperationGroup( + Object[] loadedState, + boolean applyVersion, + SharedSessionContractImplementor session) { + final MutationGroupBuilder deleteGroupBuilder = new MutationGroupBuilder( MutationType.DELETE, entityPersister() ); + + entityPersister().forEachMutableTableReverse( (tableMapping) -> { + + final TableDeleteBuilder tableDeleteBuilder; + if ( tableMapping.isCascadeDeleteEnabled() ) { + tableDeleteBuilder = new TableDeleteBuilderSkipped( tableMapping ); + } + else { + tableDeleteBuilder = new TableDeleteBuilderStandard( + entityPersister(), + tableMapping, + factory() + ); + + } + deleteGroupBuilder.addTableDetailsBuilder( tableDeleteBuilder ); + } ); + + applyTableDeleteDetails( deleteGroupBuilder, loadedState, applyVersion, session ); + + return createOperationGroup( null, deleteGroupBuilder.buildMutationGroup() ); + } + + private void applyTableDeleteDetails( + MutationGroupBuilder deleteGroupBuilder, + Object[] loadedState, + boolean applyVersion, + SharedSessionContractImplementor session) { + // first, the table key column(s) + deleteGroupBuilder.forEachTableMutationBuilder( (tableMutationBuilder) -> { + final TableDeleteBuilder tableDeleteBuilder = (TableDeleteBuilder) tableMutationBuilder; + + final EntityTableMapping tableMapping = (EntityTableMapping) tableDeleteBuilder.getMutatingTable().getTableMapping(); + final EntityTableMapping.KeyMapping keyMapping = tableMapping.getKeyMapping(); + keyMapping.forEachKeyColumn( (columnMapping) -> tableDeleteBuilder.addKeyRestriction( + columnMapping.getColumnName(), + columnMapping.getWriteExpression(), + columnMapping.getJdbcMapping() + ) ); + } ); + + if ( applyVersion ) { + // apply any optimistic locking + applyOptimisticLocking( deleteGroupBuilder, loadedState, session ); + } + + // todo (6.2) : apply where + where-fragments + } + + protected void applyOptimisticLocking( + MutationGroupBuilder mutationGroupBuilder, + Object[] loadedState, + SharedSessionContractImplementor session) { + final OptimisticLockStyle optimisticLockStyle = entityPersister().optimisticLockStyle(); + if ( optimisticLockStyle.isVersion() && entityPersister().getVersionMapping() != null ) { + applyVersionBasedOptLocking( mutationGroupBuilder ); + } + else if ( loadedState != null && entityPersister().optimisticLockStyle().isAllOrDirty() ) { + applyNonVersionOptLocking( + optimisticLockStyle, + mutationGroupBuilder, + loadedState, + session + ); + } + } + + protected void applyVersionBasedOptLocking(MutationGroupBuilder mutationGroupBuilder) { + assert entityPersister().optimisticLockStyle() == OptimisticLockStyle.VERSION; + assert entityPersister().getVersionMapping() != null; + + final String tableNameForMutation = entityPersister().physicalTableNameForMutation( entityPersister().getVersionMapping() ); + final RestrictedTableMutationBuilder rootTableMutationBuilder = mutationGroupBuilder.findTableDetailsBuilder( tableNameForMutation ); + rootTableMutationBuilder.addOptimisticLockRestriction( entityPersister().getVersionMapping() ); + } + + protected void applyNonVersionOptLocking( + OptimisticLockStyle lockStyle, + MutationGroupBuilder mutationGroupBuilder, + Object[] loadedState, + SharedSessionContractImplementor session) { + assert loadedState != null; + assert lockStyle.isAllOrDirty(); + assert entityPersister().optimisticLockStyle().isAllOrDirty(); + assert session != null; + + final boolean[] versionability = entityPersister().getPropertyVersionability(); + + entityPersister().forEachAttributeMapping( (attributeIndex, attribute) -> { + if ( ! versionability[attributeIndex] ) { + // the attribute is excluded from optimistic locking + return; + } + + if ( !( attribute instanceof SingularAttributeMapping ) ) { + // only makes sense to lock on singular attributes + return; + } + + final Object loadedValue = loadedState[ attributeIndex ]; + attribute.breakDownJdbcValues( + loadedValue, + (jdbcValue, columnMapping) -> { + final String physicalTableName = entityPersister().physicalTableNameForMutation( columnMapping ); + final RestrictedTableMutationBuilder tableMutationBuilder = mutationGroupBuilder.findTableDetailsBuilder( physicalTableName ); + if ( tableMutationBuilder == null ) { + // there is no actual delete statement for that table. this + // generally indicates we have an on-delete=cascade situation + return; + } + if ( jdbcValue == null ) { + tableMutationBuilder.addNullOptimisticLockRestriction( columnMapping ); + } + else { + tableMutationBuilder.addOptimisticLockRestriction( columnMapping ); + } + }, + session + ); + } ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityMutationTarget.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityMutationTarget.java new file mode 100644 index 0000000000..09f974b6f2 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityMutationTarget.java @@ -0,0 +1,52 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.entity.mutation; + +import org.hibernate.Incubating; +import org.hibernate.annotations.Table; +import org.hibernate.engine.jdbc.mutation.MutationExecutor; +import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; +import org.hibernate.metamodel.mapping.EntityMappingType; +import org.hibernate.metamodel.mapping.ModelPart; +import org.hibernate.sql.model.MutationTarget; + +/** + * Anything that can be the target of {@linkplain MutationExecutor mutations} + * + * @author Steve Ebersole + */ +@Incubating +public interface EntityMutationTarget extends MutationTarget { + + @Override + EntityMappingType getTargetPart(); + + @Override + EntityTableMapping getIdentifierTableMapping(); + + /** + * The ModelPart describing the identifier/key for this target + */ + ModelPart getIdentifierDescriptor(); + + /** + * Whether this target defines any potentially skippable tables. + *

+ * A table is considered potentially skippable if it is defined + * as inverse or as optional. + * + * @see Table#inverse + * @see Table#optional + */ + boolean hasSkippableTables(); + + /** + * The delegate for executing inserts against the root table for + * targets defined using post-insert id generation + */ + InsertGeneratedIdentifierDelegate getIdentityInsertDelegate(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityTableMapping.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityTableMapping.java new file mode 100644 index 0000000000..eb74c0945f --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityTableMapping.java @@ -0,0 +1,337 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.entity.mutation; + +import java.util.BitSet; +import java.util.List; +import java.util.Objects; +import java.util.function.Consumer; + +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.internal.util.collections.ArrayHelper; +import org.hibernate.jdbc.Expectation; +import org.hibernate.metamodel.mapping.JdbcMapping; +import org.hibernate.metamodel.mapping.ModelPart; +import org.hibernate.metamodel.mapping.SelectableMapping; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.TableMapping; + +/** + * Descriptor for the mapping of a table relative to an entity + * + * @author Steve Ebersole + */ +public class EntityTableMapping implements TableMapping { + private enum Flag { + OPTIONAL, + INVERSE, + ID_TABLE, + CASCADE_DELETE + } + + private final String tableName; + private final int relativePosition; + private final KeyMapping keyMapping; + + private final BitSet flags = new BitSet(); + + private final int[] attributeIndexes; + + private final MutationDetails insertDetails; + private final MutationDetails updateDetails; + private final MutationDetails deleteDetails; + + public EntityTableMapping( + String tableName, + int relativePosition, + KeyMapping keyMapping, + boolean isOptional, + boolean isInverse, + boolean isIdentifierTable, + int[] attributeIndexes, + Expectation insertExpectation, + String insertCustomSql, + boolean insertCallable, + Expectation updateExpectation, + String updateCustomSql, + boolean updateCallable, + boolean cascadeDeleteEnabled, + Expectation deleteExpectation, + String deleteCustomSql, + boolean deleteCallable) { + this.tableName = tableName; + this.relativePosition = relativePosition; + this.keyMapping = keyMapping; + this.attributeIndexes = attributeIndexes; + this.insertDetails = new MutationDetails( MutationType.INSERT, insertExpectation, insertCustomSql, insertCallable ); + this.updateDetails = new MutationDetails( MutationType.UPDATE, updateExpectation, updateCustomSql, updateCallable ); + this.deleteDetails = new MutationDetails( MutationType.DELETE, deleteExpectation, deleteCustomSql, deleteCallable ); + + if ( isOptional ) { + flags.set( Flag.OPTIONAL.ordinal() ); + } + + if ( isInverse ) { + flags.set( Flag.INVERSE.ordinal() ); + } + + if ( isIdentifierTable ) { + flags.set( Flag.ID_TABLE.ordinal() ); + } + + if ( cascadeDeleteEnabled ) { + flags.set( Flag.CASCADE_DELETE.ordinal() ); + } + } + + @Override public String getTableName() { + return tableName; + } + + @Override public int getRelativePosition() { + return relativePosition; + } + + @Override public boolean isOptional() { + return flags.get( Flag.OPTIONAL.ordinal() ); + } + + @Override public boolean isInverse() { + return flags.get( Flag.INVERSE.ordinal() ); + } + + @Override public boolean isIdentifierTable() { + return flags.get( Flag.ID_TABLE.ordinal() ); + } + + public KeyMapping getKeyMapping() { + return keyMapping; + } + + public boolean hasColumns() { + return attributeIndexes.length > 0; + } + + public boolean containsAttributeColumns(int attributeIndex) { + return ArrayHelper.contains( attributeIndexes, attributeIndex ); + } + + public int[] getAttributeIndexes() { + return attributeIndexes; + } + + @Override public MutationDetails getInsertDetails() { + return insertDetails; + } + + public Expectation getInsertExpectation() { + return getInsertDetails().getExpectation(); + } + + public String getInsertCustomSql() { + return getInsertDetails().getCustomSql(); + } + + public boolean isInsertCallable() { + return getInsertDetails().isCallable(); + } + + @Override public MutationDetails getUpdateDetails() { + return updateDetails; + } + + public Expectation getUpdateExpectation() { + return getUpdateDetails().getExpectation(); + } + + public String getUpdateCustomSql() { + return getUpdateDetails().getCustomSql(); + } + + public boolean isUpdateCallable() { + return getUpdateDetails().isCallable(); + } + + @Override public boolean isCascadeDeleteEnabled() { + return flags.get( Flag.CASCADE_DELETE.ordinal() ); + } + + @Override public MutationDetails getDeleteDetails() { + return deleteDetails; + } + + public Expectation getDeleteExpectation() { + return getDeleteDetails().getExpectation(); + } + + public String getDeleteCustomSql() { + return getDeleteDetails().getCustomSql(); + } + + public boolean isDeleteCallable() { + return getDeleteDetails().isCallable(); + } + + @Override + public boolean equals(Object o) { + if ( this == o ) { + return true; + } + if ( o == null || getClass() != o.getClass() ) { + return false; + } + final EntityTableMapping that = (EntityTableMapping) o; + return tableName.equals( that.tableName ); + } + + @Override + public int hashCode() { + return Objects.hash( tableName ); + } + + @Override + public String toString() { + return "TableMapping(" + tableName + ")"; + } + + @FunctionalInterface + public interface KeyValueConsumer { + void consume(Object jdbcValue, KeyColumn columnMapping); + } + + public static class KeyMapping { + private final List keyColumns; + + private final ModelPart identifierPart; + + public KeyMapping(List keyColumns, ModelPart identifierPart) { + assert keyColumns.size() == identifierPart.getJdbcTypeCount(); + + this.keyColumns = keyColumns; + this.identifierPart = identifierPart; + } + + public void breakDownKeyJdbcValues( + Object domainValue, + KeyValueConsumer valueConsumer, + SharedSessionContractImplementor session) { + identifierPart.forEachJdbcValue( + domainValue, + null, + (selectionIndex, jdbcValue, jdbcMapping) -> valueConsumer.consume( + jdbcValue, + keyColumns.get( selectionIndex ) + ), + session + ); + } + + public void forEachKeyColumn(Consumer keyColumnConsumer) { + keyColumns.forEach( keyColumnConsumer ); + } + } + + public static class KeyColumn implements SelectableMapping { + private final String tableName; + private final String columnName; + private final String writeExpression; + + private final boolean formula; + + private final JdbcMapping jdbcMapping; + + public KeyColumn( + String tableName, + String columnName, + String writeExpression, + boolean formula, + JdbcMapping jdbcMapping) { + this.tableName = tableName; + this.columnName = columnName; + this.writeExpression = writeExpression; + this.formula = formula; + this.jdbcMapping = jdbcMapping; + } + + public String getColumnName() { + return columnName; + } + + @Override + public String getContainingTableExpression() { + return tableName; + } + + @Override + public String getWriteExpression() { + return writeExpression; + } + + @Override + public String getSelectionExpression() { + return columnName; + } + + @Override + public JdbcMapping getJdbcMapping() { + return jdbcMapping; + } + + @Override + public boolean isFormula() { + return formula; + } + + @Override + public boolean isNullable() { + // keys are never nullable + return false; + } + + @Override + public boolean isInsertable() { + // keys are always insertable, unless this "column" is a formula + return !formula; + } + + @Override + public boolean isUpdateable() { + // keys are never updateable + return false; + } + + @Override + public String getColumnDefinition() { + return null; + } + + @Override + public Long getLength() { + return null; + } + + @Override + public Integer getPrecision() { + return null; + } + + @Override + public Integer getScale() { + return null; + } + + @Override + public String getCustomReadExpression() { + return null; + } + + @Override + public String getCustomWriteExpression() { + return null; + } + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinator.java new file mode 100644 index 0000000000..fbee800497 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinator.java @@ -0,0 +1,470 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.entity.mutation; + +import java.util.ArrayList; +import java.util.List; + +import org.hibernate.Internal; +import org.hibernate.Session; +import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey; +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.MutationExecutor; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.TableInclusionChecker; +import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; +import org.hibernate.metamodel.mapping.AttributeMapping; +import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping; +import org.hibernate.metamodel.mapping.PluralAttributeMapping; +import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping; +import org.hibernate.persister.entity.AbstractEntityPersister; +import org.hibernate.sql.model.MutationOperationGroup; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.ValuesAnalysis; +import org.hibernate.sql.model.ast.builder.MutationGroupBuilder; +import org.hibernate.sql.model.ast.builder.TableInsertBuilder; +import org.hibernate.sql.model.ast.builder.TableInsertBuilderStandard; +import org.hibernate.tuple.InMemoryValueGenerationStrategy; +import org.hibernate.tuple.ValueGeneration; +import org.hibernate.tuple.entity.EntityMetamodel; + +/** + * Coordinates the insertion of an entity. + * + * @see #coordinateInsert + * + * @author Steve Ebersole + */ +@Internal +public class InsertCoordinator extends AbstractMutationCoordinator { + private final MutationOperationGroup staticInsertGroup; + private final BasicBatchKey insertBatchKey; + + public InsertCoordinator(AbstractEntityPersister entityPersister, SessionFactoryImplementor factory) { + super( entityPersister, factory ); + + insertBatchKey = new BasicBatchKey( + entityPersister.getEntityName() + "#INSERT", + null + ); + + if ( entityPersister.getEntityMetamodel().isDynamicInsert() ) { + // the entity specified dynamic-insert - skip generating the + // static inserts as we will create them every time + staticInsertGroup = null; + } + else { + staticInsertGroup = generateStaticOperationGroup(); + } + } + + public MutationOperationGroup getStaticInsertGroup() { + return staticInsertGroup; + } + + /** + * Perform the insert(s). + * + * @param id This is the id as known in memory. For post-insert id generation (IDENTITY, etc) + * this will be null. + * @param values The extracted attribute values + * @param entity The entity instance being persisted + * @param session The originating context + * + * @return The id + * + * todo (mutation) : Allow passing an id value here even with post-insert id generation strategies; + * this is a long-standing request. It would simply trigger a dynamically built insert which + * binds the id value rather than allowing the database to generate it + */ + public Object coordinateInsert( + Object id, + Object[] values, + Object entity, + SharedSessionContractImplementor session) { + // apply any pre-insert in-memory value generation + preInsertInMemoryValueGeneration( values, entity, session ); + + final EntityMetamodel entityMetamodel = entityPersister().getEntityMetamodel(); + if ( entityMetamodel.isDynamicInsert() ) { + return doDynamicInserts( id, values, entity, session ); + } + else { + return doStaticInserts( id, values, entity, session ); + } + } + + protected void preInsertInMemoryValueGeneration(Object[] values, Object entity, SharedSessionContractImplementor session) { + final EntityMetamodel entityMetamodel = entityPersister().getEntityMetamodel(); + if ( entityMetamodel.hasPreInsertGeneratedValues() ) { + final InMemoryValueGenerationStrategy[] strategies = entityMetamodel.getInMemoryValueGenerationStrategies(); + for ( int i = 0; i < strategies.length; i++ ) { + if ( strategies[i] != null && strategies[i].getGenerationTiming().includesInsert() ) { + values[i] = strategies[i].getValueGenerator().generateValue( (Session) session, entity, values[i] ); + entityPersister().setPropertyValue( entity, i, values[i] ); + } + } + } + } + + private static class InsertValuesAnalysis implements ValuesAnalysis { + private final List tablesWithNonNullValues = new ArrayList<>(); + + public InsertValuesAnalysis(EntityMutationTarget mutationTarget, Object[] values) { + mutationTarget.forEachMutableTable( (tableMapping) -> { + final int[] tableAttributeIndexes = tableMapping.getAttributeIndexes(); + for ( int i = 0; i < tableAttributeIndexes.length; i++ ) { + if ( values[tableAttributeIndexes[i]] != null ) { + tablesWithNonNullValues.add( tableMapping ); + break; + } + } + } ); + } + + public List getTablesWithNonNullValues() { + return tablesWithNonNullValues; + } + + public boolean hasNonNullBindings(TableMapping tableMapping) { + return tablesWithNonNullValues.contains( tableMapping ); + } + } + + private Object doStaticInserts(Object id, Object[] values, Object object, SharedSessionContractImplementor session) { + final InsertValuesAnalysis insertValuesAnalysis = new InsertValuesAnalysis( entityPersister(), values ); + + final TableInclusionChecker tableInclusionChecker = (tableMapping) -> { + if ( tableMapping.isOptional() ) { + if ( !insertValuesAnalysis.hasNonNullBindings( tableMapping ) ) { + return false; + } + } + + return true; + }; + + + final MutationExecutorService mutationExecutorService = session.getSessionFactory() + .getServiceRegistry() + .getService( MutationExecutorService.class ); + + final MutationExecutor mutationExecutor = mutationExecutorService.createExecutor( + () -> insertBatchKey, + staticInsertGroup, + session + ); + + decomposeForInsert( + mutationExecutor, + id, + values, + staticInsertGroup, + entityPersister().getPropertyInsertability(), + tableInclusionChecker, + session + ); + + try { + return mutationExecutor.execute( + object, + insertValuesAnalysis, + tableInclusionChecker, + (statementDetails, affectedRowCount, batchPosition) -> { + statementDetails.getExpectation().verifyOutcome( + affectedRowCount, + statementDetails.getStatement(), + batchPosition, + statementDetails.getSqlString() + ); + return true; + }, + session + ); + } + finally { + mutationExecutor.release(); + } + } + + private void decomposeForInsert( + MutationExecutor mutationExecutor, + Object id, + Object[] values, + MutationOperationGroup mutationGroup, + boolean[] propertyInclusions, + TableInclusionChecker tableInclusionChecker, + SharedSessionContractImplementor session) { + final JdbcValueBindings jdbcValueBindings = mutationExecutor.getJdbcValueBindings(); + + final List attributeMappings = entityPersister().getAttributeMappings(); + mutationGroup.forEachOperation( (position, operation) -> { + final EntityTableMapping tableDetails = (EntityTableMapping) operation.getTableDetails(); + + if ( !tableInclusionChecker.include( tableDetails ) ) { + return; + } + + final int[] attributeIndexes = tableDetails.getAttributeIndexes(); + for ( int i = 0; i < attributeIndexes.length; i++ ) { + final int attributeIndex = attributeIndexes[ i ]; + + if ( !propertyInclusions[attributeIndex] ) { + continue; + } + + final AttributeMapping attributeMapping = attributeMappings.get( attributeIndex ); + if ( attributeMapping instanceof PluralAttributeMapping ) { + continue; + } + + attributeMapping.decompose( + values[ attributeIndex ], + (jdbcValue, selectableMapping) -> { + if ( !selectableMapping.isInsertable() ) { + return; + } + + final String tableName = entityPersister().physicalTableNameForMutation( selectableMapping ); + jdbcValueBindings.bindValue( + jdbcValue, + tableName, + selectableMapping.getSelectionExpression(), + ParameterUsage.SET, + session + ); + }, + session + ); + } + } ); + + mutationGroup.forEachOperation( (position, jdbcOperation) -> { + final EntityTableMapping tableDetails = (EntityTableMapping) jdbcOperation.getTableDetails(); + +// todo (mutation) : this did not work at some point, but seems logical. worth tracking down? +// this +// if ( !tableInclusionChecker.include( tableDetails ) ) { +// return; +// } + + final String tableName = tableDetails.getTableName(); + + if ( id == null ) { + assert entityPersister().getIdentityInsertDelegate() != null; + return; + } + + tableDetails.getKeyMapping().breakDownKeyJdbcValues( + id, + (jdbcValue, columnMapping) -> jdbcValueBindings.bindValue( + jdbcValue, + tableName, + columnMapping.getColumnName(), + ParameterUsage.SET, + session + ), + session + ); + } ); + } + + private Object doDynamicInserts(Object id, Object[] values, Object object, SharedSessionContractImplementor session) { + final boolean[] insertability = getPropertiesToInsert( values ); + final MutationOperationGroup insertGroup = generateDynamicInsertSqlGroup( insertability ); + + final MutationExecutorService mutationExecutorService = session + .getFactory() + .getServiceRegistry() + .getService( MutationExecutorService.class ); + final MutationExecutor mutationExecutor = mutationExecutorService.createExecutor( + () -> insertBatchKey, + insertGroup, + session + ); + + final InsertValuesAnalysis insertValuesAnalysis = new InsertValuesAnalysis( entityPersister(), values ); + + final TableInclusionChecker tableInclusionChecker = (tableMapping) -> { + if ( tableMapping.isOptional() ) { + return insertValuesAnalysis.hasNonNullBindings( tableMapping ); + } + + return true; + }; + + decomposeForInsert( mutationExecutor, id, values, insertGroup, insertability, tableInclusionChecker, session ); + + try { + return mutationExecutor.execute( + object, + insertValuesAnalysis, + tableInclusionChecker, + (statementDetails, affectedRowCount, batchPosition) -> { + statementDetails.getExpectation().verifyOutcome( + affectedRowCount, + statementDetails.getStatement(), + batchPosition, + statementDetails.getSqlString() + ); + return true; + }, + session + ); + } + finally { + mutationExecutor.release(); + } + } + + + /** + * Transform the array of property indexes to an array of booleans, + * true when the property is insertable and non-null + */ + public boolean[] getPropertiesToInsert(Object[] fields) { + boolean[] notNull = new boolean[fields.length]; + boolean[] insertable = entityPersister().getPropertyInsertability(); + for ( int i = 0; i < fields.length; i++ ) { + notNull[i] = insertable[i] && fields[i] != null; + } + return notNull; + } + + private MutationOperationGroup generateDynamicInsertSqlGroup(boolean[] insertable) { + assert entityPersister().getEntityMetamodel().isDynamicInsert(); + + final MutationGroupBuilder insertGroupBuilder = new MutationGroupBuilder( MutationType.INSERT, entityPersister() ); + + entityPersister().forEachMutableTable( (tableMapping) -> { + final TableInsertBuilder tableInsertBuilder; + final InsertGeneratedIdentifierDelegate identityDelegate = entityPersister().getIdentityInsertDelegate(); + if ( tableMapping.isIdentifierTable() && identityDelegate != null ) { + final BasicEntityIdentifierMapping identifierMapping = (BasicEntityIdentifierMapping) entityPersister().getIdentifierMapping(); + tableInsertBuilder = identityDelegate.createTableInsertBuilder( + identifierMapping, + tableMapping.getInsertExpectation(), + factory() + ); + } + else { + tableInsertBuilder = new TableInsertBuilderStandard( + entityPersister(), + tableMapping, + factory() + ); + } + insertGroupBuilder.addTableDetailsBuilder( tableInsertBuilder ); + } ); + + applyTableInsertDetails( insertGroupBuilder, insertable ); + + return createOperationGroup( null, insertGroupBuilder.buildMutationGroup() ); + } + + public MutationOperationGroup generateStaticOperationGroup() { + final MutationGroupBuilder insertGroupBuilder = new MutationGroupBuilder( MutationType.INSERT, entityPersister() ); + + entityPersister().forEachMutableTable( (tableMapping) -> { + final TableInsertBuilder tableInsertBuilder; + final InsertGeneratedIdentifierDelegate identityDelegate = entityPersister().getIdentityInsertDelegate(); + if ( tableMapping.isIdentifierTable() && identityDelegate != null ) { + tableInsertBuilder = identityDelegate.createTableInsertBuilder( + (BasicEntityIdentifierMapping) entityPersister().getIdentifierMapping(), + tableMapping.getInsertExpectation(), + factory() + ); + } + else { + tableInsertBuilder = new TableInsertBuilderStandard( + entityPersister(), + tableMapping, + factory() + ); + } + insertGroupBuilder.addTableDetailsBuilder( tableInsertBuilder ); + } ); + + applyTableInsertDetails( insertGroupBuilder, entityPersister().getPropertyInsertability() ); + + return createOperationGroup( null, insertGroupBuilder.buildMutationGroup() ); + } + + private void applyTableInsertDetails( + MutationGroupBuilder insertGroupBuilder, + boolean[] attributeInclusions) { + final List attributeMappings = entityPersister().getAttributeMappings(); + + insertGroupBuilder.forEachTableMutationBuilder( (builder) -> { + final EntityTableMapping tableMapping = (EntityTableMapping) builder.getMutatingTable().getTableMapping(); + assert !tableMapping.isInverse(); + + // `attributeIndexes` represents the indexes (relative to `attributeMappings`) of + // the attributes mapped to the table + final int[] attributeIndexes = tableMapping.getAttributeIndexes(); + for ( int i = 0; i < attributeIndexes.length; i++ ) { + final int attributeIndex = attributeIndexes[ i ]; + final AttributeMapping attributeMapping = attributeMappings.get( attributeIndex ); + + if ( !attributeInclusions[ attributeIndex ] ) { + final ValueGeneration valueGeneration = attributeMapping.getValueGeneration(); + if ( valueGeneration.getGenerationTiming().includesInsert() + && valueGeneration.getValueGenerator() == null + && valueGeneration.referenceColumnInSql() ) { + // value-generation is only valid for basic attributes + final BasicAttributeMapping basicAttributeMapping = (BasicAttributeMapping) attributeMapping; + final String tableNameForMutation = entityPersister().physicalTableNameForMutation( basicAttributeMapping ); + final TableInsertBuilder tableInsertBuilder = insertGroupBuilder.findTableDetailsBuilder( tableNameForMutation ); + tableInsertBuilder.addValueColumn( + basicAttributeMapping.getSelectionExpression(), + valueGeneration.getDatabaseGeneratedReferencedColumnValue(), + basicAttributeMapping.getJdbcMapping() + ); + } + continue; + } + + attributeMapping.forEachSelectable( (selectionIndex, selectableMapping) -> { + if ( selectableMapping.isFormula() ) { + // no physical column + return; + } + + if ( !selectableMapping.isInsertable() ) { + return; + } + + final String tableNameForMutation = entityPersister().physicalTableNameForMutation( selectableMapping ); + final TableInsertBuilder tableInsertBuilder = insertGroupBuilder.findTableDetailsBuilder( tableNameForMutation ); + + tableInsertBuilder.addValueColumn( selectableMapping ); + } ); + } + } ); + + // add the discriminator + entityPersister().addDiscriminatorToInsertGroup( insertGroupBuilder ); + + // add the keys + final InsertGeneratedIdentifierDelegate identityDelegate = entityPersister().getIdentityInsertDelegate(); + insertGroupBuilder.forEachTableMutationBuilder( (tableMutationBuilder) -> { + final TableInsertBuilder tableInsertBuilder = (TableInsertBuilder) tableMutationBuilder; + final EntityTableMapping tableMapping = (EntityTableMapping) tableInsertBuilder.getMutatingTable().getTableMapping(); + //noinspection StatementWithEmptyBody + if ( tableMapping.isIdentifierTable() && identityDelegate != null ) { + // nothing to do - the builder already includes the identity handling + } + else { + tableMapping.getKeyMapping().forEachKeyColumn( tableInsertBuilder::addKeyColumn ); + } + } ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinator.java new file mode 100644 index 0000000000..41e4e959a0 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinator.java @@ -0,0 +1,34 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.entity.mutation; + +import org.hibernate.Internal; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.sql.model.MutationOperationGroup; + +/** + * Coordinates the updating of an entity. + * + * @see #coordinateUpdate + * + * @author Steve Ebersole + */ +@Internal +public interface UpdateCoordinator { + MutationOperationGroup getStaticUpdateGroup(); + + void coordinateUpdate( + Object entity, + Object id, + Object rowId, + Object[] values, + Object oldVersion, + Object[] incomingOldValues, + int[] dirtyAttributeIndexes, + boolean hasDirtyCollection, + SharedSessionContractImplementor session); +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorNoOp.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorNoOp.java new file mode 100644 index 0000000000..9408b457f1 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorNoOp.java @@ -0,0 +1,34 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.entity.mutation; + +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.persister.entity.AbstractEntityPersister; +import org.hibernate.sql.model.MutationOperationGroup; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.internal.MutationOperationGroupNone; + +/** + * @author Steve Ebersole + */ +public class UpdateCoordinatorNoOp implements UpdateCoordinator { + private final MutationOperationGroup operationGroup; + + public UpdateCoordinatorNoOp(AbstractEntityPersister entityPersister) { + operationGroup = new MutationOperationGroupNone( MutationType.UPDATE, entityPersister ); + } + + @Override + public MutationOperationGroup getStaticUpdateGroup() { + return operationGroup; + } + + @Override + public void coordinateUpdate(Object entity, Object id, Object rowId, Object[] values, Object oldVersion, Object[] incomingOldValues, int[] dirtyAttributeIndexes, boolean hasDirtyCollection, SharedSessionContractImplementor session) { + // nothing to do + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java new file mode 100644 index 0000000000..429df6badb --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java @@ -0,0 +1,1470 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.entity.mutation; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.Set; + +import org.hibernate.Internal; +import org.hibernate.Session; +import org.hibernate.engine.OptimisticLockStyle; +import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey; +import org.hibernate.engine.jdbc.batch.spi.BatchKey; +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.MutationExecutor; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.internal.ModelMutationHelper; +import org.hibernate.engine.jdbc.mutation.internal.MutationQueryOptions; +import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService; +import org.hibernate.engine.spi.EntityEntry; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.internal.CoreLogging; +import org.hibernate.internal.CoreMessageLogger; +import org.hibernate.internal.util.collections.ArrayHelper; +import org.hibernate.internal.util.collections.CollectionHelper; +import org.hibernate.metamodel.mapping.AttributeMapping; +import org.hibernate.metamodel.mapping.EntityRowIdMapping; +import org.hibernate.metamodel.mapping.EntityVersionMapping; +import org.hibernate.metamodel.mapping.SingularAttributeMapping; +import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping; +import org.hibernate.persister.entity.AbstractEntityPersister; +import org.hibernate.sql.ast.SqlAstTranslator; +import org.hibernate.sql.ast.SqlAstTranslatorFactory; +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationOperationGroup; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.ast.RestrictedTableMutation; +import org.hibernate.sql.model.ast.builder.MutationGroupBuilder; +import org.hibernate.sql.model.ast.builder.RestrictedTableMutationBuilder; +import org.hibernate.sql.model.ast.builder.TableUpdateBuilder; +import org.hibernate.sql.model.ast.builder.TableUpdateBuilderSkipped; +import org.hibernate.sql.model.ast.builder.TableUpdateBuilderStandard; +import org.hibernate.sql.model.internal.MutationOperationGroupSingle; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; +import org.hibernate.tuple.InMemoryValueGenerationStrategy; +import org.hibernate.tuple.ValueGeneration; +import org.hibernate.tuple.entity.EntityMetamodel; + +import static org.hibernate.engine.OptimisticLockStyle.ALL; +import static org.hibernate.engine.OptimisticLockStyle.DIRTY; +import static org.hibernate.engine.OptimisticLockStyle.NONE; +import static org.hibernate.engine.OptimisticLockStyle.VERSION; +import static org.hibernate.engine.internal.Versioning.isVersionIncrementRequired; +import static org.hibernate.internal.util.collections.ArrayHelper.EMPTY_INT_ARRAY; + +/** + * Coordinates the updating of an entity. + * + * @see #coordinateUpdate + * + * @author Steve Ebersole + */ +public class UpdateCoordinatorStandard extends AbstractMutationCoordinator implements UpdateCoordinator { + // `org.hibernate.orm.test.mapping.onetoone.OneToOneMapsIdChangeParentTest#test` expects + // the logger-name to be AbstractEntityPersister + // todo (mutation) : Change this? It is an interesting "api" question wrt logging +// private static final CoreMessageLogger LOG = CoreLogging.messageLogger( UpdateCoordinatorStandard.class ); + private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AbstractEntityPersister.class ); + + private final MutationOperationGroup staticUpdateGroup; + private final BatchKey batchKey; + + private final MutationOperationGroup versionUpdateGroup; + + public UpdateCoordinatorStandard(AbstractEntityPersister entityPersister, SessionFactoryImplementor factory) { + super( entityPersister, factory ); + + // NOTE : even given dynamic-update and/or dirty optimistic locking + // there are cases where we need the full static updates. + this.staticUpdateGroup = buildStaticUpdateGroup(); + this.versionUpdateGroup = buildVersionUpdateGroup(); + this.batchKey = new BasicBatchKey( + entityPersister.getEntityName() + "#UPDATE", + null + ); + } + + @Override + public MutationOperationGroup getStaticUpdateGroup() { + return staticUpdateGroup; + } + + public final boolean isModifiableEntity(EntityEntry entry) { + return ( entry == null ? entityPersister().isMutable() : entry.isModifiableEntity() ); + } + + @Override + public void coordinateUpdate( + Object entity, + Object id, + Object rowId, + Object[] values, + Object oldVersion, + Object[] incomingOldValues, + int[] incomingDirtyAttributeIndexes, + boolean hasDirtyCollection, + SharedSessionContractImplementor session) { + final EntityVersionMapping versionMapping = entityPersister().getVersionMapping(); + if ( versionMapping != null ) { + // see if this is a simple version update + boolean isSimpleVersionUpdate = false; + Object newVersion = null; + + if ( incomingDirtyAttributeIndexes != null ) { + if ( incomingDirtyAttributeIndexes.length == 1 + && versionMapping.getVersionAttribute() == entityPersister().getAttributeMapping( incomingDirtyAttributeIndexes[0] ) ) { + // special case of only the version attribute itself as dirty + isSimpleVersionUpdate = true; + newVersion = values[incomingDirtyAttributeIndexes[0]]; + } + else if ( incomingDirtyAttributeIndexes.length == 0 && oldVersion != null ) { + isSimpleVersionUpdate = !versionMapping.areEqual( + values[ versionMapping.getVersionAttribute().getStateArrayPosition() ], + oldVersion, + session + ); + newVersion = values[versionMapping.getVersionAttribute().getStateArrayPosition()]; + } + } + + if ( isSimpleVersionUpdate ) { + // we have just the version being updated - use the special handling + assert newVersion != null; + doVersionUpdate( entity, id, newVersion, oldVersion, session ); + return; + } + } + + final EntityEntry entry = session.getPersistenceContextInternal().getEntry( entity ); + + // Ensure that an immutable or non-modifiable entity is not being updated unless it is + // in the process of being deleted. + if ( entry == null && !entityPersister().isMutable() ) { + throw new IllegalStateException( "Updating immutable entity that is not in session yet" ); + } + + // apply any pre-update in-memory value generation + final int[] inMemoryGeneratedAttributeIndexes = preUpdateInMemoryValueGeneration( + entity, + values, + session + ); + + final int[] dirtyAttributeIndexes; + if ( inMemoryGeneratedAttributeIndexes.length > 0 ) { + if ( incomingDirtyAttributeIndexes == null ) { + dirtyAttributeIndexes = inMemoryGeneratedAttributeIndexes; + } + else { + dirtyAttributeIndexes = ArrayHelper.join( incomingDirtyAttributeIndexes, inMemoryGeneratedAttributeIndexes ); + } + } + else { + dirtyAttributeIndexes = incomingDirtyAttributeIndexes; + } + + final boolean[] attributeUpdateability; + boolean forceDynamicUpdate = false; + + + if ( entityPersister().getEntityMetamodel().isDynamicUpdate() && dirtyAttributeIndexes != null ) { + attributeUpdateability = getPropertiesToUpdate( dirtyAttributeIndexes, hasDirtyCollection ); + forceDynamicUpdate = true; + } + else if ( !isModifiableEntity( entry ) ) { + // either the entity is mapped as immutable or has been marked as read-only within the Session + attributeUpdateability = getPropertiesToUpdate( + dirtyAttributeIndexes == null ? EMPTY_INT_ARRAY : dirtyAttributeIndexes, + hasDirtyCollection + ); + forceDynamicUpdate = true; + } + else if ( dirtyAttributeIndexes != null + && entityPersister().hasUninitializedLazyProperties( entity ) + && entityPersister().hasLazyDirtyFields( dirtyAttributeIndexes ) ) { + // we have an entity with dirty lazy attributes. we need to use dynamic + // delete and add the dirty, lazy attributes plus the non-lazy attributes + forceDynamicUpdate = true; + attributeUpdateability = getPropertiesToUpdate( dirtyAttributeIndexes, hasDirtyCollection ); + + final boolean[] propertyLaziness = entityPersister().getPropertyLaziness(); + for ( int i = 0; i < propertyLaziness.length; i++ ) { + // add also all the non lazy properties because dynamic update is false + if ( propertyLaziness[i] == false ) { + attributeUpdateability[i] = true; + } + } + } + else { + attributeUpdateability = getPropertyUpdateability( entity ); + if ( entityPersister().hasUninitializedLazyProperties( entity ) ) { + forceDynamicUpdate = true; + } + } + + final InclusionChecker updateabilityChecker = (position, attribute) -> { + final ValueGeneration valueGeneration = attribute.getValueGeneration(); + if ( valueGeneration.getGenerationTiming().includesUpdate() + && valueGeneration.getValueGenerator() == null + && valueGeneration.referenceColumnInSql() ) { + return true; + } + + return attributeUpdateability[ position ]; + }; + + final InclusionChecker dirtinessChecker = (position, attribute) -> { + if ( !attributeUpdateability[ position ] ) { + return false; + } + + if ( versionMapping != null + && versionMapping.getVersionAttribute() == attribute ) { + return isVersionIncrementRequired( + dirtyAttributeIndexes, + hasDirtyCollection, + entityPersister().getPropertyVersionability() + ); + } + + if ( dirtyAttributeIndexes == null ) { + // we do not know, so assume it is + return true; + } + + return ArrayHelper.contains( dirtyAttributeIndexes, position ); + }; + + final InclusionChecker lockingChecker = (position, attribute) -> { + final OptimisticLockStyle optimisticLockStyle = entityPersister().optimisticLockStyle(); + if ( optimisticLockStyle == NONE ) { + return false; + } + + if ( optimisticLockStyle == VERSION ) { + return versionMapping != null + && versionMapping.getVersionAttribute() == attribute + ; +// && updateableAttributeIndexes[position]; + } + + final boolean includeInLocking = attribute.getAttributeMetadataAccess() + .resolveAttributeMetadata( null ) + .isIncludedInOptimisticLocking(); + if ( !includeInLocking ) { + return false; + } + + if ( optimisticLockStyle == ALL ) { + return true; + } + + assert optimisticLockStyle == DIRTY; + return dirtinessChecker.include( position, attribute ); + }; + + final UpdateValuesAnalysisImpl valuesAnalysis = analyzeUpdateValues( + values, + oldVersion, + incomingOldValues, + dirtyAttributeIndexes, + updateabilityChecker, + lockingChecker, + dirtinessChecker, + forceDynamicUpdate, + session + ); + + //noinspection StatementWithEmptyBody + if ( valuesAnalysis.tablesNeedingUpdate.isEmpty() ) { + // nothing to do + } + else if ( valuesAnalysis.needsDynamicUpdate() ) { + doDynamicUpdate( + entity, + id, + rowId, + values, + incomingOldValues, + dirtinessChecker, + valuesAnalysis, + session + ); + } + else { + doStaticUpdate( + entity, + id, + rowId, + values, + valuesAnalysis, + session + ); + } + } + + /** + * Which properties appear in the SQL update? + * (Initialized, updateable ones!) + */ + public boolean[] getPropertyUpdateability(Object entity) { + return entityPersister().hasUninitializedLazyProperties( entity ) + ? entityPersister().getNonLazyPropertyUpdateability() + : entityPersister().getPropertyUpdateability(); + } + + private void doVersionUpdate( + Object entity, + Object id, + Object version, + Object oldVersion, + SharedSessionContractImplementor session) { + assert versionUpdateGroup != null; + + final EntityTableMapping mutatingTableDetails = (EntityTableMapping) versionUpdateGroup.getSingleOperation().getTableDetails(); + + final MutationExecutorService mutationExecutorService = session.getSessionFactory() + .getServiceRegistry() + .getService( MutationExecutorService.class ); + + final MutationExecutor mutationExecutor = mutationExecutorService.createExecutor( + () -> batchKey, + versionUpdateGroup, + session + ); + + final EntityVersionMapping versionMapping = entityPersister().getVersionMapping(); + + // set the new version + mutationExecutor.getJdbcValueBindings().bindValue( + version, + mutatingTableDetails.getTableName(), + versionMapping.getSelectionExpression(), + ParameterUsage.SET, + session + ); + + // restrict the key + mutatingTableDetails.getKeyMapping().breakDownKeyJdbcValues( + id, + (jdbcValue, columnMapping) -> mutationExecutor.getJdbcValueBindings().bindValue( + jdbcValue, + mutatingTableDetails.getTableName(), + columnMapping.getSelectionExpression(), + ParameterUsage.RESTRICT, + session + ), + session + ); + + // restrict the old-version + mutationExecutor.getJdbcValueBindings().bindValue( + oldVersion, + mutatingTableDetails.getTableName(), + versionMapping.getSelectionExpression(), + ParameterUsage.RESTRICT, + session + ); + + try { + mutationExecutor.execute( + entity, + null, + (tableMapping) -> tableMapping.getTableName().equals( entityPersister().getIdentifierTableName() ), + (statementDetails, affectedRowCount, batchPosition) -> ModelMutationHelper.identifiedResultsCheck( + statementDetails, + affectedRowCount, + batchPosition, + entityPersister(), + id, + factory() + ), + session + ); + } + finally { + mutationExecutor.release(); + } + } + + private int[] preUpdateInMemoryValueGeneration( + Object object, + Object[] newValues, + SharedSessionContractImplementor session) { + final EntityMetamodel entityMetamodel = entityPersister().getEntityMetamodel(); + if ( ! entityMetamodel.hasPreUpdateGeneratedValues() ) { + return EMPTY_INT_ARRAY; + } + + final InMemoryValueGenerationStrategy[] valueGenerationStrategies = entityMetamodel.getInMemoryValueGenerationStrategies(); + if ( valueGenerationStrategies.length != 0 ) { + final int[] fieldsPreUpdateNeeded = new int[valueGenerationStrategies.length]; + int count = 0; + for ( int i = 0; i < valueGenerationStrategies.length; i++ ) { + if ( valueGenerationStrategies[i] != null + && valueGenerationStrategies[i].getGenerationTiming().includesUpdate() ) { + newValues[i] = valueGenerationStrategies[i].getValueGenerator().generateValue( + (Session) session, + object + ); + entityPersister().setPropertyValue( object, i, newValues[i] ); + fieldsPreUpdateNeeded[count++] = i; + } + } + + if ( count > 0 ) { + return ArrayHelper.trim( fieldsPreUpdateNeeded, count ); + } + } + + return EMPTY_INT_ARRAY; + } + + /** + * Transform the array of property indexes to an array of booleans for each attribute, + * true when the property is dirty + */ + private boolean[] getPropertiesToUpdate(final int[] dirtyProperties, final boolean hasDirtyCollection) { + final boolean[] updateability = entityPersister().getPropertyUpdateability(); + + if ( dirtyProperties == null ) { + return updateability; + } + + final boolean[] propsToUpdate = new boolean[entityPersister().getNumberOfAttributeMappings()]; + + for ( int property: dirtyProperties ) { + if ( updateability[property] ) { + propsToUpdate[property] = true; + } + } + + if ( entityPersister().isVersioned() && entityPersister().getVersionMapping().getVersionAttribute().isUpdateable() ) { + final int versionAttributeIndex = entityPersister().getVersionMapping() + .getVersionAttribute() + .getStateArrayPosition(); + propsToUpdate[versionAttributeIndex] = propsToUpdate[versionAttributeIndex] || isVersionIncrementRequired( + dirtyProperties, + hasDirtyCollection, + entityPersister().getPropertyVersionability() + ); + } + + return propsToUpdate; + } + + private UpdateValuesAnalysisImpl analyzeUpdateValues( + Object[] values, + Object oldVersion, + Object[] oldValues, + int[] dirtyAttributeIndexes, + InclusionChecker inclusionChecker, + InclusionChecker lockingChecker, + InclusionChecker dirtinessChecker, + boolean forceDynamicUpdate, + SharedSessionContractImplementor session) { + final List attributeMappings = entityPersister().getAttributeMappings(); + + // NOTE: + // * `dirtyAttributeIndexes == null` means we had no snapshot and couldn't + // get one using select-before-update; never the case for #merge + // * `oldValues == null` just means we had no snapshot to begin with - we might + // have used select-before-update to get the dirtyAttributeIndexes (again, + // never the case for #merge) + final UpdateValuesAnalysisImpl analysis = new UpdateValuesAnalysisImpl( + values, + oldValues, + dirtyAttributeIndexes, + dirtinessChecker, + forceDynamicUpdate + ); + + for ( int attributeIndex = 0; attributeIndex < attributeMappings.size(); attributeIndex++ ) { + final AttributeMapping attributeMapping = attributeMappings.get( attributeIndex ); + analysis.startingAttribute( attributeMapping ); + + try { + if ( attributeMapping.getJdbcTypeCount() < 1 ) { + continue; + } + + if ( !( attributeMapping instanceof SingularAttributeMapping ) ) { + continue; + } + + if ( ! entityPersister().getPropertyUpdateability()[attributeIndex] ) { + LOG.ignoreImmutablePropertyModification( attributeMapping.getAttributeName(), entityPersister().getEntityName() ); + } + + processAttribute( + analysis, + attributeIndex, + (SingularAttributeMapping) attributeMapping, + oldVersion, + oldValues, + inclusionChecker, + lockingChecker, + session + ); + } + finally { + analysis.finishedAttribute( attributeMapping ); + } + } + + return analysis; + } + + private void processAttribute( + UpdateValuesAnalysisImpl analysis, + int attributeIndex, + SingularAttributeMapping attributeMapping, + Object oldVersion, + Object[] oldValues, + InclusionChecker inclusionChecker, + InclusionChecker lockingChecker, + SharedSessionContractImplementor session) { + final boolean includeInSet = inclusionChecker.include( attributeIndex, attributeMapping ); + final boolean includeInLock = lockingChecker.include( attributeIndex, attributeMapping ); + + if ( includeInSet ) { + attributeMapping.forEachSelectable( (selectableIndex, selectable) -> { + if ( selectable.isFormula() ) { + return; + } + + if ( !selectable.isUpdateable() ) { + return; + } + + final EntityTableMapping tableMapping = entityPersister().getPhysicalTableMappingForMutation( selectable ); + analysis.registerColumnSet( tableMapping, selectable.getSelectionExpression(), selectable.getWriteExpression() ); + } ); + } + + if ( includeInLock ) { + final Object attributeLockValue; + if ( entityPersister().getVersionMapping() != null + && entityPersister().getVersionMapping().getVersionAttribute() == attributeMapping ) { + attributeLockValue = oldVersion; + } + else { + attributeLockValue = oldValues == null ? null : oldValues[ attributeIndex ]; + } + + attributeMapping.decompose( + attributeLockValue, + (jdbcValue, columnMapping) -> { + if ( ! columnMapping.isFormula() ) { + final EntityTableMapping tableMapping = entityPersister().getPhysicalTableMappingForMutation( columnMapping ); + analysis.registerColumnOptLock( tableMapping, columnMapping.getSelectionExpression(), jdbcValue ); + } + }, + session + ); + } + } + + private void doStaticUpdate( + Object entity, + Object id, + Object rowId, + Object[] values, + UpdateValuesAnalysisImpl valuesAnalysis, + SharedSessionContractImplementor session) { + final MutationExecutorService mutationExecutorService = session.getSessionFactory() + .getServiceRegistry() + .getService( MutationExecutorService.class ); + + final MutationExecutor mutationExecutor = mutationExecutorService.createExecutor( + () -> batchKey, + staticUpdateGroup, + session + ); + + decomposeForUpdate( + id, + rowId, + values, + valuesAnalysis, + mutationExecutor, + staticUpdateGroup, +// (position, attribute) -> valuesAnalysis.getAttributeAnalyses().get( position ).isDirty(), + (position, attribute) -> true, + session + ); + + try { + mutationExecutor.execute( + entity, + valuesAnalysis, + valuesAnalysis.tablesNeedingUpdate::contains, + (statementDetails, affectedRowCount, batchPosition) -> ModelMutationHelper.identifiedResultsCheck( + statementDetails, + affectedRowCount, + batchPosition, + entityPersister(), + id, + factory() + ), + session + ); + } + finally { + mutationExecutor.release(); + } + } + + private void decomposeForUpdate( + Object id, + Object rowId, + Object[] values, + UpdateValuesAnalysisImpl valuesAnalysis, + MutationExecutor mutationExecutor, + MutationOperationGroup jdbcOperationGroup, + DirtinessChecker dirtinessChecker, + SharedSessionContractImplementor session) { + final JdbcValueBindings jdbcValueBindings = mutationExecutor.getJdbcValueBindings(); + + // apply values + jdbcOperationGroup.forEachOperation( (position, operation) -> { + final EntityTableMapping tableMapping = (EntityTableMapping) operation.getTableDetails(); + if ( !valuesAnalysis.tablesNeedingUpdate.contains( tableMapping ) ) { + return; + } + + final int[] attributeIndexes = tableMapping.getAttributeIndexes(); + for ( int i = 0; i < attributeIndexes.length; i++ ) { + final int attributeIndex = attributeIndexes[ i ]; + final AttributeMapping attributeMapping = entityPersister().getAttributeMappings().get( attributeIndex ); + if ( !( attributeMapping instanceof SingularAttributeMapping ) ) { + continue; + } + + final AttributeAnalysis attributeAnalysisRef = valuesAnalysis.attributeAnalyses.get( attributeIndex ); + if ( attributeAnalysisRef.isSkipped() ) { + continue; + } + + final IncludedAttributeAnalysis attributeAnalysis = (IncludedAttributeAnalysis) attributeAnalysisRef; + final ValueGeneration valueGeneration = attributeMapping.getValueGeneration(); + + if ( attributeAnalysis.includeInSet() ) { + // apply the new values + final boolean includeInSet; + + if ( valueGeneration.getGenerationTiming().includesUpdate() + && valueGeneration.getValueGenerator() == null + && valueGeneration.referenceColumnInSql() + && valueGeneration.getDatabaseGeneratedReferencedColumnValue() != null ) { + // we applied `#getDatabaseGeneratedReferencedColumnValue` earlier + includeInSet = false; + } + else if ( entityPersister().isVersioned() + && entityPersister().getVersionMapping().getVersionAttribute() == attributeMapping ) { + includeInSet = true; + } + else if ( entityPersister().getEntityMetamodel().isDynamicUpdate() && dirtinessChecker != null ) { + includeInSet = attributeAnalysis.includeInSet() + && dirtinessChecker.isDirty( attributeIndex, attributeMapping ); + } + else { + includeInSet = true; + } + + if ( includeInSet ) { + attributeMapping.decompose( + values[ attributeIndex ], + (jdbcValue, jdbcMapping) -> { + if ( jdbcMapping.isFormula() ) { + return; + } + + if ( !jdbcMapping.isUpdateable() ) { + return; + } + + jdbcValueBindings.bindValue( + jdbcValue, + tableMapping.getTableName(), + jdbcMapping.getSelectionExpression(), + ParameterUsage.SET, + session + ); + }, + session + ); + } + } + + // apply any optimistic locking + if ( attributeAnalysis.includeInLocking() ) { + attributeAnalysis.columnLockingAnalyses.forEach( (columnLockingAnalysis) -> { + if ( columnLockingAnalysis.getLockValue() != null ) { + jdbcValueBindings.bindValue( + columnLockingAnalysis.getLockValue(), + tableMapping.getTableName(), + columnLockingAnalysis.getReadExpression(), + ParameterUsage.RESTRICT, + session + ); + } + } ); + } + } + } ); + + // apply keys + jdbcOperationGroup.forEachOperation( (position, operation) -> { + final EntityTableMapping tableMapping = (EntityTableMapping) operation.getTableDetails(); + + // if the mutation is against the identifier table and we need to use row-id... + if ( tableMapping.isIdentifierTable() && entityPersister().hasRowId() && rowId != null ) { + // todo (mutation) : make sure the SQL uses row-id in this case + jdbcValueBindings.bindValue( + rowId, + tableMapping.getTableName(), + entityPersister().getRowIdMapping().getRowIdName(), + ParameterUsage.RESTRICT, + session + ); + } + else { + tableMapping.getKeyMapping().breakDownKeyJdbcValues( + id, + (jdbcValue, columnMapping) -> jdbcValueBindings.bindValue( + jdbcValue, + tableMapping.getTableName(), + columnMapping.getColumnName(), + ParameterUsage.RESTRICT, + session + ), + session + ); + } + } ); + } + + private void doDynamicUpdate( + Object entity, + Object id, + Object rowId, + Object[] values, + Object[] oldValues, + InclusionChecker dirtinessChecker, + UpdateValuesAnalysisImpl valuesAnalysis, + SharedSessionContractImplementor session) { + // Create the JDBC operation descriptors + final MutationOperationGroup dynamicUpdateGroup = generateDynamicUpdateGroup( + id, + rowId, + oldValues, + valuesAnalysis, + session + ); + + // and then execute them + final MutationExecutorService mutationExecutorService = session.getSessionFactory() + .getServiceRegistry() + .getService( MutationExecutorService.class ); + + final MutationExecutor mutationExecutor = mutationExecutorService.createExecutor( + () -> batchKey, + dynamicUpdateGroup, + session + ); + + decomposeForUpdate( + id, + rowId, + values, + valuesAnalysis, + mutationExecutor, + dynamicUpdateGroup, + (attributeIndex, attribute) -> dirtinessChecker.include( attributeIndex, (SingularAttributeMapping) attribute ), + session + ); + + try { + mutationExecutor.execute( + entity, + valuesAnalysis, + (tableMapping) -> { + if ( tableMapping.isOptional() + && !valuesAnalysis.tablesWithNonNullValues.contains( tableMapping ) ) { + // the table is optional, and we have null values for all of its columns + // todo (6.0) : technically we might need to delete row here + return false; + } + + //noinspection RedundantIfStatement + if ( !valuesAnalysis.tablesNeedingUpdate.contains( tableMapping ) ) { + // nothing changed + return false; + } + + return true; + }, + (statementDetails, affectedRowCount, batchPosition) -> ModelMutationHelper.identifiedResultsCheck( + statementDetails, + affectedRowCount, + batchPosition, + entityPersister(), + id, + factory() + ), + session + ); + } + finally { + mutationExecutor.release(); + } + } + + private MutationOperationGroup generateDynamicUpdateGroup( + Object id, + Object rowId, + Object[] oldValues, + UpdateValuesAnalysisImpl valuesAnalysis, + SharedSessionContractImplementor session) { + final MutationGroupBuilder updateGroupBuilder = new MutationGroupBuilder( MutationType.UPDATE, entityPersister() ); + + entityPersister().forEachMutableTable( (tableMapping) -> { + final RestrictedTableMutationBuilder tableUpdateBuilder; + + final MutatingTableReference tableReference = new MutatingTableReference( tableMapping ); + if ( ! valuesAnalysis.tablesNeedingUpdate.contains( tableReference.getTableMapping() ) ) { + // this table does not need updating + tableUpdateBuilder = new TableUpdateBuilderSkipped( tableReference ); + } + else { + tableUpdateBuilder = new TableUpdateBuilderStandard<>( + entityPersister(), + tableMapping, + factory() + ); + } + updateGroupBuilder.addTableDetailsBuilder( tableUpdateBuilder ); + } ); + + applyTableUpdateDetails( + rowId, + updateGroupBuilder, + oldValues, + valuesAnalysis, + (position, attribute) -> valuesAnalysis.getAttributeAnalyses().get( position ).isDirty(), + session + ); + + return createOperationGroup( valuesAnalysis, updateGroupBuilder.buildMutationGroup() ); + } + + private void applyTableUpdateDetails( + Object rowId, + MutationGroupBuilder updateGroupBuilder, + Object[] oldValues, + UpdateValuesAnalysisImpl updateValuesAnalysis, + DirtinessChecker dirtinessChecker, + SharedSessionContractImplementor session) { + final EntityVersionMapping versionMapping = entityPersister().getVersionMapping(); + final EntityRowIdMapping rowIdMapping = entityPersister().getRowIdMapping(); + final List attributeMappings = entityPersister().getAttributeMappings(); + final boolean[] versionability = entityPersister().getPropertyVersionability(); + final OptimisticLockStyle optimisticLockStyle = entityPersister().optimisticLockStyle(); + + updateGroupBuilder.forEachTableMutationBuilder( (builder) -> { + final EntityTableMapping tableMapping = (EntityTableMapping) builder.getMutatingTable().getTableMapping(); + + final int[] attributeIndexes = tableMapping.getAttributeIndexes(); + for ( int i = 0; i < attributeIndexes.length; i++ ) { + final int attributeIndex = attributeIndexes[i]; + + final AttributeMapping attributeMapping = attributeMappings.get( attributeIndex ); + final AttributeAnalysis attributeAnalysis = updateValuesAnalysis.attributeAnalyses.get( attributeIndex ); + + final TableUpdateBuilder tableUpdateBuilder = (TableUpdateBuilder) builder; + + if ( attributeAnalysis.includeInSet() ) { + assert updateValuesAnalysis.tablesNeedingUpdate.contains( tableMapping ); + + final ValueGeneration valueGeneration = attributeMapping.getValueGeneration(); + if ( valueGeneration.getGenerationTiming().includesUpdate() + && valueGeneration.getValueGenerator() == null + && valueGeneration.referenceColumnInSql() ) { + // value-generation is only valid for basic attributes + final BasicAttributeMapping basicAttributeMapping = (BasicAttributeMapping) attributeMapping; + final String columnValue = valueGeneration.getDatabaseGeneratedReferencedColumnValue() == null + ? "?" + : valueGeneration.getDatabaseGeneratedReferencedColumnValue(); + if ( columnValue != null ) { + tableUpdateBuilder.addValueColumn( + basicAttributeMapping.getSelectionExpression(), + columnValue, + basicAttributeMapping.getJdbcMapping() + ); + } + } + else if ( versionMapping != null + && versionMapping.getVersionAttribute() == attributeMapping ) { + tableUpdateBuilder.addValueColumn( versionMapping.getVersionAttribute() ); + } + else { + final boolean includeInSet; + if ( entityPersister().getEntityMetamodel().isDynamicUpdate() && dirtinessChecker != null ) { + includeInSet = dirtinessChecker.isDirty( attributeIndex, attributeMapping ); + } + else { + includeInSet = true; + } + + if ( includeInSet ) { + attributeMapping.forEachSelectable( (selectionIndex, selectableMapping) -> { + if ( selectableMapping.isFormula() ) { + // no physical column + return; + } + + if ( !selectableMapping.isUpdateable() ) { + // column is not updateable + return; + } + + tableUpdateBuilder.addValueColumn( selectableMapping ); + } ); + } + } + } + + if ( attributeAnalysis.includeInLocking() ) { + final boolean includeRestriction; + if ( optimisticLockStyle == OptimisticLockStyle.VERSION + && versionMapping != null + && attributeMapping == versionMapping.getVersionAttribute() ) { + includeRestriction = true; + } + else if ( optimisticLockStyle == OptimisticLockStyle.ALL ) { + includeRestriction = versionability[ attributeIndex ]; + } + else if ( optimisticLockStyle == DIRTY ) { + if ( dirtinessChecker == null ) { + // this should indicate creation of the "static" update group. + includeRestriction = false; + } + else { + includeRestriction = versionability[ attributeIndex ] + && attributeAnalysis.includeInLocking() + && dirtinessChecker.isDirty( attributeIndex, attributeMapping ); + } + } + else { + includeRestriction = false; + } + + if ( includeRestriction ) { + if ( oldValues == null ) { + attributeMapping.forEachSelectable( (selectionIndex, selectableMapping) -> { + tableUpdateBuilder.addOptimisticLockRestriction( selectableMapping ); + } ); + } + else { + attributeMapping.decompose( + oldValues[ attributeIndex ], + (jdbcValue, jdbcMapping) -> { + if ( jdbcValue == null ) { + tableUpdateBuilder.addNullOptimisticLockRestriction( jdbcMapping ); + } + else { + tableUpdateBuilder.addOptimisticLockRestriction( jdbcMapping ); + } + }, + session + ); + } + } + } + } + } ); + + updateGroupBuilder.forEachTableMutationBuilder( (tableMutationBuilder) -> { + final TableUpdateBuilder tableUpdateBuilder = (TableUpdateBuilder) tableMutationBuilder; + final EntityTableMapping tableMapping = (EntityTableMapping) tableUpdateBuilder.getMutatingTable().getTableMapping(); + if ( rowIdMapping != null + && rowId != null + && tableMapping.isIdentifierTable() ) { + tableUpdateBuilder.addKeyRestriction( rowIdMapping ); + } + else { + tableMapping.getKeyMapping().forEachKeyColumn( keyColumn -> tableUpdateBuilder.addKeyRestriction( + keyColumn.getColumnName(), + "?", + keyColumn.getJdbcMapping() + ) ); + } + } ); + } + + + /** + * Contains the aggregated analysis of the update values to determine + * what SQL UPDATE statement(s) should be used to update the entity + * and to drive parameter binding + */ + private class UpdateValuesAnalysisImpl implements UpdateValuesAnalysis { + private final Object[] values; + private final int[] dirtyAttributeIndexes; + private final InclusionChecker dirtinessChecker; + + private final Set tablesNeedingUpdate = new HashSet<>(); + private final Set tablesNeedingDynamicUpdate = new HashSet<>(); + private final Set tablesWithNonNullValues = new HashSet<>(); + private final Set tablesWithPreviousNonNullValues = new HashSet<>(); + + private final List attributeAnalyses = new ArrayList<>(); + + // transient values as we perform the analysis + private AttributeAnalysisImplementor currentAttributeAnalysis; + private boolean dirtyChecked = false; + private boolean nullChecked = false; + + public UpdateValuesAnalysisImpl( + Object[] values, + Object[] oldValues, + int[] dirtyAttributeIndexes, + InclusionChecker dirtinessChecker, + boolean forceDynamicUpdate) { + this.values = values; + this.dirtyAttributeIndexes = dirtyAttributeIndexes; + this.dirtinessChecker = dirtinessChecker; + + entityPersister().forEachMutableTable( (tableMapping) -> { + if ( values == null ) { + tablesWithNonNullValues.add( tableMapping ); + } + else { + for ( int i = 0; i < tableMapping.getAttributeIndexes().length; i++ ) { + final int attributeIndex = tableMapping.getAttributeIndexes()[ i ]; + if ( values[ attributeIndex ] != null ) { + tablesWithNonNullValues.add( tableMapping ); + break; + } + } + } + + if ( dirtyAttributeIndexes == null && tableMapping.hasColumns() ) { + tablesNeedingUpdate.add( tableMapping ); + } + + if ( oldValues == null ) { + tablesWithPreviousNonNullValues.add( tableMapping ); + } + else { + for ( int i = 0; i < tableMapping.getAttributeIndexes().length; i++ ) { + final int attributeIndex = tableMapping.getAttributeIndexes()[ i ]; + if ( oldValues[ attributeIndex ] != null ) { + tablesWithPreviousNonNullValues.add( tableMapping ); + break; + } + } + } + + if ( tableMapping.getUpdateDetails().getCustomSql() == null ) { + // we should only dynamically update tables w/o custom update sql + if ( forceDynamicUpdate ) { + tablesNeedingDynamicUpdate.add( tableMapping ); + } + else if ( dirtyAttributeIndexes != null ) { + if ( entityPersister().getEntityMetamodel().isDynamicUpdate() + || entityPersister().optimisticLockStyle() == DIRTY ) { + tablesNeedingDynamicUpdate.add( tableMapping ); + } + } + } + } ); + } + + @Override + public Object[] getValues() { + return values; + } + + @Override + public Set getTablesNeedingUpdate() { + return tablesNeedingUpdate; + } + + @Override + public Set getTablesWithNonNullValues() { + return tablesWithNonNullValues; + } + + @Override + public Set getTablesWithPreviousNonNullValues() { + return tablesWithPreviousNonNullValues; + } + + @Override + public List getAttributeAnalyses() { + return attributeAnalyses; + } + + /** + * Basically, can the ({@linkplain UpdateCoordinatorStandard#staticUpdateGroup static update group} + * be used or is a dynamic update needed. + */ + public boolean needsDynamicUpdate() { + return !tablesNeedingDynamicUpdate.isEmpty(); + } + + /** + * Callback at start of processing an attribute + */ + public void startingAttribute(AttributeMapping attribute) { + if ( attribute.getJdbcTypeCount() < 1 || !( attribute instanceof SingularAttributeMapping ) ) { + currentAttributeAnalysis = new SkippedAttributeAnalysis( attribute ); + } + else { + currentAttributeAnalysis = new IncludedAttributeAnalysis( (SingularAttributeMapping) attribute ); + if ( dirtyAttributeIndexes == null + || ArrayHelper.contains( dirtyAttributeIndexes, attribute.getStateArrayPosition() ) ) { + currentAttributeAnalysis.markDirty(); + } + } + + attributeAnalyses.add( currentAttributeAnalysis ); + } + + public void finishedAttribute(AttributeMapping attribute) { + assert currentAttributeAnalysis.getAttribute() == attribute; + currentAttributeAnalysis = null; + dirtyChecked = false; + nullChecked = false; + } + + /** + * Callback to register the setting of a column value + */ + public void registerColumnSet(EntityTableMapping table, String readExpression, String writeExpression) { + final IncludedAttributeAnalysis includedAttributeAnalysis = (IncludedAttributeAnalysis) currentAttributeAnalysis; + includedAttributeAnalysis.columnValueAnalyses.add( new ColumnSetAnalysis( readExpression, writeExpression ) ); + + if ( !dirtyChecked ) { + final SingularAttributeMapping attribute = includedAttributeAnalysis.attribute; + if ( dirtinessChecker.include( attribute.getStateArrayPosition(), attribute ) ) { + tablesNeedingUpdate.add( table ); + } + + dirtyChecked = true; + } + + if ( values != null && !nullChecked ) { + final int attributePosition = currentAttributeAnalysis.getAttribute().getStateArrayPosition(); + if ( values[attributePosition] != null ) { + tablesWithNonNullValues.add( table ); + } + nullChecked = true; + } + } + + public void registerColumnOptLock(EntityTableMapping table, String readExpression, Object lockValue) { + final IncludedAttributeAnalysis attributeAnalysis = (IncludedAttributeAnalysis) currentAttributeAnalysis; + attributeAnalysis.columnLockingAnalyses.add( new ColumnLockingAnalysis( readExpression, lockValue ) ); + + if ( dirtyAttributeIndexes != null && lockValue == null ) { + // we need to use `IS NULL` as opposed to `= ?` w/ NULL + tablesNeedingDynamicUpdate.add( table ); + } + } + } + + /** + * Local extension to AttributeAnalysis + */ + private interface AttributeAnalysisImplementor extends AttributeAnalysis { + void markDirty(); + } + + /** + * Local AttributeAnalysis implementation for use when the attribute is + * to be completely skipped. Avoids having to define the collections + * needed to fully implement AttributeAnalysis. + * + * @see IncludedAttributeAnalysis + */ + private static class SkippedAttributeAnalysis implements AttributeAnalysisImplementor { + private final AttributeMapping attributeMapping; + + public SkippedAttributeAnalysis(AttributeMapping attributeMapping) { + this.attributeMapping = attributeMapping; + } + + @Override + public AttributeMapping getAttribute() { + return attributeMapping; + } + + @Override + public boolean includeInSet() { + return false; + } + + @Override + public boolean includeInLocking() { + return false; + } + + @Override + public boolean isDirty() { + return false; + } + + @Override + public void markDirty() { + } + + @Override + public String toString() { + return String.format( + Locale.ROOT, + "SkippedAttributeAnalysis(`%s`)", + attributeMapping.getNavigableRole().getFullPath() + ); + } + } + + /** + * Local AttributeAnalysis implementation + */ + private static class IncludedAttributeAnalysis implements AttributeAnalysisImplementor { + private final SingularAttributeMapping attribute; + + private final List columnValueAnalyses; + private final List columnLockingAnalyses; + + private boolean dirty; + + public IncludedAttributeAnalysis(SingularAttributeMapping attribute) { + this.attribute = attribute; + + this.columnValueAnalyses = CollectionHelper.arrayList( attribute.getJdbcTypeCount() ); + this.columnLockingAnalyses = CollectionHelper.arrayList( attribute.getJdbcTypeCount() ); + } + + @Override + public SingularAttributeMapping getAttribute() { + return attribute; + } + + @Override + public boolean includeInSet() { + return !columnValueAnalyses.isEmpty(); + } + + @Override + public boolean includeInLocking() { + return !columnLockingAnalyses.isEmpty(); + } + + @Override + public boolean isDirty() { + return dirty; + } + + @Internal + @Override + public void markDirty() { + this.dirty = true; + } + + @Override + public String toString() { + return String.format( + Locale.ROOT, + "IncludedAttributeAnalysis(`%s`)", + attribute.getNavigableRole().getFullPath() + ); + } + } + + private static class ColumnSetAnalysis { + private final String readExpression; + private final String writeExpression; + + public ColumnSetAnalysis(String readExpression, String writeExpression) { + this.readExpression = readExpression; + this.writeExpression = writeExpression; + } + + @SuppressWarnings("unused") + public String getReadExpression() { + return readExpression; + } + + @SuppressWarnings("unused") + public String getWriteExpression() { + return writeExpression; + } + } + + private static class ColumnLockingAnalysis { + private final String readExpression; + private final Object lockValue; + + public ColumnLockingAnalysis(String readExpression, Object lockValue) { + assert readExpression != null; + assert !readExpression.equals( "?" ); + + this.readExpression = readExpression; + this.lockValue = lockValue; + } + + public String getReadExpression() { + return readExpression; + } + + public Object getLockValue() { + return lockValue; + } + } + + private MutationOperationGroup buildStaticUpdateGroup() { + final UpdateValuesAnalysisImpl valuesAnalysis = analyzeUpdateValues( + null, + null, + null, + null, + (index,attribute) -> { + final ValueGeneration valueGeneration = attribute.getValueGeneration(); + if ( valueGeneration.getGenerationTiming().includesUpdate() + && valueGeneration.getValueGenerator() == null + && valueGeneration.referenceColumnInSql() ) { + return true; + } + + return entityPersister().getPropertyUpdateability()[index]; + }, + (index,attribute) -> { + final OptimisticLockStyle optimisticLockStyle = entityPersister().optimisticLockStyle(); + if ( optimisticLockStyle.isAll() ) { + return true; + } + + return optimisticLockStyle == OptimisticLockStyle.VERSION + && entityPersister().getVersionMapping() != null + && attribute == entityPersister().getVersionMapping().getVersionAttribute(); + }, + (index,attribute) -> true, + false, + null + ); + + final MutationGroupBuilder updateGroupBuilder = new MutationGroupBuilder( MutationType.UPDATE, entityPersister() ); + + entityPersister().forEachMutableTable( (tableMapping) -> { + // NOTE : TableUpdateBuilderStandard handles custom sql-update mappings + final TableUpdateBuilder tableUpdateBuilder = new TableUpdateBuilderStandard<>( entityPersister(), tableMapping, factory() ); + updateGroupBuilder.addTableDetailsBuilder( tableUpdateBuilder ); + } ); + + // next, iterate each attribute and build the SET and WHERE clauses + applyTableUpdateDetails( + // row-id + null, + // the "collector" + updateGroupBuilder, + // oldValues + null, + valuesAnalysis, + (position, attribute) -> valuesAnalysis.getAttributeAnalyses().get( position ).isDirty(), +// // optimistic locking (restriction) checker +// (position, attribute) -> { +// final OptimisticLockStyle optimisticLockStyle = entityPersister() +// .getEntityMetamodel() +// .getOptimisticLockStyle(); +// +// if ( optimisticLockStyle == ALL ) { +// return true; +// } +// +// if ( optimisticLockStyle == VERSION ) { +// final EntityVersionMapping versionMapping = entityPersister().getVersionMapping(); +// if ( versionMapping == null ) { +// return false; +// } +// return attribute == versionMapping.getVersionAttribute(); +// } +// +// return false; +// }, + // session + null + ); + + // build the mutation-group (SQL AST) and convert it into a jdbc-operations (SQL String, etc) group + return createOperationGroup( valuesAnalysis, updateGroupBuilder.buildMutationGroup() ); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + private MutationOperationGroup buildVersionUpdateGroup() { + final EntityVersionMapping versionMapping = entityPersister().getVersionMapping(); + if ( versionMapping == null ) { + return null; + } + + final TableUpdateBuilderStandard updateBuilder = new TableUpdateBuilderStandard( + entityPersister(), + entityPersister().getIdentifierTableMapping(), + factory() + ); + + updateBuilder.addValueColumn( versionMapping ); + + entityPersister().getIdentifierMapping().forEachSelectable( (selectionIndex, selectableMapping) -> { + updateBuilder.addKeyRestriction( selectableMapping ); + } ); + + updateBuilder.addOptimisticLockRestriction( versionMapping ); + + final RestrictedTableMutation mutation = updateBuilder.buildMutation(); + + //noinspection resource + final SqlAstTranslatorFactory sqlAstTranslatorFactory = factory() + .getJdbcServices() + .getJdbcEnvironment() + .getSqlAstTranslatorFactory(); + final SqlAstTranslator translator = sqlAstTranslatorFactory.buildModelMutationTranslator( + (RestrictedTableMutation) mutation, + factory() + ); + + final JdbcMutationOperation jdbcMutation = translator.translate( null, MutationQueryOptions.INSTANCE ); + return new MutationOperationGroupSingle( MutationType.UPDATE, entityPersister(), jdbcMutation ); + } + + @FunctionalInterface + private interface InclusionChecker { + boolean include(int position, SingularAttributeMapping attribute); + + default boolean reject(int position, SingularAttributeMapping attribute) { + return !include( position, attribute ); + } + } + + @FunctionalInterface + private interface DirtinessChecker { + boolean isDirty(int position, AttributeMapping attribute); + } + + @Override + public String toString() { + return "UpdateCoordinatorStandard(" + entityPersister().getEntityName() + ")"; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateValuesAnalysis.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateValuesAnalysis.java new file mode 100644 index 0000000000..ce95f1b517 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateValuesAnalysis.java @@ -0,0 +1,48 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.persister.entity.mutation; + +import java.util.List; +import java.util.Set; + +import org.hibernate.Incubating; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.ValuesAnalysis; + +/** + * Contains an aggregated analysis of the values for an update mutation + * to determine behavior such as skipping tables which contained no changes, + * etc. + * + * @author Steve Ebersole + */ +@Incubating +public interface UpdateValuesAnalysis extends ValuesAnalysis { + Object[] getValues(); + + /** + * Descriptor of the tables needing to be updated. + * + * @apiNote {@linkplain TableMapping#isInverse() Inverse tables} are not included in the result + */ + Set getTablesNeedingUpdate(); + + /** + * Descriptor of the tables which had any non-null value bindings + */ + Set getTablesWithNonNullValues(); + + /** + * Descriptor of the tables which had any non-null value bindings + */ + Set getTablesWithPreviousNonNullValues(); + + /** + * Descriptors for the analysis of each attribute + */ + List getAttributeAnalyses(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/AbstractStandardCallableStatementSupport.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/AbstractStandardCallableStatementSupport.java index 27bb23806f..a2d8c1c24b 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/AbstractStandardCallableStatementSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/AbstractStandardCallableStatementSupport.java @@ -11,15 +11,15 @@ import java.sql.CallableStatement; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.procedure.spi.CallableStatementSupport; import org.hibernate.query.spi.ProcedureParameterMetadataImplementor; -import org.hibernate.sql.exec.spi.JdbcCall; import org.hibernate.sql.exec.spi.JdbcCallParameterRegistration; +import org.hibernate.sql.exec.spi.JdbcOperationQueryCall; public abstract class AbstractStandardCallableStatementSupport implements CallableStatementSupport { @Override public void registerParameters( String procedureName, - JdbcCall procedureCall, + JdbcOperationQueryCall procedureCall, CallableStatement statement, ProcedureParameterMetadataImplementor parameterMetadata, SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/PostgresCallableStatementSupport.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/PostgresCallableStatementSupport.java index 15088b91b1..2417112932 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/PostgresCallableStatementSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/PostgresCallableStatementSupport.java @@ -11,13 +11,12 @@ import java.util.List; import org.hibernate.HibernateException; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.procedure.spi.FunctionReturnImplementor; -import org.hibernate.procedure.spi.ParameterStrategy; import org.hibernate.procedure.spi.ProcedureCallImplementor; import org.hibernate.procedure.spi.ProcedureParameterImplementor; import org.hibernate.query.spi.ProcedureParameterMetadataImplementor; import org.hibernate.sql.exec.internal.JdbcCallImpl; -import org.hibernate.sql.exec.spi.JdbcCall; import org.hibernate.sql.exec.spi.JdbcCallParameterRegistration; +import org.hibernate.sql.exec.spi.JdbcOperationQueryCall; import jakarta.persistence.ParameterMode; @@ -31,7 +30,7 @@ public class PostgresCallableStatementSupport extends AbstractStandardCallableSt public static final PostgresCallableStatementSupport INSTANCE = new PostgresCallableStatementSupport(); @Override - public JdbcCall interpretCall(ProcedureCallImplementor procedureCall) { + public JdbcOperationQueryCall interpretCall(ProcedureCallImplementor procedureCall) { final String procedureName = procedureCall.getProcedureName(); final FunctionReturnImplementor functionReturn = procedureCall.getFunctionReturn(); final ProcedureParameterMetadataImplementor parameterMetadata = procedureCall.getParameterMetadata(); @@ -47,10 +46,7 @@ public class PostgresCallableStatementSupport extends AbstractStandardCallableSt } final List> registrations = parameterMetadata.getRegistrationsAsList(); - final ParameterStrategy parameterStrategy = parameterMetadata.hasNamedParameters() ? - ParameterStrategy.NAMED : - ParameterStrategy.POSITIONAL; - final JdbcCallImpl.Builder builder = new JdbcCallImpl.Builder( parameterStrategy ); + final JdbcCallImpl.Builder builder = new JdbcCallImpl.Builder(); final StringBuilder buffer; final int offset; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java index fbc3947fab..e19b90715d 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java @@ -72,9 +72,9 @@ import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl; import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; import org.hibernate.sql.exec.spi.Callback; import org.hibernate.sql.exec.spi.ExecutionContext; -import org.hibernate.sql.exec.spi.JdbcCall; import org.hibernate.sql.exec.spi.JdbcCallParameterRegistration; import org.hibernate.sql.exec.spi.JdbcCallRefCursorExtractor; +import org.hibernate.sql.exec.spi.JdbcOperationQueryCall; import org.hibernate.sql.exec.spi.JdbcParameterBinder; import org.hibernate.sql.exec.spi.JdbcParameterBindings; import org.hibernate.sql.results.NoMoreOutputsException; @@ -120,6 +120,7 @@ public class ProcedureCallImpl private final QueryOptionsImpl queryOptions = new QueryOptionsImpl(); + private JdbcOperationQueryCall call; private ProcedureOutputsImpl outputs; @@ -584,7 +585,7 @@ public class ProcedureCallImpl .getJdbcEnvironment() .getDialect() .getCallableStatementSupport(); - JdbcCall call = callableStatementSupport.interpretCall(this); + this.call = callableStatementSupport.interpretCall(this); final Map, JdbcCallParameterRegistration> parameterRegistrations = new IdentityHashMap<>(); final List refCursorExtractors = new ArrayList<>(); @@ -610,7 +611,7 @@ public class ProcedureCallImpl final CallableStatement statement = (CallableStatement) getSession() .getJdbcCoordinator() .getStatementPreparer() - .prepareStatement( call.getSql(), true ); + .prepareStatement( call.getSqlString(), true ); try { // Register the parameter mode and type callableStatementSupport.registerParameters( diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java index 58f0f5b620..4309f7f8ea 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java @@ -12,13 +12,12 @@ import org.hibernate.QueryException; import org.hibernate.dialect.Dialect; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.procedure.spi.FunctionReturnImplementor; -import org.hibernate.procedure.spi.ParameterStrategy; import org.hibernate.procedure.spi.ProcedureCallImplementor; import org.hibernate.procedure.spi.ProcedureParameterImplementor; import org.hibernate.query.spi.ProcedureParameterMetadataImplementor; import org.hibernate.sql.exec.internal.JdbcCallImpl; -import org.hibernate.sql.exec.spi.JdbcCall; import org.hibernate.sql.exec.spi.JdbcCallParameterRegistration; +import org.hibernate.sql.exec.spi.JdbcOperationQueryCall; import jakarta.persistence.ParameterMode; @@ -47,16 +46,13 @@ public class StandardCallableStatementSupport extends AbstractStandardCallableSt } @Override - public JdbcCall interpretCall(ProcedureCallImplementor procedureCall) { + public JdbcOperationQueryCall interpretCall(ProcedureCallImplementor procedureCall) { final String procedureName = procedureCall.getProcedureName(); final FunctionReturnImplementor functionReturn = procedureCall.getFunctionReturn(); final ProcedureParameterMetadataImplementor parameterMetadata = procedureCall.getParameterMetadata(); final SharedSessionContractImplementor session = procedureCall.getSession(); final List> registrations = parameterMetadata.getRegistrationsAsList(); - final ParameterStrategy parameterStrategy = functionReturn == null && parameterMetadata.hasNamedParameters() ? - ParameterStrategy.NAMED : - ParameterStrategy.POSITIONAL; - final JdbcCallImpl.Builder builder = new JdbcCallImpl.Builder( parameterStrategy ); + final JdbcCallImpl.Builder builder = new JdbcCallImpl.Builder(); final StringBuilder buffer; final int offset; if ( functionReturn != null && !implicitReturn ) { diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/spi/CallableStatementSupport.java b/hibernate-core/src/main/java/org/hibernate/procedure/spi/CallableStatementSupport.java index 61fb96e82a..ec0406be33 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/spi/CallableStatementSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/spi/CallableStatementSupport.java @@ -10,17 +10,17 @@ import java.sql.CallableStatement; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.query.spi.ProcedureParameterMetadataImplementor; -import org.hibernate.sql.exec.spi.JdbcCall; +import org.hibernate.sql.exec.spi.JdbcOperationQueryCall; /** * @author Steve Ebersole */ public interface CallableStatementSupport { - JdbcCall interpretCall(ProcedureCallImplementor procedureCall); + JdbcOperationQueryCall interpretCall(ProcedureCallImplementor procedureCall); void registerParameters( String procedureName, - JdbcCall procedureCall, + JdbcOperationQueryCall procedureCall, CallableStatement statement, ProcedureParameterMetadataImplementor parameterMetadata, SharedSessionContractImplementor session); diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicEntityIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicEntityIdentifierMapping.java index 5bb8966bf2..5659d569b2 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicEntityIdentifierMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicEntityIdentifierMapping.java @@ -18,7 +18,8 @@ import org.hibernate.query.sqm.SqmExpressible; * @author Christian Beikov */ @Incubating -public class AnonymousTupleBasicEntityIdentifierMapping extends AnonymousTupleBasicValuedModelPart +public class AnonymousTupleBasicEntityIdentifierMapping + extends AnonymousTupleBasicValuedModelPart implements BasicEntityIdentifierMapping { private final BasicEntityIdentifierMapping delegate; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java index cf52a621ce..9d3671eada 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java @@ -26,7 +26,6 @@ import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; -import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableReference; @@ -38,8 +37,6 @@ import org.hibernate.sql.results.graph.basic.BasicFetch; import org.hibernate.sql.results.graph.basic.BasicResult; import org.hibernate.type.descriptor.java.JavaType; -import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey; - /** * @author Christian Beikov */ @@ -123,6 +120,21 @@ public class AnonymousTupleBasicValuedModelPart implements ModelPart, MappingTyp return false; } + @Override + public boolean isNullable() { + return false; + } + + @Override + public boolean isInsertable() { + return true; + } + + @Override + public boolean isUpdateable() { + return false; + } + @Override public String getColumnDefinition() { return null; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java index 0ab840e717..d197142533 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java @@ -34,8 +34,10 @@ import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingType; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.NaturalIdMapping; +import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.metamodel.mapping.SelectableConsumer; import org.hibernate.metamodel.mapping.SelectableMapping; +import org.hibernate.metamodel.mapping.internal.OneToManyCollectionPart; import org.hibernate.metamodel.mapping.internal.SingleAttributeIdentifierMapping; import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping; import org.hibernate.metamodel.model.domain.DomainType; @@ -65,13 +67,14 @@ import org.hibernate.sql.results.graph.DomainResultCreationState; import org.hibernate.type.descriptor.java.JavaType; import static java.util.Objects.requireNonNullElse; +import static org.hibernate.internal.util.collections.CollectionHelper.arrayList; /** * @author Christian Beikov */ @Incubating -public class AnonymousTupleEntityValuedModelPart implements EntityValuedModelPart, EntityMappingType, - TableGroupJoinProducer { +public class AnonymousTupleEntityValuedModelPart + implements EntityValuedModelPart, EntityMappingType, TableGroupJoinProducer { private final EntityIdentifierMapping identifierMapping; private final DomainType domainType; @@ -270,34 +273,52 @@ public class AnonymousTupleEntityValuedModelPart implements EntityValuedModelPar // As we will "resolve" the derived column references for these mappings // -------------- - final EntityAssociationMapping associationMapping = (EntityAssociationMapping) delegate; final List keyMappings; final List targetMappings; - if ( associationMapping.isReferenceToPrimaryKey() && associationMapping.getSideNature() == ForeignKeyDescriptor.Nature.KEY ) { - final ModelPart targetJoinModelPart = associationMapping.getForeignKeyDescriptor() - .getPart( associationMapping.getSideNature().inverse() ); - targetMappings = new ArrayList<>( targetJoinModelPart.getJdbcTypeCount() ); - targetJoinModelPart.forEachSelectable( - 0, - (i, selectableMapping) -> targetMappings.add( selectableMapping ) - ); - keyMappings = new ArrayList<>( targetJoinModelPart.getJdbcTypeCount() ); - associationMapping.getForeignKeyDescriptor() - .getPart( associationMapping.getSideNature() ) - .forEachSelectable( - 0, - (i, selectableMapping) -> keyMappings.add( selectableMapping ) - ); + + if ( delegate instanceof OneToManyCollectionPart ) { + final OneToManyCollectionPart oneToMany = (OneToManyCollectionPart) delegate; + final PluralAttributeMapping pluralAttribute = oneToMany.getCollectionDescriptor().getAttributeMapping(); + + final ModelPart keyPart = pluralAttribute.getKeyDescriptor().getKeyPart(); + final ModelPart keyTargetPart = pluralAttribute.getKeyDescriptor().getTargetPart(); + + keyMappings = arrayList( keyPart.getJdbcTypeCount() ); + keyPart.forEachSelectable( (selectionIndex, selectableMapping) -> keyMappings.add( selectableMapping ) ); + + targetMappings = arrayList( keyTargetPart.getJdbcTypeCount() ); + keyTargetPart.forEachSelectable( (selectionIndex, selectableMapping) -> targetMappings.add( selectableMapping ) ); } else { - final ModelPart targetJoinModelPart = delegate.getEntityMappingType().getIdentifierMapping(); - targetMappings = new ArrayList<>( targetJoinModelPart.getJdbcTypeCount() ); - targetJoinModelPart.forEachSelectable( - 0, - (i, selectableMapping) -> targetMappings.add( selectableMapping ) - ); - keyMappings = targetMappings; + final EntityAssociationMapping associationMapping = (EntityAssociationMapping) delegate; + + if ( associationMapping.isReferenceToPrimaryKey() && associationMapping.getSideNature() == ForeignKeyDescriptor.Nature.KEY ) { + final ModelPart targetJoinModelPart = associationMapping.getForeignKeyDescriptor() + .getPart( associationMapping.getSideNature().inverse() ); + targetMappings = new ArrayList<>( targetJoinModelPart.getJdbcTypeCount() ); + targetJoinModelPart.forEachSelectable( + 0, + (i, selectableMapping) -> targetMappings.add( selectableMapping ) + ); + keyMappings = new ArrayList<>( targetJoinModelPart.getJdbcTypeCount() ); + associationMapping.getForeignKeyDescriptor() + .getPart( associationMapping.getSideNature() ) + .forEachSelectable( + 0, + (i, selectableMapping) -> keyMappings.add( selectableMapping ) + ); + } + else { + final ModelPart targetJoinModelPart = delegate.getEntityMappingType().getIdentifierMapping(); + targetMappings = new ArrayList<>( targetJoinModelPart.getJdbcTypeCount() ); + targetJoinModelPart.forEachSelectable( + 0, + (i, selectableMapping) -> targetMappings.add( selectableMapping ) + ); + keyMappings = targetMappings; + } } + final TableReference tableReference = lhs.getPrimaryTableReference(); final List keyColumnReferences = new ArrayList<>( this.identifierMapping.getJdbcTypeCount() ); this.identifierMapping.forEachSelectable( diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityStandard.java index 1c1ea74051..485f46a9a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityStandard.java @@ -18,25 +18,20 @@ import org.hibernate.engine.FetchTiming; import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.EntityIdentifierMapping; import org.hibernate.metamodel.mapping.EntityMappingType; -import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.metamodel.mapping.SelectableMapping; -import org.hibernate.metamodel.mapping.internal.EntityCollectionPart; +import org.hibernate.metamodel.mapping.internal.ManyToManyCollectionPart; import org.hibernate.metamodel.mapping.internal.SingleAttributeIdentifierMapping; import org.hibernate.query.NativeQuery; +import org.hibernate.query.results.DomainResultCreationStateImpl; import org.hibernate.query.results.FetchBuilder; import org.hibernate.query.results.ResultsHelper; +import org.hibernate.query.results.TableGroupImpl; import org.hibernate.query.results.complete.CompleteFetchBuilder; import org.hibernate.spi.NavigablePath; -import org.hibernate.query.results.DomainResultCreationStateImpl; -import org.hibernate.query.results.ResultSetMappingSqlSelection; -import org.hibernate.query.results.TableGroupImpl; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.spi.SqlAliasBaseConstant; -import org.hibernate.sql.ast.spi.SqlAstCreationState; -import org.hibernate.sql.ast.spi.SqlExpressionResolver; -import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.results.graph.DomainResultCreationState; @@ -47,7 +42,6 @@ import org.hibernate.sql.results.graph.entity.EntityResult; import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata; import static org.hibernate.query.results.ResultsHelper.impl; -import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey; /** * @author Steve Ebersole @@ -230,7 +224,6 @@ public class DynamicResultBuilderEntityStandard final TableGroup keyTableGroup; if ( fetchable instanceof PluralAttributeMapping ) { final PluralAttributeMapping pluralAttributeMapping = (PluralAttributeMapping) fetchable; - final EntityCollectionPart elementDescriptor = (EntityCollectionPart) pluralAttributeMapping.getElementDescriptor(); if ( pluralAttributeMapping.getCollectionDescriptor().isOneToMany() ) { keyPart = entityMapping.getIdentifierMapping(); keyTableGroup = tableGroup; @@ -238,6 +231,7 @@ public class DynamicResultBuilderEntityStandard else { // In here, we know that the idColumnNames refer to the columns of the join table, // so we also need to resolve selections for the element identifier columns + final ManyToManyCollectionPart elementDescriptor = (ManyToManyCollectionPart) pluralAttributeMapping.getElementDescriptor(); keyPart = elementDescriptor.getForeignKeyDescriptor().getKeyPart(); keyTableGroup = collectionTableGroup; final List idColumnAliases; @@ -247,16 +241,16 @@ public class DynamicResultBuilderEntityStandard else { idColumnAliases = ( (CompleteFetchBuilder) idFetchBuilder ).getColumnAliases(); } - entityMapping.getIdentifierMapping().forEachSelectable( - (selectionIndex, selectableMapping) -> { - resolveSqlSelection( - idColumnAliases.get( selectionIndex ), - tableReference, - selectableMapping, - jdbcResultsMetadata, - domainResultCreationState - ); - } + + entityMapping + .getIdentifierMapping() + .forEachSelectable( (selectionIndex, selectableMapping) -> resolveSqlSelection( + idColumnAliases.get( selectionIndex ), + tableReference, + selectableMapping, + jdbcResultsMetadata, + domainResultCreationState + ) ); } } @@ -264,17 +258,14 @@ public class DynamicResultBuilderEntityStandard keyPart = entityMapping.getIdentifierMapping(); keyTableGroup = tableGroup; } - keyPart.forEachSelectable( - (selectionIndex, selectableMapping) -> { - resolveSqlSelection( - keyColumnAliases.get( selectionIndex ), - keyTableGroup.resolveTableReference( selectableMapping.getContainingTableExpression() ), - selectableMapping, - jdbcResultsMetadata, - domainResultCreationState - ); - } - ); + + keyPart.forEachSelectable( (selectionIndex, selectableMapping) -> resolveSqlSelection( + keyColumnAliases.get( selectionIndex ), + keyTableGroup.resolveTableReference( selectableMapping.getContainingTableExpression() ), + selectableMapping, + jdbcResultsMetadata, + domainResultCreationState + ) ); } if ( discriminatorColumnName != null ) { diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/SqlOmittingQueryOptions.java b/hibernate-core/src/main/java/org/hibernate/query/spi/SqlOmittingQueryOptions.java index 7518d46f92..31d6a90a07 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/SqlOmittingQueryOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/query/spi/SqlOmittingQueryOptions.java @@ -7,7 +7,7 @@ package org.hibernate.query.spi; import org.hibernate.LockOptions; -import org.hibernate.sql.exec.spi.JdbcSelect; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.results.spi.ListResultsConsumer; /** @@ -37,7 +37,7 @@ public class SqlOmittingQueryOptions extends DelegatingQueryOptions { return omitSqlQueryOptions( originalOptions, true, true ); } - public static QueryOptions omitSqlQueryOptions(QueryOptions originalOptions, JdbcSelect select) { + public static QueryOptions omitSqlQueryOptions(QueryOptions originalOptions, JdbcOperationQuerySelect select) { return omitSqlQueryOptions( originalOptions, !select.usesLimitParameters(), false ); } diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeNonSelectQueryPlanImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeNonSelectQueryPlanImpl.java index 41b051117a..0491526ffd 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeNonSelectQueryPlanImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeNonSelectQueryPlanImpl.java @@ -19,10 +19,10 @@ import org.hibernate.query.spi.QueryParameterBindings; import org.hibernate.query.sql.spi.ParameterOccurrence; import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter; import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; -import org.hibernate.sql.exec.spi.JdbcMutation; +import org.hibernate.sql.exec.spi.JdbcOperationQueryMutation; +import org.hibernate.sql.exec.spi.JdbcOperationQueryMutationNative; import org.hibernate.sql.exec.spi.JdbcParameterBinder; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.NativeJdbcMutation; /** * @author Steve Ebersole @@ -69,7 +69,7 @@ public class NativeNonSelectQueryPlanImpl implements NonSelectQueryPlan { final SQLQueryParser parser = new SQLQueryParser( sql, null, session.getSessionFactory() ); - final JdbcMutation jdbcMutation = new NativeJdbcMutation( + final JdbcOperationQueryMutation jdbcMutation = new JdbcOperationQueryMutationNative( parser.process(), jdbcParameterBinders, affectedTableNames diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeSelectQueryPlanImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeSelectQueryPlanImpl.java index 98757d4cab..2a2a5905ab 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeSelectQueryPlanImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeSelectQueryPlanImpl.java @@ -26,9 +26,9 @@ import org.hibernate.query.sql.spi.NativeSelectQueryPlan; import org.hibernate.query.sql.spi.ParameterOccurrence; import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter; import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcParameterBinder; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer; import org.hibernate.sql.results.spi.ListResultsConsumer; @@ -91,7 +91,7 @@ public class NativeSelectQueryPlanImpl implements NativeSelectQueryPlan { executionContext.getSession().autoFlushIfRequired( affectedTableNames ); - final JdbcSelect jdbcSelect = new JdbcSelect( + final JdbcOperationQuerySelect jdbcSelect = new JdbcOperationQuerySelect( sql, jdbcParameterBinders, resultSetMapping, @@ -138,7 +138,7 @@ public class NativeSelectQueryPlanImpl implements NativeSelectQueryPlan { ); } - final JdbcSelect jdbcSelect = new JdbcSelect( + final JdbcOperationQuerySelect jdbcSelect = new JdbcOperationQuerySelect( sql, jdbcParameterBinders, resultSetMapping, diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java index 5c8546eca4..683dd0f6bc 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java @@ -47,8 +47,8 @@ import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.ast.tree.select.SelectStatement; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; import org.hibernate.sql.exec.spi.JdbcSelectExecutor; import org.hibernate.sql.results.graph.entity.LoadingEntityEntry; import org.hibernate.sql.results.internal.RowTransformerArrayImpl; @@ -99,7 +99,7 @@ public class ConcreteSqmSelectQueryPlan implements SelectQueryPlan { } this.listInterpreter = (unused, executionContext, sqmInterpretation, jdbcParameterBindings) -> { final SharedSessionContractImplementor session = executionContext.getSession(); - final JdbcSelect jdbcSelect = sqmInterpretation.getJdbcSelect(); + final JdbcOperationQuerySelect jdbcSelect = sqmInterpretation.getJdbcSelect(); try { final SubselectFetch.RegistrationHandler subSelectFetchKeyHandler = SubselectFetch.createRegistrationHandler( session.getPersistenceContext().getBatchFetchQueue(), @@ -383,7 +383,7 @@ public class ConcreteSqmSelectQueryPlan implements SelectQueryPlan { final JdbcServices jdbcServices = sessionFactory.getJdbcServices(); final JdbcEnvironment jdbcEnvironment = jdbcServices.getJdbcEnvironment(); final SqlAstTranslatorFactory sqlAstTranslatorFactory = jdbcEnvironment.getSqlAstTranslatorFactory(); - final SqlAstTranslator selectTranslator = sqlAstTranslatorFactory.buildSelectTranslator( + final SqlAstTranslator selectTranslator = sqlAstTranslatorFactory.buildSelectTranslator( sessionFactory, sqmInterpretation.getSqlAst() ); @@ -404,7 +404,7 @@ public class ConcreteSqmSelectQueryPlan implements SelectQueryPlan { }, session ); - final JdbcSelect jdbcSelect = selectTranslator.translate( jdbcParameterBindings, executionContext.getQueryOptions() ); + final JdbcOperationQuerySelect jdbcSelect = selectTranslator.translate( jdbcParameterBindings, executionContext.getQueryOptions() ); return new CacheableSqmInterpretation( sqmInterpretation.getSqlAst(), @@ -426,7 +426,7 @@ public class ConcreteSqmSelectQueryPlan implements SelectQueryPlan { private static class CacheableSqmInterpretation { private final SelectStatement selectStatement; - private final JdbcSelect jdbcSelect; + private final JdbcOperationQuerySelect jdbcSelect; private final FromClauseAccess tableGroupAccess; private final Map, Map, List>>> jdbcParamsXref; private final Map, MappingModelExpressible> sqmParameterMappingModelTypes; @@ -434,7 +434,7 @@ public class ConcreteSqmSelectQueryPlan implements SelectQueryPlan { CacheableSqmInterpretation( SelectStatement selectStatement, - JdbcSelect jdbcSelect, + JdbcOperationQuerySelect jdbcSelect, FromClauseAccess tableGroupAccess, Map, Map, List>>> jdbcParamsXref, Map, MappingModelExpressible> sqmParameterMappingModelTypes, @@ -451,7 +451,7 @@ public class ConcreteSqmSelectQueryPlan implements SelectQueryPlan { return selectStatement; } - JdbcSelect getJdbcSelect() { + JdbcOperationQuerySelect getJdbcSelect() { return jdbcSelect; } diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleDeleteQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleDeleteQueryPlan.java index fc4567a73b..41b177430a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleDeleteQueryPlan.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleDeleteQueryPlan.java @@ -16,8 +16,7 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; import org.hibernate.metamodel.mapping.MappingModelExpressible; -import org.hibernate.metamodel.mapping.MappingModelHelper; -import org.hibernate.spi.NavigablePath; +import org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper; import org.hibernate.query.spi.DomainQueryExecutionContext; import org.hibernate.query.spi.NonSelectQueryPlan; import org.hibernate.query.spi.QueryEngine; @@ -29,6 +28,7 @@ import org.hibernate.query.sqm.sql.SqmTranslator; import org.hibernate.query.sqm.sql.SqmTranslatorFactory; import org.hibernate.query.sqm.tree.delete.SqmDeleteStatement; import org.hibernate.query.sqm.tree.expression.SqmParameter; +import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.tree.delete.DeleteStatement; import org.hibernate.sql.ast.tree.expression.Expression; @@ -36,7 +36,7 @@ import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.ast.tree.from.MutatingTableReferenceGroupWrapper; import org.hibernate.sql.ast.tree.predicate.InSubQueryPredicate; import org.hibernate.sql.ast.tree.select.QuerySpec; -import org.hibernate.sql.exec.spi.JdbcDelete; +import org.hibernate.sql.exec.spi.JdbcOperationQueryDelete; import org.hibernate.sql.exec.spi.JdbcParameterBindings; import org.hibernate.sql.results.internal.SqlSelectionImpl; @@ -48,7 +48,7 @@ public class SimpleDeleteQueryPlan implements NonSelectQueryPlan { private final SqmDeleteStatement sqmDelete; private final DomainParameterXref domainParameterXref; - private JdbcDelete jdbcDelete; + private JdbcOperationQueryDelete jdbcDelete; private SqmTranslation sqmInterpretation; private Map, Map, List>>> jdbcParamsXref; @@ -63,7 +63,7 @@ public class SimpleDeleteQueryPlan implements NonSelectQueryPlan { this.domainParameterXref = domainParameterXref; } - private SqlAstTranslator createDeleteTranslator(DomainQueryExecutionContext executionContext) { + private SqlAstTranslator createDeleteTranslator(DomainQueryExecutionContext executionContext) { final SessionFactoryImplementor factory = executionContext.getSession().getFactory(); final QueryEngine queryEngine = factory.getQueryEngine(); @@ -94,7 +94,7 @@ public class SimpleDeleteQueryPlan implements NonSelectQueryPlan { final SharedSessionContractImplementor session = executionContext.getSession(); final SessionFactoryImplementor factory = session.getFactory(); final JdbcServices jdbcServices = factory.getJdbcServices(); - SqlAstTranslator deleteTranslator = null; + SqlAstTranslator deleteTranslator = null; if ( jdbcDelete == null ) { deleteTranslator = createDeleteTranslator( executionContext ); } @@ -143,7 +143,7 @@ public class SimpleDeleteQueryPlan implements NonSelectQueryPlan { } final ForeignKeyDescriptor fkDescriptor = attributeMapping.getKeyDescriptor(); - final Expression fkColumnExpression = MappingModelHelper.buildColumnReferenceExpression( + final Expression fkColumnExpression = MappingModelCreationHelper.buildColumnReferenceExpression( fkDescriptor.getKeyPart(), null, factory @@ -156,7 +156,7 @@ public class SimpleDeleteQueryPlan implements NonSelectQueryPlan { attributeMapping, sqmInterpretation.getSqlAst().getTargetTable() ); - final Expression fkTargetColumnExpression = MappingModelHelper.buildColumnReferenceExpression( + final Expression fkTargetColumnExpression = MappingModelCreationHelper.buildColumnReferenceExpression( tableGroup, fkDescriptor.getTargetPart(), sqmInterpretation.getSqlExpressionResolver(), diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleInsertQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleInsertQueryPlan.java index cf623e0ee2..59df6531ba 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleInsertQueryPlan.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleInsertQueryPlan.java @@ -28,7 +28,7 @@ import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.ast.tree.insert.InsertStatement; -import org.hibernate.sql.exec.spi.JdbcInsert; +import org.hibernate.sql.exec.spi.JdbcOperationQueryInsert; import org.hibernate.sql.exec.spi.JdbcParameterBindings; /** @@ -39,7 +39,7 @@ public class SimpleInsertQueryPlan implements NonSelectQueryPlan { private final DomainParameterXref domainParameterXref; private Map, MappingModelExpressible> paramTypeResolutions; - private JdbcInsert jdbcInsert; + private JdbcOperationQueryInsert jdbcInsert; private FromClauseAccess tableGroupAccess; private Map, Map, List>>> jdbcParamsXref; @@ -50,7 +50,7 @@ public class SimpleInsertQueryPlan implements NonSelectQueryPlan { this.domainParameterXref = domainParameterXref; } - private SqlAstTranslator createInsertTranslator(DomainQueryExecutionContext executionContext) { + private SqlAstTranslator createInsertTranslator(DomainQueryExecutionContext executionContext) { final SessionFactoryImplementor factory = executionContext.getSession().getFactory(); final QueryEngine queryEngine = factory.getQueryEngine(); @@ -87,7 +87,7 @@ public class SimpleInsertQueryPlan implements NonSelectQueryPlan { final SharedSessionContractImplementor session = executionContext.getSession(); final SessionFactoryImplementor factory = session.getFactory(); final JdbcServices jdbcServices = factory.getJdbcServices(); - SqlAstTranslator insertTranslator = null; + SqlAstTranslator insertTranslator = null; if ( jdbcInsert == null ) { insertTranslator = createInsertTranslator( executionContext ); } diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleUpdateQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleUpdateQueryPlan.java index 77bd15e83e..4ec424ec1c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleUpdateQueryPlan.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleUpdateQueryPlan.java @@ -28,8 +28,8 @@ import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.ast.tree.update.UpdateStatement; +import org.hibernate.sql.exec.spi.JdbcOperationQueryUpdate; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcUpdate; /** * @author Steve Ebersole @@ -38,7 +38,7 @@ public class SimpleUpdateQueryPlan implements NonSelectQueryPlan { private final SqmUpdateStatement sqmUpdate; private final DomainParameterXref domainParameterXref; - private JdbcUpdate jdbcUpdate; + private JdbcOperationQueryUpdate jdbcUpdate; private FromClauseAccess tableGroupAccess; private Map, Map, List>>> jdbcParamsXref; private Map, MappingModelExpressible> sqmParamMappingTypeResolutions; @@ -56,7 +56,7 @@ public class SimpleUpdateQueryPlan implements NonSelectQueryPlan { final SharedSessionContractImplementor session = executionContext.getSession(); final SessionFactoryImplementor factory = session.getFactory(); final JdbcServices jdbcServices = factory.getJdbcServices(); - SqlAstTranslator updateTranslator = null; + SqlAstTranslator updateTranslator = null; if ( jdbcUpdate == null ) { updateTranslator = createUpdateTranslator( executionContext ); } @@ -102,7 +102,7 @@ public class SimpleUpdateQueryPlan implements NonSelectQueryPlan { ); } - private SqlAstTranslator createUpdateTranslator(DomainQueryExecutionContext executionContext) { + private SqlAstTranslator createUpdateTranslator(DomainQueryExecutionContext executionContext) { final SessionFactoryImplementor factory = executionContext.getSession().getFactory(); final QueryEngine queryEngine = factory.getQueryEngine(); diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmJdbcExecutionContextAdapter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmJdbcExecutionContextAdapter.java index 476c29e2b3..9c9a1bead2 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmJdbcExecutionContextAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmJdbcExecutionContextAdapter.java @@ -12,7 +12,7 @@ import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.spi.QueryParameterBindings; import org.hibernate.sql.exec.spi.Callback; import org.hibernate.sql.exec.spi.ExecutionContext; -import org.hibernate.sql.exec.spi.JdbcSelect; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import static org.hibernate.query.spi.SqlOmittingQueryOptions.omitSqlQueryOptions; @@ -46,7 +46,7 @@ public class SqmJdbcExecutionContextAdapter implements ExecutionContext { this.queryOptions = queryOptions; } - public SqmJdbcExecutionContextAdapter(DomainQueryExecutionContext sqmExecutionContext, JdbcSelect jdbcSelect) { + public SqmJdbcExecutionContextAdapter(DomainQueryExecutionContext sqmExecutionContext, JdbcOperationQuerySelect jdbcSelect) { this( sqmExecutionContext, omitSqlQueryOptions( sqmExecutionContext.getQueryOptions(), jdbcSelect ) ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmMappingModelHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmMappingModelHelper.java index ccf3634bbe..5b5d722a9e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmMappingModelHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmMappingModelHelper.java @@ -28,7 +28,6 @@ import org.hibernate.metamodel.model.domain.internal.EmbeddedSqmPathSource; import org.hibernate.metamodel.model.domain.internal.EntitySqmPathSource; import org.hibernate.metamodel.model.domain.internal.MappedSuperclassSqmPathSource; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.spi.NavigablePath; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.SqmPathSource; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; @@ -36,6 +35,7 @@ import org.hibernate.query.sqm.tree.SqmTypedNode; import org.hibernate.query.sqm.tree.domain.AbstractSqmSpecificPluralPartPath; import org.hibernate.query.sqm.tree.domain.SqmPath; import org.hibernate.query.sqm.tree.domain.SqmTreatedPath; +import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.type.BasicType; @@ -175,7 +175,7 @@ public class SqmMappingModelHelper { // For entity collection parts, we must return the entity mapping type, // as that is the mapping type of the expression if ( collectionPart instanceof EntityCollectionPart ) { - return ( (EntityCollectionPart) collectionPart ).getEntityMappingType(); + return ( (EntityCollectionPart) collectionPart ).getAssociatedEntityMappingType(); } return collectionPart; } diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MatchingIdSelectionHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MatchingIdSelectionHelper.java index 1bd4edebed..fd2f382095 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MatchingIdSelectionHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MatchingIdSelectionHelper.java @@ -40,8 +40,8 @@ import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.ast.tree.predicate.Predicate; import org.hibernate.sql.ast.tree.select.QuerySpec; import org.hibernate.sql.ast.tree.select.SelectStatement; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.basic.BasicResult; import org.hibernate.sql.results.internal.SqlSelectionImpl; @@ -279,7 +279,7 @@ public class MatchingIdSelectionHelper { final JdbcServices jdbcServices = factory.getJdbcServices(); final JdbcEnvironment jdbcEnvironment = jdbcServices.getJdbcEnvironment(); - final SqlAstTranslator sqlAstSelectTranslator = jdbcEnvironment + final SqlAstTranslator sqlAstSelectTranslator = jdbcEnvironment .getSqlAstTranslatorFactory() .buildSelectTranslator( factory, matchingIdSelection ); @@ -312,7 +312,7 @@ public class MatchingIdSelectionHelper { } ); } - final JdbcSelect idSelectJdbcOperation = sqlAstSelectTranslator.translate( + final JdbcOperationQuerySelect idSelectJdbcOperation = sqlAstSelectTranslator.translate( jdbcParameterBindings, executionContext.getQueryOptions() ); diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMutationStrategyHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMutationStrategyHelper.java index 934d4aaad1..a6365a0740 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMutationStrategyHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMutationStrategyHelper.java @@ -217,8 +217,7 @@ public class SqmMutationStrategyHelper { final NamedTableReference tableReference = new NamedTableReference( separateCollectionTable, DeleteStatement.DEFAULT_ALIAS, - true, - sessionFactory + true ); final DeleteStatement sqlAstDelete = new DeleteStatement( diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/AbstractCteMutationHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/AbstractCteMutationHandler.java index d7bd7398db..75d8f3a3e4 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/AbstractCteMutationHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/AbstractCteMutationHandler.java @@ -52,8 +52,8 @@ import org.hibernate.sql.ast.tree.predicate.Predicate; import org.hibernate.sql.ast.tree.select.QuerySpec; import org.hibernate.sql.ast.tree.select.SelectClause; import org.hibernate.sql.ast.tree.select.SelectStatement; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.basic.BasicResult; import org.hibernate.sql.results.internal.SqlSelectionImpl; @@ -100,6 +100,7 @@ public abstract class AbstractCteMutationHandler extends AbstractMutationHandler @Override public int execute(DomainQueryExecutionContext executionContext) { + //noinspection rawtypes final SqmDeleteOrUpdateStatement sqmMutationStatement = getSqmDeleteOrUpdateStatement(); final SessionFactoryImplementor factory = executionContext.getSession().getFactory(); final EntityMappingType entityDescriptor = getEntityDescriptor(); @@ -131,6 +132,7 @@ public abstract class AbstractCteMutationHandler extends AbstractMutationHandler parameterResolutions = new IdentityHashMap<>(); } + //noinspection rawtypes final Map paramTypeResolutions = new LinkedHashMap<>(); final Predicate restriction = sqmConverter.visitWhereClause( @@ -160,11 +162,12 @@ public abstract class AbstractCteMutationHandler extends AbstractMutationHandler final List> domainResults = new ArrayList<>( 1 ); final SelectStatement statement = new SelectStatement( querySpec, domainResults ); final JdbcServices jdbcServices = factory.getJdbcServices(); - final SqlAstTranslator translator = jdbcServices.getJdbcEnvironment() + final SqlAstTranslator translator = jdbcServices.getJdbcEnvironment() .getSqlAstTranslatorFactory() .buildSelectTranslator( factory, statement ); final Expression count = createCountStar( factory, sqmConverter ); + //noinspection rawtypes,unchecked domainResults.add( new BasicResult<>( 0, @@ -178,8 +181,7 @@ public abstract class AbstractCteMutationHandler extends AbstractMutationHandler new NamedTableReference( idSelectCte.getCteTable().getTableExpression(), CTE_TABLE_IDENTIFIER, - false, - factory + false ) ) ); @@ -201,7 +203,7 @@ public abstract class AbstractCteMutationHandler extends AbstractMutationHandler final LockMode lockMode = lockOptions.getAliasSpecificLockMode( explicitDmlTargetAlias ); // Acquire a WRITE lock for the rows that are about to be modified lockOptions.setAliasSpecificLockMode( explicitDmlTargetAlias, LockMode.WRITE ); - final JdbcSelect select = translator.translate( jdbcParameterBindings, executionContext.getQueryOptions() ); + final JdbcOperationQuerySelect select = translator.translate( jdbcParameterBindings, executionContext.getQueryOptions() ); lockOptions.setAliasSpecificLockMode( explicitDmlTargetAlias, lockMode ); executionContext.getSession().autoFlushIfRequired( select.getAffectedTableNames() ); List list = jdbcServices.getJdbcSelectExecutor().list( @@ -269,8 +271,7 @@ public abstract class AbstractCteMutationHandler extends AbstractMutationHandler final NamedTableReference idSelectTableReference = new NamedTableReference( idSelectCte.getCteTable().getTableExpression(), CTE_TABLE_IDENTIFIER, - false, - factory + false ); final List cteColumns = idSelectCte.getCteTable().getCteColumns(); final int size = cteColumns.size(); @@ -295,19 +296,18 @@ public abstract class AbstractCteMutationHandler extends AbstractMutationHandler } else { fkModelPart.forEachSelectable( - (selectionIndex, selectableMapping) -> { - subQuerySelectClause.addSqlSelection( - new SqlSelectionImpl( - selectionIndex + 1, - selectionIndex, - new ColumnReference( - idSelectTableReference, - selectableMapping.getSelectionExpression(), - selectableMapping.getJdbcMapping() - ) - ) - ); - } + (selectionIndex, selectableMapping) -> subQuerySelectClause.addSqlSelection( + new SqlSelectionImpl( + selectionIndex + 1, + selectionIndex, + new ColumnReference( + idSelectTableReference, + selectableMapping.getSelectionExpression(), + selectableMapping.getJdbcMapping() + + ) + ) + ) ); } return subQuery; @@ -328,8 +328,7 @@ public abstract class AbstractCteMutationHandler extends AbstractMutationHandler return new NamedTableReference( tableExpression, tableReference.getIdentificationVariable(), - tableReference.isOptional(), - getSessionFactory() + tableReference.isOptional() ); } else { diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteDeleteHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteDeleteHandler.java index c5e03833a1..3a34afdceb 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteDeleteHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteDeleteHandler.java @@ -113,17 +113,14 @@ public class CteDeleteHandler extends AbstractCteMutationHandler implements Dele final NamedTableReference dmlTableReference = new NamedTableReference( tableExpression, DeleteStatement.DEFAULT_ALIAS, - true, - factory - ); - final List columnReferences = new ArrayList<>( idSelectCte.getCteTable() - .getCteColumns() - .size() ); - pluralAttribute.getKeyDescriptor().visitKeySelectables( - (index, selectable) -> columnReferences.add( - new ColumnReference( - dmlTableReference, - selectable + true + ); + final List columnReferences = new ArrayList<>( idSelectCte.getCteTable().getCteColumns().size() ); + pluralAttribute.getKeyDescriptor().visitKeySelectables( + (index, selectable) -> columnReferences.add( + new ColumnReference( + dmlTableReference, + selectable ) ) ); diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java index 65bb94b584..37810bc866 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java @@ -35,22 +35,21 @@ import org.hibernate.metamodel.mapping.SqlExpressible; import org.hibernate.persister.entity.AbstractEntityPersister; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.Joinable; -import org.hibernate.query.sqm.BinaryArithmeticOperator; -import org.hibernate.query.sqm.ComparisonOperator; -import org.hibernate.query.sqm.mutation.internal.SqmInsertStrategyHelper; -import org.hibernate.query.sqm.sql.internal.SqmPathInterpretation; -import org.hibernate.spi.NavigablePath; import org.hibernate.query.SemanticException; -import org.hibernate.query.sqm.SortOrder; import org.hibernate.query.results.TableGroupImpl; import org.hibernate.query.spi.DomainQueryExecutionContext; +import org.hibernate.query.sqm.BinaryArithmeticOperator; +import org.hibernate.query.sqm.ComparisonOperator; +import org.hibernate.query.sqm.SortOrder; import org.hibernate.query.sqm.internal.DomainParameterXref; import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter; import org.hibernate.query.sqm.internal.SqmUtil; import org.hibernate.query.sqm.mutation.internal.InsertHandler; import org.hibernate.query.sqm.mutation.internal.MultiTableSqmMutationConverter; +import org.hibernate.query.sqm.mutation.internal.SqmInsertStrategyHelper; import org.hibernate.query.sqm.spi.SqmParameterMappingModelResolutionAccess; import org.hibernate.query.sqm.sql.BaseSqmToSqlAstConverter; +import org.hibernate.query.sqm.sql.internal.SqmPathInterpretation; import org.hibernate.query.sqm.tree.expression.SqmExpression; import org.hibernate.query.sqm.tree.expression.SqmParameter; import org.hibernate.query.sqm.tree.expression.SqmStar; @@ -58,6 +57,7 @@ import org.hibernate.query.sqm.tree.insert.SqmInsertSelectStatement; import org.hibernate.query.sqm.tree.insert.SqmInsertStatement; import org.hibernate.query.sqm.tree.insert.SqmInsertValuesStatement; import org.hibernate.query.sqm.tree.insert.SqmValues; +import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAstProcessingState; @@ -81,7 +81,7 @@ import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.ast.tree.from.TableReferenceJoin; import org.hibernate.sql.ast.tree.from.UnionTableReference; import org.hibernate.sql.ast.tree.from.ValuesTableGroup; -import org.hibernate.sql.ast.tree.insert.InsertStatement; +import org.hibernate.sql.ast.tree.insert.InsertSelectStatement; import org.hibernate.sql.ast.tree.insert.Values; import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate; import org.hibernate.sql.ast.tree.select.QueryPart; @@ -89,8 +89,8 @@ import org.hibernate.sql.ast.tree.select.QuerySpec; import org.hibernate.sql.ast.tree.select.SelectStatement; import org.hibernate.sql.ast.tree.select.SortSpecification; import org.hibernate.sql.ast.tree.update.Assignment; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.basic.BasicResult; import org.hibernate.sql.results.internal.SqlSelectionImpl; @@ -198,10 +198,9 @@ public class CteInsertHandler implements InsertHandler { final NamedTableReference entityTableReference = new NamedTableReference( cteTable.getTableExpression(), TemporaryTable.DEFAULT_ALIAS, - true, - sessionFactory + true ); - final InsertStatement insertStatement = new InsertStatement( entityTableReference ); + final InsertSelectStatement insertStatement = new InsertSelectStatement( entityTableReference ); final BaseSqmToSqlAstConverter.AdditionalInsertValues additionalInsertValues = sqmConverter.visitInsertionTargetPaths( (assignable, columnReferences) -> { @@ -265,8 +264,8 @@ public class CteInsertHandler implements InsertHandler { null, rowNumberColumn.getJdbcMapping() ); - insertStatement.getTargetColumnReferences().set( - insertStatement.getTargetColumnReferences().size() - 1, + insertStatement.getTargetColumns().set( + insertStatement.getTargetColumns().size() - 1, columnReference ); targetPathCteColumns.set( @@ -350,7 +349,7 @@ public class CteInsertHandler implements InsertHandler { null, rowNumberColumn.getJdbcMapping() ); - insertStatement.getTargetColumnReferences().add( columnReference ); + insertStatement.getTargetColumns().add( columnReference ); targetPathCteColumns.add( rowNumberColumn ); } @@ -418,8 +417,7 @@ public class CteInsertHandler implements InsertHandler { new NamedTableReference( baseTableName, "e", - false, - factory + false ) ) ); @@ -475,8 +473,7 @@ public class CteInsertHandler implements InsertHandler { new NamedTableReference( baseTableName, "e", - false, - factory + false ), null ); @@ -484,8 +481,7 @@ public class CteInsertHandler implements InsertHandler { new NamedTableReference( ROW_NUMBERS_WITH_SEQUENCE_VALUE, "t", - false, - factory + false ) ); baseTableGroup.addTableGroupJoin( @@ -645,15 +641,14 @@ public class CteInsertHandler implements InsertHandler { // We want to return the insertion count of the base table baseInsertCte, CTE_TABLE_IDENTIFIER, - false, - factory + false ) ) ); // Execute the statement final JdbcServices jdbcServices = factory.getJdbcServices(); - final SqlAstTranslator translator = jdbcServices.getJdbcEnvironment() + final SqlAstTranslator translator = jdbcServices.getJdbcEnvironment() .getSqlAstTranslatorFactory() .buildSelectTranslator( factory, statement ); final JdbcParameterBindings jdbcParameterBindings = SqmUtil.createJdbcParameterBindings( @@ -670,7 +665,7 @@ public class CteInsertHandler implements InsertHandler { }, executionContext.getSession() ); - final JdbcSelect select = translator.translate( jdbcParameterBindings, executionContext.getQueryOptions() ); + final JdbcOperationQuerySelect select = translator.translate( jdbcParameterBindings, executionContext.getQueryOptions() ); executionContext.getSession().autoFlushIfRequired( select.getAffectedTableNames() ); List list = jdbcServices.getJdbcSelectExecutor().list( @@ -823,8 +818,7 @@ public class CteInsertHandler implements InsertHandler { new NamedTableReference( baseTableName, "e", - false, - factory + false ) ) ); @@ -873,8 +867,7 @@ public class CteInsertHandler implements InsertHandler { new NamedTableReference( baseTableName, "e", - false, - factory + false ), null ); @@ -882,8 +875,7 @@ public class CteInsertHandler implements InsertHandler { new NamedTableReference( getCteTableName( tableExpression ), "t", - false, - factory + false ) ); baseTableGroup.addTableGroupJoin( @@ -956,8 +948,7 @@ public class CteInsertHandler implements InsertHandler { new NamedTableReference( dmlResultCte.getTableExpression(), "e", - false, - factory + false ) ) ); @@ -1007,8 +998,7 @@ public class CteInsertHandler implements InsertHandler { new NamedTableReference( queryCte.getCteTable().getTableExpression(), "e", - false, - factory + false ) ) ); @@ -1045,7 +1035,7 @@ public class CteInsertHandler implements InsertHandler { insertColumnReferences = returningColumnReferences; } - final InsertStatement dmlStatement = new InsertStatement( + final InsertSelectStatement dmlStatement = new InsertSelectStatement( dmlTableReference, returningColumnReferences ); @@ -1099,8 +1089,7 @@ public class CteInsertHandler implements InsertHandler { return new NamedTableReference( tableExpression, tableReference.getIdentificationVariable(), - tableReference.isOptional(), - sessionFactory + tableReference.isOptional() ); } else { diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteUpdateHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteUpdateHandler.java index 922cd9952b..fda1c1a89e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteUpdateHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteUpdateHandler.java @@ -42,7 +42,7 @@ import org.hibernate.sql.ast.tree.from.NamedTableReference; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.ast.tree.from.TableReferenceJoin; -import org.hibernate.sql.ast.tree.insert.InsertStatement; +import org.hibernate.sql.ast.tree.insert.InsertSelectStatement; import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate; import org.hibernate.sql.ast.tree.predicate.ExistsPredicate; import org.hibernate.sql.ast.tree.select.QuerySpec; @@ -182,8 +182,7 @@ public class CteUpdateHandler extends AbstractCteMutationHandler implements Upda final NamedTableReference existsTableReference = new NamedTableReference( tableExpression, "dml_", - false, - factory + false ); final List existsKeyColumns = new ArrayList<>( idSelectCte.getCteTable().getCteColumns().size() ); final String[] keyColumns = entityPersister.getKeyColumns( i ); @@ -253,7 +252,7 @@ public class CteUpdateHandler extends AbstractCteMutationHandler implements Upda ); } - final InsertStatement dmlStatement = new InsertStatement( dmlTableReference, existsKeyColumns ); + final InsertSelectStatement dmlStatement = new InsertSelectStatement( dmlTableReference, existsKeyColumns ); dmlStatement.addTargetColumnReferences( targetColumnReferences.toArray( new ColumnReference[0] ) ); dmlStatement.setSourceSelectStatement( querySpec ); statement.addCteStatement( new CteStatement( dmlResultCte, dmlStatement ) ); diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java index c552e4c7f6..6dfbc06740 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java @@ -14,10 +14,9 @@ import java.util.function.Supplier; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.MutableInteger; import org.hibernate.metamodel.mapping.EntityIdentifierMapping; +import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.SelectableConsumer; -import org.hibernate.metamodel.mapping.EntityMappingType; -import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.query.spi.DomainQueryExecutionContext; import org.hibernate.query.sqm.internal.DomainParameterXref; import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter; @@ -30,8 +29,8 @@ import org.hibernate.sql.ast.tree.delete.DeleteStatement; import org.hibernate.sql.ast.tree.from.NamedTableReference; import org.hibernate.sql.ast.tree.predicate.Predicate; import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; -import org.hibernate.sql.exec.spi.JdbcDelete; import org.hibernate.sql.exec.spi.JdbcMutationExecutor; +import org.hibernate.sql.exec.spi.JdbcOperationQueryDelete; import org.hibernate.sql.exec.spi.JdbcParameterBindings; import org.hibernate.sql.exec.spi.StatementCreatorHelper; @@ -159,8 +158,7 @@ public class InlineDeleteHandler implements DeleteHandler { final NamedTableReference targetTableReference = new NamedTableReference( targetTableExpression, DeleteStatement.DEFAULT_ALIAS, - false, - sessionFactory + false ); final SqmJdbcExecutionContextAdapter executionContextAdapter = SqmJdbcExecutionContextAdapter.omittingLockingAndPaging( executionContext ); @@ -177,7 +175,7 @@ public class InlineDeleteHandler implements DeleteHandler { final DeleteStatement deleteStatement = new DeleteStatement( targetTableReference, matchingIdsPredicate ); - final JdbcDelete jdbcOperation = sqlAstTranslatorFactory.buildDeleteTranslator( sessionFactory, deleteStatement ) + final JdbcOperationQueryDelete jdbcOperation = sqlAstTranslatorFactory.buildDeleteTranslator( sessionFactory, deleteStatement ) .translate( jdbcParameterBindings, executionContext.getQueryOptions() ); jdbcMutationExecutor.execute( diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java index 9fa34d1f9a..86ecf0f9ab 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java @@ -39,8 +39,8 @@ import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter; import org.hibernate.query.sqm.internal.SqmUtil; import org.hibernate.query.sqm.mutation.internal.MatchingIdSelectionHelper; import org.hibernate.query.sqm.mutation.internal.MultiTableSqmMutationConverter; -import org.hibernate.query.sqm.mutation.internal.UpdateHandler; import org.hibernate.query.sqm.mutation.internal.TableKeyExpressionCollector; +import org.hibernate.query.sqm.mutation.internal.UpdateHandler; import org.hibernate.query.sqm.spi.SqmParameterMappingModelResolutionAccess; import org.hibernate.query.sqm.tree.expression.SqmParameter; import org.hibernate.query.sqm.tree.predicate.SqmWhereClause; @@ -62,7 +62,7 @@ import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.ast.tree.from.TableReferenceJoin; import org.hibernate.sql.ast.tree.from.UnionTableReference; import org.hibernate.sql.ast.tree.from.ValuesTableGroup; -import org.hibernate.sql.ast.tree.insert.InsertStatement; +import org.hibernate.sql.ast.tree.insert.InsertSelectStatement; import org.hibernate.sql.ast.tree.insert.Values; import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate; import org.hibernate.sql.ast.tree.predicate.InListPredicate; @@ -74,10 +74,10 @@ import org.hibernate.sql.ast.tree.select.SelectClause; import org.hibernate.sql.ast.tree.update.Assignment; import org.hibernate.sql.ast.tree.update.UpdateStatement; import org.hibernate.sql.exec.spi.ExecutionContext; -import org.hibernate.sql.exec.spi.JdbcInsert; import org.hibernate.sql.exec.spi.JdbcMutationExecutor; +import org.hibernate.sql.exec.spi.JdbcOperationQueryInsert; +import org.hibernate.sql.exec.spi.JdbcOperationQueryUpdate; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcUpdate; import org.hibernate.sql.results.internal.SqlSelectionImpl; /** @@ -382,7 +382,7 @@ public class InlineUpdateHandler implements UpdateHandler { ); final JdbcServices jdbcServices = sessionFactory.getJdbcServices(); - final JdbcUpdate jdbcUpdate = jdbcServices.getJdbcEnvironment() + final JdbcOperationQueryUpdate jdbcUpdate = jdbcServices.getJdbcEnvironment() .getSqlAstTranslatorFactory() .buildUpdateTranslator( sessionFactory, sqlAst ) .translate( jdbcParameterBindings, executionContext.getQueryOptions() ); @@ -555,13 +555,13 @@ public class InlineUpdateHandler implements UpdateHandler { ); } - final InsertStatement insertSqlAst = new InsertStatement( + final InsertSelectStatement insertSqlAst = new InsertSelectStatement( dmlTableReference ); insertSqlAst.addTargetColumnReferences( targetColumnReferences.toArray( new ColumnReference[0] ) ); insertSqlAst.setSourceSelectStatement( querySpec ); - final JdbcInsert jdbcInsert = jdbcServices.getJdbcEnvironment() + final JdbcOperationQueryInsert jdbcInsert = jdbcServices.getJdbcEnvironment() .getSqlAstTranslatorFactory() .buildInsertTranslator( sessionFactory, insertSqlAst ) .translate( jdbcParameterBindings, executionContext.getQueryOptions() ); @@ -623,8 +623,7 @@ public class InlineUpdateHandler implements UpdateHandler { return new NamedTableReference( tableExpression, tableReference.getIdentificationVariable(), - tableReference.isOptional(), - sessionFactory + tableReference.isOptional() ); } return (NamedTableReference) tableReference; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ExecuteWithTemporaryTableHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ExecuteWithTemporaryTableHelper.java index 58177505cb..f3c1955bdb 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ExecuteWithTemporaryTableHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ExecuteWithTemporaryTableHelper.java @@ -25,8 +25,8 @@ import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.sqm.ComparisonOperator; -import org.hibernate.spi.NavigablePath; import org.hibernate.query.sqm.mutation.internal.MultiTableSqmMutationConverter; +import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.tree.expression.ColumnReference; @@ -35,12 +35,12 @@ import org.hibernate.sql.ast.tree.from.NamedTableReference; import org.hibernate.sql.ast.tree.from.StandardTableGroup; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableReference; -import org.hibernate.sql.ast.tree.insert.InsertStatement; +import org.hibernate.sql.ast.tree.insert.InsertSelectStatement; import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate; import org.hibernate.sql.ast.tree.predicate.Predicate; import org.hibernate.sql.ast.tree.select.QuerySpec; import org.hibernate.sql.exec.spi.ExecutionContext; -import org.hibernate.sql.exec.spi.JdbcInsert; +import org.hibernate.sql.exec.spi.JdbcOperationQueryInsert; import org.hibernate.sql.exec.spi.JdbcParameterBindings; import org.hibernate.sql.results.internal.SqlSelectionImpl; @@ -67,11 +67,10 @@ public final class ExecuteWithTemporaryTableHelper { final NamedTableReference idTableReference = new NamedTableReference( idTable.getTableExpression(), - InsertStatement.DEFAULT_ALIAS, - false, - factory + InsertSelectStatement.DEFAULT_ALIAS, + false ); - final InsertStatement idTableInsert = new InsertStatement( idTableReference ); + final InsertSelectStatement idTableInsert = new InsertSelectStatement( idTableReference ); for ( int i = 0; i < idTable.getColumns().size(); i++ ) { final TemporaryTableColumn column = idTable.getColumns().get( i ); @@ -131,7 +130,7 @@ public final class ExecuteWithTemporaryTableHelper { } public static int saveIntoTemporaryTable( - InsertStatement temporaryTableInsert, + InsertSelectStatement temporaryTableInsert, JdbcParameterBindings jdbcParameterBindings, ExecutionContext executionContext) { final SessionFactoryImplementor factory = executionContext.getSession().getFactory(); @@ -157,7 +156,7 @@ public final class ExecuteWithTemporaryTableHelper { } ); } - final JdbcInsert jdbcInsert = sqlAstTranslatorFactory.buildInsertTranslator( factory, temporaryTableInsert ) + final JdbcOperationQueryInsert jdbcInsert = sqlAstTranslatorFactory.buildInsertTranslator( factory, temporaryTableInsert ) .translate( jdbcParameterBindings, executionContext.getQueryOptions() ); lockOptions.setLockMode( lockMode ); @@ -192,8 +191,7 @@ public final class ExecuteWithTemporaryTableHelper { final NamedTableReference idTableReference = new NamedTableReference( idTable.getTableExpression(), TemporaryTable.DEFAULT_ALIAS, - true, - executionContext.getSession().getFactory() + true ); final TableGroup idTableGroup = new StandardTableGroup( true, 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 93a3392fa8..f1fb663283 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 @@ -37,11 +37,11 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.MappingModelExpressible; import org.hibernate.metamodel.mapping.ModelPartContainer; import org.hibernate.persister.entity.AbstractEntityPersister; -import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.SemanticException; -import org.hibernate.query.sqm.SortOrder; import org.hibernate.query.results.TableGroupImpl; import org.hibernate.query.spi.DomainQueryExecutionContext; +import org.hibernate.query.sqm.ComparisonOperator; +import org.hibernate.query.sqm.SortOrder; import org.hibernate.query.sqm.internal.DomainParameterXref; import org.hibernate.query.sqm.internal.SqmUtil; import org.hibernate.query.sqm.mutation.internal.MultiTableSqmMutationConverter; @@ -54,7 +54,7 @@ import org.hibernate.sql.ast.tree.from.NamedTableReference; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.ast.tree.from.UnionTableReference; -import org.hibernate.sql.ast.tree.insert.InsertStatement; +import org.hibernate.sql.ast.tree.insert.InsertSelectStatement; import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate; import org.hibernate.sql.ast.tree.predicate.Predicate; import org.hibernate.sql.ast.tree.select.QuerySpec; @@ -67,16 +67,17 @@ import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl; import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; import org.hibernate.sql.exec.internal.JdbcParameterImpl; import org.hibernate.sql.exec.spi.ExecutionContext; -import org.hibernate.sql.exec.spi.JdbcInsert; +import org.hibernate.sql.exec.spi.JdbcOperationQueryInsert; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; +import org.hibernate.sql.exec.spi.JdbcOperationQueryUpdate; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; -import org.hibernate.sql.exec.spi.JdbcUpdate; import org.hibernate.sql.results.graph.basic.BasicFetch; import org.hibernate.sql.results.internal.SqlSelectionImpl; import org.hibernate.sql.results.spi.ListResultsConsumer; import org.hibernate.type.descriptor.ValueBinder; /** + * @author Christian Beikov * @author Steve Ebersole */ public class InsertExecutionDelegate implements TableBasedInsertHandler.ExecutionDelegate { @@ -87,7 +88,7 @@ public class InsertExecutionDelegate implements TableBasedInsertHandler.Executio private final Function sessionUidAccess; private final DomainParameterXref domainParameterXref; private final TableGroup updatingTableGroup; - private final InsertStatement insertStatement; + private final InsertSelectStatement insertStatement; private final EntityMappingType entityDescriptor; @@ -108,7 +109,7 @@ public class InsertExecutionDelegate implements TableBasedInsertHandler.Executio TableGroup insertingTableGroup, Map tableReferenceByAlias, List assignments, - InsertStatement insertStatement, + InsertSelectStatement insertStatement, Map, List>> parameterResolutions, JdbcParameter sessionUidParameter, Map, MappingModelExpressible> paramTypeResolutions, @@ -280,8 +281,7 @@ public class InsertExecutionDelegate implements TableBasedInsertHandler.Executio return new NamedTableReference( tableExpression, tableReference.getIdentificationVariable(), - tableReference.isOptional(), - sessionFactory + tableReference.isOptional() ); } else { @@ -318,8 +318,7 @@ public class InsertExecutionDelegate implements TableBasedInsertHandler.Executio final NamedTableReference temporaryTableReference = new NamedTableReference( insertStatement.getTargetTable().getTableExpression(), updatingTableReference.getIdentificationVariable(), - false, - sessionFactory + false ); final TableGroupImpl temporaryTableGroup = new TableGroupImpl( updatingTableGroup.getNavigablePath(), @@ -328,7 +327,7 @@ public class InsertExecutionDelegate implements TableBasedInsertHandler.Executio entityDescriptor ); querySpec.getFromClause().addRoot( temporaryTableGroup ); - final InsertStatement insertStatement = new InsertStatement( dmlTableReference ); + final InsertSelectStatement insertStatement = new InsertSelectStatement( dmlTableReference ); insertStatement.setSourceSelectStatement( querySpec ); if ( assignments != null ) { for ( Assignment assignment : assignments ) { @@ -385,7 +384,7 @@ public class InsertExecutionDelegate implements TableBasedInsertHandler.Executio ) ) ); - final JdbcSelect jdbcSelect = jdbcServices.getJdbcEnvironment() + final JdbcOperationQuerySelect jdbcSelect = jdbcServices.getJdbcEnvironment() .getSqlAstTranslatorFactory() .buildSelectTranslator( sessionFactory, selectStatement ) .translate( null, executionContext.getQueryOptions() ); @@ -415,7 +414,7 @@ public class InsertExecutionDelegate implements TableBasedInsertHandler.Executio // then we load update rows from the temporary table with the generated identifiers, // to then insert into the target tables in once statement if ( needsIdentifierGeneration( identifierGenerator ) - && insertStatement.getTargetColumnReferences() + && insertStatement.getTargetColumns() .stream() .noneMatch( c -> keyColumns[0].equals( c.getColumnExpression() ) ) ) { final BasicEntityIdentifierMapping identifierMapping = (BasicEntityIdentifierMapping) entityDescriptor.getIdentifierMapping(); @@ -481,7 +480,7 @@ public class InsertExecutionDelegate implements TableBasedInsertHandler.Executio ) ); - final JdbcUpdate jdbcUpdate = jdbcServices.getJdbcEnvironment() + final JdbcOperationQueryUpdate jdbcUpdate = jdbcServices.getJdbcEnvironment() .getSqlAstTranslatorFactory() .buildUpdateTranslator( sessionFactory, updateStatement ) .translate( null, executionContext.getQueryOptions() ); @@ -554,7 +553,7 @@ public class InsertExecutionDelegate implements TableBasedInsertHandler.Executio } } - final JdbcInsert jdbcInsert = jdbcServices.getJdbcEnvironment() + final JdbcOperationQueryInsert jdbcInsert = jdbcServices.getJdbcEnvironment() .getSqlAstTranslatorFactory() .buildInsertTranslator( sessionFactory, insertStatement ) .translate( null, executionContext.getQueryOptions() ); @@ -567,7 +566,7 @@ public class InsertExecutionDelegate implements TableBasedInsertHandler.Executio jdbcServices.getDialect(), generatedKeysEnabled ); - final String finalSql = identifierDelegate.prepareIdentifierGeneratingInsert( jdbcInsert.getSql() ); + final String finalSql = identifierDelegate.prepareIdentifierGeneratingInsert( jdbcInsert.getSqlString() ); final BasicEntityIdentifierMapping identifierMapping = (BasicEntityIdentifierMapping) entityDescriptor.getIdentifierMapping(); final ValueBinder jdbcValueBinder = identifierMapping.getJdbcMapping().getJdbcValueBinder(); for ( Map.Entry entry : entityTableToRootIdentity.entrySet() ) { @@ -618,7 +617,7 @@ public class InsertExecutionDelegate implements TableBasedInsertHandler.Executio ) ); - final JdbcUpdate jdbcUpdate = jdbcServices.getJdbcEnvironment() + final JdbcOperationQueryUpdate jdbcUpdate = jdbcServices.getJdbcEnvironment() .getSqlAstTranslatorFactory() .buildUpdateTranslator( sessionFactory, updateStatement ) .translate( null, executionContext.getQueryOptions() ); @@ -692,13 +691,12 @@ public class InsertExecutionDelegate implements TableBasedInsertHandler.Executio new NamedTableReference( insertStatement.getTargetTable().getTableExpression(), updatingTableReference.getIdentificationVariable(), - false, - sessionFactory + false ), entityDescriptor ); querySpec.getFromClause().addRoot( temporaryTableGroup ); - final InsertStatement insertStatement = new InsertStatement( dmlTargetTableReference ); + final InsertSelectStatement insertStatement = new InsertSelectStatement( dmlTargetTableReference ); insertStatement.setSourceSelectStatement( querySpec ); if ( assignments != null && !assignments.isEmpty() ) { for ( Assignment assignment : assignments ) { @@ -736,7 +734,7 @@ public class InsertExecutionDelegate implements TableBasedInsertHandler.Executio else { needsKeyInsert = true; } - if ( needsKeyInsert && insertStatement.getTargetColumnReferences() + if ( needsKeyInsert && insertStatement.getTargetColumns() .stream() .noneMatch( c -> targetKeyColumnName.equals( c.getColumnExpression() ) ) ) { final BasicEntityIdentifierMapping identifierMapping = (BasicEntityIdentifierMapping) entityDescriptor.getIdentifierMapping(); @@ -762,7 +760,7 @@ public class InsertExecutionDelegate implements TableBasedInsertHandler.Executio ); } final JdbcServices jdbcServices = sessionFactory.getJdbcServices(); - final JdbcInsert jdbcInsert = jdbcServices.getJdbcEnvironment() + final JdbcOperationQueryInsert jdbcInsert = jdbcServices.getJdbcEnvironment() .getSqlAstTranslatorFactory() .buildInsertTranslator( sessionFactory, insertStatement ) .translate( null, executionContext.getQueryOptions() ); diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/RestrictedDeleteExecutionDelegate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/RestrictedDeleteExecutionDelegate.java index bfdf83f9f3..4006c51622 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/RestrictedDeleteExecutionDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/RestrictedDeleteExecutionDelegate.java @@ -27,8 +27,8 @@ import org.hibernate.metamodel.mapping.EntityIdentifierMapping; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; import org.hibernate.metamodel.mapping.MappingModelExpressible; -import org.hibernate.metamodel.mapping.MappingModelHelper; import org.hibernate.metamodel.mapping.SelectableConsumer; +import org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.Joinable; import org.hibernate.query.spi.DomainQueryExecutionContext; @@ -58,7 +58,7 @@ import org.hibernate.sql.ast.tree.predicate.Predicate; import org.hibernate.sql.ast.tree.predicate.PredicateCollector; import org.hibernate.sql.ast.tree.select.QuerySpec; import org.hibernate.sql.exec.spi.ExecutionContext; -import org.hibernate.sql.exec.spi.JdbcDelete; +import org.hibernate.sql.exec.spi.JdbcOperationQueryDelete; import org.hibernate.sql.exec.spi.JdbcParameterBindings; import org.jboss.logging.Logger; @@ -270,7 +270,7 @@ public class RestrictedDeleteExecutionDelegate implements TableBasedDeleteHandle ); } return new InSubQueryPredicate( - MappingModelHelper.buildColumnReferenceExpression( + MappingModelCreationHelper.buildColumnReferenceExpression( fkDescriptor, null, sessionFactory @@ -291,8 +291,7 @@ public class RestrictedDeleteExecutionDelegate implements TableBasedDeleteHandle final NamedTableReference tableReference = new NamedTableReference( tableExpression, tableGroup.getPrimaryTableReference().getIdentificationVariable(), - false, - sessionFactory + false ); final QuerySpec idMatchingSubQuerySpec; // No need for a predicate if there is no supplied predicate i.e. this is a full cleanup @@ -383,8 +382,7 @@ public class RestrictedDeleteExecutionDelegate implements TableBasedDeleteHandle final NamedTableReference deleteTableReference = new NamedTableReference( targetTableReference.getTableExpression(), DeleteStatement.DEFAULT_ALIAS, - true, - sessionFactory + true ); final Predicate tableDeletePredicate; if ( matchingIdSubQuerySpec == null ) { @@ -450,7 +448,7 @@ public class RestrictedDeleteExecutionDelegate implements TableBasedDeleteHandle final JdbcServices jdbcServices = factory.getJdbcServices(); - final JdbcDelete jdbcDelete = jdbcServices.getJdbcEnvironment() + final JdbcOperationQueryDelete jdbcDelete = jdbcServices.getJdbcEnvironment() .getSqlAstTranslatorFactory() .buildDeleteTranslator( factory, sqlAst ) .translate( jdbcParameterBindings, executionContext.getQueryOptions() ); @@ -547,7 +545,7 @@ public class RestrictedDeleteExecutionDelegate implements TableBasedDeleteHandle ); } return new InSubQueryPredicate( - MappingModelHelper.buildColumnReferenceExpression( + MappingModelCreationHelper.buildColumnReferenceExpression( fkDescriptor, null, sessionFactory @@ -586,8 +584,7 @@ public class RestrictedDeleteExecutionDelegate implements TableBasedDeleteHandle final NamedTableReference targetTable = new NamedTableReference( tableExpression, DeleteStatement.DEFAULT_ALIAS, - true, - factory + true ); tableKeyColumnVisitationSupplier.get().accept( diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java index cdb33fc761..1c882d9e68 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java @@ -46,7 +46,7 @@ import org.hibernate.sql.ast.tree.from.NamedTableReference; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.ast.tree.from.TableReferenceJoin; -import org.hibernate.sql.ast.tree.insert.InsertStatement; +import org.hibernate.sql.ast.tree.insert.InsertSelectStatement; import org.hibernate.sql.ast.tree.insert.Values; import org.hibernate.sql.ast.tree.select.QueryPart; import org.hibernate.sql.ast.tree.update.Assignment; @@ -76,8 +76,6 @@ public class TableBasedInsertHandler implements InsertHandler { private final DomainParameterXref domainParameterXref; private final JdbcParameter sessionUidParameter; - private final EntityPersister entityDescriptor; - TableBasedInsertHandler( SqmInsertStatement sqmInsert, DomainParameterXref domainParameterXref, @@ -92,9 +90,6 @@ public class TableBasedInsertHandler implements InsertHandler { this.sessionUidAccess = sessionUidAccess; this.domainParameterXref = domainParameterXref; - final String targetEntityName = sqmInsert.getTarget().getEntityName(); - this.entityDescriptor = sessionFactory.getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor( targetEntityName ); - final TemporaryTableSessionUidColumn sessionUidColumn = entityTable.getSessionUidColumn(); if ( sessionUidColumn == null ) { this.sessionUidParameter = null; @@ -156,10 +151,9 @@ public class TableBasedInsertHandler implements InsertHandler { final NamedTableReference entityTableReference = new NamedTableReference( entityTable.getTableExpression(), TemporaryTable.DEFAULT_ALIAS, - true, - sessionFactory + true ); - final InsertStatement insertStatement = new InsertStatement( entityTableReference ); + final InsertSelectStatement insertStatement = new InsertSelectStatement( entityTableReference ); final BaseSqmToSqlAstConverter.AdditionalInsertValues additionalInsertValues = converterDelegate.visitInsertionTargetPaths( (assigable, columnReferences) -> { @@ -198,8 +192,8 @@ public class TableBasedInsertHandler implements InsertHandler { null, rowNumberColumn.getJdbcMapping() ); - insertStatement.getTargetColumnReferences().set( - insertStatement.getTargetColumnReferences().size() - 1, + insertStatement.getTargetColumns().set( + insertStatement.getTargetColumns().size() - 1, columnReference ); targetPathColumns.set( @@ -223,7 +217,7 @@ public class TableBasedInsertHandler implements InsertHandler { null, rowNumberColumn.getJdbcMapping() ); - insertStatement.getTargetColumnReferences().add( columnReference ); + insertStatement.getTargetColumns().add( columnReference ); targetPathColumns.add( new Assignment( columnReference, columnReference ) ); querySpec.getSelectClause().addSqlSelection( new SqlSelectionImpl( @@ -246,19 +240,13 @@ public class TableBasedInsertHandler implements InsertHandler { null, sessionUidColumn.getJdbcMapping() ); - insertStatement.getTargetColumnReferences().add( - sessionUidColumnReference - ); - targetPathColumns.add( - new Assignment( sessionUidColumnReference, sessionUidParameter ) - ); - querySpec.getSelectClause().addSqlSelection( - new SqlSelectionImpl( - insertStatement.getTargetColumnReferences().size(), - insertStatement.getTargetColumnReferences().size() - 1, - sessionUidParameter - ) - ); + insertStatement.getTargetColumns().add( sessionUidColumnReference ); + targetPathColumns.add( new Assignment( sessionUidColumnReference, sessionUidParameter ) ); + querySpec.getSelectClause().addSqlSelection( new SqlSelectionImpl( + insertStatement.getTargetColumns().size(), + insertStatement.getTargetColumns().size() - 1, + sessionUidParameter + ) ); } } ); @@ -282,7 +270,7 @@ public class TableBasedInsertHandler implements InsertHandler { null, rowNumberColumn.getJdbcMapping() ); - insertStatement.getTargetColumnReferences().add( columnReference ); + insertStatement.getTargetColumns().add( columnReference ); targetPathColumns.add( new Assignment( columnReference, columnReference ) ); } else { @@ -301,12 +289,8 @@ public class TableBasedInsertHandler implements InsertHandler { null, sessionUidColumn.getJdbcMapping() ); - insertStatement.getTargetColumnReferences().add( - sessionUidColumnReference - ); - targetPathColumns.add( - new Assignment( sessionUidColumnReference, sessionUidParameter ) - ); + insertStatement.getTargetColumns().add( sessionUidColumnReference ); + targetPathColumns.add( new Assignment( sessionUidColumnReference, sessionUidParameter ) ); } final List sqmValuesList = ( (SqmInsertValuesStatement) sqmInsertStatement ).getValuesList(); final List valuesList = new ArrayList<>( sqmValuesList.size() ); diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/UpdateExecutionDelegate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/UpdateExecutionDelegate.java index 86238efd44..42ce6b6c18 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/UpdateExecutionDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/UpdateExecutionDelegate.java @@ -45,7 +45,7 @@ import org.hibernate.sql.ast.tree.from.NamedTableReference; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.ast.tree.from.UnionTableReference; -import org.hibernate.sql.ast.tree.insert.InsertStatement; +import org.hibernate.sql.ast.tree.insert.InsertSelectStatement; import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate; import org.hibernate.sql.ast.tree.predicate.ExistsPredicate; import org.hibernate.sql.ast.tree.predicate.InSubQueryPredicate; @@ -55,9 +55,9 @@ import org.hibernate.sql.ast.tree.select.SelectClause; import org.hibernate.sql.ast.tree.update.Assignment; import org.hibernate.sql.ast.tree.update.UpdateStatement; import org.hibernate.sql.exec.spi.ExecutionContext; -import org.hibernate.sql.exec.spi.JdbcInsert; +import org.hibernate.sql.exec.spi.JdbcOperationQueryInsert; +import org.hibernate.sql.exec.spi.JdbcOperationQueryUpdate; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcUpdate; import org.hibernate.sql.results.internal.SqlSelectionImpl; /** @@ -230,8 +230,7 @@ public class UpdateExecutionDelegate implements TableBasedUpdateHandler.Executio return new NamedTableReference( tableExpression, tableReference.getIdentificationVariable(), - tableReference.isOptional(), - sessionFactory + tableReference.isOptional() ); } return (NamedTableReference) tableReference; @@ -293,7 +292,7 @@ public class UpdateExecutionDelegate implements TableBasedUpdateHandler.Executio ); final JdbcServices jdbcServices = sessionFactory.getJdbcServices(); - final JdbcUpdate jdbcUpdate = jdbcServices.getJdbcEnvironment() + final JdbcOperationQueryUpdate jdbcUpdate = jdbcServices.getJdbcEnvironment() .getSqlAstTranslatorFactory() .buildUpdateTranslator( sessionFactory, sqlAst ) .translate( jdbcParameterBindings, executionContext.getQueryOptions() ); @@ -349,8 +348,7 @@ public class UpdateExecutionDelegate implements TableBasedUpdateHandler.Executio final NamedTableReference existsTableReference = new NamedTableReference( tableExpression, "dml_", - false, - sessionFactory + false ); existsQuerySpec.getFromClause().addRoot( new TableGroupImpl( @@ -410,13 +408,13 @@ public class UpdateExecutionDelegate implements TableBasedUpdateHandler.Executio ); } - final InsertStatement insertSqlAst = new InsertStatement( + final InsertSelectStatement insertSqlAst = new InsertSelectStatement( dmlTableReference ); insertSqlAst.addTargetColumnReferences( targetColumnReferences.toArray( new ColumnReference[0] ) ); insertSqlAst.setSourceSelectStatement( querySpec ); - final JdbcInsert jdbcInsert = jdbcServices.getJdbcEnvironment() + final JdbcOperationQueryInsert jdbcInsert = jdbcServices.getJdbcEnvironment() .getSqlAstTranslatorFactory() .buildInsertTranslator( sessionFactory, insertSqlAst ) .translate( jdbcParameterBindings, executionContext.getQueryOptions() ); 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 9e978f5986..926bf2fd53 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 @@ -83,6 +83,8 @@ import org.hibernate.metamodel.mapping.SqlExpressible; import org.hibernate.metamodel.mapping.SqlTypedMapping; import org.hibernate.metamodel.mapping.ValueMapping; import org.hibernate.metamodel.mapping.internal.EntityCollectionPart; +import org.hibernate.metamodel.mapping.internal.ManyToManyCollectionPart; +import org.hibernate.metamodel.mapping.internal.OneToManyCollectionPart; import org.hibernate.metamodel.mapping.internal.SqlTypedMappingImpl; import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping; import org.hibernate.metamodel.mapping.ordering.OrderByFragment; @@ -94,11 +96,6 @@ import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.metamodel.model.domain.PluralPersistentAttribute; import org.hibernate.metamodel.model.domain.internal.AnyDiscriminatorSqmPath; import org.hibernate.metamodel.model.domain.internal.AnyDiscriminatorSqmPathSource; -import org.hibernate.query.criteria.JpaCteCriteriaAttribute; -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.metamodel.model.domain.internal.BasicSqmPathSource; import org.hibernate.metamodel.model.domain.internal.CompositeSqmPathSource; import org.hibernate.metamodel.model.domain.internal.DiscriminatorSqmPath; @@ -112,7 +109,12 @@ import org.hibernate.query.BindableType; import org.hibernate.query.QueryLogging; import org.hibernate.query.ReturnableType; import org.hibernate.query.SemanticException; +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.spi.QueryEngine; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.spi.QueryParameterBinding; @@ -338,6 +340,7 @@ import org.hibernate.sql.ast.tree.from.TableGroupJoin; import org.hibernate.sql.ast.tree.from.TableGroupJoinProducer; import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.ast.tree.from.VirtualTableGroup; +import org.hibernate.sql.ast.tree.insert.InsertSelectStatement; import org.hibernate.sql.ast.tree.insert.InsertStatement; import org.hibernate.sql.ast.tree.insert.Values; import org.hibernate.sql.ast.tree.predicate.BetweenPredicate; @@ -1067,7 +1070,7 @@ public abstract class BaseSqmToSqlAstConverter extends Base ) ); currentClauseStack.push( Clause.INSERT ); - final InsertStatement insertStatement; + final InsertSelectStatement insertStatement; final AdditionalInsertValues additionalInsertValues; try { final NavigablePath rootPath = sqmStatement.getTarget().getNavigablePath(); @@ -1083,7 +1086,7 @@ public abstract class BaseSqmToSqlAstConverter extends Base getFromClauseAccess().registerTableGroup( rootPath, rootTableGroup ); - insertStatement = new InsertStatement( + insertStatement = new InsertSelectStatement( cteContainer, (NamedTableReference) rootTableGroup.getPrimaryTableReference(), Collections.emptyList() @@ -1184,7 +1187,7 @@ public abstract class BaseSqmToSqlAstConverter extends Base getFromClauseAccess().registerTableGroup( rootPath, rootTableGroup ); - final InsertStatement insertStatement = new InsertStatement( + final InsertSelectStatement insertStatement = new InsertSelectStatement( cteContainer, (NamedTableReference) rootTableGroup.getPrimaryTableReference(), Collections.emptyList() @@ -2764,7 +2767,7 @@ public abstract class BaseSqmToSqlAstConverter extends Base navigablePath, sqlAliasBase, tableGroupProducer, - new NamedTableReference( cteName, identifierVariable, false, null ), + new NamedTableReference( cteName, identifierVariable, false ), tableGroupProducer.getCompatibleTableExpressions() ); } @@ -3655,6 +3658,7 @@ public abstract class BaseSqmToSqlAstConverter extends Base private Expression visitTableGroup(TableGroup tableGroup, SqmFrom path) { final ModelPartContainer tableGroupModelPart = tableGroup.getModelPart(); + final ModelPart actualModelPart; final NavigablePath navigablePath; if ( tableGroupModelPart instanceof PluralAttributeMapping ) { @@ -3665,6 +3669,7 @@ public abstract class BaseSqmToSqlAstConverter extends Base actualModelPart = tableGroupModelPart; navigablePath = tableGroup.getNavigablePath(); } + final Expression result; if ( actualModelPart instanceof EntityValuedModelPart ) { final EntityValuedModelPart entityValuedModelPart = (EntityValuedModelPart) actualModelPart; @@ -3723,60 +3728,70 @@ public abstract class BaseSqmToSqlAstConverter extends Base else if ( inferredEntityMapping instanceof EntityCollectionPart ) { // If the inferred mapping is a collection part, we try to make use of the FK again to avoid joins final EntityCollectionPart collectionPart = (EntityCollectionPart) inferredEntityMapping; - final TableGroup collectionTableGroup; + + // If the inferred mapping is a collection part, we try to make use of the FK again to avoid joins if ( tableGroup.getModelPart() instanceof CollectionPart ) { - collectionTableGroup = findTableGroup( tableGroup.getNavigablePath().getParent() ); + tableGroupToUse = findTableGroup( tableGroup.getNavigablePath().getParent() ); } else { - collectionTableGroup = tableGroup; + tableGroupToUse = tableGroup; } - if ( entityValuedModelPart == collectionPart ) { - // When we compare the same collection parts, we can just use the FK part - resultModelPart = collectionPart.getForeignKeyDescriptor() - .getPart( collectionPart.getSideNature() ); + if ( collectionPart.getCardinality() == EntityCollectionPart.Cardinality.ONE_TO_MANY ) { + resultModelPart = collectionPart.getAssociatedEntityMappingType().getIdentifierMapping(); } - else if ( entityValuedModelPart instanceof EntityAssociationMapping ) { - // If the table group model part is an association, we check if the FK targets are compatible - final EntityAssociationMapping tableGroupAssociation = (EntityAssociationMapping) entityValuedModelPart; - final ModelPart pathTargetPart = tableGroupAssociation.getForeignKeyDescriptor() - .getPart( tableGroupAssociation.getSideNature().inverse() ); - final ModelPart inferredTargetPart = collectionPart.getForeignKeyDescriptor() - .getPart( collectionPart.getSideNature().inverse() ); - // If the inferred association and table group association targets are the same, - // or the table group association refers to the primary key, we can safely use the FK part - if ( pathTargetPart == inferredTargetPart || tableGroupAssociation.isReferenceToPrimaryKey() ) { - resultModelPart = tableGroupAssociation.getForeignKeyDescriptor() - .getPart( tableGroupAssociation.getSideNature() ); + else { + assert collectionPart.getCardinality() == EntityCollectionPart.Cardinality.MANY_TO_MANY; + final ManyToManyCollectionPart manyToManyPart = (ManyToManyCollectionPart) collectionPart; + + if ( entityValuedModelPart == collectionPart ) { + // When we compare the same collection parts, we can just use the FK part + resultModelPart = manyToManyPart.getForeignKeyDescriptor().getKeyPart(); } - else { - // Otherwise, we must force the use of the identifier mapping and possibly create a join, - // because comparing by primary key is the only sensible thing to do in this case. - // Note that EntityValuedPathInterpretation does the same - resultModelPart = collectionPart.getAssociatedEntityMappingType().getIdentifierMapping(); + else if ( entityValuedModelPart instanceof EntityAssociationMapping ) { + // If the table group model part is an association, we check if the FK targets are compatible + final EntityAssociationMapping tableGroupAssociation = (EntityAssociationMapping) entityValuedModelPart; + final ModelPart pathTargetPart = tableGroupAssociation + .getForeignKeyDescriptor() + .getPart( tableGroupAssociation.getSideNature().inverse() ); + final ModelPart inferredTargetPart = manyToManyPart + .getForeignKeyDescriptor() + .getPart( ForeignKeyDescriptor.Nature.TARGET ); + + // If the inferred association and table group association targets are the same, + // or the table group association refers to the primary key, we can safely use the FK part + if ( pathTargetPart == inferredTargetPart || tableGroupAssociation.isReferenceToPrimaryKey() ) { + resultModelPart = tableGroupAssociation.getForeignKeyDescriptor().getKeyPart(); + } + else { + // Otherwise, we must force the use of the identifier mapping and possibly create a join, + // because comparing by primary key is the only sensible thing to do in this case. + // Note that EntityValuedPathInterpretation does the same + resultModelPart = collectionPart.getAssociatedEntityMappingType().getIdentifierMapping(); + } } - } - else if ( entityValuedModelPart instanceof AnonymousTupleEntityValuedModelPart ) { + else if ( entityValuedModelPart instanceof AnonymousTupleEntityValuedModelPart ) { resultModelPart = ( (AnonymousTupleEntityValuedModelPart) entityValuedModelPart ).getForeignKeyPart(); } else { - // Since the table group model part is an EntityMappingType, - // we can render the FK target model part of the inferred collection part, - // which might be a UK, but usually a PK - assert entityValuedModelPart instanceof EntityMappingType; - if ( collectionPart.getCollectionDescriptor().isOneToMany() ) { - // When the inferred mapping is a one-to-many collection part, - // we will render the entity identifier mapping for that collection part, - // so we will have to do the same for the EntityMappingType side - resultModelPart = collectionPart.getAssociatedEntityMappingType().getIdentifierMapping(); - } - else { - resultModelPart = collectionPart.getForeignKeyDescriptor() - .getPart( collectionPart.getSideNature().inverse() ); + // Since the table group model part is an EntityMappingType, + // we can render the FK target model part of the inferred collection part, + // which might be a UK, but usually a PK + assert entityValuedModelPart instanceof EntityMappingType; + if ( collectionPart.getCardinality() == EntityCollectionPart.Cardinality.ONE_TO_MANY ) { + // When the inferred mapping is a one-to-many collection part, + // we will render the entity identifier mapping for that collection part, + // so we will have to do the same for the EntityMappingType side + resultModelPart = collectionPart.getAssociatedEntityMappingType().getIdentifierMapping(); + } + else { + resultModelPart = manyToManyPart + .getForeignKeyDescriptor() + .getPart( manyToManyPart.getSideNature().inverse() ); + } } } interpretationModelPart = inferredEntityMapping; - tableGroupToUse = collectionTableGroup; } else if ( entityValuedModelPart instanceof AnonymousTupleEntityValuedModelPart ) { resultModelPart = ( (AnonymousTupleEntityValuedModelPart) entityValuedModelPart ).getForeignKeyPart(); @@ -3790,6 +3805,7 @@ public abstract class BaseSqmToSqlAstConverter extends Base interpretationModelPart = inferredEntityMapping; tableGroupToUse = null; } + final boolean expandToAllColumns; if ( currentClauseStack.getCurrent() == Clause.GROUP ) { // When the table group is known to be fetched i.e. a fetch join @@ -4180,11 +4196,7 @@ public abstract class BaseSqmToSqlAstConverter extends Base registerPluralTableGroupParts( tableGroup ); subQuerySpec.getFromClause().addRoot( tableGroup ); - final AbstractSqmSelfRenderingFunctionDescriptor functionDescriptor = (AbstractSqmSelfRenderingFunctionDescriptor) creationContext - .getSessionFactory() - .getQueryEngine() - .getSqmFunctionRegistry() - .findFunctionDescriptor( "count" ); + final AbstractSqmSelfRenderingFunctionDescriptor functionDescriptor = resolveFunction( "count" ); final BasicType integerType = creationContext.getMappingMetamodel() .getTypeConfiguration() .getBasicTypeForJavaType( Integer.class ); @@ -4293,10 +4305,12 @@ public abstract class BaseSqmToSqlAstConverter extends Base String function) { prepareReusablePath( pluralPartPath.getLhs(), () -> null ); + final FromClauseAccess parentFromClauseAccess = getFromClauseAccess(); final PluralAttributeMapping pluralAttributeMapping = (PluralAttributeMapping) determineValueMapping( pluralPartPath.getPluralDomainPath() ); - final FromClauseAccess parentFromClauseAccess = getFromClauseAccess(); + final QuerySpec subQuerySpec = new QuerySpec( false ); + pushProcessingState( new SqlAstQueryPartProcessingStateImpl( subQuerySpec, @@ -4329,18 +4343,18 @@ public abstract class BaseSqmToSqlAstConverter extends Base registerPluralTableGroupParts( tableGroup ); subQuerySpec.getFromClause().addRoot( tableGroup ); - final AbstractSqmSelfRenderingFunctionDescriptor functionDescriptor = - (AbstractSqmSelfRenderingFunctionDescriptor) creationContext - .getSessionFactory() - .getQueryEngine() - .getSqmFunctionRegistry() - .findFunctionDescriptor( function ); + final AbstractSqmSelfRenderingFunctionDescriptor functionDescriptor = resolveFunction( function ); final CollectionPart collectionPart = index ? pluralAttributeMapping.getIndexDescriptor() : pluralAttributeMapping.getElementDescriptor(); final ModelPart modelPart; - if ( collectionPart instanceof EntityAssociationMapping ) { - modelPart = ( (EntityAssociationMapping) collectionPart ).getKeyTargetMatchPart(); + if ( collectionPart instanceof OneToManyCollectionPart ) { + final OneToManyCollectionPart toManyPart = (OneToManyCollectionPart) collectionPart; + modelPart = toManyPart.getAssociatedEntityMappingType().getIdentifierMapping(); +// modelPart = pluralAttributeMapping.getKeyDescriptor().getTargetPart(); + } + else if ( collectionPart instanceof ManyToManyCollectionPart ) { + modelPart = ( (ManyToManyCollectionPart) collectionPart ).getKeyTargetMatchPart(); } else { modelPart = collectionPart; @@ -4398,6 +4412,14 @@ public abstract class BaseSqmToSqlAstConverter extends Base return new SelectStatement( subQuerySpec ); } + private AbstractSqmSelfRenderingFunctionDescriptor resolveFunction(String function) { + return (AbstractSqmSelfRenderingFunctionDescriptor) creationContext + .getSessionFactory() + .getQueryEngine() + .getSqmFunctionRegistry() + .findFunctionDescriptor( function ); + } + protected Expression createLateralJoinExpression( AbstractSqmSpecificPluralPartPath pluralPartPath, boolean index, @@ -4466,11 +4488,7 @@ public abstract class BaseSqmToSqlAstConverter extends Base final Boolean max = functionName.equalsIgnoreCase( "max" ) ? Boolean.TRUE : ( functionName.equalsIgnoreCase( "min" ) ? Boolean.FALSE : null ); final AbstractSqmSelfRenderingFunctionDescriptor functionDescriptor = - (AbstractSqmSelfRenderingFunctionDescriptor) creationContext - .getSessionFactory() - .getQueryEngine() - .getSqmFunctionRegistry() - .findFunctionDescriptor( functionName ); + resolveFunction( functionName ); final List subQueryColumns = new ArrayList<>( jdbcTypeCount ); modelPart.forEachSelectable( (selectionIndex, selectionMapping) -> { @@ -6602,24 +6620,11 @@ public abstract class BaseSqmToSqlAstConverter extends Base registerPluralTableGroupParts( tableGroup ); subQuerySpec.getFromClause().addRoot( tableGroup ); - final CollectionPart elementDescriptor = pluralAttributeMapping.getElementDescriptor(); - if ( elementDescriptor instanceof EntityCollectionPart ) { - ( (EntityCollectionPart) elementDescriptor ).getKeyTargetMatchPart() - .createDomainResult( - pluralPath.getNavigablePath(), - tableGroup, - null, - this - ); - } - else { - elementDescriptor.createDomainResult( - pluralPath.getNavigablePath(), - tableGroup, - null, - this - ); - } + pluralAttributeMapping.getElementDescriptor().getInclusionCheckPart().applySqlSelections( + pluralPath.getNavigablePath(), + tableGroup, + this + ); subQuerySpec.applyPredicate( pluralAttributeMapping.getKeyDescriptor().generateJoinPredicate( 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 7128c91c3a..02f4bd475c 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 @@ -25,9 +25,9 @@ import org.hibernate.metamodel.mapping.SelectableConsumer; import org.hibernate.metamodel.mapping.internal.EntityCollectionPart; import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping; import org.hibernate.query.derived.AnonymousTupleEntityValuedModelPart; -import org.hibernate.spi.NavigablePath; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.query.sqm.tree.domain.SqmEntityValuedSimplePath; +import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.SqlAstWalker; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.spi.SqlAstProcessingState; @@ -43,8 +43,6 @@ import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.ast.tree.update.Assignable; import org.hibernate.sql.results.graph.DomainResultCreationState; -import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey; - /** * @author Koen Aers */ @@ -285,7 +283,7 @@ public class EntityValuedPathInterpretation extends AbstractSqmPathInterpreta private static boolean hasJoinTable(EntityAssociationMapping associationMapping) { return associationMapping instanceof EntityCollectionPart - && !( (EntityCollectionPart) associationMapping ).getCollectionDescriptor().isOneToMany(); + && ( (EntityCollectionPart) associationMapping ).getCardinality() == EntityCollectionPart.Cardinality.MANY_TO_MANY; } public static EntityValuedPathInterpretation from( diff --git a/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java b/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java index 6d989a94e3..d98a89ead6 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java +++ b/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java @@ -25,6 +25,7 @@ import org.hibernate.engine.jdbc.dialect.internal.DialectFactoryInitiator; import org.hibernate.engine.jdbc.dialect.internal.DialectResolverInitiator; import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator; import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator; +import org.hibernate.engine.jdbc.mutation.internal.MutationExecutorServiceInitiator; import org.hibernate.engine.jndi.internal.JndiServiceInitiator; import org.hibernate.engine.transaction.jta.platform.internal.JtaPlatformInitiator; import org.hibernate.engine.transaction.jta.platform.internal.JtaPlatformResolverInitiator; @@ -77,6 +78,7 @@ public final class StandardServiceInitiators { serviceInitiators.add( MultiTenantConnectionProviderInitiator.INSTANCE ); serviceInitiators.add( DialectResolverInitiator.INSTANCE ); serviceInitiators.add( DialectFactoryInitiator.INSTANCE ); + serviceInitiators.add( MutationExecutorServiceInitiator.INSTANCE ); serviceInitiators.add( BatchBuilderInitiator.INSTANCE ); serviceInitiators.add( JdbcServicesInitiator.INSTANCE ); serviceInitiators.add( RefCursorSupportInitiator.INSTANCE ); diff --git a/hibernate-core/src/main/java/org/hibernate/sql/Insert.java b/hibernate-core/src/main/java/org/hibernate/sql/Insert.java index eaad3ddabe..0cd143b32b 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/Insert.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/Insert.java @@ -5,6 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.sql; +import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; @@ -20,13 +21,13 @@ import org.hibernate.dialect.Dialect; */ @Internal public class Insert { + private final Dialect dialect; protected String tableName; protected String comment; protected Map columns = new LinkedHashMap<>(); - - private Dialect dialect; + protected Map lobColumns; public Insert(Dialect dialect) { this.dialect = dialect; @@ -41,6 +42,10 @@ public class Insert { return this; } + public Map getColumns() { + return columns; + } + public Insert addColumn(String columnName) { return addColumn( columnName, "?" ); } @@ -75,6 +80,14 @@ public class Insert { return this; } + public void addLobColumn(String columnName, String valueExpression) { + assert dialect.forceLobAsLastValue(); + if ( lobColumns == null ) { + lobColumns = new HashMap<>(); + } + lobColumns.put( columnName, valueExpression ); + } + public Insert addIdentityColumn(String columnName) { String value = dialect.getIdentityColumnSupport().getIdentityInsertString(); if ( value != null ) { @@ -93,9 +106,10 @@ public class Insert { if ( comment != null ) { buf.append( "/* " ).append( Dialect.escapeComment( comment ) ).append( " */ " ); } - buf.append("insert into ") - .append(tableName); - if ( columns.size()==0 ) { + + buf.append("insert into ").append(tableName); + + if ( columns.size()==0 && lobColumns == null ) { if ( dialect.supportsNoColumnsInsert() ) { buf.append( ' ' ).append( dialect.getNoColumnsInsertString() ); } @@ -110,24 +124,52 @@ public class Insert { } } else { - buf.append(" ("); - Iterator iter = columns.keySet().iterator(); - while ( iter.hasNext() ) { - buf.append( iter.next() ); - if ( iter.hasNext() ) { - buf.append( ", " ); - } - } - buf.append(") values ("); - iter = columns.values().iterator(); - while ( iter.hasNext() ) { - buf.append( iter.next() ); - if ( iter.hasNext() ) { - buf.append( ", " ); - } - } + buf.append( " (" ); + renderColumnsClause( buf ); + buf.append( ") values (" ); + renderValuesClause( buf ); buf.append(')'); } return buf.toString(); } + + private void renderColumnsClause(StringBuilder buf) { + final Iterator itr = columns.keySet().iterator(); + while ( itr.hasNext() ) { + buf.append( itr.next() ); + if ( itr.hasNext() || lobColumns != null ) { + buf.append( ", " ); + } + } + + if ( lobColumns != null ) { + final Iterator columnsAtEndItr = lobColumns.keySet().iterator(); + while ( columnsAtEndItr.hasNext() ) { + buf.append( columnsAtEndItr.next() ); + if ( columnsAtEndItr.hasNext() ) { + buf.append( ", " ); + } + } + } + } + + private void renderValuesClause(StringBuilder buf) { + final Iterator itr = columns.values().iterator(); + while ( itr.hasNext() ) { + buf.append( itr.next() ); + if ( itr.hasNext() || lobColumns != null ) { + buf.append( ", " ); + } + } + + if ( lobColumns != null ) { + final Iterator columnsAtEndItr = lobColumns.values().iterator(); + while ( columnsAtEndItr.hasNext() ) { + buf.append( columnsAtEndItr.next() ); + if ( columnsAtEndItr.hasNext() ) { + buf.append( ", " ); + } + } + } + } } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/Update.java b/hibernate-core/src/main/java/org/hibernate/sql/Update.java index 45d5890d04..0b33c1bf8f 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/Update.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/Update.java @@ -5,6 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.sql; +import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; @@ -28,6 +29,7 @@ public class Update { protected Map primaryKeyColumns = new LinkedHashMap<>(); protected Map columns = new LinkedHashMap<>(); + protected Map lobColumns; protected Map whereColumns = new LinkedHashMap<>(); private Dialect dialect; @@ -132,6 +134,14 @@ public class Update { return this; } + public void addLobColumn(String columnName, String valueExpression) { + assert dialect.forceLobAsLastValue(); + if ( lobColumns == null ) { + lobColumns = new HashMap<>(); + } + lobColumns.put( columnName, valueExpression ); + } + public Update addWhereColumns(String[] columnNames) { for ( String columnName : columnNames ) { addWhereColumn( columnName ); 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 6c61770118..d81e3914e1 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 @@ -50,5 +50,4 @@ public interface SqlAstTranslator extends SqlAstWalker Set getAffectedTableNames(); T translate(JdbcParameterBindings jdbcParameterBindings, QueryOptions queryOptions); - } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslatorFactory.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslatorFactory.java index 5d36887ef6..98a9681c3c 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslatorFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslatorFactory.java @@ -11,10 +11,12 @@ import org.hibernate.sql.ast.tree.delete.DeleteStatement; import org.hibernate.sql.ast.tree.insert.InsertStatement; import org.hibernate.sql.ast.tree.select.SelectStatement; import org.hibernate.sql.ast.tree.update.UpdateStatement; -import org.hibernate.sql.exec.spi.JdbcDelete; -import org.hibernate.sql.exec.spi.JdbcInsert; -import org.hibernate.sql.exec.spi.JdbcSelect; -import org.hibernate.sql.exec.spi.JdbcUpdate; +import org.hibernate.sql.exec.spi.JdbcOperationQueryDelete; +import org.hibernate.sql.exec.spi.JdbcOperationQueryInsert; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; +import org.hibernate.sql.exec.spi.JdbcOperationQueryUpdate; +import org.hibernate.sql.model.ast.TableMutation; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; /** * Factory for obtaining single-use SQL AST translators @@ -25,20 +27,26 @@ public interface SqlAstTranslatorFactory { /** * Builds a single-use select translator */ - SqlAstTranslator buildSelectTranslator(SessionFactoryImplementor sessionFactory, SelectStatement statement); + SqlAstTranslator buildSelectTranslator(SessionFactoryImplementor sessionFactory, SelectStatement statement); /** * Builds a single-use delete translator */ - SqlAstTranslator buildDeleteTranslator(SessionFactoryImplementor sessionFactory, DeleteStatement statement); + SqlAstTranslator buildDeleteTranslator(SessionFactoryImplementor sessionFactory, DeleteStatement statement); /** * Builds a single-use insert-select translator */ - SqlAstTranslator buildInsertTranslator(SessionFactoryImplementor sessionFactory, InsertStatement statement); + SqlAstTranslator buildInsertTranslator(SessionFactoryImplementor sessionFactory, InsertStatement statement); /** * Builds a single-use update translator */ - SqlAstTranslator buildUpdateTranslator(SessionFactoryImplementor sessionFactory, UpdateStatement statement); + SqlAstTranslator buildUpdateTranslator(SessionFactoryImplementor sessionFactory, UpdateStatement statement); + + /** + * Builds a single-use translator for dealing with model mutations + */ + SqlAstTranslator buildModelMutationTranslator(TableMutation mutation, SessionFactoryImplementor sessionFactory); + } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstWalker.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstWalker.java index 6a162c8f6e..33a8eed66d 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstWalker.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstWalker.java @@ -46,7 +46,7 @@ import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableGroupJoin; import org.hibernate.sql.ast.tree.from.TableReferenceJoin; import org.hibernate.sql.ast.tree.from.ValuesTableReference; -import org.hibernate.sql.ast.tree.insert.InsertStatement; +import org.hibernate.sql.ast.tree.insert.InsertSelectStatement; import org.hibernate.sql.ast.tree.predicate.BetweenPredicate; import org.hibernate.sql.ast.tree.predicate.BooleanExpressionPredicate; import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate; @@ -68,6 +68,13 @@ import org.hibernate.sql.ast.tree.select.SelectStatement; import org.hibernate.sql.ast.tree.select.SortSpecification; import org.hibernate.sql.ast.tree.update.Assignment; import org.hibernate.sql.ast.tree.update.UpdateStatement; +import org.hibernate.sql.model.ast.ColumnWriteFragment; +import org.hibernate.sql.model.internal.TableDeleteCustomSql; +import org.hibernate.sql.model.internal.TableDeleteStandard; +import org.hibernate.sql.model.internal.TableInsertCustomSql; +import org.hibernate.sql.model.internal.TableInsertStandard; +import org.hibernate.sql.model.internal.TableUpdateCustomSql; +import org.hibernate.sql.model.internal.TableUpdateStandard; /** * @author Steve Ebersole @@ -82,7 +89,7 @@ public interface SqlAstWalker { void visitUpdateStatement(UpdateStatement statement); - void visitInsertStatement(InsertStatement statement); + void visitInsertStatement(InsertSelectStatement statement); void visitAssignment(Assignment assignment); @@ -197,4 +204,22 @@ public interface SqlAstWalker { void visitDuration(Duration duration); void visitConversion(Conversion conversion); + + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Model mutations + + void visitStandardTableInsert(TableInsertStandard tableInsert); + + void visitCustomTableInsert(TableInsertCustomSql tableInsert); + + void visitStandardTableDelete(TableDeleteStandard tableDelete); + + void visitCustomTableDelete(TableDeleteCustomSql tableDelete); + + void visitStandardTableUpdate(TableUpdateStandard tableUpdate); + + void visitCustomTableUpdate(TableUpdateCustomSql tableUpdate); + + void visitColumnWriteFragment(ColumnWriteFragment columnWriteFragment); } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlTreePrinter.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlTreePrinter.java index c8d9734cbe..7804accfc8 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlTreePrinter.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlTreePrinter.java @@ -13,14 +13,13 @@ import org.hibernate.sql.ast.tree.Statement; import org.hibernate.sql.ast.tree.delete.DeleteStatement; import org.hibernate.sql.ast.tree.from.FromClause; import org.hibernate.sql.ast.tree.from.FunctionTableReference; -import org.hibernate.sql.ast.tree.from.LazyTableGroup; import org.hibernate.sql.ast.tree.from.NamedTableReference; import org.hibernate.sql.ast.tree.from.QueryPartTableReference; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableGroupJoin; -import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.ast.tree.from.TableReferenceJoin; import org.hibernate.sql.ast.tree.from.ValuesTableReference; +import org.hibernate.sql.ast.tree.insert.InsertSelectStatement; import org.hibernate.sql.ast.tree.insert.InsertStatement; import org.hibernate.sql.ast.tree.select.QueryGroup; import org.hibernate.sql.ast.tree.select.QueryPart; @@ -79,7 +78,7 @@ public class SqlTreePrinter { ) ); } - else if ( sqlAstStatement instanceof InsertStatement) { + else if ( sqlAstStatement instanceof InsertSelectStatement ) { final InsertStatement insertStatement = (InsertStatement) sqlAstStatement; logNode( "InsertStatement", 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 e59254dd19..d5ac943f69 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 @@ -22,6 +22,7 @@ import java.util.Set; import java.util.TimeZone; import java.util.function.Consumer; import java.util.function.Function; +import java.util.function.Supplier; import org.hibernate.LockMode; import org.hibernate.LockOptions; @@ -68,8 +69,8 @@ import org.hibernate.query.sqm.SetOperator; import org.hibernate.query.sqm.SortOrder; import org.hibernate.query.sqm.UnaryArithmeticOperator; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; -import org.hibernate.query.sqm.function.SelfRenderingAggregateFunctionSqlAstExpression; import org.hibernate.query.sqm.function.MultipatternSqmFunctionDescriptor; +import org.hibernate.query.sqm.function.SelfRenderingAggregateFunctionSqlAstExpression; import org.hibernate.query.sqm.function.SelfRenderingFunctionSqlAstExpression; import org.hibernate.query.sqm.function.SqmFunctionDescriptor; import org.hibernate.query.sqm.sql.internal.SqmParameterInterpretation; @@ -137,7 +138,7 @@ import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.ast.tree.from.TableReferenceJoin; import org.hibernate.sql.ast.tree.from.ValuesTableReference; import org.hibernate.sql.ast.tree.from.VirtualTableGroup; -import org.hibernate.sql.ast.tree.insert.InsertStatement; +import org.hibernate.sql.ast.tree.insert.InsertSelectStatement; import org.hibernate.sql.ast.tree.insert.Values; import org.hibernate.sql.ast.tree.predicate.BetweenPredicate; import org.hibernate.sql.ast.tree.predicate.BooleanExpressionPredicate; @@ -163,19 +164,28 @@ import org.hibernate.sql.ast.tree.update.Assignment; import org.hibernate.sql.ast.tree.update.UpdateStatement; import org.hibernate.sql.exec.ExecutionException; import org.hibernate.sql.exec.internal.AbstractJdbcParameter; +import org.hibernate.sql.exec.internal.JdbcOperationQueryInsertImpl; import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl; import org.hibernate.sql.exec.internal.JdbcParametersImpl; import org.hibernate.sql.exec.internal.SqlTypedMappingJdbcParameter; import org.hibernate.sql.exec.spi.ExecutionContext; -import org.hibernate.sql.exec.spi.JdbcDelete; -import org.hibernate.sql.exec.spi.JdbcInsert; import org.hibernate.sql.exec.spi.JdbcLockStrategy; import org.hibernate.sql.exec.spi.JdbcOperation; +import org.hibernate.sql.exec.spi.JdbcOperationQueryDelete; +import org.hibernate.sql.exec.spi.JdbcOperationQueryInsert; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; +import org.hibernate.sql.exec.spi.JdbcOperationQueryUpdate; import org.hibernate.sql.exec.spi.JdbcParameterBinder; import org.hibernate.sql.exec.spi.JdbcParameterBinding; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; -import org.hibernate.sql.exec.spi.JdbcUpdate; +import org.hibernate.sql.model.ast.ColumnWriteFragment; +import org.hibernate.sql.model.ast.TableMutation; +import org.hibernate.sql.model.internal.TableDeleteCustomSql; +import org.hibernate.sql.model.internal.TableDeleteStandard; +import org.hibernate.sql.model.internal.TableInsertCustomSql; +import org.hibernate.sql.model.internal.TableInsertStandard; +import org.hibernate.sql.model.internal.TableUpdateCustomSql; +import org.hibernate.sql.model.internal.TableUpdateStandard; import org.hibernate.sql.results.internal.SqlSelectionImpl; import org.hibernate.sql.results.jdbc.internal.JdbcValuesMappingProducerStandard; import org.hibernate.type.BasicPluralType; @@ -457,7 +467,7 @@ public abstract class AbstractSqlAstTranslator implemen public MutationStatement getCurrentDmlStatement() { return statementStack.findCurrentFirst( stmt -> { - if ( stmt instanceof MutationStatement && !( stmt instanceof InsertStatement ) ) { + if ( stmt instanceof MutationStatement && !( stmt instanceof InsertSelectStatement ) ) { return (MutationStatement) stmt; } return null; @@ -721,9 +731,15 @@ public abstract class AbstractSqlAstTranslator implemen public T translate(JdbcParameterBindings jdbcParameterBindings, QueryOptions queryOptions) { try { this.jdbcParameterBindings = jdbcParameterBindings; + + final Statement statement = statementStack.pop(); + + if ( statement instanceof TableMutation ) { + return translateTableMutation( (TableMutation) statement ); + } + this.lockOptions = queryOptions.getLockOptions().makeCopy(); this.limit = queryOptions.getLimit() == null ? null : queryOptions.getLimit().makeCopy(); - final Statement statement = statementStack.pop(); final JdbcOperation jdbcOperation; if ( statement instanceof DeleteStatement ) { jdbcOperation = translateDelete( (DeleteStatement) statement ); @@ -731,14 +747,14 @@ public abstract class AbstractSqlAstTranslator implemen else if ( statement instanceof UpdateStatement ) { jdbcOperation = translateUpdate( (UpdateStatement) statement ); } - else if ( statement instanceof InsertStatement ) { - jdbcOperation = translateInsert( (InsertStatement) statement ); + else if ( statement instanceof InsertSelectStatement ) { + jdbcOperation = translateInsert( (InsertSelectStatement) statement ); } else if ( statement instanceof SelectStatement ) { jdbcOperation = translateSelect( (SelectStatement) statement ); } else { - throw new IllegalArgumentException( "Unexpected statement" ); + throw new IllegalArgumentException( "Unexpected statement - " + statement ); } if ( jdbcParameterBindings != null && CollectionHelper.isNotEmpty( getFilterJdbcParameters() ) ) { @@ -757,10 +773,10 @@ public abstract class AbstractSqlAstTranslator implemen } } - protected JdbcDelete translateDelete(DeleteStatement sqlAst) { + protected JdbcOperationQueryDelete translateDelete(DeleteStatement sqlAst) { visitDeleteStatement( sqlAst ); - return new JdbcDelete( + return new JdbcOperationQueryDelete( getSql(), getParameterBinders(), getAffectedTableNames(), @@ -769,10 +785,10 @@ public abstract class AbstractSqlAstTranslator implemen ); } - protected JdbcUpdate translateUpdate(UpdateStatement sqlAst) { + protected JdbcOperationQueryUpdate translateUpdate(UpdateStatement sqlAst) { visitUpdateStatement( sqlAst ); - return new JdbcUpdate( + return new JdbcOperationQueryUpdate( getSql(), getParameterBinders(), getAffectedTableNames(), @@ -781,26 +797,24 @@ public abstract class AbstractSqlAstTranslator implemen ); } - protected JdbcInsert translateInsert(InsertStatement sqlAst) { + protected JdbcOperationQueryInsert translateInsert(InsertSelectStatement sqlAst) { visitInsertStatement( sqlAst ); - return new JdbcInsert( + return new JdbcOperationQueryInsertImpl( getSql(), getParameterBinders(), - getAffectedTableNames(), - getFilterJdbcParameters(), - getAppliedParameterBindings() + getAffectedTableNames() ); } - protected JdbcSelect translateSelect(SelectStatement selectStatement) { + protected JdbcOperationQuerySelect translateSelect(SelectStatement selectStatement) { logDomainResultGraph( selectStatement.getDomainResultDescriptors() ); logSqlAst( selectStatement ); visitSelectStatement( selectStatement ); final int rowsToSkip; - return new JdbcSelect( + return new JdbcOperationQuerySelect( getSql(), getParameterBinders(), new JdbcValuesMappingProducerStandard( @@ -967,7 +981,7 @@ public abstract class AbstractSqlAstTranslator implemen } @Override - public void visitInsertStatement(InsertStatement statement) { + public void visitInsertStatement(InsertSelectStatement statement) { try { statementStack.push( statement ); visitCteContainer( statement ); @@ -991,7 +1005,7 @@ public abstract class AbstractSqlAstTranslator implemen } visitWhereClause( statement.getRestriction() ); - visitReturningColumns( statement ); + visitReturningColumns( statement.getReturningColumns() ); } protected void visitUpdateStatementOnly(UpdateStatement statement) { @@ -1008,7 +1022,7 @@ public abstract class AbstractSqlAstTranslator implemen renderSetClause( statement, clauseStack ); visitWhereClause( statement.getRestriction() ); - visitReturningColumns( statement ); + visitReturningColumns( statement.getReturningColumns() ); } protected void renderSetClause(UpdateStatement statement, Stack clauseStack) { @@ -1059,14 +1073,14 @@ public abstract class AbstractSqlAstTranslator implemen appendSql( columnReference.getColumnExpression() ); } - protected void visitInsertStatementOnly(InsertStatement statement) { + protected void visitInsertStatementOnly(InsertSelectStatement statement) { appendSql( "insert into " ); appendSql( statement.getTargetTable().getTableExpression() ); appendSql( OPEN_PARENTHESIS ); boolean firstPass = true; - final List targetColumnReferences = statement.getTargetColumnReferences(); + final List targetColumnReferences = statement.getTargetColumns(); if ( targetColumnReferences == null ) { renderImplicitTargetColumnSpec(); } @@ -1091,7 +1105,7 @@ public abstract class AbstractSqlAstTranslator implemen else { visitValuesList( statement.getValuesList() ); } - visitReturningColumns( statement ); + visitReturningColumns( statement.getReturningColumns() ); } private void renderImplicitTargetColumnSpec() { @@ -1407,8 +1421,17 @@ public abstract class AbstractSqlAstTranslator implemen return strategy; } - protected void visitReturningColumns(MutationStatement mutationStatement) { - final List returningColumns = mutationStatement.getReturningColumns(); + protected void visitReturningColumns(Supplier> returningColumnsAccess) { + final List returningColumns = returningColumnsAccess.get(); + + if ( returningColumns.isEmpty() ) { + return; + } + + visitReturningColumns( returningColumns ); + } + + protected void visitReturningColumns(List returningColumns) { final int size = returningColumns.size(); if ( size == 0 ) { return; @@ -4329,7 +4352,7 @@ public abstract class AbstractSqlAstTranslator implemen appendSql( "select " ); // When we emulate a root statement, we don't need to select the select items // to filter out the row number column we introduce, because we will simply ignore it anyway - if ( getClauseStack().isEmpty() && !( getStatement() instanceof InsertStatement ) + if ( getClauseStack().isEmpty() && !( getStatement() instanceof InsertSelectStatement ) // If the query part is a child of a query group, we have can't do that, // since we need the select items to properly align in query group parts && !( getCurrentQueryPart() instanceof QueryGroup ) ) { @@ -4531,7 +4554,7 @@ public abstract class AbstractSqlAstTranslator implemen } final SqlAstNodeRenderingMode original = parameterRenderingMode; final SqlAstNodeRenderingMode defaultRenderingMode; - if ( getStatement() instanceof InsertStatement && clauseStack.depth() == 1 && queryPartStack.depth() == 1 ) { + if ( getStatement() instanceof InsertSelectStatement && clauseStack.depth() == 1 && queryPartStack.depth() == 1 ) { // Databases support inferring parameter types for simple insert-select statements defaultRenderingMode = SqlAstNodeRenderingMode.DEFAULT; } @@ -7592,4 +7615,220 @@ public abstract class AbstractSqlAstTranslator implemen } } + private T translateTableMutation(TableMutation mutation) { + mutation.accept( this ); + //noinspection unchecked + return (T) mutation.createMutationOperation( getSql(), parameterBinders ); + } + + @Override + public void visitStandardTableInsert(TableInsertStandard tableInsert) { + getCurrentClauseStack().push( Clause.INSERT ); + try { + renderInsertInto( tableInsert ); + + if ( tableInsert.getNumberOfReturningColumns() > 0 ) { + visitReturningColumns( tableInsert::getReturningColumns ); + } + } + finally { + getCurrentClauseStack().pop(); + } + } + + private void renderInsertInto(TableInsertStandard tableInsert) { + sqlBuffer.append( "insert into " ); + + appendSql( tableInsert.getMutatingTable().getTableName() ); + registerAffectedTable( tableInsert.getMutatingTable().getTableName() ); + + sqlBuffer.append( " (" ); + + tableInsert.forEachValueBinding( (columnPosition, columnValueBinding) -> { + sqlBuffer.append( columnValueBinding.getColumnReference().getColumnExpression() ); + + if ( columnPosition < tableInsert.getNumberOfValueBindings() - 1 ) { + sqlBuffer.append( ", " ); + } + } ); + + getCurrentClauseStack().push( Clause.VALUES ); + try { + sqlBuffer.append( ") values (" ); + + tableInsert.forEachValueBinding( (columnPosition, columnValueBinding) -> { + columnValueBinding.getValueExpression().accept( this ); + + if ( columnPosition < tableInsert.getNumberOfValueBindings() - 1 ) { + sqlBuffer.append( ", " ); + } + } ); + } + finally { + getCurrentClauseStack().pop(); + } + + sqlBuffer.append( ")" ); + } + + @Override + public void visitCustomTableInsert(TableInsertCustomSql tableInsert) { + assert sqlBuffer.toString().isEmpty(); + sqlBuffer.append( tableInsert.getCustomSql() ); + + tableInsert.getParameters().forEach( (parameter) -> { + parameterBinders.add( parameter.getParameterBinder() ); + jdbcParameters.addParameter( parameter ); + } ); + } + + @Override + public void visitStandardTableUpdate(TableUpdateStandard tableUpdate) { + getCurrentClauseStack().push( Clause.UPDATE ); + try { + sqlBuffer.append( "update " ); + appendSql( tableUpdate.getMutatingTable().getTableName() ); + registerAffectedTable( tableUpdate.getMutatingTable().getTableName() ); + + getCurrentClauseStack().push( Clause.SET ); + try { + sqlBuffer.append( " set " ); + tableUpdate.forEachValueBinding( (position, columnValueBinding) -> { + sqlBuffer.append( columnValueBinding.getColumnReference().getColumnExpression() ); + sqlBuffer.append( "=" ); + columnValueBinding.getValueExpression().accept( this ); + + if ( position < tableUpdate.getNumberOfValueBindings() - 1 ) { + sqlBuffer.append( ", " ); + } + } ); + } + finally { + getCurrentClauseStack().pop(); + } + + getCurrentClauseStack().push( Clause.WHERE ); + try { + sqlBuffer.append( " where " ); + tableUpdate.forEachKeyBinding( (position, columnValueBinding) -> { + sqlBuffer.append( columnValueBinding.getColumnReference().getColumnExpression() ); + sqlBuffer.append( "=" ); + columnValueBinding.getValueExpression().accept( this ); + + if ( position < tableUpdate.getNumberOfKeyBindings() - 1 ) { + sqlBuffer.append( " and " ); + } + } ); + + if ( tableUpdate.getNumberOfOptimisticLockBindings() > 0 ) { + sqlBuffer.append( " and " ); + tableUpdate.forEachOptimisticLockBinding( (position, columnValueBinding) -> { + sqlBuffer.append( columnValueBinding.getColumnReference().getColumnExpression() ); + if ( columnValueBinding.getValueExpression() == null ) { + sqlBuffer.append( " is null" ); + } + else { + sqlBuffer.append( "=" ); + columnValueBinding.getValueExpression().accept( this ); + } + + if ( position < tableUpdate.getNumberOfOptimisticLockBindings() - 1 ) { + sqlBuffer.append( " and " ); + } + } ); + } + + if ( tableUpdate.getWhereFragment() != null ) { + sqlBuffer.append( " and (" ).append( tableUpdate.getWhereFragment() ).append( ")" ); + } + } + finally { + getCurrentClauseStack().pop(); + } + } + finally { + getCurrentClauseStack().pop(); + } + } + + @Override + public void visitCustomTableUpdate(TableUpdateCustomSql tableUpdate) { + assert sqlBuffer.toString().isEmpty(); + sqlBuffer.append( tableUpdate.getCustomSql() ); + + tableUpdate.getParameters().forEach( (parameter) -> { + parameterBinders.add( parameter.getParameterBinder() ); + jdbcParameters.addParameter( parameter ); + } ); + } + + @Override + public void visitStandardTableDelete(TableDeleteStandard tableDelete) { + getCurrentClauseStack().push( Clause.DELETE ); + try { + sqlBuffer.append( "delete from " ); + appendSql( tableDelete.getMutatingTable().getTableName() ); + registerAffectedTable( tableDelete.getMutatingTable().getTableName() ); + + getCurrentClauseStack().push( Clause.WHERE ); + try { + sqlBuffer.append( " where " ); + + tableDelete.forEachKeyBinding( (columnPosition, columnValueBinding) -> { + sqlBuffer.append( columnValueBinding.getColumnReference().getColumnExpression() ); + sqlBuffer.append( "=" ); + columnValueBinding.getValueExpression().accept( this ); + + if ( columnPosition < tableDelete.getNumberOfKeyBindings() - 1 ) { + sqlBuffer.append( " and " ); + } + } ); + + if ( tableDelete.getNumberOfOptimisticLockBindings() > 0 ) { + sqlBuffer.append( " and " ); + + tableDelete.forEachOptimisticLockBinding( (columnPosition, columnValueBinding) -> { + sqlBuffer.append( columnValueBinding.getColumnReference().getColumnExpression() ); + if ( columnValueBinding.getValueExpression() == null ) { + sqlBuffer.append( " is null" ); + } + else { + sqlBuffer.append( "=" ); + columnValueBinding.getValueExpression().accept( this ); + } + + if ( columnPosition < tableDelete.getNumberOfOptimisticLockBindings() - 1 ) { + sqlBuffer.append( " and " ); + } + } ); + } + } + finally { + getCurrentClauseStack().pop(); + } + } + finally { + getCurrentClauseStack().pop(); + } + } + + @Override + public void visitCustomTableDelete(TableDeleteCustomSql tableDelete) { + assert sqlBuffer.toString().isEmpty(); + sqlBuffer.append( tableDelete.getCustomSql() ); + + tableDelete.getParameters().forEach( (parameter) -> { + parameterBinders.add( parameter.getParameterBinder() ); + jdbcParameters.addParameter( parameter ); + } ); + } + + @Override + public void visitColumnWriteFragment(ColumnWriteFragment columnWriteFragment) { + sqlBuffer.append( columnWriteFragment.getFragment() ); + if ( columnWriteFragment.getParameter() != null ) { + parameterBinders.add( columnWriteFragment.getParameter().getParameterBinder() ); + jdbcParameters.addParameter( columnWriteFragment.getParameter() ); + } + } } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstWalker.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstWalker.java index 651f2bc29c..bf41337cf0 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstWalker.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstWalker.java @@ -7,6 +7,7 @@ package org.hibernate.sql.ast.spi; +import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.persister.internal.SqlFragmentPredicate; import org.hibernate.query.sqm.tree.expression.Conversion; import org.hibernate.sql.ast.SqlAstWalker; @@ -52,7 +53,7 @@ import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableGroupJoin; import org.hibernate.sql.ast.tree.from.TableReferenceJoin; import org.hibernate.sql.ast.tree.from.ValuesTableReference; -import org.hibernate.sql.ast.tree.insert.InsertStatement; +import org.hibernate.sql.ast.tree.insert.InsertSelectStatement; import org.hibernate.sql.ast.tree.insert.Values; import org.hibernate.sql.ast.tree.predicate.BetweenPredicate; import org.hibernate.sql.ast.tree.predicate.BooleanExpressionPredicate; @@ -76,6 +77,13 @@ import org.hibernate.sql.ast.tree.select.SelectStatement; import org.hibernate.sql.ast.tree.select.SortSpecification; import org.hibernate.sql.ast.tree.update.Assignment; import org.hibernate.sql.ast.tree.update.UpdateStatement; +import org.hibernate.sql.model.ast.ColumnWriteFragment; +import org.hibernate.sql.model.internal.TableDeleteCustomSql; +import org.hibernate.sql.model.internal.TableDeleteStandard; +import org.hibernate.sql.model.internal.TableInsertCustomSql; +import org.hibernate.sql.model.internal.TableInsertStandard; +import org.hibernate.sql.model.internal.TableUpdateCustomSql; +import org.hibernate.sql.model.internal.TableUpdateStandard; /** * A simple walker that checks for aggregate functions. @@ -281,7 +289,7 @@ public class AbstractSqlAstWalker implements SqlAstWalker { } @Override - public void visitInsertStatement(InsertStatement statement) { + public void visitInsertStatement(InsertSelectStatement statement) { for ( CteStatement cteStatement : statement.getCteStatements().values() ) { cteStatement.getCteDefinition().accept( this ); } @@ -512,4 +520,49 @@ public class AbstractSqlAstWalker implements SqlAstWalker { argument.accept( this ); } } + + + @Override + public void visitStandardTableInsert(TableInsertStandard tableInsert) { + tableInsert.getMutatingTable().accept( this ); + + tableInsert.forEachValueBinding( (integer, columnValueBinding) -> { + columnValueBinding.getColumnReference().accept( this ); + columnValueBinding.getValueExpression().accept( this ); + } ); + + tableInsert.forEachReturningColumn( (integer, columnReference) -> { + columnReference.accept( this ); + } ); + } + + @Override + public void visitCustomTableInsert(TableInsertCustomSql tableInsert) { + throw new NotYetImplementedFor6Exception( getClass() ); + } + + @Override + public void visitStandardTableUpdate(TableUpdateStandard tableUpdate) { + throw new NotYetImplementedFor6Exception( getClass() ); + } + + @Override + public void visitCustomTableUpdate(TableUpdateCustomSql tableUpdate) { + throw new NotYetImplementedFor6Exception( getClass() ); + } + + @Override + public void visitColumnWriteFragment(ColumnWriteFragment columnWriteFragment) { + throw new NotYetImplementedFor6Exception( getClass() ); + } + + @Override + public void visitStandardTableDelete(TableDeleteStandard tableDelete) { + throw new NotYetImplementedFor6Exception( getClass() ); + } + + @Override + public void visitCustomTableDelete(TableDeleteCustomSql tableDelete) { + throw new NotYetImplementedFor6Exception( getClass() ); + } } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AggregateFunctionChecker.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AggregateFunctionChecker.java index a5e8cb9d9d..93459cbde5 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AggregateFunctionChecker.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AggregateFunctionChecker.java @@ -42,8 +42,7 @@ import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableGroupJoin; import org.hibernate.sql.ast.tree.from.TableReferenceJoin; import org.hibernate.sql.ast.tree.from.ValuesTableReference; -import org.hibernate.sql.ast.tree.insert.InsertStatement; -import org.hibernate.sql.ast.tree.insert.Values; +import org.hibernate.sql.ast.tree.insert.InsertSelectStatement; import org.hibernate.sql.ast.tree.predicate.ExistsPredicate; import org.hibernate.sql.ast.tree.predicate.FilterPredicate; import org.hibernate.sql.ast.tree.predicate.InListPredicate; @@ -134,7 +133,7 @@ public class AggregateFunctionChecker extends AbstractSqlAstWalker { } @Override - public void visitInsertStatement(InsertStatement statement) { + public void visitInsertStatement(InsertSelectStatement statement) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/ExpressionReplacementWalker.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/ExpressionReplacementWalker.java index 24d9708cca..2ea1d6efbb 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/ExpressionReplacementWalker.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/ExpressionReplacementWalker.java @@ -51,7 +51,7 @@ import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableGroupJoin; import org.hibernate.sql.ast.tree.from.TableReferenceJoin; import org.hibernate.sql.ast.tree.from.ValuesTableReference; -import org.hibernate.sql.ast.tree.insert.InsertStatement; +import org.hibernate.sql.ast.tree.insert.InsertSelectStatement; import org.hibernate.sql.ast.tree.predicate.BetweenPredicate; import org.hibernate.sql.ast.tree.predicate.BooleanExpressionPredicate; import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate; @@ -74,6 +74,13 @@ import org.hibernate.sql.ast.tree.select.SelectStatement; import org.hibernate.sql.ast.tree.select.SortSpecification; import org.hibernate.sql.ast.tree.update.Assignment; import org.hibernate.sql.ast.tree.update.UpdateStatement; +import org.hibernate.sql.model.ast.ColumnWriteFragment; +import org.hibernate.sql.model.internal.TableDeleteCustomSql; +import org.hibernate.sql.model.internal.TableDeleteStandard; +import org.hibernate.sql.model.internal.TableInsertCustomSql; +import org.hibernate.sql.model.internal.TableInsertStandard; +import org.hibernate.sql.model.internal.TableUpdateCustomSql; +import org.hibernate.sql.model.internal.TableUpdateStandard; /** * A walker that allows to replace expressions. @@ -469,7 +476,7 @@ public class ExpressionReplacementWalker implements SqlAstWalker { } @Override - public void visitInsertStatement(InsertStatement statement) { + public void visitInsertStatement(InsertSelectStatement statement) { throw new UnsupportedOperationException(); } @@ -557,4 +564,39 @@ public class ExpressionReplacementWalker implements SqlAstWalker { public void visitFilterFragmentPredicate(FilterPredicate.FilterFragmentPredicate fragmentPredicate) { throw new UnsupportedOperationException(); } + + @Override + public void visitStandardTableInsert(TableInsertStandard tableInsert) { + throw new UnsupportedOperationException(); + } + + @Override + public void visitCustomTableInsert(TableInsertCustomSql tableInsert) { + throw new UnsupportedOperationException(); + } + + @Override + public void visitStandardTableUpdate(TableUpdateStandard tableUpdate) { + throw new UnsupportedOperationException(); + } + + @Override + public void visitCustomTableUpdate(TableUpdateCustomSql tableUpdate) { + throw new UnsupportedOperationException(); + } + + @Override + public void visitStandardTableDelete(TableDeleteStandard tableDelete) { + throw new UnsupportedOperationException(); + } + + @Override + public void visitCustomTableDelete(TableDeleteCustomSql tableDelete) { + throw new UnsupportedOperationException(); + } + + @Override + public void visitColumnWriteFragment(ColumnWriteFragment columnWriteFragment) { + throw new UnsupportedOperationException(); + } } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslator.java index 70bb30243e..ee86017ee3 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslator.java @@ -9,12 +9,12 @@ package org.hibernate.sql.ast.spi; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.sql.ast.tree.Statement; import org.hibernate.sql.exec.spi.JdbcOperation; -import org.hibernate.sql.exec.spi.JdbcSelect; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; /** * The final phase of query translation. Here we take the SQL-AST an * "interpretation". For a select query, that means an instance of - * {@link JdbcSelect}. + * {@link JdbcOperationQuerySelect}. * * @author Christian Beikov */ diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslatorFactory.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslatorFactory.java index f97d271835..51c97c38f1 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslatorFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslatorFactory.java @@ -14,38 +14,51 @@ import org.hibernate.sql.ast.tree.delete.DeleteStatement; import org.hibernate.sql.ast.tree.insert.InsertStatement; import org.hibernate.sql.ast.tree.select.SelectStatement; import org.hibernate.sql.ast.tree.update.UpdateStatement; -import org.hibernate.sql.exec.spi.JdbcDelete; -import org.hibernate.sql.exec.spi.JdbcInsert; import org.hibernate.sql.exec.spi.JdbcOperation; -import org.hibernate.sql.exec.spi.JdbcSelect; -import org.hibernate.sql.exec.spi.JdbcUpdate; +import org.hibernate.sql.exec.spi.JdbcOperationQueryDelete; +import org.hibernate.sql.exec.spi.JdbcOperationQueryInsert; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; +import org.hibernate.sql.exec.spi.JdbcOperationQueryUpdate; +import org.hibernate.sql.model.ast.TableMutation; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; /** + * Standard implementation of SqlAstTranslatorFactory + * * @author Steve Ebersole */ public class StandardSqlAstTranslatorFactory implements SqlAstTranslatorFactory { @Override - public SqlAstTranslator buildSelectTranslator(SessionFactoryImplementor sessionFactory, SelectStatement statement) { + public SqlAstTranslator buildSelectTranslator(SessionFactoryImplementor sessionFactory, SelectStatement statement) { return buildTranslator( sessionFactory, statement ); } @Override - public SqlAstTranslator buildDeleteTranslator(SessionFactoryImplementor sessionFactory, DeleteStatement statement) { + public SqlAstTranslator buildDeleteTranslator(SessionFactoryImplementor sessionFactory, DeleteStatement statement) { return buildTranslator( sessionFactory, statement ); } @Override - public SqlAstTranslator buildInsertTranslator(SessionFactoryImplementor sessionFactory, InsertStatement statement) { + public SqlAstTranslator buildInsertTranslator(SessionFactoryImplementor sessionFactory, InsertStatement statement) { return buildTranslator( sessionFactory, statement ); } @Override - public SqlAstTranslator buildUpdateTranslator(SessionFactoryImplementor sessionFactory, UpdateStatement statement) { + public SqlAstTranslator buildUpdateTranslator(SessionFactoryImplementor sessionFactory, UpdateStatement statement) { return buildTranslator( sessionFactory, statement ); } + @Override + public SqlAstTranslator buildModelMutationTranslator(TableMutation mutation, SessionFactoryImplementor sessionFactory) { + return buildTranslator( sessionFactory, mutation ); + } + + /** + * Consolidated building of a translator for all Query cases + */ protected SqlAstTranslator buildTranslator(SessionFactoryImplementor sessionFactory, Statement statement) { return new StandardSqlAstTranslator<>( sessionFactory, statement ); } + } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/Statement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/Statement.java index 4541cfe1f0..519bef84e9 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/Statement.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/Statement.java @@ -14,5 +14,8 @@ import org.hibernate.sql.ast.SqlAstWalker; * @author Steve Ebersole */ public interface Statement { + /** + * Visitation + */ void accept(SqlAstWalker walker); } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/NamedTableReference.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/NamedTableReference.java index 3d6a320dae..8df44f899b 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/NamedTableReference.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/NamedTableReference.java @@ -12,7 +12,6 @@ import java.util.Locale; import java.util.function.Consumer; import java.util.function.Function; -import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.SqlAstWalker; @@ -31,8 +30,7 @@ public class NamedTableReference extends AbstractTableReference { public NamedTableReference( String tableExpression, String identificationVariable, - boolean isOptional, - SessionFactoryImplementor sessionFactory) { + boolean isOptional) { super( identificationVariable, isOptional ); assert tableExpression != null; this.tableExpression = tableExpression; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/UnionTableReference.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/UnionTableReference.java index f48745a062..c58ec4d8ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/UnionTableReference.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/UnionTableReference.java @@ -9,7 +9,6 @@ package org.hibernate.sql.ast.tree.from; import java.util.Locale; import java.util.function.Function; -import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.spi.NavigablePath; import static org.hibernate.internal.util.StringHelper.isEmpty; @@ -24,9 +23,8 @@ public class UnionTableReference extends NamedTableReference { String unionTableExpression, String[] subclassTableSpaceExpressions, String identificationVariable, - boolean isOptional, - SessionFactoryImplementor sessionFactory) { - super( unionTableExpression, identificationVariable, isOptional, sessionFactory ); + boolean isOptional) { + super( unionTableExpression, identificationVariable, isOptional ); this.subclassTableSpaceExpressions = subclassTableSpaceExpressions; } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertSelectStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertSelectStatement.java new file mode 100644 index 0000000000..59bb28e2b3 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertSelectStatement.java @@ -0,0 +1,114 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html + */ +package org.hibernate.sql.ast.tree.insert; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.function.BiConsumer; + +import org.hibernate.sql.ast.SqlAstWalker; +import org.hibernate.sql.ast.tree.AbstractMutationStatement; +import org.hibernate.sql.ast.tree.cte.CteContainer; +import org.hibernate.sql.ast.tree.cte.CteStatement; +import org.hibernate.sql.ast.tree.expression.ColumnReference; +import org.hibernate.sql.ast.tree.from.NamedTableReference; +import org.hibernate.sql.ast.tree.select.QueryPart; + +/** + * todo (6.2) - Would much prefer to split insert-values and + * insert-select into individual contracts - something like + * `InsertStatement` and `InsertSelectStatement` e.g. + * Would help alleviate much of the duplication in handling + * between inserts from SQM and those from model mutation + * + * @author Steve Ebersole + */ +public class InsertSelectStatement extends AbstractMutationStatement implements InsertStatement { + + public static final String DEFAULT_ALIAS = "to_insert_"; + private List targetColumnReferences; + private QueryPart sourceSelectStatement; + private List valuesList = new ArrayList<>(); + + public InsertSelectStatement(NamedTableReference targetTable) { + super( targetTable ); + } + + public InsertSelectStatement(NamedTableReference targetTable, List returningColumns) { + super( new LinkedHashMap<>(), targetTable, returningColumns ); + } + + public InsertSelectStatement( + CteContainer cteContainer, + NamedTableReference targetTable, + List returningColumns) { + this( cteContainer.getCteStatements(), targetTable, returningColumns ); + } + + public InsertSelectStatement( + Map cteStatements, + NamedTableReference targetTable, + List returningColumns) { + super( cteStatements, targetTable, returningColumns ); + } + + @Override + public List getTargetColumns() { + return targetColumnReferences == null ? Collections.emptyList() : targetColumnReferences; + } + + @Override + public void forEachTargetColumn(BiConsumer consumer) { + if ( targetColumnReferences == null ) { + return; + } + + for ( int i = 0; i < targetColumnReferences.size(); i++ ) { + consumer.accept( i, targetColumnReferences.get( i ) ); + } + } + + public void addTargetColumnReferences(ColumnReference... references) { + if ( targetColumnReferences == null ) { + targetColumnReferences = new ArrayList<>(); + } + + Collections.addAll( this.targetColumnReferences, references ); + } + + public void addTargetColumnReferences(List references) { + if ( targetColumnReferences == null ) { + targetColumnReferences = new ArrayList<>(); + } + + this.targetColumnReferences.addAll( references ); + } + + public QueryPart getSourceSelectStatement() { + return sourceSelectStatement; + } + + public void setSourceSelectStatement(QueryPart sourceSelectStatement) { + this.sourceSelectStatement = sourceSelectStatement; + } + + public List getValuesList() { + return valuesList; + } + + public void setValuesList(List valuesList) { + this.valuesList = valuesList; + } + + @Override + public void accept(SqlAstWalker walker) { + walker.visitInsertStatement( this ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertStatement.java index c9e2436497..ae4a9981ff 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertStatement.java @@ -1,95 +1,40 @@ /* * 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 http://www.gnu.org/licenses/lgpl-2.1.html + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ package org.hibernate.sql.ast.tree.insert; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; +import java.util.function.BiConsumer; -import org.hibernate.sql.ast.SqlAstWalker; -import org.hibernate.sql.ast.tree.AbstractMutationStatement; -import org.hibernate.sql.ast.tree.cte.CteContainer; -import org.hibernate.sql.ast.tree.cte.CteStatement; +import org.hibernate.sql.ast.tree.MutationStatement; import org.hibernate.sql.ast.tree.expression.ColumnReference; -import org.hibernate.sql.ast.tree.from.NamedTableReference; -import org.hibernate.sql.ast.tree.select.QueryPart; /** + * Specialization of MutationStatement for inserts + * * @author Steve Ebersole */ -public class InsertStatement extends AbstractMutationStatement { +public interface InsertStatement extends MutationStatement { + /** + * Get all target columns + */ + List getTargetColumns(); - public static final String DEFAULT_ALIAS = "to_insert_"; - private List targetColumnReferences; - private QueryPart sourceSelectStatement; - private List valuesList = new ArrayList<>(); - - public InsertStatement(NamedTableReference targetTable) { - super( targetTable ); + /** + * The number of target columns associated with this insert. + * + * @implNote By default, returns the size of {@link #getTargetColumns()} + * which may be appropriate or not + */ + default int getNumberOfTargetColumns() { + return getTargetColumns().size(); } - public InsertStatement(NamedTableReference targetTable, List returningColumns) { - super( new LinkedHashMap<>(), targetTable, returningColumns ); - } - - public InsertStatement( - CteContainer cteContainer, - NamedTableReference targetTable, - List returningColumns) { - this( cteContainer.getCteStatements(), targetTable, returningColumns ); - } - - public InsertStatement( - Map cteStatements, - NamedTableReference targetTable, - List returningColumns) { - super( cteStatements, targetTable, returningColumns ); - } - - public List getTargetColumnReferences() { - return targetColumnReferences == null ? Collections.emptyList() : targetColumnReferences; - } - - public void addTargetColumnReferences(ColumnReference... references) { - if ( targetColumnReferences == null ) { - targetColumnReferences = new ArrayList<>(); - } - - Collections.addAll( this.targetColumnReferences, references ); - } - - public void addTargetColumnReferences(List references) { - if ( targetColumnReferences == null ) { - targetColumnReferences = new ArrayList<>(); - } - - this.targetColumnReferences.addAll( references ); - } - - public QueryPart getSourceSelectStatement() { - return sourceSelectStatement; - } - - public void setSourceSelectStatement(QueryPart sourceSelectStatement) { - this.sourceSelectStatement = sourceSelectStatement; - } - - public List getValuesList() { - return valuesList; - } - - public void setValuesList(List valuesList) { - this.valuesList = valuesList; - } - - @Override - public void accept(SqlAstWalker walker) { - walker.visitInsertStatement( this ); - } + /** + * Iterates each target column + */ + void forEachTargetColumn(BiConsumer consumer); } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQueryInsert.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQueryInsert.java new file mode 100644 index 0000000000..b22e2492a4 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQueryInsert.java @@ -0,0 +1,29 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.exec.internal; + +import java.util.Collections; +import java.util.List; +import java.util.Set; + +import org.hibernate.sql.exec.spi.AbstractJdbcOperationQuery; +import org.hibernate.sql.exec.spi.JdbcOperationQueryInsert; +import org.hibernate.sql.exec.spi.JdbcParameterBinder; + +/** + * Base support for JdbcInsertMutation implementations + * + * @author Steve Ebersole + */ +public class AbstractJdbcOperationQueryInsert extends AbstractJdbcOperationQuery implements JdbcOperationQueryInsert { + public AbstractJdbcOperationQueryInsert( + String sql, + List parameterBinders, + Set affectedTableNames) { + super( sql, parameterBinders, affectedTableNames, Collections.emptySet() ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallImpl.java index a59ca22060..5caf922498 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallImpl.java @@ -14,13 +14,12 @@ import java.util.Set; import org.hibernate.HibernateException; import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.internal.FilterJdbcParameter; -import org.hibernate.procedure.spi.ParameterStrategy; import org.hibernate.query.spi.QueryOptions; -import org.hibernate.sql.exec.spi.JdbcCall; import org.hibernate.sql.exec.spi.JdbcCallFunctionReturn; import org.hibernate.sql.exec.spi.JdbcCallParameterExtractor; import org.hibernate.sql.exec.spi.JdbcCallParameterRegistration; import org.hibernate.sql.exec.spi.JdbcCallRefCursorExtractor; +import org.hibernate.sql.exec.spi.JdbcOperationQueryCall; import org.hibernate.sql.exec.spi.JdbcParameterBinder; import org.hibernate.sql.exec.spi.JdbcParameterBindings; import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer; @@ -30,7 +29,7 @@ import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer; * * @author Steve Ebersole */ -public class JdbcCallImpl implements JdbcCall { +public class JdbcCallImpl implements JdbcOperationQueryCall { private final String callableName; private final JdbcCallFunctionReturn functionReturn; @@ -40,26 +39,57 @@ public class JdbcCallImpl implements JdbcCall { private final List refCursorExtractors; public JdbcCallImpl(Builder builder) { - this.callableName = builder.callableName; + this( + builder.callableName, + builder.functionReturn, + builder.parameterRegistrations == null + ? Collections.emptyList() + : Collections.unmodifiableList( builder.parameterRegistrations ), + builder.parameterBinders == null + ? Collections.emptyList() + : Collections.unmodifiableList( builder.parameterBinders ), + builder.parameterExtractors == null + ? Collections.emptyList() + : Collections.unmodifiableList( builder.parameterExtractors ), + builder.refCursorExtractors == null + ? Collections.emptyList() + : Collections.unmodifiableList( builder.refCursorExtractors ) + ); + } - this.functionReturn = builder.functionReturn; + protected JdbcCallImpl( + String callableName, + JdbcCallFunctionReturn functionReturn, + List parameterRegistrations, + List parameterBinders, + List parameterExtractors, + List refCursorExtractors) { + this.callableName = callableName; + this.functionReturn = functionReturn; + this.parameterRegistrations = parameterRegistrations; + this.parameterBinders = parameterBinders; + this.parameterExtractors = parameterExtractors; + this.refCursorExtractors = refCursorExtractors; + } - this.parameterRegistrations = builder.parameterRegistrations == null - ? Collections.emptyList() - : Collections.unmodifiableList( builder.parameterRegistrations ); - this.parameterBinders = builder.parameterBinders == null - ? Collections.emptyList() - : Collections.unmodifiableList( builder.parameterBinders ); - this.parameterExtractors = builder.parameterExtractors == null - ? Collections.emptyList() - : Collections.unmodifiableList( builder.parameterExtractors ); - this.refCursorExtractors = builder.refCursorExtractors == null - ? Collections.emptyList() - : Collections.unmodifiableList( builder.refCursorExtractors ); + protected JdbcCallImpl( + String callableName, + JdbcCallFunctionReturn functionReturn, + List parameterRegistrations, + List parameterBinders, + List parameterExtractors) { + this( + callableName, + functionReturn, + parameterRegistrations, + parameterBinders, + parameterExtractors, + null + ); } @Override - public String getSql() { + public String getSqlString() { return callableName; } @@ -85,7 +115,7 @@ public class JdbcCallImpl implements JdbcCall { @Override public Set getFilterJdbcParameters() { - return null; + return Collections.emptySet(); } @Override @@ -115,8 +145,6 @@ public class JdbcCallImpl implements JdbcCall { } public static class Builder { - private final ParameterStrategy parameterStrategy; - private String callableName; private JdbcCallFunctionReturn functionReturn; @@ -125,11 +153,10 @@ public class JdbcCallImpl implements JdbcCall { private List parameterExtractors; private List refCursorExtractors; - public Builder(ParameterStrategy parameterStrategy) { - this.parameterStrategy = parameterStrategy; + public Builder() { } - public JdbcCall buildJdbcCall() { + public JdbcOperationQueryCall buildJdbcCall() { return new JdbcCallImpl( this ); } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQueryInsertImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQueryInsertImpl.java new file mode 100644 index 0000000000..d42dfab2f8 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQueryInsertImpl.java @@ -0,0 +1,29 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.exec.internal; + +import java.util.List; +import java.util.Set; + +import org.hibernate.sql.exec.spi.JdbcOperationQueryMutation; +import org.hibernate.sql.exec.spi.JdbcParameterBinder; + +/** + * Standard insert operation + * + * @author Steve Ebersole + */ +public class JdbcOperationQueryInsertImpl + extends AbstractJdbcOperationQueryInsert + implements JdbcOperationQueryMutation { + public JdbcOperationQueryInsertImpl( + String sql, + List parameterBinders, + Set affectedTableNames) { + super( sql, parameterBinders, affectedTableNames ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectExecutorStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectExecutorStandardImpl.java index 7d927716ae..12ea5b2801 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectExecutorStandardImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectExecutorStandardImpl.java @@ -16,8 +16,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import jakarta.persistence.CacheRetrieveMode; -import jakarta.persistence.CacheStoreMode; import org.hibernate.CacheMode; import org.hibernate.FlushMode; @@ -40,8 +38,8 @@ import org.hibernate.query.spi.ScrollableResultsImplementor; import org.hibernate.sql.exec.SqlExecLogger; import org.hibernate.sql.exec.spi.Callback; import org.hibernate.sql.exec.spi.ExecutionContext; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; import org.hibernate.sql.exec.spi.JdbcSelectExecutor; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.internal.ResultsHelper; @@ -67,6 +65,9 @@ import org.hibernate.stat.spi.StatisticsImplementor; import org.hibernate.type.BasicType; import org.hibernate.type.descriptor.java.JavaType; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; + /** * Standard JdbcSelectExecutor implementation used by Hibernate, * through {@link JdbcSelectExecutorStandardImpl#INSTANCE} @@ -81,7 +82,7 @@ public class JdbcSelectExecutorStandardImpl implements JdbcSelectExecutor { @Override public List list( - JdbcSelect jdbcSelect, + JdbcOperationQuerySelect jdbcSelect, JdbcParameterBindings jdbcParameterBindings, ExecutionContext executionContext, RowTransformer rowTransformer, @@ -104,7 +105,7 @@ public class JdbcSelectExecutorStandardImpl implements JdbcSelectExecutor { @Override public ScrollableResultsImplementor scroll( - JdbcSelect jdbcSelect, + JdbcOperationQuerySelect jdbcSelect, ScrollMode scrollMode, JdbcParameterBindings jdbcParameterBindings, ExecutionContext executionContext, @@ -128,7 +129,7 @@ public class JdbcSelectExecutorStandardImpl implements JdbcSelectExecutor { @Override public Stream stream( - JdbcSelect jdbcSelect, + JdbcOperationQuerySelect jdbcSelect, JdbcParameterBindings jdbcParameterBindings, ExecutionContext executionContext, RowTransformer rowTransformer) { @@ -147,7 +148,7 @@ public class JdbcSelectExecutorStandardImpl implements JdbcSelectExecutor { } private T executeQuery( - JdbcSelect jdbcSelect, + JdbcOperationQuerySelect jdbcSelect, JdbcParameterBindings jdbcParameterBindings, ExecutionContext executionContext, RowTransformer rowTransformer, @@ -181,7 +182,7 @@ public class JdbcSelectExecutorStandardImpl implements JdbcSelectExecutor { } private T executeQueryScroll( - JdbcSelect jdbcSelect, + JdbcOperationQuerySelect jdbcSelect, JdbcParameterBindings jdbcParameterBindings, ExecutionContext executionContext, RowTransformer rowTransformer, @@ -333,7 +334,7 @@ public class JdbcSelectExecutorStandardImpl implements JdbcSelectExecutor { } private T doExecuteQuery( - JdbcSelect jdbcSelect, + JdbcOperationQuerySelect jdbcSelect, JdbcParameterBindings jdbcParameterBindings, ExecutionContext executionContext, RowTransformer rowTransformer, @@ -453,7 +454,7 @@ public class JdbcSelectExecutorStandardImpl implements JdbcSelectExecutor { final long endTime = System.nanoTime(); final long milliseconds = TimeUnit.MILLISECONDS.convert( endTime - startTime, TimeUnit.NANOSECONDS ); statistics.queryExecuted( - executionContext.getQueryIdentifier( jdbcSelect.getSql() ), + executionContext.getQueryIdentifier( jdbcSelect.getSqlString() ), getResultSize( result ), milliseconds ); @@ -471,7 +472,7 @@ public class JdbcSelectExecutorStandardImpl implements JdbcSelectExecutor { public JdbcValues resolveJdbcValuesSource( String queryIdentifier, - JdbcSelect jdbcSelect, + JdbcOperationQuerySelect jdbcSelect, boolean canBeCached, ExecutionContext executionContext, ResultSetAccess resultSetAccess) { @@ -501,7 +502,7 @@ public class JdbcSelectExecutorStandardImpl implements JdbcSelectExecutor { .getQueryResultsCache( executionContext.getQueryOptions().getResultCacheRegionName() ); queryResultsCacheKey = QueryKey.from( - jdbcSelect.getSql(), + jdbcSelect.getSqlString(), executionContext.getQueryOptions().getLimit(), executionContext.getQueryParameterBindings(), session @@ -541,7 +542,7 @@ public class JdbcSelectExecutorStandardImpl implements JdbcSelectExecutor { cachedResults = null; if ( cacheable && cacheMode.isPutEnabled() ) { queryResultsCacheKey = QueryKey.from( - jdbcSelect.getSql(), + jdbcSelect.getSqlString(), executionContext.getQueryOptions().getLimit(), executionContext.getQueryParameterBindings(), session diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java index c90a40a57a..4b2a337005 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java @@ -11,14 +11,13 @@ import java.sql.SQLException; import java.util.function.BiConsumer; import java.util.function.Function; -import org.hibernate.dialect.Dialect; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.query.spi.QueryOptions; import org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor; import org.hibernate.sql.exec.spi.ExecutionContext; -import org.hibernate.sql.exec.spi.JdbcMutation; import org.hibernate.sql.exec.spi.JdbcMutationExecutor; +import org.hibernate.sql.exec.spi.JdbcOperationQueryMutation; import org.hibernate.sql.exec.spi.JdbcParameterBinder; import org.hibernate.sql.exec.spi.JdbcParameterBindings; @@ -33,7 +32,7 @@ public class StandardJdbcMutationExecutor implements JdbcMutationExecutor { @Override public int execute( - JdbcMutation jdbcMutation, + JdbcOperationQueryMutation jdbcMutation, JdbcParameterBindings jdbcParameterBindings, Function statementCreator, BiConsumer expectationCheck, @@ -49,11 +48,11 @@ public class StandardJdbcMutationExecutor implements JdbcMutationExecutor { final QueryOptions queryOptions = executionContext.getQueryOptions(); final String finalSql; if ( queryOptions == null ) { - finalSql = jdbcMutation.getSql(); + finalSql = jdbcMutation.getSqlString(); } else { finalSql = jdbcServices.getDialect().addSqlHintOrComment( - jdbcMutation.getSql(), + jdbcMutation.getSqlString(), queryOptions, executionContext.getSession().getFactory().getSessionFactoryOptions().isCommentsEnabled() ); diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/package-info.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/package-info.java index 88672cabda..e27d68c181 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/package-info.java @@ -7,7 +7,7 @@ /** * Package defining support for execution of SQL statements through JDBC. The statement - * to execute is modelled by {@link org.hibernate.sql.exec.spi.JdbcOperation} and + * to execute is modelled by {@link org.hibernate.sql.exec.spi.JdbcOperationQuery} and * are executed via the corresponding executor. * * For operations that return ResultSets, be sure to see {@link org.hibernate.sql.results} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/AbstractJdbcOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/AbstractJdbcOperationQuery.java similarity index 91% rename from hibernate-core/src/main/java/org/hibernate/sql/exec/spi/AbstractJdbcOperation.java rename to hibernate-core/src/main/java/org/hibernate/sql/exec/spi/AbstractJdbcOperationQuery.java index c007415556..5ce4688731 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/AbstractJdbcOperation.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/AbstractJdbcOperationQuery.java @@ -20,14 +20,14 @@ import org.hibernate.sql.ast.tree.expression.JdbcParameter; * * @author Steve Ebersole */ -public class AbstractJdbcOperation implements JdbcOperation { +public class AbstractJdbcOperationQuery implements JdbcOperationQuery { protected final String sql; protected final List parameterBinders; protected final Set affectedTableNames; protected final Set filterJdbcParameters; protected final Map appliedParameters; - public AbstractJdbcOperation( + public AbstractJdbcOperationQuery( String sql, List parameterBinders, Set affectedTableNames, @@ -41,7 +41,7 @@ public class AbstractJdbcOperation implements JdbcOperation { ); } - public AbstractJdbcOperation( + public AbstractJdbcOperationQuery( String sql, List parameterBinders, Set affectedTableNames, @@ -55,7 +55,7 @@ public class AbstractJdbcOperation implements JdbcOperation { } @Override - public String getSql() { + public String getSqlString() { return sql; } @@ -78,10 +78,6 @@ public class AbstractJdbcOperation implements JdbcOperation { public boolean dependsOnParameterBindings() { return !appliedParameters.isEmpty(); } - - public Map getAppliedParameters() { - return appliedParameters; - } @Override public boolean isCompatibleWith(JdbcParameterBindings jdbcParameterBindings, QueryOptions queryOptions) { @@ -92,6 +88,7 @@ public class AbstractJdbcOperation implements JdbcOperation { for ( Map.Entry entry : appliedParameters.entrySet() ) { final JdbcParameterBinding binding = jdbcParameterBindings.getBinding( entry.getKey() ); final JdbcParameterBinding appliedBinding = entry.getValue(); + //noinspection unchecked if ( binding == null || !appliedBinding.getBindType() .getJavaTypeDescriptor() .areEqual( binding.getBindValue(), appliedBinding.getBindValue() ) ) { diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallFunctionReturn.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallFunctionReturn.java index 8f8c2493dc..ea8bb6aa16 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallFunctionReturn.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallFunctionReturn.java @@ -8,7 +8,7 @@ package org.hibernate.sql.exec.spi; /** - * Models the function return when the JdbcCall represents a call to a database + * Models the function return when the JdbcOperationQueryCall represents a call to a database * function. * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcLockStrategy.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcLockStrategy.java index f6aee4ef8e..299fccf326 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcLockStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcLockStrategy.java @@ -7,7 +7,7 @@ package org.hibernate.sql.exec.spi; /** - * The strategy to use for applying locks to a {@link JdbcSelect}. + * The strategy to use for applying locks to a {@link JdbcOperationQuerySelect}. * * @author Christian Beikov */ diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcMutationExecutor.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcMutationExecutor.java index d19580ae3e..5a8b65bf0e 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcMutationExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcMutationExecutor.java @@ -11,7 +11,7 @@ import java.util.function.BiConsumer; import java.util.function.Function; /** - * Executor for JdbcDelete and JdbcUpdate operations + * Executor for model-mutation operations * * @author Steve Ebersole */ @@ -20,7 +20,7 @@ public interface JdbcMutationExecutor { * Perform the execution */ int execute( - JdbcMutation jdbcMutation, + JdbcOperationQueryMutation jdbcMutation, JdbcParameterBindings jdbcParameterBindings, Function statementCreator, BiConsumer expectationCheck, diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperation.java index 4186efd15a..cd61a1cf01 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperation.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperation.java @@ -1,20 +1,17 @@ /* * 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 http://www.gnu.org/licenses/lgpl-2.1.html + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ package org.hibernate.sql.exec.spi; import java.util.List; -import java.util.Set; - -import org.hibernate.internal.FilterJdbcParameter; -import org.hibernate.internal.util.collections.CollectionHelper; -import org.hibernate.query.spi.QueryOptions; /** - * Unifying contract for any SQL statement we want to execute via JDBC. + * A JDBC operation to perform. This always equates to + * some form of JDBC {@link java.sql.PreparedStatement} or + * {@link java.sql.CallableStatement} execution * * @author Steve Ebersole */ @@ -23,30 +20,10 @@ public interface JdbcOperation { * Get the SQL command we will be executing through JDBC PreparedStatement * or CallableStatement */ - String getSql(); + String getSqlString(); /** * Get the list of parameter binders for the generated PreparedStatement */ List getParameterBinders(); - - Set getAffectedTableNames(); - - Set getFilterJdbcParameters(); - - /** - * Signals that the SQL depends on the parameter bindings e.g. due to the need for inlining - * of parameter values or multiValued parameters. - */ - boolean dependsOnParameterBindings(); - - boolean isCompatibleWith(JdbcParameterBindings jdbcParameterBindings, QueryOptions queryOptions); - - default void bindFilterJdbcParameters(JdbcParameterBindings jdbcParameterBindings) { - if ( CollectionHelper.isNotEmpty( getFilterJdbcParameters() ) ) { - for ( FilterJdbcParameter filterJdbcParameter : getFilterJdbcParameters() ) { - jdbcParameterBindings.addBinding( filterJdbcParameter.getParameter(), filterJdbcParameter.getBinding() ); - } - } - } } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQuery.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQuery.java new file mode 100644 index 0000000000..46070a8504 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQuery.java @@ -0,0 +1,49 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html + */ +package org.hibernate.sql.exec.spi; + +import java.util.Set; + +import org.hibernate.internal.FilterJdbcParameter; +import org.hibernate.internal.util.collections.CollectionHelper; +import org.hibernate.query.spi.QueryOptions; + +/** + * Unifying contract for any SQL statement we want to execute via JDBC. + * + * @author Steve Ebersole + */ +public interface JdbcOperationQuery extends JdbcOperation { + + /** + * The names of tables this operation refers to + */ + Set getAffectedTableNames(); + + /** + * Any parameters to apply for filters + * + * @see org.hibernate.annotations.Filter + */ + Set getFilterJdbcParameters(); + + /** + * Signals that the SQL depends on the parameter bindings e.g. due to the need for inlining + * of parameter values or multiValued parameters. + */ + boolean dependsOnParameterBindings(); + + boolean isCompatibleWith(JdbcParameterBindings jdbcParameterBindings, QueryOptions queryOptions); + + default void bindFilterJdbcParameters(JdbcParameterBindings jdbcParameterBindings) { + if ( CollectionHelper.isNotEmpty( getFilterJdbcParameters() ) ) { + for ( FilterJdbcParameter filterJdbcParameter : getFilterJdbcParameters() ) { + jdbcParameterBindings.addBinding( filterJdbcParameter.getParameter(), filterJdbcParameter.getBinding() ); + } + } + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcAnonBlock.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryAnonBlock.java similarity index 93% rename from hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcAnonBlock.java rename to hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryAnonBlock.java index d315986811..5dad03c753 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcAnonBlock.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryAnonBlock.java @@ -15,7 +15,7 @@ import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer; * * @author Steve Ebersole */ -public interface JdbcAnonBlock extends JdbcOperation { +public interface JdbcOperationQueryAnonBlock extends JdbcOperationQuery { /** * Retrieve the "result set mappings" for processing any ResultSets returned from * the JDBC call. We expose multiple because JPA allows for an application to diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCall.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryCall.java similarity index 92% rename from hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCall.java rename to hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryCall.java index 31c8beee4f..221db13cc3 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCall.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryCall.java @@ -11,7 +11,7 @@ import java.util.List; /** * @author Steve Ebersole */ -public interface JdbcCall extends JdbcAnonBlock { +public interface JdbcOperationQueryCall extends JdbcOperationQueryAnonBlock { /** * If the call is a function, returns the function return descriptor */ diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcDelete.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryDelete.java similarity index 84% rename from hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcDelete.java rename to hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryDelete.java index ca20e59b08..0f61075276 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcDelete.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryDelete.java @@ -10,16 +10,15 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.hibernate.LockOptions; import org.hibernate.internal.FilterJdbcParameter; import org.hibernate.sql.ast.tree.expression.JdbcParameter; /** * @author Steve Ebersole */ -public class JdbcDelete extends AbstractJdbcOperation implements JdbcMutation { +public class JdbcOperationQueryDelete extends AbstractJdbcOperationQuery implements JdbcOperationQueryMutation { - public JdbcDelete( + public JdbcOperationQueryDelete( String sql, List parameterBinders, Set affectedTableNames, diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryInsert.java similarity index 62% rename from hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcMutation.java rename to hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryInsert.java index 08bace8ccf..2179002438 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcMutation.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryInsert.java @@ -1,16 +1,15 @@ /* * 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 http://www.gnu.org/licenses/lgpl-2.1.html + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ package org.hibernate.sql.exec.spi; /** - * Classification of JdbcDelete and JdbcUpdate operations + * Basic contract for an insert operation * * @author Steve Ebersole */ -public interface JdbcMutation extends JdbcOperation { - +public interface JdbcOperationQueryInsert extends JdbcOperationQueryMutation { } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryMutation.java new file mode 100644 index 0000000000..3821f74c63 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryMutation.java @@ -0,0 +1,23 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html + */ +package org.hibernate.sql.exec.spi; + +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; + +/** + * Specialization of JdbcOperation for cases which mutate + * table state (i.e. inserts, update, delete and some callables). + * + * @apiNote This contract describes mutations specified via query forms + * and is very different from {@link JdbcMutationOperation} + * which describes mutations related to persistence-context events + * + * @author Steve Ebersole + */ +public interface JdbcOperationQueryMutation extends JdbcOperationQuery { + +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/NativeJdbcMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryMutationNative.java similarity index 89% rename from hibernate-core/src/main/java/org/hibernate/sql/exec/spi/NativeJdbcMutation.java rename to hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryMutationNative.java index 72608491d1..2239628e2e 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/NativeJdbcMutation.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryMutationNative.java @@ -18,12 +18,12 @@ import org.hibernate.query.spi.QueryOptions; * * @author Christian Beikov */ -public class NativeJdbcMutation implements JdbcMutation { +public class JdbcOperationQueryMutationNative implements JdbcOperationQueryMutation { private final String sql; private final List parameterBinders; private final Set affectedTableNames; - public NativeJdbcMutation( + public JdbcOperationQueryMutationNative( String sql, List parameterBinders, Set affectedTableNames) { @@ -33,7 +33,7 @@ public class NativeJdbcMutation implements JdbcMutation { } @Override - public String getSql() { + public String getSqlString() { return sql; } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelect.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQuerySelect.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelect.java rename to hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQuerySelect.java index 34fd491b7d..c4021e805f 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelect.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQuerySelect.java @@ -22,7 +22,7 @@ import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer; * * @author Steve Ebersole */ -public class JdbcSelect extends AbstractJdbcOperation { +public class JdbcOperationQuerySelect extends AbstractJdbcOperationQuery { private final JdbcValuesMappingProducer jdbcValuesMappingProducer; private final int rowsToSkip; private final int maxRows; @@ -30,7 +30,7 @@ public class JdbcSelect extends AbstractJdbcOperation { private final JdbcParameter limitParameter; private final JdbcLockStrategy jdbcLockStrategy; - public JdbcSelect( + public JdbcOperationQuerySelect( String sql, List parameterBinders, JdbcValuesMappingProducer jdbcValuesMappingProducer, @@ -51,7 +51,7 @@ public class JdbcSelect extends AbstractJdbcOperation { ); } - public JdbcSelect( + public JdbcOperationQuerySelect( String sql, List parameterBinders, JdbcValuesMappingProducer jdbcValuesMappingProducer, diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcInsert.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryUpdate.java similarity index 84% rename from hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcInsert.java rename to hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryUpdate.java index 24bcbc2ed8..587f79106f 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcInsert.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryUpdate.java @@ -10,16 +10,17 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.hibernate.LockOptions; import org.hibernate.internal.FilterJdbcParameter; import org.hibernate.sql.ast.tree.expression.JdbcParameter; /** * @author Steve Ebersole */ -public class JdbcInsert extends AbstractJdbcOperation implements JdbcMutation { +public class JdbcOperationQueryUpdate + extends AbstractJdbcOperationQuery + implements JdbcOperationQueryMutation { - public JdbcInsert( + public JdbcOperationQueryUpdate( String sql, List parameterBinders, Set affectedTableNames, diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelectExecutor.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelectExecutor.java index 174b1ba603..6f78dc5e10 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelectExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelectExecutor.java @@ -23,7 +23,7 @@ import org.hibernate.sql.results.spi.RowTransformer; @Incubating public interface JdbcSelectExecutor { default List list( - JdbcSelect jdbcSelect, + JdbcOperationQuerySelect jdbcSelect, JdbcParameterBindings jdbcParameterBindings, ExecutionContext executionContext, RowTransformer rowTransformer, @@ -32,7 +32,7 @@ public interface JdbcSelectExecutor { } List list( - JdbcSelect jdbcSelect, + JdbcOperationQuerySelect jdbcSelect, JdbcParameterBindings jdbcParameterBindings, ExecutionContext executionContext, RowTransformer rowTransformer, @@ -40,14 +40,14 @@ public interface JdbcSelectExecutor { ListResultsConsumer.UniqueSemantic uniqueSemantic); ScrollableResultsImplementor scroll( - JdbcSelect jdbcSelect, + JdbcOperationQuerySelect jdbcSelect, ScrollMode scrollMode, JdbcParameterBindings jdbcParameterBindings, ExecutionContext executionContext, RowTransformer rowTransformer); Stream stream( - JdbcSelect jdbcSelect, + JdbcOperationQuerySelect jdbcSelect, JdbcParameterBindings jdbcParameterBindings, ExecutionContext executionContext, RowTransformer rowTransformer); diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcUpdate.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcUpdate.java deleted file mode 100644 index 14318edcf4..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcUpdate.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 http://www.gnu.org/licenses/lgpl-2.1.html - */ -package org.hibernate.sql.exec.spi; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.hibernate.LockOptions; -import org.hibernate.internal.FilterJdbcParameter; -import org.hibernate.sql.ast.tree.expression.JdbcParameter; - -/** - * @author Steve Ebersole - */ -public class JdbcUpdate extends AbstractJdbcOperation implements JdbcMutation { - - public JdbcUpdate( - String sql, - List parameterBinders, - Set affectedTableNames, - Set filterJdbcParameters, - Map appliedParameters) { - super( sql, parameterBinders, affectedTableNames, filterJdbcParameters, appliedParameters ); - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java new file mode 100644 index 0000000000..8f41fe2268 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java @@ -0,0 +1,30 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model; + +import org.hibernate.internal.log.SubSystemLogging; + +import org.jboss.logging.Logger; + +/** + * Logging related to entity and collection mutations stemming from persistence-context events + * + * @author Steve Ebersole + */ +@SubSystemLogging( + name = ModelMutationLogging.NAME, + description = "Logging related to entity and collection mutations stemming from persistence-context events" +) +public final class ModelMutationLogging { + + public static final String NAME = SubSystemLogging.BASE + ".jdbc.mutation"; + + public static final Logger MODEL_MUTATION_LOGGER = Logger.getLogger( NAME ); + + public static final boolean MODEL_MUTATION_LOGGER_TRACE_ENABLED = MODEL_MUTATION_LOGGER.isTraceEnabled(); + public static final boolean MODEL_MUTATION_LOGGER_DEBUG_ENABLED = MODEL_MUTATION_LOGGER.isDebugEnabled(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/MutationOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/MutationOperation.java new file mode 100644 index 0000000000..f9f352b860 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/MutationOperation.java @@ -0,0 +1,95 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model; + +import org.hibernate.Incubating; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.group.UnknownParameterException; +import org.hibernate.sql.model.jdbc.JdbcValueDescriptor; + +/** + * Mutation for a specific table as part of a logical mutation on the entity. + * + * Functional behavior is driven by the specific subtypes:
    + *
  • {@link PreparableMutationOperation}
    • + *
  • {@link SelfExecutingUpdateOperation}
    • + *
+ * + * + * example #1 - delete simple entity (Person) + * (1) MutationOperation(DELETE, person) + * + * example #2 - delete entity (Person) w/ secondary *non-optional* table + * (1) MutationOperation(DELETE, person) + * (2) MutationOperation(DELETE, person_supp) + * + * example #3 - insert simple entity (Person) + * (1) MutationOperation(INSERT, person) + * + * example #4 - insert entity (Person) w/ secondary *non-optional* table & IDENTITY id column + * (1) MutationOperation(INSERT, person) + * (2) MutationOperation(INSERT, person_supp) + * + * example #6 - update/merge entity (Person) w/ secondary *optional* table + * (1) MutationOperation(UPDATE, person) + * (2) MutationOperation(UPDATE, person_supp) - upsert / delete + * + * + * account for batching + * + * example #1 - insert entity (Person) w/ secondary *optional* table + * (1) MutationOperation(INSERT, person) - batched, all + * (2) MutationOperation(INSERT, person_supp) - batched, conditional[1] + * + * example #2 - delete entity (Person) w/ secondary table + * (1) MutationOperation(DELETE, person) - batched, all + * (2) MutationOperation(DELETE, person_supp) - batched, all + * + * example #3 - update/merge entity (Person) w/ secondary *optional* table + * (1) MutationOperation(UPDATE, person) - batched + * (2) MutationOperation(UPDATE, person_supp) - non-batched + * + * + * [1] For insertions with optional secondary tables, if the values are all null for that table we + * do not want to perform the "add-to-batch" handling for that specific "row" + * + * @author Steve Ebersole + */ +@Incubating +public interface MutationOperation { + /** + * The type of operation (INSERT, etc) + */ + MutationType getMutationType(); + + /** + * The thing being mutated + */ + MutationTarget getMutationTarget(); + + /** + * The table against which operation is to be performed + */ + TableMapping getTableDetails(); + + /** + * Find the JDBC parameter to be used for the specified column + */ + JdbcValueDescriptor findValueDescriptor(String columnName, ParameterUsage usage); + + /** + * Form of {@link #findValueDescriptor}, throwing an exception if not found as opposed + * to simply returning null + */ + default JdbcValueDescriptor getJdbcValueDescriptor(String columnName, ParameterUsage usage) { + final JdbcValueDescriptor parameterDescriptor = findValueDescriptor( columnName, usage ); + if ( parameterDescriptor == null ) { + throw new UnknownParameterException( getMutationType(), getMutationTarget(), getTableDetails().getTableName(), columnName, usage ); + } + return parameterDescriptor; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/MutationOperationGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/model/MutationOperationGroup.java new file mode 100644 index 0000000000..62b85bbec2 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/MutationOperationGroup.java @@ -0,0 +1,58 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model; + +import java.util.List; +import java.util.function.BiConsumer; +import java.util.function.BiFunction; + +/** + * Group of {@link MutationOperation} references for a specific + * logical operation (target + type) + * + * @author Steve Ebersole + */ +public interface MutationOperationGroup { + /** + * The type of mutation (at the model-level) represented by this group. + */ + MutationType getMutationType(); + + /** + * The model-part being mutated + */ + MutationTarget getMutationTarget(); + + /** + * Number of operations in this group + */ + int getNumberOfOperations(); + + /** + * Get the singular operation, assuming there is just one. + * + * Throws an exception if there are more than one. + */ + O getSingleOperation(); + + List getOperations(); + + /** + * Get the operation for a specific table. + */ + O getOperation(String tableName); + + /** + * Visit each operation + */ + void forEachOperation(BiConsumer action); + + /** + * Test whether any operations match the condition + */ + boolean hasMatching(BiFunction matcher); +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/MutationTarget.java b/hibernate-core/src/main/java/org/hibernate/sql/model/MutationTarget.java new file mode 100644 index 0000000000..fe2aaf433c --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/MutationTarget.java @@ -0,0 +1,60 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model; + +import java.util.function.Consumer; + +import org.hibernate.metamodel.mapping.ModelPartContainer; +import org.hibernate.metamodel.model.domain.NavigableRole; + +/** + * Target of mutations from persistence context events + * + * @author Steve Ebersole + */ +public interface MutationTarget { + /** + * The model role of this target + */ + NavigableRole getNavigableRole(); + + default String getRolePath() { + return getNavigableRole().getFullPath(); + } + + /** + * The ModelPart describing the mutation target + */ + ModelPartContainer getTargetPart(); + + /** + * Visit each table. + * + * @apiNote Inverse tables are excluded here - they are not mutable + * relative to this mapping + */ + void forEachMutableTable(Consumer consumer); + + /** + * Same as {@link #forEachMutableTable} except that here the tables + * are visited in reverse order + * + * @apiNote Inverse tables are excluded here - they are not mutable + * relative to this mapping + */ + void forEachMutableTableReverse(Consumer consumer); + + /** + * The name of the table defining the identifier for this target + */ + String getIdentifierTableName(); + + /** + * The descriptor for the table containing the identifier for the target + */ + TableMapping getIdentifierTableMapping(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/MutationType.java b/hibernate-core/src/main/java/org/hibernate/sql/model/MutationType.java new file mode 100644 index 0000000000..98627d3579 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/MutationType.java @@ -0,0 +1,28 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model; + +/** + * The type of mutation + * + * @author Steve Ebersole + */ +public enum MutationType { + INSERT( true ), + UPDATE( true ), + DELETE( false ); + + private final boolean canSkipTables; + + MutationType(boolean canSkipTables) { + this.canSkipTables = canSkipTables; + } + + public boolean canSkipTables() { + return canSkipTables; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/PreparableMutationOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/PreparableMutationOperation.java new file mode 100644 index 0000000000..292943c732 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/PreparableMutationOperation.java @@ -0,0 +1,77 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model; + +import java.util.List; + +import org.hibernate.engine.jdbc.batch.spi.BatchKey; +import org.hibernate.jdbc.Expectation; +import org.hibernate.persister.entity.mutation.EntityMutationTarget; +import org.hibernate.sql.exec.spi.JdbcParameterBinder; + +/** + * MutationOperation that is capable of being handled as a + * JDBC {@link java.sql.PreparedStatement} + * + * Person ( PERSON, PERSON_SUPP ) + * + * - PERSON_SUPP is optional secondary table + * + * @author Steve Ebersole + */ +public interface PreparableMutationOperation extends MutationOperation { + /** + * The SQL to be used when creating the PreparedStatement + */ + String getSqlString(); + + /** + * Get the list of parameter binders for the generated PreparedStatement + */ + List getParameterBinders(); + + /** + * Whether the operation is callable + */ + boolean isCallable(); + + /** + * The expected outcome of execution + */ + Expectation getExpectation(); + + /** + * Series of opt-out checks for whether the operation can be + * handled as part of a batch. + * + * @implNote This does not account for whether batching is enabled + * or not on the factory, just whether we can potentially batch it + * relative to the operation itself + */ + default boolean canBeBatched(BatchKey batchKey, int batchSize) { + if ( batchKey == null || batchSize < 2 ) { + return false; + } + + if ( getMutationType() == MutationType.INSERT ) { + // we cannot batch inserts which generate id values post-insert (IDENTITY, TRIGGER, etc) + if ( getTableDetails().isIdentifierTable() + && getMutationTarget() instanceof EntityMutationTarget + && ( (EntityMutationTarget) getMutationTarget() ).getIdentityInsertDelegate() != null ) { + return false; + } + } + else if ( getMutationType() == MutationType.UPDATE ) { + // we cannot batch updates against optional tables + if ( getTableDetails().isOptional() ) { + return false; + } + } + + return getExpectation().canBeBatched(); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/SelfExecutingUpdateOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/SelfExecutingUpdateOperation.java new file mode 100644 index 0000000000..db0f217f8c --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/SelfExecutingUpdateOperation.java @@ -0,0 +1,24 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model; + +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.spi.SharedSessionContractImplementor; + +/** + * Extension to MutationOperation for cases where the operation wants to + * handle execution itself. + * + * @author Steve Ebersole + */ +public interface SelfExecutingUpdateOperation extends MutationOperation { + void performMutation( + JdbcValueBindings jdbcValueBindings, + ValuesAnalysis valuesAnalysis, + SharedSessionContractImplementor session); + +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/TableMapping.java b/hibernate-core/src/main/java/org/hibernate/sql/model/TableMapping.java new file mode 100644 index 0000000000..8330ef24ae --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/TableMapping.java @@ -0,0 +1,118 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model; + +import org.hibernate.jdbc.Expectation; + +/** + * Describes a table as far as Hibernate understands it from mapping details + * + * @author Steve Ebersole + */ +public interface TableMapping { + /** + * The name of the mapped table + */ + String getTableName(); + + /** + * The position of the table relative to others for the {@link MutationTarget} + */ + int getRelativePosition(); + + /** + * Whether the table is mapped as optional + */ + boolean isOptional(); + + /** + * Whether the table is mapped as inverse + */ + boolean isInverse(); + + /** + * Whether this table holds the identifier for the {@link MutationTarget} + */ + boolean isIdentifierTable(); + + /** + * Details for insertion into this table + */ + MutationDetails getInsertDetails(); + + /** + * Details for updating this table + */ + MutationDetails getUpdateDetails(); + + /** + * Whether deletions are cascaded to this table at the database level. + * + * @apiNote When {@code true}, {@link #isIdentifierTable()} will generally + * be {@code false} + * + * @see org.hibernate.annotations.OnDelete + */ + boolean isCascadeDeleteEnabled(); + + /** + * Details for deleting from this table + */ + MutationDetails getDeleteDetails(); + + + /** + * Details for the {@linkplain MutationType mutation} of a table + */ + class MutationDetails { + private final MutationType mutationType; + private final Expectation expectation; + private final String customSql; + private final boolean callable; + + public MutationDetails( + MutationType mutationType, + Expectation expectation, + String customSql, + boolean callable) { + this.mutationType = mutationType; + this.expectation = expectation; + this.customSql = customSql; + this.callable = callable; + } + + /** + * The type of mutation being detailed + */ + public MutationType getMutationType() { + return mutationType; + } + + /** + * The expectation for this mutation + */ + public Expectation getExpectation() { + return expectation; + } + + /** + * Custom, application-provided SQL for this mutation (if one). + * Will return {@code null} if no custom SQL was provided indicating + * Hibernate will generate the SQL based on the mapping + */ + public String getCustomSql() { + return customSql; + } + + /** + * Whether {@linkplain #getCustomSql() custom SQL} should be treated as callable (function / procedure) + */ + public boolean isCallable() { + return callable; + } + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ValuesAnalysis.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ValuesAnalysis.java new file mode 100644 index 0000000000..60036f8bee --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ValuesAnalysis.java @@ -0,0 +1,20 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model; + +import org.hibernate.persister.entity.mutation.UpdateValuesAnalysis; + +/** + * Marker interface for analysis of new/old values. + * + * @see org.hibernate.engine.jdbc.mutation.MutationExecutor#execute + * @see UpdateValuesAnalysis + * + * @author Steve Ebersole + */ +public interface ValuesAnalysis { +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractRestrictedTableMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractRestrictedTableMutation.java new file mode 100644 index 0000000000..f4db77dd45 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractRestrictedTableMutation.java @@ -0,0 +1,59 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast; + +import java.util.List; +import java.util.function.BiConsumer; + +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationTarget; + +/** + * @author Steve Ebersole + */ +public abstract class AbstractRestrictedTableMutation + extends AbstractTableMutation + implements RestrictedTableMutation { + private final List keyRestrictionBindings; + private final List optLockRestrictionBindings; + + public AbstractRestrictedTableMutation( + MutatingTableReference mutatingTable, + MutationTarget mutationTarget, + String comment, + List keyRestrictionBindings, + List optLockRestrictionBindings, + List parameters) { + super( mutatingTable, mutationTarget, comment, parameters ); + this.keyRestrictionBindings = keyRestrictionBindings; + this.optLockRestrictionBindings = optLockRestrictionBindings; + } + + @Override + public List getKeyBindings() { + return keyRestrictionBindings; + } + + @Override + public void forEachKeyBinding(BiConsumer consumer) { + for ( int i = 0; i < keyRestrictionBindings.size(); i++ ) { + consumer.accept( i, keyRestrictionBindings.get( i ) ); + } + } + + @Override + public List getOptimisticLockBindings() { + return optLockRestrictionBindings; + } + + @Override + public void forEachOptimisticLockBinding(BiConsumer consumer) { + for ( int i = 0; i < optLockRestrictionBindings.size(); i++ ) { + consumer.accept( i, optLockRestrictionBindings.get( i ) ); + } + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableDelete.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableDelete.java new file mode 100644 index 0000000000..3c35bb6bff --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableDelete.java @@ -0,0 +1,67 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast; + +import java.util.List; + +import org.hibernate.jdbc.Expectation; +import org.hibernate.sql.exec.spi.JdbcParameterBinder; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.jdbc.JdbcDeleteMutation; + +/** + * @author Steve Ebersole + */ +public abstract class AbstractTableDelete extends AbstractRestrictedTableMutation implements TableDelete { + + public AbstractTableDelete( + MutatingTableReference mutatingTable, + MutationTarget mutationTarget, + List keyRestrictionBindings, + List optLockRestrictionBindings, + List parameters) { + this( + mutatingTable, + mutationTarget, + "delete for " + mutationTarget.getRolePath(), + keyRestrictionBindings, + optLockRestrictionBindings, + parameters + ); + } + + public AbstractTableDelete( + MutatingTableReference mutatingTable, + MutationTarget mutationTarget, + String sqlComment, + List keyRestrictionBindings, + List optLockRestrictionBindings, + List parameters) { + super( mutatingTable, mutationTarget, sqlComment, keyRestrictionBindings, optLockRestrictionBindings, parameters ); + } + + @Override + public Expectation getExpectation() { + return getMutatingTable().getTableMapping().getDeleteDetails().getExpectation(); + } + + @Override + protected JdbcDeleteMutation createMutationOperation( + TableMapping tableDetails, + String sql, + List effectiveBinders) { + return new JdbcDeleteMutation( + tableDetails, + getMutationTarget(), + sql, + isCallable(), + getExpectation(), + effectiveBinders + ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableInsert.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableInsert.java new file mode 100644 index 0000000000..979204cc52 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableInsert.java @@ -0,0 +1,77 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast; + +import java.util.List; +import java.util.function.BiConsumer; + +import org.hibernate.jdbc.Expectation; +import org.hibernate.sql.exec.spi.JdbcParameterBinder; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.jdbc.JdbcInsertMutation; + +/** + * @author Steve Ebersole + */ +public abstract class AbstractTableInsert extends AbstractTableMutation implements TableInsert { + private final List valueBindings; + + public AbstractTableInsert( + MutatingTableReference mutatingTable, + MutationTarget mutationTarget, + List parameters, + List valueBindings) { + this( + mutatingTable, + mutationTarget, + "insert for " + mutationTarget.getRolePath(), + parameters, + valueBindings + ); + } + + public AbstractTableInsert( + MutatingTableReference mutatingTable, + MutationTarget mutationTarget, + String comment, + List parameters, + List valueBindings) { + super( mutatingTable, mutationTarget, comment, parameters ); + this.valueBindings = valueBindings; + } + + @Override + public Expectation getExpectation() { + return getMutatingTable().getTableMapping().getInsertDetails().getExpectation(); + } + + @Override + public List getValueBindings() { + return valueBindings; + } + + @Override + public void forEachValueBinding(BiConsumer consumer) { + forEachThing( valueBindings, consumer ); + } + + @Override + protected JdbcInsertMutation createMutationOperation( + TableMapping tableDetails, + String sql, + List effectiveBinders) { + return new JdbcInsertMutation( + tableDetails, + getMutationTarget(), + sql, + isCallable(), + getExpectation(), + effectiveBinders + ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableMutation.java new file mode 100644 index 0000000000..6612653005 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableMutation.java @@ -0,0 +1,105 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast; + +import java.util.List; +import java.util.function.BiConsumer; + +import org.hibernate.engine.jdbc.mutation.internal.MutationQueryOptions; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.sql.ast.SqlAstTranslator; +import org.hibernate.sql.ast.SqlAstTranslatorFactory; +import org.hibernate.sql.exec.spi.JdbcParameterBinder; +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.ValuesAnalysis; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; + +/** + * Base TableMutation support + * + * @author Steve Ebersole + */ +public abstract class AbstractTableMutation + implements TableMutation { + private final MutatingTableReference mutatingTable; + private final MutationTarget mutationTarget; + private final String sqlComment; + + private final List parameters; + + public AbstractTableMutation( + MutatingTableReference mutatingTable, + MutationTarget mutationTarget, + String sqlComment, + List parameters) { + this.mutatingTable = mutatingTable; + this.mutationTarget = mutationTarget; + this.sqlComment = sqlComment; + this.parameters = parameters; + } + + @Override + public MutatingTableReference getMutatingTable() { + return mutatingTable; + } + + public MutationTarget getMutationTarget() { + return mutationTarget; + } + + @Override + public String getMutationComment() { + return sqlComment; + } + + @Override + public List getParameters() { + return parameters; + } + + protected void forEachThing(List list, BiConsumer action) { + for ( int i = 0; i < list.size(); i++ ) { + action.accept( i, list.get( i ) ); + } + } + + @Override + public O createMutationOperation(ValuesAnalysis valuesAnalysis, SessionFactoryImplementor factory) { + final SqlAstTranslatorFactory sqlAstTranslatorFactory = factory + .getJdbcServices() + .getJdbcEnvironment() + .getSqlAstTranslatorFactory(); + //noinspection unchecked + final SqlAstTranslator translator = sqlAstTranslatorFactory.buildModelMutationTranslator( + (TableMutation) this, + factory + ); + + //noinspection unchecked + return (O) translator.translate( null, MutationQueryOptions.INSTANCE ); + } + + /** + * Intended for use from {@link SqlAstTranslator} + */ + @Override + public final O createMutationOperation(String sql, List parameterBinders) { + return createMutationOperation( getMutatingTable().getTableMapping(), sql, parameterBinders ); + } + + /** + * Intended for use from {@link SqlAstTranslator} + * + * @param effectiveBinders The parameter binders effective for this table mutation + */ + protected abstract O createMutationOperation( + TableMapping tableDetails, + String sql, + List effectiveBinders); +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableUpdate.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableUpdate.java new file mode 100644 index 0000000000..62b8d6af67 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableUpdate.java @@ -0,0 +1,84 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast; + +import java.util.List; +import java.util.function.BiConsumer; + +import org.hibernate.jdbc.Expectation; +import org.hibernate.sql.exec.spi.JdbcParameterBinder; +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.jdbc.JdbcUpdateMutation; + +/** + * @author Steve Ebersole + */ +public abstract class AbstractTableUpdate + extends AbstractRestrictedTableMutation + implements TableUpdate { + private final List valueBindings; + + public AbstractTableUpdate( + MutatingTableReference mutatingTable, + MutationTarget mutationTarget, + List parameters, + List valueBindings, + List keyRestrictionBindings, + List optLockRestrictionBindings) { + this( + mutatingTable, + mutationTarget, + "update for " + mutationTarget.getRolePath(), + parameters, + valueBindings, + keyRestrictionBindings, + optLockRestrictionBindings + ); + } + + public AbstractTableUpdate( + MutatingTableReference mutatingTable, + MutationTarget mutationTarget, + String sqlComment, + List parameters, + List valueBindings, + List keyRestrictionBindings, + List optLockRestrictionBindings) { + super( mutatingTable, mutationTarget, sqlComment, keyRestrictionBindings, optLockRestrictionBindings, parameters ); + this.valueBindings = valueBindings; + } + + @Override + public Expectation getExpectation() { + return getMutatingTable().getTableMapping().getUpdateDetails().getExpectation(); + } + + @Override + public List getValueBindings() { + return valueBindings; + } + + @Override + public void forEachValueBinding(BiConsumer consumer) { + forEachThing( valueBindings, consumer ); + } + + @Override + protected O createMutationOperation(TableMapping tableDetails, String sql, List effectiveBinders) { + //noinspection unchecked + return (O) new JdbcUpdateMutation( + tableDetails, + getMutationTarget(), + sql, + isCallable(), + getExpectation(), + effectiveBinders + ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueBinding.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueBinding.java new file mode 100644 index 0000000000..d87ac11582 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueBinding.java @@ -0,0 +1,41 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast; + +import org.hibernate.sql.ast.tree.expression.ColumnReference; + +/** + * Represents the binding of a value to a column. Can be used to + * uniformly model value assignments wrt inserts, updates and upserts. + * + * @apiNote Practically speaking, the {@linkplain #getValueExpression() value} + * can only be a JDBC parameter or a literal. + * + * @author Steve Ebersole + */ +public class ColumnValueBinding { + private final ColumnReference columnReference; + private final ColumnWriteFragment valueExpression; + + public ColumnValueBinding(ColumnReference columnReference, ColumnWriteFragment valueExpression) { + this.columnReference = columnReference; + this.valueExpression = valueExpression; + } + + public ColumnReference getColumnReference() { + return columnReference; + } + + public ColumnWriteFragment getValueExpression() { + return valueExpression; + } + + @Override + public String toString() { + return "ColumnValueBinding(" + valueExpression + ")"; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueParameter.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueParameter.java new file mode 100644 index 0000000000..18cc42f3dd --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueParameter.java @@ -0,0 +1,36 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast; + +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.sql.ast.tree.expression.ColumnReference; +import org.hibernate.sql.exec.internal.AbstractJdbcParameter; + +/** + * Parameter descriptor specific to mutations. It exposes metadata about the parameter + * + * @author Steve Ebersole + */ +public class ColumnValueParameter extends AbstractJdbcParameter { + private final ColumnReference columnReference; + private final ParameterUsage usage; + + public ColumnValueParameter(ColumnReference columnReference, ParameterUsage usage) { + super( columnReference.getJdbcMapping() ); + this.columnReference = columnReference; + this.usage = usage; + } + + @Override + public ColumnReference getColumnReference() { + return columnReference; + } + + public ParameterUsage getUsage() { + return usage; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnWriteFragment.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnWriteFragment.java new file mode 100644 index 0000000000..8a59e17a7f --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnWriteFragment.java @@ -0,0 +1,63 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast; + +import java.util.Locale; + +import org.hibernate.annotations.ColumnTransformer; +import org.hibernate.metamodel.mapping.JdbcMapping; +import org.hibernate.sql.ast.SqlAstWalker; +import org.hibernate.sql.ast.tree.expression.Expression; + +/** + * Models a column's "write fragment" within the SQL AST + * + * @see ColumnTransformer#write() + * + * @author Steve Ebersole + */ +public class ColumnWriteFragment implements Expression { + private final String fragment; + private final ColumnValueParameter parameter; + private final JdbcMapping jdbcMapping; + + public ColumnWriteFragment(String fragment, ColumnValueParameter parameter, JdbcMapping jdbcMapping) { + this.fragment = fragment; + this.parameter = parameter; + this.jdbcMapping = jdbcMapping; + } + + public String getFragment() { + return fragment; + } + + public ColumnValueParameter getParameter() { + return parameter; + } + + @Override + public JdbcMapping getExpressionType() { + return jdbcMapping; + } + + @Override + public void accept(SqlAstWalker sqlTreeWalker) { + sqlTreeWalker.visitColumnWriteFragment( this ); + } + + @Override + public String toString() { + return String.format( + Locale.ROOT, + "ColumnWriteFragment(%s = %s (%s))@%s", + parameter.getColumnReference().getColumnExpression(), + fragment, + parameter.getUsage(), + hashCode() + ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/CustomSqlMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/CustomSqlMutation.java new file mode 100644 index 0000000000..2c8bd7305b --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/CustomSqlMutation.java @@ -0,0 +1,24 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast; + +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; + +/** + * @author Steve Ebersole + */ +public interface CustomSqlMutation extends TableMutation { + /** + * The custom SQL provided by the mapping + */ + String getCustomSql(); + + /** + * Whether {@link #getCustomSql()} represents a callable (function/procedure) + */ + boolean isCallable(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/MutatingTableReference.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/MutatingTableReference.java new file mode 100644 index 0000000000..cb1ca9c0f3 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/MutatingTableReference.java @@ -0,0 +1,105 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast; + +import java.util.Locale; +import java.util.Objects; +import java.util.function.Function; + +import org.hibernate.spi.NavigablePath; +import org.hibernate.sql.ast.SqlAstWalker; +import org.hibernate.sql.ast.tree.from.TableReference; +import org.hibernate.sql.model.TableMapping; + +/** + * Specialized TableReference for model mutation operations + * + * @author Steve Ebersole + */ +public class MutatingTableReference implements TableReference { + private final TableMapping tableMapping; + + public MutatingTableReference(TableMapping tableMapping) { + this.tableMapping = tableMapping; + } + + public TableMapping getTableMapping() { + return tableMapping; + } + + public String getTableName() { + return tableMapping.getTableName(); + } + + @Override + public String getIdentificationVariable() { + return null; + } + + @Override + public String getTableId() { + return getTableName(); + } + + @Override + public boolean isOptional() { + return tableMapping.isOptional(); + } + + @Override + public void accept(SqlAstWalker sqlTreeWalker) { + throw new UnsupportedOperationException( "Mutating table reference should be handled by the statement visitation" ); + } + + @Override + public Boolean visitAffectedTableNames(Function nameCollector) { + return nameCollector.apply( getTableName() ); + } + + @Override + public TableReference resolveTableReference(NavigablePath navigablePath, String tableExpression, boolean allowFkOptimization) { + if ( getTableName().equals( tableExpression ) ) { + return this; + } + + throw new IllegalArgumentException( + String.format( + Locale.ROOT, + "Table-expression (%s) did not match mutating table name - %s", + tableExpression, + getTableName() + ) + ); + } + + @Override + public TableReference getTableReference(NavigablePath navigablePath, String tableExpression, boolean allowFkOptimization, boolean resolve) { + return resolveTableReference( navigablePath, tableExpression, allowFkOptimization ); + } + + @Override + public boolean equals(Object o) { + if ( this == o ) { + return true; + } + if ( o == null || getClass() != o.getClass() ) { + return false; + } + final MutatingTableReference that = (MutatingTableReference) o; + return Objects.equals( getTableName(), that.getTableName() ); + } + + @Override + public int hashCode() { + return Objects.hash( getTableName() ); + } + + @Override + public String toString() { + return "MutatingTableReference(" + getTableName() + ")"; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/MutationGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/MutationGroup.java new file mode 100644 index 0000000000..320b81c7d7 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/MutationGroup.java @@ -0,0 +1,33 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast; + +import java.util.function.BiConsumer; + +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; + +/** + * Grouping of table mutations for the given target for + * the given type of mutation + * + * @author Steve Ebersole + */ +public interface MutationGroup { + MutationType getMutationType(); + + MutationTarget getMutationTarget(); + + int getNumberOfTableMutations(); + + > M getSingleTableMutation(); + + > M getTableMutation(String tableName); + + > void forEachTableMutation(BiConsumer action); +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/RestrictedTableMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/RestrictedTableMutation.java new file mode 100644 index 0000000000..bf6dffcf44 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/RestrictedTableMutation.java @@ -0,0 +1,38 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast; + +import java.util.List; +import java.util.function.BiConsumer; + +import org.hibernate.sql.model.MutationOperation; + +/** + * Specialized TableMutation implementation for mutations which + * define a where-clause + * + * @author Steve Ebersole + */ +public interface RestrictedTableMutation + extends TableMutation { + List getKeyBindings(); + + default int getNumberOfKeyBindings() { + return getKeyBindings().size(); + } + + void forEachKeyBinding(BiConsumer consumer); + + List getOptimisticLockBindings(); + + default int getNumberOfOptimisticLockBindings() { + final List bindings = getOptimisticLockBindings(); + return bindings == null ? 0 : bindings.size(); + } + + void forEachOptimisticLockBinding(BiConsumer consumer); +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableDelete.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableDelete.java new file mode 100644 index 0000000000..d4e32fab43 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableDelete.java @@ -0,0 +1,18 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast; + +import org.hibernate.sql.model.jdbc.JdbcDeleteMutation; + +/** + * Models an update to a model (entity or collection) table, + * triggered from flush + * + * @author Steve Ebersole + */ +public interface TableDelete extends RestrictedTableMutation { +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableInsert.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableInsert.java new file mode 100644 index 0000000000..e8d0eda015 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableInsert.java @@ -0,0 +1,67 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast; + +import java.util.List; +import java.util.function.BiConsumer; + +import org.hibernate.internal.util.collections.CollectionHelper; +import org.hibernate.sql.ast.tree.expression.ColumnReference; +import org.hibernate.sql.model.jdbc.JdbcInsertMutation; + +/** + * Models an insert into a model (entity or collection) table, + * triggered from flush + * + * @author Steve Ebersole + */ +public interface TableInsert extends TableMutation { + /** + * The value bindings for each column, including table key(s) + */ + List getValueBindings(); + + /** + * The number of value bindings + * + * @see #getValueBindings() + */ + default int getNumberOfValueBindings() { + return getValueBindings().size(); + } + + /** + * Visit each value binding + * + * @see #getValueBindings() + */ + void forEachValueBinding(BiConsumer consumer); + + /** + * The columns to return from the insert. + * + * @see java.sql.Connection#prepareStatement(String, String[]) + */ + List getReturningColumns(); + + /** + * The number of columns being returned + * + * @see #getReturningColumns + */ + default int getNumberOfReturningColumns() { + final List returningColumns = getReturningColumns(); + return CollectionHelper.size( returningColumns ); + } + + /** + * Visit each return-column + * + * @see #getReturningColumns + */ + void forEachReturningColumn(BiConsumer consumer); +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableMutation.java new file mode 100644 index 0000000000..6c864c7a19 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableMutation.java @@ -0,0 +1,67 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast; + +import java.util.List; + +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.jdbc.Expectation; +import org.hibernate.sql.ast.tree.Statement; +import org.hibernate.sql.exec.spi.JdbcParameterBinder; +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.ValuesAnalysis; + +/** + * Describes the mutation of a model table (mapped by an entity or collection) + * triggered from flush. + *

+ * Modeled as a SQL AST and processed via {@link org.hibernate.sql.ast.SqlAstTranslator} + *

+ * Acts as a factory for {@link org.hibernate.sql.model.MutationOperation} instances, + * which are the forms used to "perform" the mutation using JDBC. + * + * @author Steve Ebersole + */ +public interface TableMutation extends Statement { + /** + * The table being mutated + */ + MutatingTableReference getMutatingTable(); + + /** + * The name of the table being mutated. + * + * @see #getMutatingTable() + */ + default String getTableName() { + return getMutatingTable().getTableName(); + } + + /** + * The comment to be used in the SQL if enabled and supported + */ + String getMutationComment(); + + /** + * Is the mutation a procedure/function? + */ + boolean isCallable(); + + /** + * The validation expectation for the mutation + */ + Expectation getExpectation(); + + /** + * The JDBC parameters associated with this mutation + */ + List getParameters(); + + O createMutationOperation(ValuesAnalysis valuesAnalysis, SessionFactoryImplementor sessionFactory); + + O createMutationOperation(String sql, List parameterBinders); +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableUpdate.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableUpdate.java new file mode 100644 index 0000000000..dbf148a9ab --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableUpdate.java @@ -0,0 +1,47 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast; + +import java.util.List; +import java.util.function.BiConsumer; + +import org.hibernate.sql.model.MutationOperation; + +/** + * Models an update to a model (entity or collection) table, + * triggered from flush + * + * @apiNote I + * + * @author Steve Ebersole + */ +public interface TableUpdate + extends RestrictedTableMutation { + /** + * The value bindings for each column. + * + * @implNote Table key column(s) are not included here as + * those are not ever updated + */ + List getValueBindings(); + + /** + * The number of value bindings + * + * @see #getValueBindings() + */ + default int getNumberOfValueBindings() { + return getValueBindings().size(); + } + + /** + * Visit each value binding + * + * @see #getValueBindings() + */ + void forEachValueBinding(BiConsumer consumer); +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractRestrictedTableMutationBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractRestrictedTableMutationBuilder.java new file mode 100644 index 0000000000..4b4d2bcb0d --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractRestrictedTableMutationBuilder.java @@ -0,0 +1,105 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast.builder; + +import java.util.ArrayList; +import java.util.List; + +import org.hibernate.NotYetImplementedFor6Exception; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.metamodel.mapping.JdbcMapping; +import org.hibernate.metamodel.mapping.SelectableMapping; +import org.hibernate.sql.ast.tree.expression.ColumnReference; +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.ast.ColumnValueBinding; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.ast.RestrictedTableMutation; + +/** + * Specialization of TableMutationBuilder for mutations which contain a + * restriction. + * + * @author Steve Ebersole + */ +public abstract class AbstractRestrictedTableMutationBuilder> + extends AbstractTableMutationBuilder + implements RestrictedTableMutationBuilder { + + private final List keyRestrictionBindings = new ArrayList<>(); + private List optimisticLockBindings; + + public AbstractRestrictedTableMutationBuilder( + MutationType mutationType, + MutationTarget mutationTarget, + TableMapping table, + SessionFactoryImplementor sessionFactory) { + super( mutationType, mutationTarget, table, sessionFactory ); + } + + public AbstractRestrictedTableMutationBuilder( + MutationType mutationType, + MutationTarget mutationTarget, + MutatingTableReference tableReference, + SessionFactoryImplementor sessionFactory) { + super( mutationType, mutationTarget, tableReference, sessionFactory ); + } + + public List getKeyRestrictionBindings() { + return keyRestrictionBindings; + } + + public List getOptimisticLockBindings() { + return optimisticLockBindings; + } + + @Override + public void addKeyRestriction(String columnName, String columnWriteFragment, JdbcMapping jdbcMapping) { + addColumn( + columnName, + columnWriteFragment, + jdbcMapping, + ParameterUsage.RESTRICT, + keyRestrictionBindings + ); + } + + @Override + public void addNullOptimisticLockRestriction(SelectableMapping column) { + if ( optimisticLockBindings == null ) { + optimisticLockBindings = new ArrayList<>(); + } + final ColumnReference columnReference = new ColumnReference( + getMutatingTable(), + column.getSelectionExpression(), + column.getJdbcMapping() + ); + optimisticLockBindings.add( new ColumnValueBinding( columnReference, null ) ); + } + + @Override + public void addOptimisticLockRestriction(String columnName, String columnWriteFragment, JdbcMapping jdbcMapping) { + if ( optimisticLockBindings == null ) { + optimisticLockBindings = new ArrayList<>(); + } + + addColumn( columnName, columnWriteFragment, jdbcMapping, ParameterUsage.RESTRICT, optimisticLockBindings ); + } + + @Override + public void setWhere(String fragment) { + throw new NotYetImplementedFor6Exception( getClass() ); + } + + @Override + public void addWhereFragment(String fragment) { + throw new NotYetImplementedFor6Exception( getClass() ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableInsertBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableInsertBuilder.java new file mode 100644 index 0000000000..a38002d8ff --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableInsertBuilder.java @@ -0,0 +1,84 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast.builder; + +import java.util.ArrayList; +import java.util.List; + +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.metamodel.mapping.JdbcMapping; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.ast.ColumnValueBinding; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.ast.TableInsert; + +/** + * Base support for TableInsertBuilder implementations + * + * @author Steve Ebersole + */ +public abstract class AbstractTableInsertBuilder + extends AbstractTableMutationBuilder + implements TableInsertBuilder { + private final List keyBindingList = new ArrayList<>(); + private final List valueBindingList = new ArrayList<>(); + private List lobValueBindingList; + + public AbstractTableInsertBuilder( + MutationTarget mutationTarget, + TableMapping table, + SessionFactoryImplementor sessionFactory) { + super( MutationType.INSERT, mutationTarget, table, sessionFactory ); + } + + public AbstractTableInsertBuilder( + MutationTarget mutationTarget, + MutatingTableReference tableReference, + SessionFactoryImplementor sessionFactory) { + super( MutationType.INSERT, mutationTarget, tableReference, sessionFactory ); + } + + protected List getKeyBindingList() { + return keyBindingList; + } + + protected List getValueBindingList() { + return valueBindingList; + } + + protected List getLobValueBindingList() { + return lobValueBindingList; + } + + @Override + public void addValueColumn( + String columnName, + String columnWriteFragment, + JdbcMapping jdbcMapping) { + final ColumnValueBinding valueBinding = createValueBinding( columnName, columnWriteFragment, jdbcMapping ); + + if ( jdbcMapping.getJdbcType().isLob() && getJdbcServices().getDialect().forceLobAsLastValue() ) { + if ( lobValueBindingList == null ) { + lobValueBindingList = new ArrayList<>(); + lobValueBindingList.add( valueBinding ); + } + } + else { + valueBindingList.add( valueBinding ); + } + } + + @Override + public void addKeyColumn( + String columnName, + String columnWriteFragment, + JdbcMapping jdbcMapping) { + addColumn( columnName, columnWriteFragment, jdbcMapping, keyBindingList ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableMutationBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableMutationBuilder.java new file mode 100644 index 0000000000..53ab2b1096 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableMutationBuilder.java @@ -0,0 +1,150 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast.builder; + +import java.util.ArrayList; +import java.util.List; + +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.spi.JdbcServices; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.metamodel.mapping.JdbcMapping; +import org.hibernate.sql.ast.tree.expression.ColumnReference; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.ast.ColumnValueBinding; +import org.hibernate.sql.model.ast.ColumnValueParameter; +import org.hibernate.sql.model.ast.ColumnWriteFragment; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.ast.TableMutation; + +/** + * Base support for TableMutationBuilder implementations + * + * @author Steve Ebersole + */ +public abstract class AbstractTableMutationBuilder> implements TableMutationBuilder { + private final SessionFactoryImplementor sessionFactory; + + private final MutationType mutationType; + private final MutationTarget mutationTarget; + + private final MutatingTableReference mutatingTable; + + private final List parameters = new ArrayList<>(); + + + public AbstractTableMutationBuilder( + MutationType mutationType, + MutationTarget mutationTarget, + TableMapping table, + SessionFactoryImplementor sessionFactory) { + this( mutationType, mutationTarget, new MutatingTableReference( table ), sessionFactory ); + } + + public AbstractTableMutationBuilder( + MutationType mutationType, + MutationTarget mutationTarget, + MutatingTableReference mutatingTable, + SessionFactoryImplementor sessionFactory) { + this.mutationType = mutationType; + this.mutationTarget = mutationTarget; + this.sessionFactory = sessionFactory; + + this.mutatingTable = mutatingTable; + } + + protected MutationTarget getMutationTarget() { + return mutationTarget; + } + + @Override + public MutatingTableReference getMutatingTable() { + return mutatingTable; + } + + protected SessionFactoryImplementor getSessionFactory() { + return sessionFactory; + } + + protected JdbcServices getJdbcServices() { + return sessionFactory.getJdbcServices(); + } + + protected List getParameters() { + return parameters; + } + + protected void addColumn( + String columnName, + String columnWriteFragment, + JdbcMapping jdbcMapping, + List list) { + final ColumnValueBinding valueBinding = createValueBinding( columnName, columnWriteFragment, jdbcMapping ); + list.add( valueBinding ); + } + + protected void addColumn( + String columnName, + String columnWriteFragment, + JdbcMapping jdbcMapping, + ParameterUsage parameterUsage, + List list) { + final ColumnValueBinding valueBinding = createValueBinding( columnName, columnWriteFragment, jdbcMapping, parameterUsage ); + list.add( valueBinding ); + } + + protected ColumnValueBinding createValueBinding( + String columnName, + String columnWriteFragment, + JdbcMapping jdbcMapping) { + return createValueBinding( columnName, columnWriteFragment, jdbcMapping, ParameterUsage.SET ); + } + + protected ColumnValueBinding createValueBinding( + String columnName, + String columnWriteFragment, + JdbcMapping jdbcMapping, + ParameterUsage parameterUsage) { + final ColumnReference columnReference = new ColumnReference( mutatingTable, columnName, jdbcMapping ); + + final ColumnValueParameter parameter; + if ( columnWriteFragment.contains( "?" ) ) { + parameter = new ColumnValueParameter( columnReference, parameterUsage ); + parameters.add( parameter ); + } + else { + parameter = null; + } + + return new ColumnValueBinding( columnReference, new ColumnWriteFragment( columnWriteFragment, parameter, jdbcMapping ) ); + } + + @SafeVarargs + protected final List combine(List list1, List... additionalLists) { + final ArrayList combined = list1 == null + ? new ArrayList<>() + : new ArrayList<>( list1 ); + + if ( additionalLists != null ) { + for ( int i = 0; i < additionalLists.length; i++ ) { + if ( additionalLists[i] == null ) { + continue; + } + combined.addAll( additionalLists[i] ); + } + } + + return combined; + } + + @Override + public String toString() { + return "TableMutationBuilder( " + mutationType + " - `" + mutatingTable.getTableName() + "`)"; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableUpdateBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableUpdateBuilder.java new file mode 100644 index 0000000000..3ab2d9c92d --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableUpdateBuilder.java @@ -0,0 +1,83 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast.builder; + +import java.util.ArrayList; +import java.util.List; + +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.metamodel.mapping.JdbcMapping; +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.ast.ColumnValueBinding; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.ast.RestrictedTableMutation; + +/** + * @author Steve Ebersole + */ +public abstract class AbstractTableUpdateBuilder + extends AbstractRestrictedTableMutationBuilder> + implements TableUpdateBuilder { + private final List keyBindings = new ArrayList<>(); + private final List valueBindings = new ArrayList<>(); + private List lobValueBindings; + + public AbstractTableUpdateBuilder( + MutationTarget mutationTarget, + TableMapping tableMapping, + SessionFactoryImplementor sessionFactory) { + super( MutationType.UPDATE, mutationTarget, tableMapping, sessionFactory ); + } + + public AbstractTableUpdateBuilder( + MutationTarget mutationTarget, + MutatingTableReference tableReference, + SessionFactoryImplementor sessionFactory) { + super( MutationType.UPDATE, mutationTarget, tableReference, sessionFactory ); + } + + protected List getKeyBindings() { + return keyBindings; + } + + protected List getValueBindings() { + return valueBindings; + } + + protected List getLobValueBindings() { + return lobValueBindings; + } + + @Override + public void addValueColumn( + String columnName, + String columnWriteFragment, + JdbcMapping jdbcMapping) { + final ColumnValueBinding valueBinding = createValueBinding( columnName, columnWriteFragment, jdbcMapping ); + + if ( jdbcMapping.getJdbcType().isLob() && getJdbcServices().getDialect().forceLobAsLastValue() ) { + if ( lobValueBindings == null ) { + lobValueBindings = new ArrayList<>(); + lobValueBindings.add( valueBinding ); + } + } + else { + valueBindings.add( valueBinding ); + } + } + + @Override + public void addKeyColumn( + String columnName, + String columnWriteFragment, + JdbcMapping jdbcMapping) { + addColumn( columnName, columnWriteFragment, jdbcMapping, keyBindings ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/MutationGroupBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/MutationGroupBuilder.java new file mode 100644 index 0000000000..b1c7db63e2 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/MutationGroupBuilder.java @@ -0,0 +1,120 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast.builder; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.Locale; +import java.util.Map; +import java.util.function.Consumer; + +import org.hibernate.persister.entity.mutation.EntityMutationTarget; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.ast.MutationGroup; +import org.hibernate.sql.model.ast.TableMutation; +import org.hibernate.sql.model.internal.MutationGroupNone; +import org.hibernate.sql.model.internal.MutationGroupSingle; +import org.hibernate.sql.model.internal.MutationGroupStandard; + +/** + * Builder (pattern) for {@link TableMutation} references + * + * @author Steve Ebersole + */ +public class MutationGroupBuilder { + private final MutationType mutationType; + private final EntityMutationTarget mutationTarget; + + private final Map> tableMutationBuilderMap; + + public MutationGroupBuilder(MutationType mutationType, EntityMutationTarget mutationTarget) { + this.mutationType = mutationType; + this.mutationTarget = mutationTarget; + this.tableMutationBuilderMap = new LinkedHashMap<>(); + } + + public MutationType getMutationType() { + return mutationType; + } + + public EntityMutationTarget getMutationTarget() { + return mutationTarget; + } + + public > B findTableDetailsBuilder(String name) { + //noinspection unchecked + return (B) tableMutationBuilderMap.get( name ); + } + + public > B getTableDetailsBuilder(String name) { + final B builder = findTableDetailsBuilder( name ); + if ( builder == null ) { + throw new RuntimeException( + "Expecting already existing TableMutationBuilder : " + name + ); + } + return builder; + } + + public void addTableDetailsBuilder(TableMutationBuilder builder) { + tableMutationBuilderMap.put( builder.getMutatingTable().getTableName(), builder ); + } + + public void forEachTableMutationBuilder(Consumer> consumer) { + tableMutationBuilderMap.forEach( (name, mutationBuilder) -> consumer.accept( mutationBuilder ) ); + } + + public MutationGroup buildMutationGroup() { + if ( tableMutationBuilderMap.isEmpty() ) { + throw new IllegalStateException( + String.format( + Locale.ROOT, + "Mutation group contained no table mutations - %s : `%s`", + mutationType, + mutationTarget.getNavigableRole().getFullPath() + ) + ); + } + + if ( tableMutationBuilderMap.size() == 1 ) { + final TableMutationBuilder tableMutationBuilder = tableMutationBuilderMap.entrySet().iterator().next().getValue(); + final TableMutation mutation = tableMutationBuilder.buildMutation(); + if ( mutation == null ) { + return new MutationGroupNone( mutationType, mutationTarget ); + } + return new MutationGroupSingle( mutationType, mutationTarget, mutation ); + } + + final ArrayList> tableMutations = new ArrayList<>( tableMutationBuilderMap.size() ); + tableMutationBuilderMap.forEach( (name, tableDetailsBuilder) -> { + final TableMutation tableMutation = tableDetailsBuilder.buildMutation(); + if ( tableMutation != null ) { + tableMutations.add( tableMutation ); + } + } ); + + if ( tableMutations.isEmpty() ) { + return new MutationGroupNone( mutationType, mutationTarget ); + } + + if ( tableMutations.size() == 1 ) { + return new MutationGroupSingle( mutationType, mutationTarget, tableMutations.get( 0 ) ); + } + + return new MutationGroupStandard( mutationType, mutationTarget, tableMutations ); + } + + @Override + public String toString() { + return String.format( + Locale.ROOT, + "MutationGroupBuilder( %s:`%s` )", + mutationType.name(), + mutationTarget.getNavigableRole().getFullPath() + ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/RestrictedTableMutationBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/RestrictedTableMutationBuilder.java new file mode 100644 index 0000000000..e1face0217 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/RestrictedTableMutationBuilder.java @@ -0,0 +1,83 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast.builder; + +import org.hibernate.metamodel.mapping.JdbcMapping; +import org.hibernate.metamodel.mapping.SelectableConsumer; +import org.hibernate.metamodel.mapping.SelectableMapping; +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.ast.RestrictedTableMutation; + +/** + * Specialized TableMutationBuilder implementation for building mutations + * which define a where-clause + * + * @author Steve Ebersole + */ +public interface RestrictedTableMutationBuilder> extends TableMutationBuilder { + /** + * Add a restriction as long as the selectable is not a formula and is not nullable + */ + default void addKeyRestriction(SelectableMapping selectableMapping) { + if ( selectableMapping.isNullable() ) { + return; + } + addKeyRestrictionLeniently( selectableMapping ); + } + + /** + * Convenience form of {@link #addKeyRestriction(SelectableMapping)} matching the + * signature of {@link SelectableConsumer} allowing it to be used as a method reference + * in its place. + * + * @param dummy Ignored; here simply to satisfy the {@link SelectableConsumer} signature + */ + default void addKeyRestriction(@SuppressWarnings("unused") int dummy, SelectableMapping selectableMapping) { + addKeyRestriction( selectableMapping ); + } + + /** + * Add a restriction as long as the selectable is not a formula + */ + default void addKeyRestrictionLeniently(SelectableMapping selectableMapping) { + if ( selectableMapping.isFormula() ) { + return; + } + addKeyRestriction( + selectableMapping.getSelectionExpression(), + selectableMapping.getWriteExpression(), + selectableMapping.getJdbcMapping() + ); + } + + /** + * Add restriction based on the column in the table's key + */ + void addKeyRestriction(String columnName, String columnWriteFragment, JdbcMapping jdbcMapping); + + void addNullOptimisticLockRestriction(SelectableMapping column); + + /** + * Add restriction based on non-version optimistically-locked column + */ + default void addOptimisticLockRestriction(SelectableMapping selectableMapping) { + addOptimisticLockRestriction( + selectableMapping.getSelectionExpression(), + selectableMapping.getWriteExpression(), + selectableMapping.getJdbcMapping() + ); + } + + /** + * Add restriction based on non-version optimistically-locked column + */ + void addOptimisticLockRestriction(String columnName, String columnWriteFragment, JdbcMapping jdbcMapping); + + void setWhere(String fragment); + + void addWhereFragment(String fragment); +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilder.java new file mode 100644 index 0000000000..a110c6c71d --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilder.java @@ -0,0 +1,17 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast.builder; + +import org.hibernate.sql.model.ast.TableDelete; +import org.hibernate.sql.model.jdbc.JdbcDeleteMutation; + +/** + * @author Steve Ebersole + */ +public interface TableDeleteBuilder extends RestrictedTableMutationBuilder { + +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilderSkipped.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilderSkipped.java new file mode 100644 index 0000000000..b1d8dfcf72 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilderSkipped.java @@ -0,0 +1,54 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast.builder; + +import org.hibernate.metamodel.mapping.JdbcMapping; +import org.hibernate.metamodel.mapping.SelectableMapping; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.ast.TableDelete; + +/** + * @author Steve Ebersole + */ +public class TableDeleteBuilderSkipped implements TableDeleteBuilder { + private final MutatingTableReference tableReference; + + public TableDeleteBuilderSkipped(TableMapping tableMapping) { + tableReference = new MutatingTableReference( tableMapping ); + } + + @Override + public void addKeyRestriction(String columnName, String columnWriteFragment, JdbcMapping jdbcMapping) { + } + + @Override + public void addNullOptimisticLockRestriction(SelectableMapping column) { + } + + @Override + public void addOptimisticLockRestriction(String columnName, String columnWriteFragment, JdbcMapping jdbcMapping) { + } + + @Override + public void setWhere(String fragment) { + } + + @Override + public void addWhereFragment(String fragment) { + } + + @Override + public MutatingTableReference getMutatingTable() { + return tableReference; + } + + @Override + public TableDelete buildMutation() { + return null; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilderStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilderStandard.java new file mode 100644 index 0000000000..9f82a39611 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilderStandard.java @@ -0,0 +1,87 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast.builder; + +import org.hibernate.HibernateException; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.ast.TableDelete; +import org.hibernate.sql.model.internal.TableDeleteCustomSql; +import org.hibernate.sql.model.internal.TableDeleteStandard; +import org.hibernate.sql.model.jdbc.JdbcDeleteMutation; + +/** + * Standard TableDeleteBuilder implementation used when Hibernate + * generates the delete statement + * + * @author Steve Ebersole + */ +public class TableDeleteBuilderStandard + extends AbstractRestrictedTableMutationBuilder + implements TableDeleteBuilder { + private final boolean isCustomSql; + + public TableDeleteBuilderStandard( + MutationTarget mutationTarget, + TableMapping table, + SessionFactoryImplementor sessionFactory) { + this( mutationTarget, new MutatingTableReference( table ), sessionFactory ); + } + + public TableDeleteBuilderStandard( + MutationTarget mutationTarget, + MutatingTableReference tableReference, + SessionFactoryImplementor sessionFactory) { + super( MutationType.DELETE, mutationTarget, tableReference, sessionFactory ); + + this.isCustomSql = tableReference.getTableMapping().getDeleteDetails().getCustomSql() != null; + } + + @Override + public void setWhere(String fragment) { + if ( isCustomSql && fragment != null ) { + throw new HibernateException( + "Invalid attempt to apply where-restriction on top of custom sql-delete mapping : " + + getMutationTarget().getNavigableRole().getFullPath() + ); + } + } + + @Override + public void addWhereFragment(String fragment) { + if ( isCustomSql && fragment != null ) { + throw new HibernateException( + "Invalid attempt to apply where-filter on top of custom sql-delete mapping : " + + getMutationTarget().getNavigableRole().getFullPath() + ); + } + } + + @Override + public TableDelete buildMutation() { + if ( isCustomSql ) { + return new TableDeleteCustomSql( + getMutatingTable(), + getMutationTarget(), + getKeyRestrictionBindings(), + getOptimisticLockBindings(), + getParameters() + ); + } + + return new TableDeleteStandard( + getMutatingTable(), + getMutationTarget(), + getKeyRestrictionBindings(), + getOptimisticLockBindings(), + getParameters() + ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableInsertBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableInsertBuilder.java new file mode 100644 index 0000000000..69a9b09c1c --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableInsertBuilder.java @@ -0,0 +1,50 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast.builder; + +import org.hibernate.metamodel.mapping.JdbcMapping; +import org.hibernate.metamodel.mapping.SelectableMapping; +import org.hibernate.sql.model.ast.TableInsert; + +/** + * TableMutationBuilder implementation for insert statements + * + * @author Steve Ebersole + */ +public interface TableInsertBuilder extends TableMutationBuilder { + /** + * Add a column as part of the values list + */ + default void addValueColumn(SelectableMapping selectableMapping) { + addValueColumn( + selectableMapping.getSelectionExpression(), + selectableMapping.getWriteExpression(), + selectableMapping.getJdbcMapping() + ); + } + + /** + * Add a column as part of the values list + */ + void addValueColumn(String columnName, String columnWriteFragment, JdbcMapping jdbcMapping); + + /** + * Add a key column + */ + default void addKeyColumn(SelectableMapping selectableMapping) { + addKeyColumn( + selectableMapping.getSelectionExpression(), + selectableMapping.getWriteExpression(), + selectableMapping.getJdbcMapping() + ); + } + + /** + * Add a key column + */ + void addKeyColumn(String columnName, String valueExpression, JdbcMapping jdbcMapping); +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableInsertBuilderStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableInsertBuilderStandard.java new file mode 100644 index 0000000000..6650c49c63 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableInsertBuilderStandard.java @@ -0,0 +1,95 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast.builder; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.hibernate.dialect.Dialect; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.metamodel.mapping.SelectableMapping; +import org.hibernate.sql.ast.tree.expression.ColumnReference; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.ast.TableInsert; +import org.hibernate.sql.model.internal.TableInsertCustomSql; +import org.hibernate.sql.model.internal.TableInsertStandard; + +/** + * Standard TableInsertBuilder + * + * @author Steve Ebersole + */ +public class TableInsertBuilderStandard extends AbstractTableInsertBuilder { + private final boolean returningGeneratedKeys; + private final boolean isCustomSql; + private List returningColumnsList; + + public TableInsertBuilderStandard( + MutationTarget mutationTarget, + TableMapping table, + SessionFactoryImplementor sessionFactory) { + super( mutationTarget, table, sessionFactory ); + + final Dialect dialect = getJdbcServices().getDialect(); + this.returningGeneratedKeys = dialect.getDefaultUseGetGeneratedKeys(); + + this.isCustomSql = table.getInsertDetails().getCustomSql() != null; + } + + public TableInsertBuilderStandard( + MutationTarget mutationTarget, + MutatingTableReference tableReference, + SessionFactoryImplementor sessionFactory) { + super( mutationTarget, tableReference, sessionFactory ); + + final Dialect dialect = getJdbcServices().getDialect(); + this.returningGeneratedKeys = dialect.getDefaultUseGetGeneratedKeys(); + + this.isCustomSql = tableReference.getTableMapping().getInsertDetails().getCustomSql() != null; + } + + public boolean isReturningGeneratedKeys() { + return returningGeneratedKeys; + } + + public List getReturningColumns() { + return returningColumnsList == null ? Collections.emptyList() : returningColumnsList; + } + + public ColumnReference addReturningColumn(SelectableMapping selectableMapping) { + final ColumnReference columnReference = new ColumnReference( (String) null, selectableMapping, null ); + if ( returningColumnsList == null ) { + returningColumnsList = new ArrayList<>(); + } + returningColumnsList.add( columnReference ); + return columnReference; + } + + @Override + public TableInsert buildMutation() { + if ( isCustomSql ) { + return new TableInsertCustomSql( + getMutatingTable(), + getMutationTarget(), + combine( getValueBindingList(), getKeyBindingList(), getLobValueBindingList() ), + getParameters() + ); + } + + return new TableInsertStandard( + getMutatingTable(), + getMutationTarget(), + combine( getValueBindingList(), getKeyBindingList(), getLobValueBindingList() ), + returningGeneratedKeys, + returningColumnsList, + getParameters() + ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableMutationBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableMutationBuilder.java new file mode 100644 index 0000000000..e8d4e46a2a --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableMutationBuilder.java @@ -0,0 +1,32 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast.builder; + +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.ast.TableMutation; + +/** + * Generalized contract for building {@link TableMutation} instances + * + * @author Steve Ebersole + */ +public interface TableMutationBuilder> { + /** + * Constant for `null` + */ + String NULL = "null"; + + /** + * Reference (in the SQL AST sense) to the mutating table + */ + MutatingTableReference getMutatingTable(); + + /** + * Build the mutation descriptor + */ + M buildMutation(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilder.java new file mode 100644 index 0000000000..39657f8c4a --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilder.java @@ -0,0 +1,67 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast.builder; + +import org.hibernate.metamodel.mapping.JdbcMapping; +import org.hibernate.metamodel.mapping.SelectableConsumer; +import org.hibernate.metamodel.mapping.SelectableMapping; +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.ast.RestrictedTableMutation; + +/** + * @author Steve Ebersole + */ +public interface TableUpdateBuilder + extends RestrictedTableMutationBuilder> { + + /** + * Add a column as part of the values list + */ + default void addValueColumn(SelectableMapping selectableMapping) { + addValueColumn( + selectableMapping.getSelectionExpression(), + selectableMapping.getWriteExpression(), + selectableMapping.getJdbcMapping() + ); + } + + /** + * Convenience form of {@link #addValueColumn(SelectableMapping)} matching the + * signature of {@link SelectableConsumer} allowing it to be used as a method reference + * in its place. + * + * @param dummy Ignored; here simply to satisfy the {@link SelectableConsumer} signature + * + * @see RestrictedTableMutationBuilder#addKeyRestriction(int, SelectableMapping) + */ + default void addValueColumn(@SuppressWarnings("unused") int dummy, SelectableMapping selectableMapping) { + addValueColumn( selectableMapping ); + } + + /** + * Add a column as part of the values list + */ + void addValueColumn(String columnName, String columnWriteFragment, JdbcMapping jdbcMapping); + + /** + * Add a key column + */ + default void addKeyColumn(SelectableMapping selectableMapping) { + addKeyColumn( + selectableMapping.getSelectionExpression(), + selectableMapping.getWriteExpression(), + selectableMapping.getJdbcMapping() + ); + } + + /** + * Add a key column + */ + void addKeyColumn(String columnName, String valueExpression, JdbcMapping jdbcMapping); + + void setWhere(String fragment); +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilderSkipped.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilderSkipped.java new file mode 100644 index 0000000000..ec2967451b --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilderSkipped.java @@ -0,0 +1,76 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast.builder; + +import org.hibernate.metamodel.mapping.JdbcMapping; +import org.hibernate.metamodel.mapping.SelectableMapping; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.ast.RestrictedTableMutation; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; + +/** + * @author Steve Ebersole + */ +public class TableUpdateBuilderSkipped implements TableUpdateBuilder { + private final MutatingTableReference tableReference; + + public TableUpdateBuilderSkipped(MutatingTableReference tableReference) { + this.tableReference = tableReference; + } + + @Override + public MutatingTableReference getMutatingTable() { + return tableReference; + } + + @Override + public RestrictedTableMutation buildMutation() { + return null; + } + + @Override + public void addKeyRestriction(String columnName, String columnWriteFragment, JdbcMapping jdbcMapping) { + // nothing to do + // todo (mutation) : should this be an exception? + } + + @Override + public void addNullOptimisticLockRestriction(SelectableMapping column) { + // nothing to do + // todo (mutation) : should this be an exception? + } + + @Override + public void addOptimisticLockRestriction(String columnName, String columnWriteFragment, JdbcMapping jdbcMapping) { + // nothing to do + // todo (mutation) : should this be an exception? + } + + @Override + public void addWhereFragment(String fragment) { + // nothing to do + // todo (mutation) : should this be an exception? + } + + @Override + public void addValueColumn(String columnName, String columnWriteFragment, JdbcMapping jdbcMapping) { + // nothing to do + // todo (mutation) : should this be an exception? + } + + @Override + public void addKeyColumn(String columnName, String valueExpression, JdbcMapping jdbcMapping) { + // nothing to do + // todo (mutation) : should this be an exception? + } + + @Override + public void setWhere(String fragment) { + // nothing to do + // todo (mutation) : should this be an exception? + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilderStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilderStandard.java new file mode 100644 index 0000000000..ffdced47a0 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilderStandard.java @@ -0,0 +1,80 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.ast.builder; + +import java.util.List; + +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.ast.ColumnValueBinding; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.ast.RestrictedTableMutation; +import org.hibernate.sql.model.internal.TableUpdateCustomSql; +import org.hibernate.sql.model.internal.TableUpdateNoSet; +import org.hibernate.sql.model.internal.TableUpdateStandard; +import org.hibernate.sql.model.internal.TableUpsert; + +/** + * @author Steve Ebersole + */ +public class TableUpdateBuilderStandard extends AbstractTableUpdateBuilder { + public TableUpdateBuilderStandard( + MutationTarget mutationTarget, + TableMapping tableMapping, + SessionFactoryImplementor sessionFactory) { + super( mutationTarget, tableMapping, sessionFactory ); + } + + public TableUpdateBuilderStandard( + MutationTarget mutationTarget, + MutatingTableReference tableReference, + SessionFactoryImplementor sessionFactory) { + super( mutationTarget, tableReference, sessionFactory ); + } + + @SuppressWarnings("unchecked") + @Override + public RestrictedTableMutation buildMutation() { + final List valueBindings = combine( getValueBindings(), getKeyBindings(), getLobValueBindings() ); + if ( valueBindings.isEmpty() ) { + return (RestrictedTableMutation) new TableUpdateNoSet( getMutatingTable(), getMutationTarget() ); + } + + if ( getMutatingTable().getTableMapping().getUpdateDetails().getCustomSql() != null ) { + return (RestrictedTableMutation) new TableUpdateCustomSql( + getMutatingTable(), + getMutationTarget(), + getParameters(), + valueBindings, + getKeyRestrictionBindings(), + getOptimisticLockBindings() + ); + } + + if ( getMutatingTable().getTableMapping().isOptional() ) { + return (RestrictedTableMutation) new TableUpsert( + getMutatingTable(), + getMutationTarget(), + valueBindings, + getKeyRestrictionBindings(), + getOptimisticLockBindings(), + getParameters() + ); + } + + return (RestrictedTableMutation) new TableUpdateStandard( + getMutatingTable(), + getMutationTarget(), + getParameters(), + valueBindings, + getKeyRestrictionBindings(), + getOptimisticLockBindings() + ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/package-info.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/package-info.java new file mode 100644 index 0000000000..3734adac3b --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/package-info.java @@ -0,0 +1,17 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ + +/** + * Support for building {@link org.hibernate.sql.model.ast.TableMutation} + * references for persisting entity mutation events + * + * @author Steve Ebersole + */ +@Internal +package org.hibernate.sql.model.ast.builder; + +import org.hibernate.Internal; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingTypedModelPart.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/package-info.java similarity index 57% rename from hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingTypedModelPart.java rename to hibernate-core/src/main/java/org/hibernate/sql/model/ast/package-info.java index 9bc681c8c8..e09be0808e 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingTypedModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/package-info.java @@ -1,14 +1,13 @@ /* * 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 http://www.gnu.org/licenses/lgpl-2.1.html + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ -package org.hibernate.metamodel.mapping; /** + * SQL AST extensions for model mutations + * * @author Steve Ebersole */ -public interface MappingTypedModelPart extends ModelPart { - MappingType getMappingType(); -} +package org.hibernate.sql.model.ast; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/AbstractMutationOperationGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/AbstractMutationOperationGroup.java new file mode 100644 index 0000000000..aabd7628ae --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/AbstractMutationOperationGroup.java @@ -0,0 +1,34 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.internal; + +import org.hibernate.sql.model.MutationOperationGroup; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; + +/** + * @author Steve Ebersole + */ +public abstract class AbstractMutationOperationGroup implements MutationOperationGroup { + private final MutationType mutationType; + private final MutationTarget mutationTarget; + + public AbstractMutationOperationGroup(MutationType mutationType, MutationTarget mutationTarget) { + this.mutationType = mutationType; + this.mutationTarget = mutationTarget; + } + + @Override + public MutationType getMutationType() { + return mutationType; + } + + @Override + public MutationTarget getMutationTarget() { + return mutationTarget; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupNone.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupNone.java new file mode 100644 index 0000000000..f8f14c4507 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupNone.java @@ -0,0 +1,71 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.internal; + +import java.util.Locale; +import java.util.function.BiConsumer; + +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.ast.MutationGroup; +import org.hibernate.sql.model.ast.TableMutation; + +/** + * MutationGroup for cases where we have no mutations. Generally + * this is only used from the case of a single TableMutationBuilder + * + * @author Steve Ebersole + */ +public class MutationGroupNone implements MutationGroup { + private final MutationType mutationType; + private final MutationTarget mutationTarget; + + public MutationGroupNone(MutationType mutationType, MutationTarget mutationTarget) { + this.mutationType = mutationType; + this.mutationTarget = mutationTarget; + } + + @Override + public MutationType getMutationType() { + return mutationType; + } + + @Override + public MutationTarget getMutationTarget() { + return mutationTarget; + } + + @Override + public int getNumberOfTableMutations() { + return 0; + } + + @Override + public > M getSingleTableMutation() { + return null; + } + + @Override + public > M getTableMutation(String tableName) { + return null; + } + + @Override + public > void forEachTableMutation(BiConsumer action) { + } + + @Override + public String toString() { + return String.format( + Locale.ROOT, + "MutationGroupNone( %s:`%s` )", + mutationType.name(), + mutationTarget.getNavigableRole().getFullPath() + ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupSingle.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupSingle.java new file mode 100644 index 0000000000..3c2adda364 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupSingle.java @@ -0,0 +1,81 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.internal; + +import java.util.Locale; +import java.util.function.BiConsumer; + +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.ast.MutationGroup; +import org.hibernate.sql.model.ast.TableMutation; + +/** + * MutationGroup implementation for cases where we have a + * single table operation + * + * @author Steve Ebersole + */ +public class MutationGroupSingle implements MutationGroup { + private final MutationType mutationType; + private final MutationTarget mutationTarget; + private final TableMutation tableMutation; + + public MutationGroupSingle( + MutationType mutationType, + MutationTarget mutationTarget, + TableMutation tableMutation) { + this.mutationType = mutationType; + this.mutationTarget = mutationTarget; + this.tableMutation = tableMutation; + } + + @Override + public MutationType getMutationType() { + return mutationType; + } + + @Override + public MutationTarget getMutationTarget() { + return mutationTarget; + } + + @Override + public int getNumberOfTableMutations() { + return 1; + } + + @Override + public > M getSingleTableMutation() { + //noinspection unchecked + return (M) tableMutation; + } + + @Override + public > M getTableMutation(String tableName) { + assert tableMutation.getMutatingTable().getTableName().equals( tableName ); + //noinspection unchecked + return (M) tableMutation; + } + + @Override + public > void forEachTableMutation(BiConsumer action) { + //noinspection unchecked + action.accept( 0, (M) tableMutation ); + } + + @Override + public String toString() { + return String.format( + Locale.ROOT, + "MutationSqlGroup( %s:`%s` )", + mutationType.name(), + mutationTarget.getNavigableRole().getFullPath() + ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupStandard.java new file mode 100644 index 0000000000..281b7cf2db --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupStandard.java @@ -0,0 +1,78 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.internal; + +import java.util.List; +import java.util.function.BiConsumer; + +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.ast.MutationGroup; +import org.hibernate.sql.model.ast.TableMutation; + +/** + * Standard MutationGroup implementation for cases with multiple table mutations + * + * @author Steve Ebersole + */ +public class MutationGroupStandard implements MutationGroup { + private final MutationType mutationType; + private final MutationTarget mutationTarget; + private final List> tableMutationList; + + public MutationGroupStandard( + MutationType mutationType, + MutationTarget mutationTarget, + List> tableMutationList) { + this.mutationType = mutationType; + this.mutationTarget = mutationTarget; + this.tableMutationList = tableMutationList; + } + + @Override + public MutationType getMutationType() { + return mutationType; + } + + @Override + public MutationTarget getMutationTarget() { + return mutationTarget; + } + + @Override + public int getNumberOfTableMutations() { + return tableMutationList.size(); + } + + @Override + public > M getSingleTableMutation() { + throw new IllegalStateException( "Group contains multiple table mutations : " + mutationTarget.getNavigableRole() ); + } + + @Override + public > M getTableMutation(String tableName) { + for ( int i = 0; i < tableMutationList.size(); i++ ) { + final TableMutation tableMutation = tableMutationList.get( i ); + if ( tableMutation != null ) { + if ( tableMutation.getMutatingTable().getTableName().equals( tableName ) ) { + //noinspection unchecked + return (M) tableMutation; + } + } + } + return null; + } + + @Override + public > void forEachTableMutation(BiConsumer action) { + for ( int i = 0; i < tableMutationList.size(); i++ ) { + //noinspection unchecked + action.accept( i, (M)tableMutationList.get( i ) ); + } + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupNone.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupNone.java new file mode 100644 index 0000000000..c36cc289bd --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupNone.java @@ -0,0 +1,56 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.internal; + +import java.util.Collections; +import java.util.List; +import java.util.function.BiConsumer; +import java.util.function.BiFunction; + +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; + +/** + * Specialized MutationOperationGroup for case of no operations + * + * @author Steve Ebersole + */ +public class MutationOperationGroupNone extends AbstractMutationOperationGroup { + public MutationOperationGroupNone(MutationType mutationType, MutationTarget mutationTarget) { + super( mutationType, mutationTarget ); + } + + @Override + public int getNumberOfOperations() { + return 0; + } + + @Override + public O getSingleOperation() { + return null; + } + + @Override + public List getOperations() { + return Collections.emptyList(); + } + + @Override + public O getOperation(String tableName) { + return null; + } + + @Override + public void forEachOperation(BiConsumer action) { + } + + @Override + public boolean hasMatching(BiFunction matcher) { + return false; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupSingle.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupSingle.java new file mode 100644 index 0000000000..d6ff1b17cc --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupSingle.java @@ -0,0 +1,73 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.internal; + +import java.util.Collections; +import java.util.List; +import java.util.function.BiConsumer; +import java.util.function.BiFunction; + +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; + +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER; + +/** + * @author Steve Ebersole + */ +public class MutationOperationGroupSingle extends AbstractMutationOperationGroup { + private final MutationOperation operation; + + public MutationOperationGroupSingle(MutationType mutationType, MutationTarget mutationTarget, MutationOperation operation) { + super( mutationType, mutationTarget ); + this.operation = operation; + } + + @Override + public int getNumberOfOperations() { + return 1; + } + + @Override + public O getSingleOperation() { + //noinspection unchecked + return (O) operation; + } + + @Override + public List getOperations() { + //noinspection unchecked + return Collections.singletonList( (O) operation ); + } + + @Override + public O getOperation(String tableName) { + if ( !tableName.equals( operation.getTableDetails().getTableName() ) ) { + MODEL_MUTATION_LOGGER.debugf( + "Unexpected table name mismatch : `%s` - `%s`", + tableName, + operation.getTableDetails().getTableName() + ); + } + + //noinspection unchecked + return (O) operation; + } + + @Override + public void forEachOperation(BiConsumer action) { + //noinspection unchecked + action.accept( 0, (O) operation ); + } + + @Override + public boolean hasMatching(BiFunction matcher) { + //noinspection unchecked + return matcher.apply( 0, (O) operation ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupStandard.java new file mode 100644 index 0000000000..29cb70f1b6 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupStandard.java @@ -0,0 +1,87 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.internal; + +import java.util.List; +import java.util.Locale; +import java.util.function.BiConsumer; +import java.util.function.BiFunction; + +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; + +/** + * @author Steve Ebersole + */ +public class MutationOperationGroupStandard extends AbstractMutationOperationGroup { + private final List operations; + + public MutationOperationGroupStandard(MutationType mutationType, MutationTarget mutationTarget, List operations) { + super( mutationType, mutationTarget ); + this.operations = operations; + } + + @Override + public int getNumberOfOperations() { + return operations.size(); + } + + @Override + public O getSingleOperation() { + if ( operations.size() == 1 ) { + //noinspection unchecked + return (O) operations.get( 0 ); + } + throw new IllegalStateException( + String.format( + Locale.ROOT, + "Group contains multiple table mutations - %s : %s ", + getMutationType().name(), + getMutationTarget().getNavigableRole() + ) + ); + } + + @SuppressWarnings("unchecked") + @Override + public List getOperations() { + //noinspection rawtypes + return (List) operations; + } + + @SuppressWarnings("unchecked") + @Override + public O getOperation(String tableName) { + for ( int i = 0; i < operations.size(); i++ ) { + final MutationOperation operation = operations.get( i ); + if ( operation.getTableDetails().getTableName().equals( tableName ) ) { + return (O) operation; + } + } + return null; + } + + @SuppressWarnings("unchecked") + @Override + public void forEachOperation(BiConsumer action) { + for ( int i = 0; i < operations.size(); i++ ) { + action.accept( i, (O) operations.get( i ) ); + } + } + + @SuppressWarnings("unchecked") + @Override + public boolean hasMatching(BiFunction matcher) { + for ( int i = 0; i < operations.size(); i++ ) { + if ( matcher.apply( i, (O) operations.get( i ) ) ) { + return true; + } + } + return false; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableDeleteCustomSql.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableDeleteCustomSql.java new file mode 100644 index 0000000000..52d7597d4b --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableDeleteCustomSql.java @@ -0,0 +1,52 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.internal; + +import java.util.List; + +import org.hibernate.sql.ast.SqlAstWalker; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.ast.AbstractTableDelete; +import org.hibernate.sql.model.ast.ColumnValueBinding; +import org.hibernate.sql.model.ast.ColumnValueParameter; +import org.hibernate.sql.model.ast.CustomSqlMutation; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.jdbc.JdbcDeleteMutation; + +/** + * Deletion defined using custom sql-delete + * + * @see org.hibernate.annotations.SQLDelete + * + * @author Steve Ebersole + */ +public class TableDeleteCustomSql extends AbstractTableDelete implements CustomSqlMutation { + public TableDeleteCustomSql( + MutatingTableReference mutatingTable, + MutationTarget mutationTarget, + List keyRestrictionBindings, + List optLockRestrictionBindings, + List parameters) { + super( mutatingTable, mutationTarget, keyRestrictionBindings, optLockRestrictionBindings, parameters ); + } + + @Override + public String getCustomSql() { + return getMutatingTable().getTableMapping().getDeleteDetails().getCustomSql(); + } + + @Override + public boolean isCallable() { + return getMutatingTable().getTableMapping().getDeleteDetails().isCallable(); + } + + + @Override + public void accept(SqlAstWalker walker) { + walker.visitCustomTableDelete( this ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableDeleteStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableDeleteStandard.java new file mode 100644 index 0000000000..d5ce56a1bd --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableDeleteStandard.java @@ -0,0 +1,40 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.internal; + +import java.util.List; + +import org.hibernate.sql.ast.SqlAstWalker; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.ast.AbstractTableDelete; +import org.hibernate.sql.model.ast.ColumnValueBinding; +import org.hibernate.sql.model.ast.ColumnValueParameter; +import org.hibernate.sql.model.ast.MutatingTableReference; + +/** + * @author Steve Ebersole + */ +public class TableDeleteStandard extends AbstractTableDelete { + public TableDeleteStandard( + MutatingTableReference mutatingTable, + MutationTarget mutationTarget, + List keyRestrictionBindings, + List optLockRestrictionBindings, + List parameters) { + super( mutatingTable, mutationTarget, keyRestrictionBindings, optLockRestrictionBindings, parameters ); + } + + @Override + public boolean isCallable() { + return false; + } + + @Override + public void accept(SqlAstWalker walker) { + walker.visitStandardTableDelete( this ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableInsertCustomSql.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableInsertCustomSql.java new file mode 100644 index 0000000000..c603cca688 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableInsertCustomSql.java @@ -0,0 +1,64 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.internal; + +import java.util.Collections; +import java.util.List; +import java.util.function.BiConsumer; + +import org.hibernate.sql.ast.SqlAstWalker; +import org.hibernate.sql.ast.tree.expression.ColumnReference; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.ast.AbstractTableInsert; +import org.hibernate.sql.model.ast.ColumnValueBinding; +import org.hibernate.sql.model.ast.ColumnValueParameter; +import org.hibernate.sql.model.ast.CustomSqlMutation; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.jdbc.JdbcInsertMutation; + +/** + * Insertion defined using custom sql-insert + * + * @see org.hibernate.annotations.SQLInsert + * + * @author Steve Ebersole + */ +public class TableInsertCustomSql extends AbstractTableInsert implements CustomSqlMutation { + + public TableInsertCustomSql( + MutatingTableReference mutatingTable, + MutationTarget mutationTarget, + List valueBindings, + List parameters) { + super( mutatingTable, mutationTarget, parameters, valueBindings ); + } + + @Override + public String getCustomSql() { + return getMutatingTable().getTableMapping().getInsertDetails().getCustomSql(); + } + + @Override + public boolean isCallable() { + return getMutatingTable().getTableMapping().getInsertDetails().isCallable(); + } + + @Override + public List getReturningColumns() { + return Collections.emptyList(); + } + + @Override + public void forEachReturningColumn(BiConsumer consumer) { + // nothing to do + } + + @Override + public void accept(SqlAstWalker walker) { + walker.visitCustomTableInsert( this ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableInsertStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableInsertStandard.java new file mode 100644 index 0000000000..88144bb983 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableInsertStandard.java @@ -0,0 +1,58 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.internal; + +import java.util.List; +import java.util.function.BiConsumer; + +import org.hibernate.sql.ast.SqlAstWalker; +import org.hibernate.sql.ast.tree.expression.ColumnReference; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.ast.AbstractTableInsert; +import org.hibernate.sql.model.ast.ColumnValueBinding; +import org.hibernate.sql.model.ast.ColumnValueParameter; +import org.hibernate.sql.model.ast.MutatingTableReference; + +/** + * @author Steve Ebersole + */ +public class TableInsertStandard extends AbstractTableInsert { + private final boolean returnGeneratedKeys; + private final List returningColumns; + + public TableInsertStandard( + MutatingTableReference mutatingTable, + MutationTarget mutationTarget, + List valueBindings, + boolean returnGeneratedKeys, + List returningColumns, + List parameters) { + super( mutatingTable, mutationTarget, parameters, valueBindings ); + this.returnGeneratedKeys = returnGeneratedKeys; + this.returningColumns = returningColumns; + } + + @Override + public List getReturningColumns() { + return returningColumns; + } + + @Override + public void forEachReturningColumn(BiConsumer consumer) { + forEachThing( returningColumns, consumer ); + } + + @Override + public boolean isCallable() { + return false; + } + + @Override + public void accept(SqlAstWalker walker) { + walker.visitStandardTableInsert( this ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateCustomSql.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateCustomSql.java new file mode 100644 index 0000000000..217a9f0c7c --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateCustomSql.java @@ -0,0 +1,54 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.internal; + +import java.util.List; + +import org.hibernate.sql.ast.SqlAstWalker; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.ast.AbstractTableUpdate; +import org.hibernate.sql.model.ast.ColumnValueBinding; +import org.hibernate.sql.model.ast.ColumnValueParameter; +import org.hibernate.sql.model.ast.CustomSqlMutation; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; + +/** + * Update defined using custom sql-update + * + * @see org.hibernate.annotations.SQLUpdate + * + * @author Steve Ebersole + */ +public class TableUpdateCustomSql + extends AbstractTableUpdate + implements CustomSqlMutation { + public TableUpdateCustomSql( + MutatingTableReference mutatingTable, + MutationTarget mutationTarget, + List parameters, + List valueBindings, + List keyRestrictionBindings, + List optLockRestrictionBindings) { + super( mutatingTable, mutationTarget, parameters, valueBindings, keyRestrictionBindings, optLockRestrictionBindings ); + } + + @Override + public String getCustomSql() { + return getMutatingTable().getTableMapping().getUpdateDetails().getCustomSql(); + } + + @Override + public boolean isCallable() { + return getMutatingTable().getTableMapping().getUpdateDetails().isCallable(); + } + + @Override + public void accept(SqlAstWalker walker) { + walker.visitCustomTableUpdate( this ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateNoSet.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateNoSet.java new file mode 100644 index 0000000000..e312a71901 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateNoSet.java @@ -0,0 +1,77 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.internal; + +import java.util.Collections; +import java.util.List; +import java.util.function.BiConsumer; + +import org.hibernate.jdbc.Expectation; +import org.hibernate.sql.ast.SqlAstWalker; +import org.hibernate.sql.exec.spi.JdbcParameterBinder; +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.ast.AbstractRestrictedTableMutation; +import org.hibernate.sql.model.ast.ColumnValueBinding; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.ast.TableUpdate; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; + +import static org.hibernate.jdbc.Expectations.NONE; + +/** + * A skipped update + * + * @author Steve Ebersole + */ +public class TableUpdateNoSet + extends AbstractRestrictedTableMutation + implements TableUpdate { + public TableUpdateNoSet(MutatingTableReference mutatingTable, MutationTarget mutationTarget) { + super( + mutatingTable, + mutationTarget, + "no-op", + Collections.emptyList(), + Collections.emptyList(), + Collections.emptyList() + ); + } + + @Override + public void accept(SqlAstWalker walker) { + } + + @Override + protected JdbcMutationOperation createMutationOperation( + TableMapping tableDetails, + String sql, + List effectiveBinders) { + // no operation + return null; + } + + @Override + public Expectation getExpectation() { + return NONE; + } + + @Override + public boolean isCallable() { + return false; + } + + @Override + public List getValueBindings() { + return Collections.emptyList(); + } + + @Override + public void forEachValueBinding(BiConsumer consumer) { + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateStandard.java new file mode 100644 index 0000000000..a298ffadab --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateStandard.java @@ -0,0 +1,60 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.internal; + +import java.util.List; + +import org.hibernate.sql.ast.SqlAstWalker; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.ast.AbstractTableUpdate; +import org.hibernate.sql.model.ast.ColumnValueBinding; +import org.hibernate.sql.model.ast.ColumnValueParameter; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; + +/** + * @author Steve Ebersole + */ +public class TableUpdateStandard extends AbstractTableUpdate { + private final String whereFragment; + + public TableUpdateStandard( + MutatingTableReference mutatingTable, + MutationTarget mutationTarget, + List parameters, + List valueBindings, + List keyRestrictionBindings, + List optLockRestrictionBindings) { + this( mutatingTable, mutationTarget, parameters, valueBindings, keyRestrictionBindings, optLockRestrictionBindings, null ); + } + + public TableUpdateStandard( + MutatingTableReference mutatingTable, + MutationTarget mutationTarget, + List parameters, + List valueBindings, + List keyRestrictionBindings, + List optLockRestrictionBindings, + String whereFragment) { + super( mutatingTable, mutationTarget, parameters, valueBindings, keyRestrictionBindings, optLockRestrictionBindings ); + this.whereFragment = whereFragment; + } + + @Override + public boolean isCallable() { + return false; + } + + public String getWhereFragment() { + return whereFragment; + } + + @Override + public void accept(SqlAstWalker walker) { + walker.visitStandardTableUpdate( this ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpsert.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpsert.java new file mode 100644 index 0000000000..772afeb582 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpsert.java @@ -0,0 +1,113 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.internal; + +import java.util.List; +import java.util.function.BiConsumer; + +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.jdbc.Expectation; +import org.hibernate.persister.entity.mutation.EntityMutationTarget; +import org.hibernate.sql.ast.SqlAstWalker; +import org.hibernate.sql.exec.spi.JdbcParameterBinder; +import org.hibernate.sql.model.MutationOperation; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.ValuesAnalysis; +import org.hibernate.sql.model.ast.AbstractRestrictedTableMutation; +import org.hibernate.sql.model.ast.ColumnValueBinding; +import org.hibernate.sql.model.ast.ColumnValueParameter; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.ast.RestrictedTableMutation; +import org.hibernate.sql.model.ast.TableUpdate; + +/** + * @apiNote Implements {@link TableUpdate} because it is fundamentally an update + * + * @author Steve Ebersole + */ +public class TableUpsert + extends AbstractRestrictedTableMutation + implements RestrictedTableMutation { + private final List valueBindings; + + public TableUpsert( + MutatingTableReference mutatingTable, + MutationTarget mutationTarget, + List valueBindings, + List keyRestrictionBindings, + List optLockRestrictionBindings, + List parameters) { + this( + mutatingTable, + mutationTarget, + "upsert for " + mutationTarget.getRolePath(), + valueBindings, + keyRestrictionBindings, + optLockRestrictionBindings, + parameters + ); + } + + public TableUpsert( + MutatingTableReference mutatingTable, + MutationTarget mutationTarget, + String comment, + List valueBindings, + List keyRestrictionBindings, + List optLockRestrictionBindings, + List parameters) { + super( mutatingTable, mutationTarget, comment, keyRestrictionBindings, optLockRestrictionBindings, parameters ); + this.valueBindings = valueBindings; + } + + @Override + public EntityMutationTarget getMutationTarget() { + return (EntityMutationTarget) super.getMutationTarget(); + } + + @Override + public boolean isCallable() { + return false; + } + + @Override + public Expectation getExpectation() { + return getMutatingTable().getTableMapping().getUpdateDetails().getExpectation(); + } + + public List getValueBindings() { + return valueBindings; + } + + public void forEachValueBinding(BiConsumer consumer) { + forEachThing( valueBindings, consumer ); + } + + @Override + public void accept(SqlAstWalker walker) { + throw new UnsupportedOperationException(); + } + + public MutationOperation createMutationOperation( + ValuesAnalysis valuesAnalysis, + SessionFactoryImplementor factory) { + return factory.getJdbcServices().getDialect().createUpsertOperation( + getMutationTarget(), + this, + factory + ); + } + + @Override + protected MutationOperation createMutationOperation( + TableMapping tableDetails, + String updateSql, + List effectiveBinders) { + throw new UnsupportedOperationException(); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/package-info.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/package-info.java new file mode 100644 index 0000000000..276c2a5748 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ + +/** + * @author Steve Ebersole + */ +@Internal +package org.hibernate.sql.model.internal; + +import org.hibernate.Internal; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/AbstractJdbcMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/AbstractJdbcMutation.java new file mode 100644 index 0000000000..cf9f20e13a --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/AbstractJdbcMutation.java @@ -0,0 +1,100 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.jdbc; + +import java.util.List; + +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.internal.JdbcValueDescriptorImpl; +import org.hibernate.jdbc.Expectation; +import org.hibernate.sql.exec.spi.JdbcParameterBinder; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.TableMapping; + +import static org.hibernate.internal.util.collections.CollectionHelper.arrayList; + +/** + * @author Steve Ebersole + */ +public abstract class AbstractJdbcMutation implements JdbcMutationOperation { + private final TableMapping tableDetails; + private final MutationTarget mutationTarget; + private final String sql; + private final boolean callable; + private final Expectation expectation; + + private final List jdbcValueDescriptors; + private final List parameterBinders; + + public AbstractJdbcMutation( + TableMapping tableDetails, + MutationTarget mutationTarget, + String sql, + boolean callable, + Expectation expectation, + List parameterBinders) { + this.tableDetails = tableDetails; + this.mutationTarget = mutationTarget; + this.sql = sql; + this.callable = callable; + this.expectation = expectation; + this.parameterBinders = parameterBinders; + + this.jdbcValueDescriptors = arrayList( parameterBinders.size() ); + for ( int i = 0; i < parameterBinders.size(); i++ ) { + final JdbcValueDescriptorImpl parameterDescriptor = new JdbcValueDescriptorImpl( + parameterBinders.get( i ), + expectation.getNumberOfParametersUsed() + i + 1 + ); + this.jdbcValueDescriptors.add( parameterDescriptor ); + } + } + + @Override + public TableMapping getTableDetails() { + return tableDetails; + } + + @Override + public MutationTarget getMutationTarget() { + return mutationTarget; + } + + @Override + public String getSqlString() { + return sql; + } + + @Override + public List getParameterBinders() { + return parameterBinders; + } + + @Override + public JdbcValueDescriptor findValueDescriptor(String columnName, ParameterUsage usage) { + for ( int i = 0; i < jdbcValueDescriptors.size(); i++ ) { + final JdbcValueDescriptor descriptor = jdbcValueDescriptors.get( i ); + if ( descriptor.getColumnName().equals( columnName ) + && descriptor.getUsage() == usage ) { + return descriptor; + } + } + return null; + } + + + + @Override + public boolean isCallable() { + return callable; + } + + @Override + public Expectation getExpectation() { + return expectation; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcDeleteMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcDeleteMutation.java new file mode 100644 index 0000000000..9327f94359 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcDeleteMutation.java @@ -0,0 +1,54 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.jdbc; + +import java.util.List; + +import org.hibernate.jdbc.Expectation; +import org.hibernate.sql.exec.spi.JdbcParameterBinder; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.TableMapping; + +/** + * @author Steve Ebersole + */ +public class JdbcDeleteMutation extends AbstractJdbcMutation { + private final MutationType mutationType; + + public JdbcDeleteMutation( + TableMapping tableDetails, + MutationTarget mutationTarget, + String sql, + boolean callable, + Expectation expectation, + List parameterBinders) { + this( tableDetails, MutationType.DELETE, mutationTarget, sql, callable, expectation, parameterBinders ); + } + + public JdbcDeleteMutation( + TableMapping tableDetails, + MutationType mutationType, + MutationTarget mutationTarget, + String sql, + boolean callable, + Expectation expectation, + List parameterBinders) { + super( tableDetails, mutationTarget, sql, callable, expectation, parameterBinders ); + this.mutationType = mutationType; + } + + @Override + public MutationType getMutationType() { + return mutationType; + } + + @Override + public String toString() { + return "JdbcDeleteMutation(" + getTableDetails().getTableName() + ")"; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcInsertMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcInsertMutation.java new file mode 100644 index 0000000000..e860fe6089 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcInsertMutation.java @@ -0,0 +1,42 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.jdbc; + +import java.util.List; + +import org.hibernate.jdbc.Expectation; +import org.hibernate.sql.exec.spi.JdbcParameterBinder; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.TableMapping; + +/** + * Descriptor for a table insert originating from a flush + * + * @author Steve Ebersole + */ +public class JdbcInsertMutation extends AbstractJdbcMutation { + public JdbcInsertMutation( + TableMapping tableDetails, + MutationTarget mutationTarget, + String sql, + boolean callable, + Expectation expectation, + List parameterBinders) { + super( tableDetails, mutationTarget, sql, callable, expectation, parameterBinders ); + } + + @Override + public MutationType getMutationType() { + return MutationType.INSERT; + } + + @Override + public String toString() { + return "JdbcInsertMutation(" + getTableDetails().getTableName() + ")"; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcMutationOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcMutationOperation.java new file mode 100644 index 0000000000..a790df3f15 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcMutationOperation.java @@ -0,0 +1,19 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.jdbc; + +import org.hibernate.sql.exec.spi.JdbcOperation; +import org.hibernate.sql.model.PreparableMutationOperation; + +/** + * JdbcOperation extension for model mutations stemming from + * persistence context flushes + * + * @author Steve Ebersole + */ +public interface JdbcMutationOperation extends JdbcOperation, PreparableMutationOperation { +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcUpdateMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcUpdateMutation.java new file mode 100644 index 0000000000..f82a8b6aa8 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcUpdateMutation.java @@ -0,0 +1,42 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.jdbc; + +import java.util.List; + +import org.hibernate.jdbc.Expectation; +import org.hibernate.sql.exec.spi.JdbcParameterBinder; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.TableMapping; + +/** + * Describes the update of a single table + * + * @author Steve Ebersole + */ +public class JdbcUpdateMutation extends AbstractJdbcMutation { + public JdbcUpdateMutation( + TableMapping tableDetails, + MutationTarget mutationTarget, + String sql, + boolean callable, + Expectation expectation, + List parameterBinders) { + super( tableDetails, mutationTarget, sql, callable, expectation, parameterBinders ); + } + + @Override + public MutationType getMutationType() { + return MutationType.INSERT; + } + + @Override + public String toString() { + return "JdbcUpdateMutation(" + getTableDetails().getTableName() + ")"; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcValueDescriptor.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcValueDescriptor.java new file mode 100644 index 0000000000..64b0292adc --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcValueDescriptor.java @@ -0,0 +1,45 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.jdbc; + +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.metamodel.mapping.JdbcMapping; + +/** + * Descriptor for JDBC value within an operation. + * + * @implSpec Used while {@linkplain org.hibernate.engine.jdbc.mutation.JdbcValueBindings binding} + * values to JDBC Statements + * + * @author Steve Ebersole + */ +public interface JdbcValueDescriptor { + /** + * The name of the column this parameter "maps to" + */ + String getColumnName(); + + /** + * How the parameter is used in the query + */ + ParameterUsage getUsage(); + + /** + * The position within the operation, starting at 1 per JDBC + */ + int getJdbcPosition(); + + /** + * The JDBC mapping (type, etc.) for the parameter + */ + JdbcMapping getJdbcMapping(); + + default boolean matches(String columnName, ParameterUsage usage) { + return getColumnName().equals( columnName ) + && getUsage() == usage; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateOperation.java new file mode 100644 index 0000000000..89d25613b8 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateOperation.java @@ -0,0 +1,466 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.sql.model.jdbc; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Objects; +import java.util.Set; + +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.jdbc.mutation.internal.JdbcValueDescriptorImpl; +import org.hibernate.engine.jdbc.mutation.internal.MutationQueryOptions; +import org.hibernate.engine.jdbc.mutation.internal.PreparedStatementGroupSingleTable; +import org.hibernate.engine.jdbc.mutation.spi.Binding; +import org.hibernate.engine.jdbc.mutation.spi.BindingGroup; +import org.hibernate.engine.jdbc.spi.JdbcCoordinator; +import org.hibernate.engine.jdbc.spi.MutationStatementPreparer; +import org.hibernate.engine.jdbc.spi.SqlStatementLogger; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.internal.util.collections.CollectionHelper; +import org.hibernate.jdbc.Expectation; +import org.hibernate.persister.entity.mutation.EntityMutationTarget; +import org.hibernate.persister.entity.mutation.EntityTableMapping; +import org.hibernate.persister.entity.mutation.UpdateValuesAnalysis; +import org.hibernate.sql.ast.SqlAstTranslator; +import org.hibernate.sql.ast.SqlAstTranslatorFactory; +import org.hibernate.sql.model.MutationTarget; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.PreparableMutationOperation; +import org.hibernate.sql.model.SelfExecutingUpdateOperation; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.ValuesAnalysis; +import org.hibernate.sql.model.ast.ColumnValueBinding; +import org.hibernate.sql.model.ast.ColumnValueParameter; +import org.hibernate.sql.model.ast.MutatingTableReference; +import org.hibernate.sql.model.ast.TableDelete; +import org.hibernate.sql.model.ast.TableInsert; +import org.hibernate.sql.model.ast.TableUpdate; +import org.hibernate.sql.model.internal.TableDeleteCustomSql; +import org.hibernate.sql.model.internal.TableDeleteStandard; +import org.hibernate.sql.model.internal.TableInsertCustomSql; +import org.hibernate.sql.model.internal.TableInsertStandard; +import org.hibernate.sql.model.internal.TableUpdateCustomSql; +import org.hibernate.sql.model.internal.TableUpdateStandard; +import org.hibernate.sql.model.internal.TableUpsert; + +import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER; + +/** + * Legacy "upsert" handling, conditionally using INSERT, UPDATE and DELETE + * statements as required for optional secondary tables. + * + * @author Steve Ebersole + */ +public class OptionalTableUpdateOperation implements SelfExecutingUpdateOperation { + private final EntityMutationTarget mutationTarget; + private final EntityTableMapping tableMapping; + private final Expectation expectation; + + private final List valueBindings; + private final List keyBindings; + private final List optimisticLockBindings; + private final List parameters; + + private final List jdbcValueDescriptors; + + public OptionalTableUpdateOperation( + MutationTarget mutationTarget, + TableUpsert upsert, + @SuppressWarnings("unused") SessionFactoryImplementor factory) { + this.mutationTarget = (EntityMutationTarget) mutationTarget; + this.tableMapping = (EntityTableMapping) upsert.getMutatingTable().getTableMapping(); + this.expectation = upsert.getExpectation(); + this.valueBindings = upsert.getValueBindings(); + this.keyBindings = upsert.getKeyBindings(); + this.optimisticLockBindings = upsert.getOptimisticLockBindings(); + this.parameters = upsert.getParameters(); + + this.jdbcValueDescriptors = CollectionHelper.arrayList( parameters.size() ); + for ( int i = 0; i < parameters.size(); i++ ) { + final ColumnValueParameter valueParameter = parameters.get( i ); + jdbcValueDescriptors.add( new JdbcValueDescriptorImpl( valueParameter, i+1 ) ); + } + } + + @Override + public MutationType getMutationType() { + // for Hibernate's purpose, an UPSERT *is an* UPDATE + return MutationType.UPDATE; + } + + @Override + public MutationTarget getMutationTarget() { + return mutationTarget; + } + + @Override + public TableMapping getTableDetails() { + return tableMapping; + } + + @Override + public JdbcValueDescriptor findValueDescriptor(String columnName, ParameterUsage usage) { + for ( int i = 0; i < jdbcValueDescriptors.size(); i++ ) { + final JdbcValueDescriptor descriptor = jdbcValueDescriptors.get( i ); + if ( descriptor.getColumnName().equals( columnName ) + && descriptor.getUsage() == usage ) { + return descriptor; + } + } + return null; + } + + @Override + public void performMutation( + JdbcValueBindings jdbcValueBindings, + ValuesAnalysis incomingValuesAnalysis, + SharedSessionContractImplementor session) { + final UpdateValuesAnalysis valuesAnalysis = (UpdateValuesAnalysis) incomingValuesAnalysis; + if ( !valuesAnalysis.getTablesNeedingUpdate().contains( tableMapping ) ) { + return; + } + + try { + if ( !valuesAnalysis.getTablesWithNonNullValues().contains( tableMapping ) ) { + // all the new values for this table were null - possibly delete the row + if ( valuesAnalysis.getTablesWithPreviousNonNullValues().contains( tableMapping ) ) { + performDelete( jdbcValueBindings, session ); + } + } + else { + // there are some non-null values for the table - we need to update or insert the values + + final boolean wasUpdated; + if ( valuesAnalysis.getTablesWithPreviousNonNullValues().contains( tableMapping ) ) { + // either + // 1) not know if the values for this table were previously all null (because old values are not known) + // 2) the values for this table were previously had at least one non-null + wasUpdated = performUpdate( jdbcValueBindings, session ); + } + else { + wasUpdated = false; + } + + if ( !wasUpdated ) { + MODEL_MUTATION_LOGGER.debugf( + "Upsert update altered no rows - inserting : %s", + tableMapping.getTableName() + ); + performInsert( jdbcValueBindings, session ); + } + } + } + finally { + jdbcValueBindings.afterStatement( tableMapping, session ); + } + + } + + private void performDelete(JdbcValueBindings jdbcValueBindings, SharedSessionContractImplementor session) { + final JdbcDeleteMutation jdbcDelete = createJdbcDelete( session ); + + final PreparedStatement deleteStatement = createStatementDetails( jdbcDelete, session ); + session.getJdbcServices().getSqlStatementLogger().logStatement( jdbcDelete.getSqlString() ); + + bindKeyValues( jdbcValueBindings, deleteStatement, jdbcDelete, session ); + + session.getJdbcCoordinator() + .getResultSetReturn() + .executeUpdate( deleteStatement ); + } + + private void bindKeyValues( + JdbcValueBindings jdbcValueBindings, + PreparedStatement statement, + JdbcDeleteMutation jdbcDelete, + SharedSessionContractImplementor session) { + final BindingGroup bindingGroup = jdbcValueBindings.getBindingGroup( tableMapping.getTableName() ); + if ( bindingGroup == null ) { + throw new IllegalStateException( + String.format( + Locale.ROOT, + "No value bindings for table on insert : %s", + tableMapping.getTableName() + ) + ); + } + + int jdbcBindingPosition = 1; + boolean foundKeyBindings = false; + + final Set bindings = bindingGroup.getBindings(); + // leverage the fact that bindings are contiguous to avoid full nested iterations + final Iterator keyBindingsItr = keyBindings.iterator(); + + bindings: for ( Binding binding : bindings ) { + // binding-position here is 1-based (JDBC) + final JdbcValueDescriptorImpl valueDescriptor = jdbcValueDescriptors.get( binding.getPosition() - 1 ); + + // key bindings would have a usage of RESTRICT relative to the UPDATE + if ( valueDescriptor.getUsage() != ParameterUsage.RESTRICT ) { + continue; + } + + while ( keyBindingsItr.hasNext() ) { + final ColumnValueBinding valueBinding = keyBindingsItr.next(); + + if ( Objects.equals( valueBinding.getColumnReference().getColumnExpression(), binding.getColumnName() ) ) { + // `binding` is for a key column + foundKeyBindings = true; + bindKeyValue( + jdbcBindingPosition++, + binding, + valueDescriptor, + statement, + jdbcDelete.getSqlString(), + session + ); + break; + } + else { + if ( foundKeyBindings ) { + // we are now "beyond" the key bindings + break bindings; + } + } + } + } + } + + private void bindKeyValue( + int jdbcPosition, + Binding binding, + JdbcValueDescriptorImpl valueDescriptor, + PreparedStatement statement, + String sql, + SharedSessionContractImplementor session) { + try { + binding.getValueBinder().bind( statement, binding.getValue(), jdbcPosition, session ); + } + catch (SQLException e) { + throw session.getJdbcServices().getSqlExceptionHelper().convert( + e, + String.format( + Locale.ROOT, + "Unable to bind parameter for upsert insert : %s.%s", + tableMapping.getTableName(), + valueDescriptor.getColumnName() + ), + sql + ); + } + } + + private JdbcDeleteMutation createJdbcDelete(SharedSessionContractImplementor session) { + final TableDelete tableDelete; + if ( tableMapping.getDeleteDetails() != null + && tableMapping.getDeleteDetails().getCustomSql() != null ) { + tableDelete = new TableDeleteCustomSql( + new MutatingTableReference( tableMapping ), + getMutationTarget(), + keyBindings, + optimisticLockBindings, + parameters + ); + } + else { + tableDelete = new TableDeleteStandard( + new MutatingTableReference( tableMapping ), + getMutationTarget(), + keyBindings, + optimisticLockBindings, + parameters + ); + } + + final SessionFactoryImplementor factory = session.getSessionFactory(); + final SqlAstTranslatorFactory sqlAstTranslatorFactory = factory + .getJdbcServices() + .getJdbcEnvironment() + .getSqlAstTranslatorFactory(); + + final SqlAstTranslator translator = sqlAstTranslatorFactory.buildModelMutationTranslator( + tableDelete, + factory + ); + + return translator.translate( null, MutationQueryOptions.INSTANCE ); + } + + private boolean performUpdate( + JdbcValueBindings jdbcValueBindings, + SharedSessionContractImplementor session) { + MODEL_MUTATION_LOGGER.tracef( + "#performUpdate(%s)", + tableMapping.getTableName() + ); + + final TableUpdate tableUpdate; + if ( tableMapping.getUpdateDetails() != null + && tableMapping.getUpdateDetails().getCustomSql() != null ) { + tableUpdate = new TableUpdateCustomSql( + new MutatingTableReference( tableMapping ), + mutationTarget, + parameters, + valueBindings, + keyBindings, + optimisticLockBindings + ); + } + else { + tableUpdate = new TableUpdateStandard( + new MutatingTableReference( tableMapping ), + mutationTarget, + parameters, + valueBindings, + keyBindings, + optimisticLockBindings + ); + } + + final SqlAstTranslator translator = session + .getJdbcServices() + .getJdbcEnvironment() + .getSqlAstTranslatorFactory() + .buildModelMutationTranslator( tableUpdate, session.getFactory() ); + + final JdbcMutationOperation jdbcUpdate = translator.translate( null, MutationQueryOptions.INSTANCE ); + + final PreparedStatementGroupSingleTable statementGroup = new PreparedStatementGroupSingleTable( jdbcUpdate, session ); + final PreparedStatementDetails statementDetails = statementGroup.resolvePreparedStatementDetails( tableMapping.getTableName() ); + + try { + final PreparedStatement updateStatement = statementDetails.resolveStatement(); + + final SqlStatementLogger sqlStatementLogger = session.getJdbcServices().getSqlStatementLogger(); + sqlStatementLogger.logStatement( statementDetails.getSqlString() ); + + jdbcValueBindings.beforeStatement( statementDetails, session ); + + final int rowCount = session.getJdbcCoordinator() + .getResultSetReturn() + .executeUpdate( updateStatement ); + + if ( rowCount == 0 ) { + return false; + } + + expectation.verifyOutcome( + rowCount, + updateStatement, + -1, + statementDetails.getSqlString() + ); + + return true; + } + catch (SQLException e) { + throw session.getJdbcServices().getSqlExceptionHelper().convert( + e, + "Unable to execute mutation PreparedStatement against table `" + tableMapping.getTableName() + "`", + statementDetails.getSqlString() + ); + } + } + + private void performInsert(JdbcValueBindings jdbcValueBindings, SharedSessionContractImplementor session) { + final JdbcInsertMutation jdbcInsert = createJdbcInsert( session ); + + final PreparedStatement insertStatement = createStatementDetails( jdbcInsert, session ); + + try { + session.getJdbcServices().getSqlStatementLogger().logStatement( jdbcInsert.getSqlString() ); + + final BindingGroup bindingGroup = jdbcValueBindings.getBindingGroup( tableMapping.getTableName() ); + if ( bindingGroup != null ) { + bindingGroup.forEachBinding( (binding) -> { + try { + binding.getValueBinder().bind( + insertStatement, + binding.getValue(), + binding.getPosition(), + session + ); + } + catch (SQLException e) { + throw session.getJdbcServices().getSqlExceptionHelper().convert( + e, + "Unable to bind parameter for upsert insert", + jdbcInsert.getSqlString() + ); + } + } ); + } + + session.getJdbcCoordinator() + .getResultSetReturn() + .executeUpdate( insertStatement ); + } + finally { + session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( insertStatement ); + } + } + + private JdbcInsertMutation createJdbcInsert(SharedSessionContractImplementor session) { + final TableInsert tableInsert; + if ( tableMapping.getInsertDetails() != null + && tableMapping.getInsertDetails().getCustomSql() != null ) { + tableInsert = new TableInsertCustomSql( + new MutatingTableReference( tableMapping ), + getMutationTarget(), + CollectionHelper.combine( valueBindings, keyBindings ), + parameters + ); + } + else { + tableInsert = new TableInsertStandard( + new MutatingTableReference( tableMapping ), + getMutationTarget(), + CollectionHelper.combine( valueBindings, keyBindings ), + false, + Collections.emptyList(), + parameters + ); + } + + final SessionFactoryImplementor factory = session.getSessionFactory(); + final SqlAstTranslatorFactory sqlAstTranslatorFactory = factory + .getJdbcServices() + .getJdbcEnvironment() + .getSqlAstTranslatorFactory(); + + final SqlAstTranslator translator = sqlAstTranslatorFactory.buildModelMutationTranslator( + tableInsert, + factory + ); + + return translator.translate( null, MutationQueryOptions.INSTANCE ); + } + + private static PreparedStatement createStatementDetails( + PreparableMutationOperation operation, + SharedSessionContractImplementor session) { + final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator(); + final MutationStatementPreparer statementPreparer = jdbcCoordinator.getMutationStatementPreparer(); + final PreparedStatement statement = statementPreparer.prepareStatement( operation.getSqlString(), false ); + session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().register( null, statement ); + return statement; + } + + @Override + public String toString() { + return "OptionalTableUpdateOperation(" + tableMapping + ")"; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/package-info.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/package-info.java new file mode 100644 index 0000000000..f39a1c9439 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ + +/** + * Extensions to {@link org.hibernate.sql.exec.spi.JdbcOperation} for + * model mutations + * + * @author Steve Ebersole + */ +package org.hibernate.sql.model.jdbc; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/package-info.java b/hibernate-core/src/main/java/org/hibernate/sql/model/package-info.java new file mode 100644 index 0000000000..a47017e564 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/package-info.java @@ -0,0 +1,18 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ + +/** + * Package contains specialized SQL AST nodes and builders for + * table mutations for model parts originating from normal + * persistence-context events related to flush, etc. + * + * @author Steve Ebersole + */ +@Incubating +package org.hibernate.sql.model; + +import org.hibernate.Incubating; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardEntityGraphTraversalStateImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardEntityGraphTraversalStateImpl.java index cbf02b5a86..fa78b774bf 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardEntityGraphTraversalStateImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardEntityGraphTraversalStateImpl.java @@ -8,7 +8,6 @@ package org.hibernate.sql.results.internal; import java.util.Map; import java.util.Objects; -import jakarta.persistence.metamodel.PluralAttribute; import org.hibernate.engine.FetchStyle; import org.hibernate.engine.FetchTiming; @@ -27,6 +26,8 @@ import org.hibernate.sql.results.graph.FetchParent; import org.hibernate.sql.results.graph.Fetchable; import org.hibernate.sql.results.graph.entity.EntityResultGraphNode; +import jakarta.persistence.metamodel.PluralAttribute; + /** * @author Nathan Xu */ diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java index 313392e979..be82258af7 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java @@ -28,9 +28,9 @@ import org.hibernate.query.spi.QueryOptions; import org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor; import org.hibernate.sql.exec.spi.ExecutionContext; import org.hibernate.sql.exec.spi.JdbcLockStrategy; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.exec.spi.JdbcParameterBinder; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.exec.spi.JdbcSelect; /** * @author Steve Ebersole @@ -40,7 +40,7 @@ public class DeferredResultSetAccess extends AbstractResultSetAccess { DeferredResultSetAccess.class ); - private final JdbcSelect jdbcSelect; + private final JdbcOperationQuerySelect jdbcSelect; private final JdbcParameterBindings jdbcParameterBindings; private final ExecutionContext executionContext; private final Function statementCreator; @@ -54,7 +54,7 @@ public class DeferredResultSetAccess extends AbstractResultSetAccess { private ResultSet resultSet; public DeferredResultSetAccess( - JdbcSelect jdbcSelect, + JdbcOperationQuerySelect jdbcSelect, JdbcParameterBindings jdbcParameterBindings, ExecutionContext executionContext, Function statementCreator) { @@ -67,7 +67,7 @@ public class DeferredResultSetAccess extends AbstractResultSetAccess { final QueryOptions queryOptions = executionContext.getQueryOptions(); if ( queryOptions == null ) { - finalSql = jdbcSelect.getSql(); + finalSql = jdbcSelect.getSqlString(); limit = null; limitHandler = NoopLimitHandler.NO_LIMIT; usesFollowOnLocking = false; @@ -79,13 +79,13 @@ public class DeferredResultSetAccess extends AbstractResultSetAccess { String sql; limit = queryOptions.getLimit(); if ( limit == null || limit.isEmpty() || jdbcSelect.usesLimitParameters() ) { - sql = jdbcSelect.getSql(); + sql = jdbcSelect.getSqlString(); limitHandler = NoopLimitHandler.NO_LIMIT; } else { limitHandler = dialect.getLimitHandler(); sql = limitHandler.processSql( - jdbcSelect.getSql(), + jdbcSelect.getSqlString(), limit, queryOptions ); diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java index f7ee0189ac..758af16e74 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java @@ -160,6 +160,21 @@ public interface JdbcType extends Serializable { return SqlTypes.isTemporalType( getDefaultSqlTypeCode() ); } + default boolean isLob() { + return isLob( getJdbcTypeCode() ); + } + + static boolean isLob(int jdbcTypeCode) { + switch ( jdbcTypeCode ) { + case SqlTypes.BLOB: + case SqlTypes.CLOB: + case SqlTypes.NCLOB: { + return true; + } + } + return false; + } + default boolean isInterval() { return SqlTypes.isIntervalType( getDefaultSqlTypeCode() ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumberConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumberConverter.java index 83fe6c5304..e5ef95edce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumberConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumberConverter.java @@ -16,6 +16,9 @@ import jakarta.persistence.Converter; public class PhoneNumberConverter implements AttributeConverter { @Override public String convertToDatabaseColumn(PhoneNumber phoneNumber) { + if ( phoneNumber == null ) { + return null; + } return phoneNumber.getNumber(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Topic.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Topic.java index 8c8cf80727..a80ed510a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Topic.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Topic.java @@ -6,18 +6,20 @@ */ package org.hibernate.orm.test.annotations.entity; + import java.util.HashSet; import java.util.Set; + +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; +import org.hibernate.annotations.ParamDef; + import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.OneToMany; -import org.hibernate.annotations.Filter; -import org.hibernate.annotations.FilterDef; -import org.hibernate.annotations.ParamDef; - /** * @author Sharath Reddy */ @@ -28,6 +30,7 @@ public class Topic { @Id @GeneratedValue private int id; + private String name; @OneToMany(mappedBy="topic", cascade=CascadeType.ALL) @Filter(name="byState", condition=":state = state") private Set narratives = new HashSet(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Alarm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Alarm.java index bd16633f73..7726de96e3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Alarm.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Alarm.java @@ -8,20 +8,33 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.joined; +import java.time.Instant; + import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; @Entity -@DiscriminatorValue("AlarmT") +@Table(name = "alarms") +@PrimaryKeyJoinColumn(name = "alarm_event_fk") +@DiscriminatorValue("alarm") public class Alarm extends EventInformation { - + private Instant notification; protected EventInformation eventInfo; + public Instant getNotification() { + return notification; + } + + public void setNotification(Instant notification) { + this.notification = notification; + } + @OneToOne - @JoinColumn(name = "EVENTINFO_NOTIFICATIONID", - referencedColumnName = "NOTIFICATIONID") + @JoinColumn(name = "event_info_fk") public EventInformation getEventInfo() { return eventInfo; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/EventInformation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/EventInformation.java index 222e664741..762beeb82c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/EventInformation.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/EventInformation.java @@ -15,16 +15,17 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; @Entity @Inheritance(strategy = InheritanceType.JOINED) -@DiscriminatorColumn(name = "DTYPE", discriminatorType = DiscriminatorType.STRING, length = 80) -@DiscriminatorValue("EventInformationT") +@Table(name = "events") +@DiscriminatorColumn(name = "event_type", discriminatorType = DiscriminatorType.STRING, length = 80) +@DiscriminatorValue("event") public class EventInformation implements java.io.Serializable { - - protected String notificationId; + private String name; @Id public String getNotificationId() { @@ -35,11 +36,17 @@ public class EventInformation implements java.io.Serializable { this.notificationId = value; } + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append( "EventInformationT: id = " + getNotificationId() ); - return sb.toString(); + return "EventInformation(" + getNotificationId() + ")"; } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java index 617e24e014..31c8d21ef0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java @@ -9,8 +9,6 @@ package org.hibernate.orm.test.annotations.inheritance.joined; import java.util.Iterator; import java.util.List; import java.util.Set; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; @@ -19,6 +17,9 @@ import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/ParentChildWithSameSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/ParentChildWithSameSecondaryTableTest.java index 1e50d44deb..4f3ed66159 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/ParentChildWithSameSecondaryTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/ParentChildWithSameSecondaryTableTest.java @@ -1,9 +1,13 @@ package org.hibernate.orm.test.annotations.secondarytable; +import org.hibernate.cfg.AvailableSettings; + import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.hibernate.testing.orm.junit.Setting; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -11,8 +15,6 @@ import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorColumn; import jakarta.persistence.DiscriminatorType; import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; @@ -22,6 +24,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; +@ServiceRegistry( settings = @Setting( name = AvailableSettings.STATEMENT_BATCH_SIZE, value = "-1" ) ) @DomainModel( annotatedClasses = { ParentChildWithSameSecondaryTableTest.EntityA.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java index a0eee558c1..f8e328e952 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java @@ -11,11 +11,6 @@ import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.Id; -import jakarta.persistence.OptimisticLockException; -import jakarta.persistence.Version; import org.hibernate.StaleObjectStateException; import org.hibernate.cfg.AvailableSettings; @@ -26,6 +21,11 @@ import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.Version; + import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -72,8 +72,10 @@ public class BatchOptimisticLockingTest extends } ); try { - doInHibernate( this::sessionFactory, session -> { - List persons = session.createQuery( "select p from Person p").getResultList(); + inTransaction( (session) -> { + List persons = session + .createSelectionQuery( "select p from Person p", Person.class ) + .getResultList(); for ( int i = 0; i < persons.size(); i++ ) { Person person = persons.get( i ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java index 3b0f126dfb..28c5c2d6c9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java @@ -6,28 +6,25 @@ */ package org.hibernate.orm.test.batch; +import java.lang.reflect.Field; + +import org.hibernate.Session; +import org.hibernate.cfg.AvailableSettings; +import org.hibernate.cfg.Configuration; +import org.hibernate.engine.jdbc.batch.spi.Batch; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; +import org.hibernate.engine.spi.SessionImplementor; + +import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.junit.Test; + import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; -import java.lang.reflect.Field; -import java.util.Map; - -import org.hibernate.Session; -import org.hibernate.cfg.AvailableSettings; -import org.hibernate.cfg.Configuration; -import org.hibernate.engine.jdbc.batch.internal.AbstractBatchImpl; -import org.hibernate.engine.jdbc.batch.internal.BatchingBatch; -import org.hibernate.engine.jdbc.batch.spi.Batch; -import org.hibernate.engine.spi.SessionImplementor; - -import org.junit.Test; - -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; - -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; /** @@ -80,12 +77,9 @@ public class BatchingBatchFailureTest extends BaseCoreFunctionalTestCase { throw new Exception( "Current batch was null" ); } else { - //make sure it's actually a batching impl - assertEquals( BatchingBatch.class, batch.getClass() ); - field = AbstractBatchImpl.class.getDeclaredField( "statements" ); - field.setAccessible( true ); - //check to see that there aren't any statements queued up (this can be an issue if using SavePoints) - assertEquals( 0, ((Map) field.get( batch )).size() ); +// //check to see that there aren't any statements queued up (this can be an issue if using SavePoints) + final PreparedStatementDetails statementDetails = batch.getStatementGroup().getSingleStatementDetails(); + assertThat( statementDetails.getStatement() ).isNull(); } } catch (Exception fieldException) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java index 7208e1f2a0..fbdd9129e9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java @@ -7,17 +7,10 @@ package org.hibernate.orm.test.batch; import java.lang.reflect.Field; -import java.util.Map; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; -import org.hibernate.engine.jdbc.batch.internal.AbstractBatchImpl; -import org.hibernate.engine.jdbc.batch.internal.NonBatchingBatch; import org.hibernate.engine.jdbc.batch.spi.Batch; import org.hibernate.engine.spi.SessionImplementor; @@ -25,7 +18,12 @@ import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; -import static org.junit.Assert.assertEquals; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; /** @@ -71,14 +69,7 @@ public class NonBatchingBatchFailureTest extends BaseCoreFunctionalTestCase { Field field = sessionImplementor.getJdbcCoordinator().getClass().getDeclaredField( "currentBatch" ); field.setAccessible( true ); Batch batch = (Batch) field.get( sessionImplementor.getJdbcCoordinator() ); - if ( batch != null ) { - //make sure it's actually a batching impl - assertEquals( NonBatchingBatch.class, batch.getClass() ); - field = AbstractBatchImpl.class.getDeclaredField( "statements" ); - field.setAccessible( true ); - //check to see that there aren't any statements queued up (this can be an issue if using SavePoints) - assertEquals( 0, ((Map) field.get( batch )).size() ); - } + assertNull( batch ); } catch (Exception fieldException) { fail( "Couldn't inspect field " + fieldException.getMessage() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java index 9f90623c4f..381ab47745 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java @@ -6,9 +6,19 @@ */ package org.hibernate.orm.test.batch; -import java.util.ArrayList; import java.util.List; -import java.util.Map; + +import org.hibernate.annotations.Table; +import org.hibernate.cfg.AvailableSettings; + +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.ServiceRegistry; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.hibernate.testing.orm.junit.Setting; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -16,127 +26,117 @@ import jakarta.persistence.Id; import jakarta.persistence.SecondaryTable; import jakarta.persistence.Version; -import org.hibernate.annotations.Table; -import org.hibernate.cfg.AvailableSettings; - -import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; -import static org.junit.Assert.assertEquals; - -public class OptionalSecondaryTableBatchTest extends BaseNonConfigCoreFunctionalTestCase { - private List companies; +import static org.assertj.core.api.Assertions.assertThat; +@ServiceRegistry( + settings = @Setting( name = AvailableSettings.STATEMENT_BATCH_SIZE, value = "5" ) +) +@DomainModel( annotatedClasses = OptionalSecondaryTableBatchTest.Company.class ) +@SessionFactory +public class OptionalSecondaryTableBatchTest { @Test - public void testMerge() { - doInHibernate( - this::sessionFactory, - session -> { - for ( int i = 0 ; i < 10 ; i++ ) { - final Company company = companies.get( i ); - company.taxNumber = 2 * i; - session.merge( company ); - } - } - ); + public void testManaged(SessionFactoryScope scope) { + scope.inTransaction( (session) -> { + final List companies = session.createQuery( "from Company", Company.class ).list(); + for ( int i = 0 ; i < companies.size() ; i++ ) { + final Company company = companies.get( i ); + company.taxNumber = 2 * i; + session.merge( company ); + } + } ); - doInHibernate( - this::sessionFactory, - session -> { - for ( int i = 0 ; i < 10 ; i++ ) { - assertEquals( Integer.valueOf( 2 * i ), session.get( Company.class, i).taxNumber ); - } - } - ); + scope.inTransaction( (session) -> { + final List companies = session.createQuery( "from Company", Company.class ).list(); + for ( int i = 0 ; i < companies.size() ; i++ ) { + assertThat( companies.get( i ).taxNumber ).isEqualTo( 2 * i ); + } + } ); + } + @Test + public void testMerge(SessionFactoryScope scope) { + final List companies = scope.fromTransaction( (session) -> { + //noinspection CodeBlock2Expr + return session.createQuery( "from Company", Company.class ).list(); + } ); + + scope.inTransaction( (session) -> { + for ( int i = 0 ; i < companies.size() ; i++ ) { + final Company company = companies.get( i ); + company.taxNumber = 2 * i; + session.merge( company ); + } + } ); + + scope.inTransaction( (session) -> { + for ( int i = 0 ; i < companies.size() ; i++ ) { + assertThat( session.get( Company.class, companies.get( i ).id ).taxNumber ).isEqualTo( 2 * i ); + } + } ); } @Test - public void testSaveOrUpdate() { - doInHibernate( - this::sessionFactory, - session -> { - for ( int i = 0 ; i < 10 ; i++ ) { - final Company company = companies.get( i ); - company.taxNumber = 2 * i; - session.saveOrUpdate( company ); - } - } - ); + public void testSaveOrUpdate(SessionFactoryScope scope) { + final List companies = scope.fromTransaction( (session) -> { + //noinspection CodeBlock2Expr + return session.createQuery( "from Company", Company.class ).list(); + } ); - doInHibernate( - this::sessionFactory, - session -> { - for ( int i = 0 ; i < 10 ; i++ ) { - assertEquals( Integer.valueOf( 2 * i ), session.get( Company.class, i).taxNumber ); - } - } - ); + scope.inTransaction( (session) -> { + for ( int i = 0 ; i < companies.size() ; i++ ) { + final Company company = companies.get( i ); + company.taxNumber = 2 * i; + session.saveOrUpdate( company ); + } + } ); + + scope.inTransaction( (session) -> { + for ( int i = 0 ; i < companies.size() ; i++ ) { + assertThat( session.get( Company.class, companies.get( i ).id ).taxNumber ).isEqualTo( 2 * i ); + } + } ); } @Test - public void testUpdate() { - doInHibernate( - this::sessionFactory, - session -> { - for ( int i = 0 ; i < 10 ; i++ ) { - final Company company = companies.get( i ); - company.taxNumber = 2 * i; - session.update( company ); - } - } - ); + public void testUpdate(SessionFactoryScope scope) { + final List companies = scope.fromTransaction( (session) -> { + //noinspection CodeBlock2Expr + return session.createQuery( "from Company", Company.class ).list(); + } ); - doInHibernate( - this::sessionFactory, - session -> { - for ( int i = 0 ; i < 10 ; i++ ) { - assertEquals( Integer.valueOf( 2 * i ), session.get( Company.class, i).taxNumber ); - } - } - ); + scope.inTransaction( (session) -> { + for ( int i = 0 ; i < companies.size() ; i++ ) { + final Company company = companies.get( i ); + company.taxNumber = 2 * i; + session.update( company ); + } + } ); + + scope.inTransaction( (session) -> { + for ( int i = 0; i < companies.size(); i++ ) { + assertThat( session.get( Company.class, companies.get( i ).id ).taxNumber ).isEqualTo( 2 * i ); + } + } ); } - @Override - protected Class[] getAnnotatedClasses() { - return new Class[] { Company.class }; - } - @Override - protected void addSettings(Map settings) { - super.addSettings( settings ); - settings.put( AvailableSettings.STATEMENT_BATCH_SIZE, 5 ); - } - - @Before - public void setupData() { - companies = new ArrayList<>( 10 ); - doInHibernate( - this::sessionFactory, - session -> { - for ( int i = 0; i < 10; i++ ) { - final Company company = new Company(); - company.id = i; - if ( i % 2 == 0 ) { - company.taxNumber = i; - } - session.persist( company ); - companies.add( company ); - } + @BeforeEach + public void setupTestData(SessionFactoryScope scope) { + scope.inTransaction( (session) -> { + for ( int i = 0; i < 10; i++ ) { + final Company company = new Company( i ); + if ( i % 2 == 0 ) { + company.taxNumber = i; } - ); + session.persist( company ); + } + } ); } - @After - public void cleanupData() { - doInHibernate( - this::sessionFactory, - session -> { - session.createQuery( "delete from Company" ).executeUpdate(); - } - ); + @AfterEach + public void dropTestData(SessionFactoryScope scope) { + scope.inTransaction( (session) -> { + session.createMutationQuery( "delete from Company" ).executeUpdate(); + } ); } @Entity(name = "Company") @@ -155,5 +155,18 @@ public class OptionalSecondaryTableBatchTest extends BaseNonConfigCoreFunctional @Column(table = "company_tax") private Integer taxNumber; + + public Company() { + } + + public Company(int id) { + this.id = id; + } + + public Company(int id, String name, Integer taxNumber) { + this.id = id; + this.name = name; + this.taxNumber = taxNumber; + } } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java index de508b5a97..8c01d5fff2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java @@ -45,6 +45,8 @@ import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableS import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableStrategy; import org.hibernate.query.sqm.mutation.internal.temptable.PersistentTableStrategy; import org.hibernate.service.spi.ServiceRegistryImplementor; +import org.hibernate.sql.model.MutationOperationGroup; +import org.hibernate.sql.model.PreparableMutationOperation; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; import org.hibernate.tool.schema.internal.exec.ScriptTargetOutputToWriter; @@ -379,12 +381,17 @@ public class DefaultCatalogAndSchemaTest { // This will include SQL generated by ID generators in some cases, which will be validated here // because ID generators table/sequence names are prefixed with the owning entity name. - verifyOnlyQualifier( persister.getSQLInsertStrings(), SqlType.RUNTIME, - jpaEntityName, expectedQualifier ); - if ( persister.isIdentifierAssignedByInsert() ) { - verifyOnlyQualifier( persister.getSQLIdentityInsertString(), SqlType.RUNTIME, - jpaEntityName, expectedQualifier ); - } + + final MutationOperationGroup staticSqlInsertGroup = persister.getInsertCoordinator().getStaticInsertGroup(); + final String[] insertSqls = new String[ staticSqlInsertGroup.getNumberOfOperations()]; + staticSqlInsertGroup.forEachOperation( (tablePosition, insertOperation) -> { + if ( insertOperation instanceof PreparableMutationOperation ) { + insertSqls[tablePosition] = ( (PreparableMutationOperation) insertOperation ).getSqlString(); + } + } ); + + verifyOnlyQualifier( insertSqls, SqlType.RUNTIME, jpaEntityName, expectedQualifier ); + try { verifyOnlyQualifierOptional( persister.getIdentitySelectString(), SqlType.RUNTIME, jpaEntityName, expectedQualifier ); @@ -399,14 +406,26 @@ public class DefaultCatalogAndSchemaTest { throw e; } } + final MutationOperationGroup staticSqlUpdateGroup = persister.getUpdateCoordinator().getStaticUpdateGroup(); + final String[] sqlUpdateStrings = new String[staticSqlUpdateGroup.getNumberOfOperations()]; + staticSqlUpdateGroup.forEachOperation( (tablePosition, operation) -> { + if ( operation instanceof PreparableMutationOperation ) { + sqlUpdateStrings[tablePosition] = ( (PreparableMutationOperation) operation ).getSqlString(); + } + } ); + verifyOnlyQualifier( sqlUpdateStrings, SqlType.RUNTIME, jpaEntityName, expectedQualifier ); - verifyOnlyQualifier( persister.getSQLUpdateStrings(), SqlType.RUNTIME, - jpaEntityName, expectedQualifier ); verifyOnlyQualifier( persister.getSQLLazyUpdateStrings(), SqlType.RUNTIME, jpaEntityName, expectedQualifier ); - verifyOnlyQualifier( persister.getSQLDeleteStrings(), SqlType.RUNTIME, - jpaEntityName, expectedQualifier ); + final MutationOperationGroup staticDeleteGroup = persister.getDeleteCoordinator().getStaticDeleteGroup(); + final String[] sqlDeleteStrings = new String[staticDeleteGroup.getNumberOfOperations()]; + staticDeleteGroup.forEachOperation( (tablePosition, operation) -> { + if ( operation instanceof PreparableMutationOperation ) { + sqlDeleteStrings[tablePosition] = ( (PreparableMutationOperation) operation ).getSqlString(); + } + } ); + verifyOnlyQualifier( sqlDeleteStrings, SqlType.RUNTIME, jpaEntityName, expectedQualifier ); // This is used in the "select" id generator in particular. verifyOnlyQualifierOptional( persister.getSelectByUniqueKeyString( "basic" ), SqlType.RUNTIME, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NestedEmbeddableAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NestedEmbeddableAttributeOverrideTest.java index 656a99990f..a0d8bd00bb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NestedEmbeddableAttributeOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NestedEmbeddableAttributeOverrideTest.java @@ -8,7 +8,6 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; import org.hibernate.Session; -import org.hibernate.testing.FailureExpected; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -16,7 +15,6 @@ import org.junit.Test; /** * @author Brett Meyer */ -@FailureExpected(jiraKey="HHH-8021") public class NestedEmbeddableAttributeOverrideTest extends BaseCoreFunctionalTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdBagElementNullBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdBagElementNullBasicTest.java index 0617567a0d..904494488e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdBagElementNullBasicTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdBagElementNullBasicTest.java @@ -160,7 +160,7 @@ public class IdBagElementNullBasicTest { return scope.fromTransaction( session -> { return session.createNativeQuery( - "SELECT aCollection FROM AnEntity_aCollection where AnEntity_id = " + id + "SELECT element_value FROM collection_table where entity_fk = " + id ).list(); } ); @@ -175,9 +175,10 @@ public class IdBagElementNullBasicTest { private int id; @ElementCollection - @CollectionTable(name = "AnEntity_aCollection", joinColumns = { @JoinColumn(name = "AnEntity_id") }) - @CollectionId( column = @Column, generator = "increment" ) + @CollectionTable(name = "collection_table", joinColumns = { @JoinColumn(name = "entity_fk") }) + @CollectionId( column = @Column(name = "element_id"), generator = "increment" ) @CollectionIdJdbcTypeCode( Types.BIGINT ) + @Column( name = "element_value" ) private List aCollection = new ArrayList<>(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java index ff1e1444c2..cc2a231e8b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java @@ -6,21 +6,21 @@ */ package org.hibernate.orm.test.collection.original; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Root; - import org.hibernate.Hibernate; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.testing.orm.junit.DialectFeatureChecks; -import org.hibernate.testing.orm.junit.RequiresDialectFeature; import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.RequiresDialectFeature; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.Test; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java index c40157e099..289825e87f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java @@ -6,10 +6,6 @@ */ package org.hibernate.orm.test.compositeelement; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Root; - import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.boot.Metadata; @@ -20,6 +16,10 @@ import org.hibernate.mapping.Formula; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; + import static org.junit.Assert.assertEquals; /** @@ -29,12 +29,12 @@ public class CompositeElementTest extends BaseNonConfigCoreFunctionalTestCase { @Override protected String getBaseForMappings() { - return "org/hibernate/orm/test/"; + return ""; } @Override public String[] getMappings() { - return new String[] { "compositeelement/Parent.hbm.xml" }; + return new String[] { "org/hibernate/orm/test/compositeelement/Parent.hbm.xml" }; } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/JdbcBatchingAgressiveReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/JdbcBatchingAgressiveReleaseTest.java deleted file mode 100644 index af3aa7f1e4..0000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/JdbcBatchingAgressiveReleaseTest.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * 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 . - */ -package org.hibernate.orm.test.connections; - -import java.util.Map; - -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; - -import org.hibernate.Session; -import org.hibernate.cfg.AvailableSettings; -import org.hibernate.cfg.Environment; -import org.hibernate.dialect.H2Dialect; -import org.hibernate.engine.jdbc.batch.internal.AbstractBatchImpl; -import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode; -import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorBuilderImpl; - -import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.jta.TestingJtaBootstrap; -import org.hibernate.testing.jta.TestingJtaPlatformImpl; -import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.testing.logger.LoggerInspectionRule; -import org.hibernate.testing.logger.Triggerable; -import org.junit.Rule; -import org.junit.Test; - -import org.jboss.logging.Logger; - -import static org.junit.Assert.assertFalse; - -@TestForIssue( jiraKey = "HHH-13307" ) -@RequiresDialect(H2Dialect.class) -public class JdbcBatchingAgressiveReleaseTest extends BaseNonConfigCoreFunctionalTestCase { - - @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, AbstractBatchImpl.class.getName() ) - ); - - private Triggerable triggerable = logInspection.watchForLogMessages( "HHH000010" ); - - - @Override - protected void addSettings(Map settings) { - super.addSettings( settings ); - - TestingJtaBootstrap.prepare( settings ); - settings.put( AvailableSettings.TRANSACTION_COORDINATOR_STRATEGY, JtaTransactionCoordinatorBuilderImpl.class.getName() ); - settings.put( Environment.CONNECTION_HANDLING, PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_AFTER_STATEMENT.toString() ); - settings.put( Environment.GENERATE_STATISTICS, "true" ); - settings.put( Environment.STATEMENT_BATCH_SIZE, "500" ); - } - - @Test - public void testJdbcBatching() throws Throwable { - triggerable.reset(); - - TestingJtaPlatformImpl.INSTANCE.getTransactionManager().begin(); - Session session = openSession(); - // The following 2 entity inserts will be batched. - session.persist( new Person( 1, "Jane" ) ); - session.persist( new Person( 2, "Sally" ) ); - // The following entity has an IDENTITY ID, which cannot be batched. - // As a result the existing batch is forced to execute before the Thing can be - // inserted. - session.persist( new Thing( "it" ) ); - session.close(); - TestingJtaPlatformImpl.INSTANCE.getTransactionManager().commit(); - - assertFalse( triggerable.wasTriggered() ); - } - - @Override - protected Class[] getAnnotatedClasses() { - return new Class[] { Person.class, Thing.class }; - } - - @Entity( name = "Person") - public static class Person { - - @Id - private int id; - private String name; - - public Person() { - } - - public Person(int id, String name) { - this.id = id; - this.name = name; - } - } - - @Entity( name = "Thing") - public static class Thing { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private int id; - private String name; - - public Thing() { - } - - public Thing(String name) { - this.id = id; - this.name = name; - } - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlGeneratedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlGeneratedTest.java index 4527d78a53..5af79907d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlGeneratedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlGeneratedTest.java @@ -1,5 +1,16 @@ package org.hibernate.orm.test.customsql; +import org.hibernate.annotations.Generated; +import org.hibernate.annotations.SQLDelete; +import org.hibernate.annotations.SQLInsert; +import org.hibernate.annotations.SQLUpdate; + +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.FailureExpected; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.junit.jupiter.api.Test; + import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -7,14 +18,6 @@ import jakarta.persistence.Id; import jakarta.persistence.SecondaryTable; import jakarta.persistence.Table; import jakarta.persistence.Version; -import org.hibernate.annotations.Generated; -import org.hibernate.annotations.SQLDelete; -import org.hibernate.annotations.SQLInsert; -import org.hibernate.annotations.SQLUpdate; -import org.hibernate.testing.orm.junit.DomainModel; -import org.hibernate.testing.orm.junit.SessionFactory; -import org.hibernate.testing.orm.junit.SessionFactoryScope; -import org.junit.jupiter.api.Test; import static org.hibernate.annotations.GenerationTime.ALWAYS; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -23,6 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @DomainModel(annotatedClasses = CustomSqlGeneratedTest.Custom.class) public class CustomSqlGeneratedTest { @Test + @FailureExpected( reason = "Change in expected order of columns in UPDATE SET clause causes problems with `@SQLUpdate`" ) public void testCustomSqlWithGenerated(SessionFactoryScope scope) { Custom c = new Custom(); c.name = "name"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlTest.java index 0fd33e14ff..92d8fea409 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlTest.java @@ -1,5 +1,15 @@ package org.hibernate.orm.test.customsql; +import org.hibernate.annotations.SQLDelete; +import org.hibernate.annotations.SQLInsert; +import org.hibernate.annotations.SQLUpdate; + +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.FailureExpected; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.junit.jupiter.api.Test; + import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -7,13 +17,6 @@ import jakarta.persistence.Id; import jakarta.persistence.SecondaryTable; import jakarta.persistence.Table; import jakarta.persistence.Version; -import org.hibernate.annotations.SQLDelete; -import org.hibernate.annotations.SQLInsert; -import org.hibernate.annotations.SQLUpdate; -import org.hibernate.testing.orm.junit.DomainModel; -import org.hibernate.testing.orm.junit.SessionFactory; -import org.hibernate.testing.orm.junit.SessionFactoryScope; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -21,6 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @DomainModel(annotatedClasses = CustomSqlTest.Custom.class) public class CustomSqlTest { @Test + @FailureExpected( reason = "Change in expected order of columns in UPDATE SET clause causes problems with `@SQLUpdate`" ) public void testCustomSql(SessionFactoryScope scope) { Custom c = new Custom(); c.name = "name"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java index a7035f1c6b..cd2f6f91f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java @@ -1065,46 +1065,45 @@ public abstract class AbstractEntityWithOneToManyTest { clearCounts(sessionFactory); - Contract cOrig = new Contract( null, "gail", "phone" ); - Party partyOrig = new Party( "party" ); - cOrig.addParty( partyOrig ); - - scope.inTransaction( - s -> s.persist( cOrig ) - ); + // Create a Contract with one Party + final Contract originalContract = new Contract( null, "gail", "phone" ); + final Party originalParty = new Party( "party" ); + originalContract.addParty( originalParty ); + scope.inTransaction( (session) -> session.persist( originalContract ) ); assertInsertCount( 2 , sessionFactory); assertUpdateCount( 0, sessionFactory ); clearCounts(sessionFactory); - scope.inTransaction( - s -> { - Contract c = s.get( Contract.class, cOrig.getId() ); - Party newParty = new Party( "new party" ); - c.addParty( newParty ); - } - ); + // Load the Contract created above and add a new Party + // - this should trigger a version increment, if `isContractVersioned` + scope.inTransaction( (session) -> { + final Contract loadedContract = session.get( Contract.class, originalContract.getId() ); + Party newParty = new Party( "new party" ); + loadedContract.addParty( newParty ); + } ); assertInsertCount( 1, sessionFactory ); assertUpdateCount( isContractVersioned ? 1 : 0 , sessionFactory); clearCounts(sessionFactory); - scope.inSession( - s -> { - cOrig.removeParty( partyOrig ); - try { - s.merge( cOrig ); - assertFalse( isContractVersioned ); - } - catch (PersistenceException ex) { - assertTyping( StaleObjectStateException.class, ex.getCause() ); - assertTrue( isContractVersioned ); - } - finally { - s.getTransaction().rollback(); - } - } - ); + // Using the now stale `originalContract` reference, remove the + // first Party. If `isContractVersioned`, this should trigger + // a staleness exception + scope.inSession( (session) -> { + originalContract.removeParty( originalParty ); + try { + session.merge( originalContract ); + assertFalse( isContractVersioned ); + } + catch (PersistenceException ex) { + assertTyping( StaleObjectStateException.class, ex.getCause() ); + assertTrue( isContractVersioned ); + } + finally { + session.getTransaction().rollback(); + } + } ); scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BaseInsertOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BaseInsertOrderingTest.java index f3be172b7f..ee08ecc3bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BaseInsertOrderingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BaseInsertOrderingTest.java @@ -13,13 +13,12 @@ import org.hibernate.type.descriptor.java.StringJavaType; import org.hibernate.type.descriptor.jdbc.JdbcType; import org.hibernate.testing.orm.jdbc.PreparedStatementSpyConnectionProvider; - import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.RequiresDialectFeature; import org.junit.jupiter.api.AfterAll; -import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -92,16 +91,9 @@ abstract class BaseInsertOrderingTest extends BaseSessionFactoryFunctionalTest { void verifyPreparedStatementCount(int expectedBatchCount) { final int realBatchCount = connectionProvider.getPreparedSQLStatements().size(); - assertEquals( - expectedBatchCount, - realBatchCount, - String.format( "expected %d batch%s; but found %d batch%s", - expectedBatchCount, - ( expectedBatchCount == 1 ? "" : "es" ), - realBatchCount, - ( realBatchCount == 1 ? "" : "es" ) - ) - ); + assertThat( realBatchCount ) + .as( "Expected %d batches, but found %d", expectedBatchCount, realBatchCount ) + .isEqualTo( expectedBatchCount ); } void clearBatches() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingTest.java index 9196346ba4..b3fa77b02f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingTest.java @@ -6,17 +6,16 @@ */ package org.hibernate.orm.test.insertordering; -import java.sql.PreparedStatement; -import java.util.ArrayList; import java.util.Iterator; -import java.util.List; +import java.util.function.Supplier; import org.hibernate.cfg.Environment; -import org.hibernate.engine.jdbc.batch.internal.BatchBuilderImpl; import org.hibernate.engine.jdbc.batch.internal.BatchBuilderInitiator; -import org.hibernate.engine.jdbc.batch.internal.BatchingBatch; +import org.hibernate.engine.jdbc.batch.internal.BatchImpl; import org.hibernate.engine.jdbc.batch.spi.Batch; +import org.hibernate.engine.jdbc.batch.spi.BatchBuilder; import org.hibernate.engine.jdbc.batch.spi.BatchKey; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup; import org.hibernate.engine.jdbc.spi.JdbcCoordinator; import org.hibernate.testing.orm.junit.DomainModel; @@ -60,7 +59,13 @@ public class InsertOrderingTest { ); - assertEquals( 3, StatsBatch.batchSizes.size() ); + // 1 for first 10 User (1) + // 1 for final 2 User (2) + // 1 for first 10 Group (3) + // 1 for last 2 Group (4) + // 1 for first 10 Membership (5) + // 1 for last 2 Membership (6) + assertEquals( 6, StatsBatch.numberOfBatches ); scope.inTransaction( session -> { @@ -73,48 +78,37 @@ public class InsertOrderingTest { ); } - public static class Counter { - public int count = 0; + @SuppressWarnings("unused") + public static class StatsBatchBuilder implements BatchBuilder { + + @Override + public Batch buildBatch(BatchKey key, Integer batchSize, Supplier statementGroupSupplier, JdbcCoordinator jdbcCoordinator) { + return new StatsBatch( key, batchSize, statementGroupSupplier.get(), jdbcCoordinator ); + } } - public static class StatsBatch extends BatchingBatch { - private static String batchSQL; - private static List batchSizes = new ArrayList(); - private static int currentBatch = -1; + public static class StatsBatch extends BatchImpl { + private static int numberOfBatches = -1; - public StatsBatch(BatchKey key, JdbcCoordinator jdbcCoordinator, int jdbcBatchSize) { - super( key, jdbcCoordinator, jdbcBatchSize ); + public StatsBatch( + BatchKey key, + int batchSize, + PreparedStatementGroup statementGroup, + JdbcCoordinator jdbcCoordinator) { + super( key, statementGroup, batchSize, jdbcCoordinator ); } static void reset() { - batchSizes = new ArrayList(); - currentBatch = -1; - batchSQL = null; + numberOfBatches = -1; } @Override - public PreparedStatement getBatchStatement(String sql, boolean callable) { - if ( batchSQL == null || !batchSQL.equals( sql ) ) { - currentBatch++; - batchSQL = sql; - batchSizes.add( currentBatch, new Counter() ); + protected void performExecution() { + super.performExecution(); + if ( numberOfBatches < 0 ) { + numberOfBatches = 0; } - return super.getBatchStatement( sql, callable ); - } - - @Override - public void addToBatch() { - Counter counter = (Counter) batchSizes.get( currentBatch ); - counter.count++; - super.addToBatch(); - } - } - - public static class StatsBatchBuilder extends BatchBuilderImpl { - - @Override - public Batch buildBatch(BatchKey key, JdbcCoordinator jdbcCoordinator) { - return new StatsBatch( key, jdbcCoordinator, getJdbcBatchSize() ); + numberOfBatches++; } } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableInheritance.java index 2f7dd2abcb..9e48e69d95 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableInheritance.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableInheritance.java @@ -8,6 +8,13 @@ package org.hibernate.orm.test.insertordering; import java.util.HashSet; import java.util.Set; + +import org.hibernate.annotations.BatchSize; + +import org.hibernate.testing.TestForIssue; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.CascadeType; @@ -16,21 +23,14 @@ import jakarta.persistence.DiscriminatorColumn; import jakarta.persistence.DiscriminatorType; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToMany; -import jakarta.persistence.SequenceGenerator; import jakarta.persistence.Table; -import org.hibernate.annotations.BatchSize; - -import org.hibernate.testing.TestForIssue; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Vlad Mihalcea @@ -55,34 +55,62 @@ public class InsertOrderingWithJoinedTableInheritance extends BaseInsertOrdering @Test public void testBatchOrdering() { sessionFactoryScope().inTransaction( session -> { - final Person person = new Person(); - person.addAddress( new Address() ); + final Person person = new Person( 1 ); + person.addAddress( new Address( 1 ) ); session.persist( person ); // Derived Object with dependent object (address) - final SpecialPerson specialPerson = new SpecialPerson(); - specialPerson.addAddress( new Address() ); + final SpecialPerson specialPerson = new SpecialPerson( 2, "#" + 2 ); + specialPerson.addAddress( new Address( 2 ) ); session.persist( specialPerson ); } ); } @Test public void testBatchingAmongstSubClasses() { + clearBatches(); sessionFactoryScope().inTransaction( session -> { int iterations = 12; - for ( int i = 0; i < iterations; i++ ) { - final Person person = new Person(); - person.addAddress( new Address() ); + for ( int i = 0; i/2 < iterations; i+=2 ) { + final Person person = new Person( i ); + person.addAddress( new Address( i ) ); session.persist( person ); - final SpecialPerson specialPerson = new SpecialPerson(); - specialPerson.addAddress( new Address() ); + final SpecialPerson specialPerson = new SpecialPerson( i+1, "#" + i+1 ); + specialPerson.addAddress( new Address( i+1 ) ); session.persist( specialPerson ); } - clearBatches(); } ); - verifyPreparedStatementCount( 26 ); + // 1 for first 10 Person + // 0 for final 2 Person (reused) + // 2 for first 10 SpecialPerson (3) + // 0 for last 2 SpecialPerson (reused) + // 1 for first 10 Address (4) + // 0 for second 10 Address (reused) + // 0 for final 4 Address (reused) + verifyPreparedStatementCount( 4 ); + + sessionFactoryScope().inTransaction( (session) -> { + final Long specialPersonCount = session + .createSelectionQuery( "select count(1) from SpecialPerson", Long.class ) + .getSingleResult(); + assertThat( specialPersonCount ).isEqualTo( 12L ); + + final Long addressCount = session + .createSelectionQuery( "select count(1) from Address", Long.class ) + .getSingleResult(); + assertThat( addressCount ).isEqualTo( 24L ); + } ); + + } + + @AfterEach + public void dropTestData() { + sessionFactoryScope().inTransaction( (session) -> { + session.createMutationQuery( "delete Person" ).executeUpdate(); + session.createMutationQuery( "delete Address" ).executeUpdate(); + } ); } @Entity(name = "Address") @@ -91,9 +119,14 @@ public class InsertOrderingWithJoinedTableInheritance extends BaseInsertOrdering public static class Address { @Id @Column(name = "ID", nullable = false) - @SequenceGenerator(name = "ID", sequenceName = "ADDRESS_SEQ") - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "ID") - private Long id; + private Integer id; + + protected Address() { + } + + public Address(int id) { + this.id = id; + } } @Entity(name = "Person") @@ -105,9 +138,7 @@ public class InsertOrderingWithJoinedTableInheritance extends BaseInsertOrdering public static class Person { @Id @Column(name = "ID", nullable = false) - @SequenceGenerator(name = "ID_2", sequenceName = "PERSON_SEQ") - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "ID_2") - private Long id; + private Integer id; @OneToMany(orphanRemoval = true, cascade = { CascadeType.PERSIST, @@ -117,6 +148,13 @@ public class InsertOrderingWithJoinedTableInheritance extends BaseInsertOrdering @BatchSize(size = 100) private Set

addresses = new HashSet<>(); + protected Person() { + } + + public Person(int id) { + this.id = id; + } + public void addAddress(Address address) { this.addresses.add( address ); } @@ -129,5 +167,14 @@ public class InsertOrderingWithJoinedTableInheritance extends BaseInsertOrdering public static class SpecialPerson extends Person { @Column(name = "special") private String special; + + + public SpecialPerson() { + } + + public SpecialPerson(int id, String special) { + super( id ); + this.special = special; + } } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java index 3be974d784..8872cefc73 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java @@ -9,6 +9,13 @@ package org.hibernate.orm.test.insertordering; import java.math.BigDecimal; import java.util.HashSet; import java.util.Set; + +import org.hibernate.annotations.BatchSize; + +import org.hibernate.testing.TestForIssue; +import org.junit.After; +import org.junit.jupiter.api.Test; + import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorColumn; @@ -25,11 +32,7 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.SequenceGenerator; import jakarta.persistence.Table; -import org.hibernate.annotations.BatchSize; - -import org.hibernate.testing.TestForIssue; -import org.junit.After; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Vlad Mihalcea @@ -74,18 +77,55 @@ public class InsertOrderingWithJoinedTableMultiLevelInheritance extends BaseInse clearBatches(); } ); - verifyPreparedStatementCount( 17 ); + // 1 for Person (1) + // 2 for SpecialPerson (3) + // 2 for AnotherPerson (5) + // 3 for President (8) + // 1 for Address (9) + // 1 for Office (10) + verifyPreparedStatementCount( 10 ); + + sessionFactoryScope().inTransaction( (session) -> { + // 2 Address per loop (4) + // 1 Office per loop (2) + // 1 Person per loop (2) + // 1 SpecialPerson per loop (2) + // 1 AnotherPerson per loop (2) + // 1 President per loop (2) + final Long addressCount = session + .createSelectionQuery( "select count(1) from Address", Long.class ) + .getSingleResult(); + assertThat( addressCount ).isEqualTo( 4L ); + + final Long officeCount = session + .createSelectionQuery( "select count(1) from Office", Long.class ) + .getSingleResult(); + assertThat( officeCount ).isEqualTo( 2L ); + + final Long presidentCount = session + .createSelectionQuery( "select count(1) from President", Long.class ) + .getSingleResult(); + assertThat( presidentCount ).isEqualTo( 2L ); + + final Long anotherPersonCount = session + .createSelectionQuery( "select count(1) from AnotherPerson", Long.class ) + .getSingleResult(); + assertThat( presidentCount ).isEqualTo( 2L ); + + } ); + + } @After protected void cleanupTestData() { sessionFactoryScope().inTransaction( session -> { - session.createQuery( "delete Address" ).executeUpdate(); - session.createQuery( "delete Person" ).executeUpdate(); - session.createQuery( "delete SpecialPerson" ).executeUpdate(); - session.createQuery( "delete AnotherPerson" ).executeUpdate(); - session.createQuery( "delete Office" ).executeUpdate(); - session.createQuery( "delete President" ).executeUpdate(); + session.createMutationQuery( "delete Address" ).executeUpdate(); + session.createMutationQuery( "delete Person" ).executeUpdate(); + session.createMutationQuery( "delete SpecialPerson" ).executeUpdate(); + session.createMutationQuery( "delete AnotherPerson" ).executeUpdate(); + session.createMutationQuery( "delete Office" ).executeUpdate(); + session.createMutationQuery( "delete President" ).executeUpdate(); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSingleTableInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSingleTableInheritance.java index 580cde0c5c..f3643e7ee4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSingleTableInheritance.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSingleTableInheritance.java @@ -8,6 +8,13 @@ package org.hibernate.orm.test.insertordering; import java.util.HashSet; import java.util.Set; + +import org.hibernate.annotations.BatchSize; + +import org.hibernate.testing.TestForIssue; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.CascadeType; @@ -26,12 +33,6 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.SequenceGenerator; import jakarta.persistence.Table; -import org.hibernate.annotations.BatchSize; - -import org.hibernate.testing.TestForIssue; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Test; - /** * @author Steve Ebersole */ @@ -83,6 +84,13 @@ public class InsertOrderingWithSingleTableInheritance extends BaseInsertOrdering clearBatches(); } ); + // 1 for first 10 Person (1) + // 0 for final 2 Person (reused) + // 1 for first 10 SpecialPerson (2) + // 0 for last 2 SpecialPerson (reused) + // 1 for first 10 Address (3) + // 0 for second 10 Address (reused) + // 0 for final 4 Address (reused) verifyPreparedStatementCount( 3 ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithTablePerClassInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithTablePerClassInheritance.java index 8b41611cda..7da90e16b6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithTablePerClassInheritance.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithTablePerClassInheritance.java @@ -8,6 +8,13 @@ package org.hibernate.orm.test.insertordering; import java.util.HashSet; import java.util.Set; + +import org.hibernate.annotations.BatchSize; + +import org.hibernate.testing.TestForIssue; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.CascadeType; @@ -16,22 +23,13 @@ import jakarta.persistence.DiscriminatorColumn; import jakarta.persistence.DiscriminatorType; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToMany; -import jakarta.persistence.SequenceGenerator; import jakarta.persistence.Table; -import org.hibernate.annotations.BatchSize; - -import org.hibernate.testing.TestForIssue; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Test; - /** * @author Vlad Mihalcea @@ -55,35 +53,43 @@ public class InsertOrderingWithTablePerClassInheritance extends BaseInsertOrderi @Test public void testBatchOrdering() { + clearBatches(); sessionFactoryScope().inTransaction( session -> { // First object with dependent object (address) - final Person person = new Person(); - person.addAddress( new Address() ); + final Person person = new Person( 1, "Baboo" ); + person.addAddress( new Address( 1, "123 Main St" ) ); session.persist( person ); // Derived Object with dependent object (address) - final SpecialPerson specialPerson = new SpecialPerson(); - specialPerson.addAddress( new Address() ); + final SpecialPerson specialPerson = new SpecialPerson( 2, "Bamboozler", "stuff" ); + specialPerson.addAddress( new Address( 2, "123 1st St" ) ); session.persist( specialPerson ); } ); } @Test public void testBatchingAmongstSubClasses() { + clearBatches(); sessionFactoryScope().inTransaction( session -> { int iterations = 12; - for ( int i = 0; i < iterations; i++ ) { - final Person person = new Person(); - person.addAddress( new Address() ); + for ( int i = 0; i/2 < iterations; i+=2 ) { + final Person person = new Person( i ); + person.addAddress( new Address( i ) ); session.persist( person ); - final SpecialPerson specialPerson = new SpecialPerson(); - specialPerson.addAddress( new Address() ); + final SpecialPerson specialPerson = new SpecialPerson( i + 1); + specialPerson.addAddress( new Address( i + 1 ) ); session.persist( specialPerson ); } - clearBatches(); } ); + // 1 for first 10 Person (1) + // 0 for final 2 Person (reused) + // 1 for first 10 SpecialPerson (2) + // 0 for last 2 SpecialPerson (reused) + // 1 for first 10 Address (3) + // 0 for second 10 Address (reused) + // 0 for final 4 Address (reused) verifyPreparedStatementCount( 3 ); } @@ -93,11 +99,37 @@ public class InsertOrderingWithTablePerClassInheritance extends BaseInsertOrderi public static class Address { @Id @Column(name = "ID", nullable = false) - @SequenceGenerator(name = "ID", sequenceName = "ADDRESS_SEQ") - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "ID") - private Long id; + private Integer id; private String street; + + public Address() { + } + + public Address(Integer id) { + this.id = id; + } + + public Address(Integer id, String street) { + this.id = id; + this.street = street; + } + + public Integer getId() { + return id; + } + + protected void setId(Integer id) { + this.id = id; + } + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } } @Entity(name = "Person") @@ -109,9 +141,7 @@ public class InsertOrderingWithTablePerClassInheritance extends BaseInsertOrderi public static class Person { @Id @Column(name = "ID", nullable = false) - @SequenceGenerator(name = "ID_2", sequenceName = "PERSON_SEQ") - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "ID_2") - private Long id; + private Integer id; private String name; @@ -123,8 +153,20 @@ public class InsertOrderingWithTablePerClassInheritance extends BaseInsertOrderi @BatchSize(size = 100) private Set
addresses = new HashSet<>(); - public void addAddress(Address address) { - this.addresses.add( address ); + protected Person() { + } + + public Person(Integer id) { + this.id = id; + } + + public Person(Integer id, String name) { + this.id = id; + this.name = name; + } + + public Integer getId() { + return id; } public String getName() { @@ -134,6 +176,10 @@ public class InsertOrderingWithTablePerClassInheritance extends BaseInsertOrderi public void setName(String name) { this.name = name; } + + public void addAddress(Address address) { + this.addresses.add( address ); + } } @Entity(name = "SpecialPerson") @@ -142,5 +188,26 @@ public class InsertOrderingWithTablePerClassInheritance extends BaseInsertOrderi public static class SpecialPerson extends Person { @Column(name = "special") private String special; + + protected SpecialPerson() { + super(); + } + + public SpecialPerson(Integer id) { + super( id ); + } + + public SpecialPerson(Integer id, String name, String special) { + super( id, name ); + this.special = special; + } + + public String getSpecial() { + return special; + } + + public void setSpecial(String special) { + this.special = special; + } } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/JdbcCoordinatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/JdbcCoordinatorTest.java index eced96430a..b02f25dcbf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/JdbcCoordinatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/JdbcCoordinatorTest.java @@ -104,4 +104,4 @@ public class JdbcCoordinatorTest { verify( jdbcConnectionAccess, times( 1 ) ).releaseConnection( same( connection ) ); } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BatchingTest.java index 614b712b5c..ae76fe1c6c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BatchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BatchingTest.java @@ -6,31 +6,34 @@ */ package org.hibernate.orm.test.jdbc.internal; -import java.sql.PreparedStatement; import java.sql.Statement; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey; import org.hibernate.engine.jdbc.batch.internal.BatchBuilderImpl; -import org.hibernate.engine.jdbc.batch.internal.BatchingBatch; -import org.hibernate.engine.jdbc.batch.internal.NonBatchingBatch; import org.hibernate.engine.jdbc.batch.spi.Batch; -import org.hibernate.engine.jdbc.batch.spi.BatchBuilder; import org.hibernate.engine.jdbc.batch.spi.BatchKey; +import org.hibernate.engine.jdbc.mutation.ParameterUsage; +import org.hibernate.engine.jdbc.mutation.internal.JdbcValueBindingsImpl; import org.hibernate.engine.jdbc.spi.JdbcCoordinator; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.jdbc.Expectation; import org.hibernate.jdbc.Expectations; +import org.hibernate.metamodel.mapping.JdbcMapping; +import org.hibernate.orm.test.common.JournalingBatchObserver; import org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor; +import org.hibernate.sql.model.MutationType; +import org.hibernate.sql.model.TableMapping; +import org.hibernate.sql.model.jdbc.JdbcValueDescriptor; +import org.hibernate.type.StandardBasicTypes; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.hibernate.orm.test.common.JournalingBatchObserver; import org.junit.Test; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; +import static org.hibernate.jdbc.Expectations.NONE; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; /** @@ -38,6 +41,54 @@ import static org.junit.Assert.assertTrue; * @author Brett Meyer */ public class BatchingTest extends BaseCoreFunctionalTestCase implements BatchKey { + private final String SANDBOX_TBL = "SANDBOX_JDBC_TST"; + private final TableMapping SANDBOX_TBL_MAPPING = new TableMapping() { + @Override + public String getTableName() { + return SANDBOX_TBL; + } + + @Override + public int getRelativePosition() { + return 0; + } + + @Override + public boolean isOptional() { + return false; + } + + @Override + public boolean isInverse() { + return false; + } + + @Override + public boolean isIdentifierTable() { + return true; + } + + @Override + public MutationDetails getInsertDetails() { + return new MutationDetails( MutationType.INSERT, NONE, null, false ); + } + + @Override + public MutationDetails getUpdateDetails() { + return new MutationDetails( MutationType.UPDATE, NONE, null, false ); + } + + @Override + public boolean isCascadeDeleteEnabled() { + return false; + } + + @Override + public MutationDetails getDeleteDetails() { + return new MutationDetails( MutationType.DELETE, NONE, null, false ); + } + }; + @Override public int getBatchedStatementCount() { return 1; @@ -49,10 +100,208 @@ public class BatchingTest extends BaseCoreFunctionalTestCase implements BatchKey } @Test - public void testNonBatchingUsage() throws Exception { + public void testBatchingUsage() throws Exception { + final Session session = openSession(); + final SessionImplementor sessionImpl = (SessionImplementor) session; + final JdbcCoordinator jdbcCoordinator = sessionImpl.getJdbcCoordinator(); + + exportSandboxSchema( sessionImpl ); + + // ok, now we can get down to it... + Transaction txn = session.getTransaction(); // same as Session#getTransaction + txn.begin(); + + final String insertSql = "insert into SANDBOX_JDBC_TST( ID, NAME ) values ( ?, ? )"; + + final BatchBuilderImpl batchBuilder = new BatchBuilderImpl( 2 ); + final BatchKey batchKey = new BasicBatchKey( "this" ); + final Batch insertBatch = batchBuilder.buildBatch( batchKey, null, SANDBOX_TBL, sessionImpl, insertSql ); + assertThat( insertBatch ).isNotNull(); + + final JournalingBatchObserver batchObserver = new JournalingBatchObserver(); + insertBatch.addObserver( batchObserver ); + + final JdbcValueBindingsImpl jdbcValueBindings = sandboxInsertValueBindings( sessionImpl ); + + // bind values for #1 - should do nothing at the JDBC level + jdbcValueBindings.bindValue( 1, SANDBOX_TBL, "ID", ParameterUsage.SET, sessionImpl ); + jdbcValueBindings.bindValue( "name", SANDBOX_TBL, "NAME", ParameterUsage.SET, sessionImpl ); + assertThat( batchObserver.getExplicitExecutionCount() ).isEqualTo( 0 ); + assertThat( batchObserver.getImplicitExecutionCount() ).isEqualTo( 0 ); + assertThat( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ).isFalse(); + + // add #1 to the batch - will acquire prepared statement to bind values + insertBatch.addToBatch( jdbcValueBindings, null ); + assertThat( batchObserver.getExplicitExecutionCount() ).isEqualTo( 0 ); + assertThat( batchObserver.getImplicitExecutionCount() ).isEqualTo( 0 ); + assertThat( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ).isTrue(); + + // bind values for #2 - again, nothing at JDBC level (we have statement from earlier) + jdbcValueBindings.bindValue( 2, SANDBOX_TBL, "ID", ParameterUsage.SET, sessionImpl ); + jdbcValueBindings.bindValue( "another name", SANDBOX_TBL, "NAME", ParameterUsage.SET, sessionImpl ); + assertThat( batchObserver.getExplicitExecutionCount() ).isEqualTo( 0 ); + assertThat( batchObserver.getImplicitExecutionCount() ).isEqualTo( 0 ); + + // add #2 to the batch - + // - uses the previous prepared statement to bind values + // - batch size has been exceeded, trigger an implicit execution + insertBatch.addToBatch( jdbcValueBindings, null ); + assertThat( batchObserver.getExplicitExecutionCount() ).isEqualTo( 0 ); + assertThat( batchObserver.getImplicitExecutionCount() ).isEqualTo( 1 ); + assertThat( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ).isTrue(); + + // execute the batch - effectively only increments the explicit-execution counter + insertBatch.execute(); + assertThat( batchObserver.getExplicitExecutionCount() ).isEqualTo( 1 ); + assertThat( batchObserver.getImplicitExecutionCount() ).isEqualTo( 1 ); + assertThat( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ).isFalse(); + + insertBatch.release(); + + txn.commit(); + session.close(); + } + + private JdbcValueBindingsImpl sandboxInsertValueBindings(SessionImplementor session) { + return new JdbcValueBindingsImpl( + MutationType.INSERT, + null, + (tableName, columnName, usage) -> { + assert tableName.equals( SANDBOX_TBL ); + + if ( columnName.equals( "ID" ) ) { + return new JdbcValueDescriptor() { + @Override + public String getColumnName() { + return "ID"; + } + + @Override + public ParameterUsage getUsage() { + return ParameterUsage.SET; + } + + @Override + public int getJdbcPosition() { + return 1; + } + + @Override + public JdbcMapping getJdbcMapping() { + return session.getTypeConfiguration() + .getBasicTypeRegistry() + .resolve( StandardBasicTypes.INTEGER ); + } + }; + } + + if ( columnName.equals( "NAME" ) ) { + return new JdbcValueDescriptor() { + @Override + public String getColumnName() { + return "NAME"; + } + + @Override + public ParameterUsage getUsage() { + return ParameterUsage.SET; + } + + @Override + public int getJdbcPosition() { + return 2; + } + + @Override + public JdbcMapping getJdbcMapping() { + return session.getTypeConfiguration() + .getBasicTypeRegistry() + .resolve( StandardBasicTypes.STRING ); + } + }; + } + + throw new IllegalArgumentException( "Unknown column : " + columnName ); + } + ); + } + + @Test + public void testSessionBatchingUsage() throws Exception { Session session = openSession(); + session.setJdbcBatchSize( 3 ); SessionImplementor sessionImpl = (SessionImplementor) session; - + final JdbcCoordinator jdbcCoordinator = sessionImpl.getJdbcCoordinator(); + + exportSandboxSchema( sessionImpl ); + + // ok, now we can get down to it... + Transaction txn = session.getTransaction(); // same as Session#getTransaction + txn.begin(); + + + final String insertSql = "insert into SANDBOX_JDBC_TST( ID, NAME ) values ( ?, ? )"; + + final BatchBuilderImpl batchBuilder = new BatchBuilderImpl( 2 ); + final BatchKey batchKey = new BasicBatchKey( "this" ); + final Batch insertBatch = batchBuilder.buildBatch( batchKey, 3, SANDBOX_TBL, sessionImpl, insertSql ); + assertThat( insertBatch ).isNotNull(); + + final JournalingBatchObserver batchObserver = new JournalingBatchObserver(); + insertBatch.addObserver( batchObserver ); + + final JdbcValueBindingsImpl jdbcValueBindings = sandboxInsertValueBindings( sessionImpl ); + + // bind values for #1 - this does nothing at the JDBC level + jdbcValueBindings.bindValue( 1, SANDBOX_TBL, "ID", ParameterUsage.SET, sessionImpl ); + jdbcValueBindings.bindValue( "name", SANDBOX_TBL, "NAME", ParameterUsage.SET, sessionImpl ); + assertThat( batchObserver.getExplicitExecutionCount() ).isEqualTo( 0 ); + assertThat( batchObserver.getImplicitExecutionCount() ).isEqualTo( 0 ); + assertThat( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ).isFalse(); + + // add the values to the batch - this creates the prepared statement and binds the values + insertBatch.addToBatch( jdbcValueBindings, null ); + assertThat( batchObserver.getExplicitExecutionCount() ).isEqualTo( 0 ); + assertThat( batchObserver.getImplicitExecutionCount() ).isEqualTo( 0 ); + assertThat( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ).isTrue(); + + // bind values for #2 - this does nothing at the JDBC level : we do still have the statement defining the batch + jdbcValueBindings.bindValue( 2, SANDBOX_TBL, "ID", ParameterUsage.SET, sessionImpl ); + jdbcValueBindings.bindValue( "another name", SANDBOX_TBL, "NAME", ParameterUsage.SET, sessionImpl ); + assertThat( batchObserver.getExplicitExecutionCount() ).isEqualTo( 0 ); + assertThat( batchObserver.getImplicitExecutionCount() ).isEqualTo( 0 ); + assertThat( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ).isTrue(); + + // add #2 to batch - we have not exceeded batch size, so we should not get an implicit execution + insertBatch.addToBatch( jdbcValueBindings, null ); + assertThat( batchObserver.getExplicitExecutionCount() ).isEqualTo( 0 ); + assertThat( batchObserver.getImplicitExecutionCount() ).isEqualTo( 0 ); + assertThat( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ).isTrue(); + + // bind values for #3 - this does nothing at the JDBC level : we do still have the statement defining the batch + jdbcValueBindings.bindValue( 3, SANDBOX_TBL, "ID", ParameterUsage.SET, sessionImpl ); + jdbcValueBindings.bindValue( "yet another name", SANDBOX_TBL, "NAME", ParameterUsage.SET, sessionImpl ); + assertThat( batchObserver.getExplicitExecutionCount() ).isEqualTo( 0 ); + assertThat( batchObserver.getImplicitExecutionCount() ).isEqualTo( 0 ); + assertThat( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ).isTrue(); + + insertBatch.addToBatch( jdbcValueBindings, null ); + assertThat( batchObserver.getExplicitExecutionCount() ).isEqualTo( 0 ); + assertThat( batchObserver.getImplicitExecutionCount() ).isEqualTo( 1 ); + assertThat( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ).isTrue(); + + insertBatch.execute(); + assertThat( batchObserver.getExplicitExecutionCount() ).isEqualTo( 1 ); + assertThat( batchObserver.getImplicitExecutionCount() ).isEqualTo( 1 ); + assertThat( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ).isFalse(); + + insertBatch.release(); + + txn.commit(); + session.close(); + } + + private void exportSandboxSchema(SessionImplementor sessionImpl) { final JdbcCoordinator jdbcCoordinator = sessionImpl.getJdbcCoordinator(); LogicalConnectionImplementor logicalConnection = jdbcCoordinator.getLogicalConnection(); @@ -66,198 +315,11 @@ public class BatchingTest extends BaseCoreFunctionalTestCase implements BatchKey // ignore if the DB doesn't support "if exists" and the table doesn't exist } jdbcCoordinator.getResultSetReturn().execute( statement, "create table SANDBOX_JDBC_TST ( ID integer, NAME varchar(100) )" ); - assertTrue( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ); + assertTrue( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ); assertTrue( logicalConnection.isPhysicallyConnected() ); - jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( statement ); - assertFalse( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ); + jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( statement ); + assertFalse( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ); assertTrue( logicalConnection.isPhysicallyConnected() ); // after_transaction specified - - // ok, now we can get down to it... - Transaction txn = session.getTransaction(); // same as Session#getTransaction - txn.begin(); - - final String insertSql = "insert into SANDBOX_JDBC_TST( ID, NAME ) values ( ?, ? )"; - - final BatchBuilder batchBuilder = new BatchBuilderImpl( -1 ); - final BatchKey batchKey = new BasicBatchKey( "this", Expectations.BASIC ); - final Batch insertBatch = batchBuilder.buildBatch( batchKey, jdbcCoordinator ); - - final JournalingBatchObserver batchObserver = new JournalingBatchObserver(); - insertBatch.addObserver( batchObserver ); - - assertTrue( "unexpected Batch impl", NonBatchingBatch.class.isInstance( insertBatch ) ); - PreparedStatement insert = insertBatch.getBatchStatement( insertSql, false ); - insert.setLong( 1, 1 ); - insert.setString( 2, "name" ); - assertEquals( 0, batchObserver.getExplicitExecutionCount() ); - assertEquals( 0, batchObserver.getImplicitExecutionCount() ); - insertBatch.addToBatch(); - assertEquals( 0, batchObserver.getExplicitExecutionCount() ); - assertEquals( 1, batchObserver.getImplicitExecutionCount() ); - assertFalse( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ); - - insertBatch.execute(); - assertEquals( 1, batchObserver.getExplicitExecutionCount() ); - assertEquals( 1, batchObserver.getImplicitExecutionCount() ); - assertFalse( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ); - - insertBatch.release(); - - txn.commit(); - session.close(); - } - - @Test - public void testBatchingUsage() throws Exception { - Session session = openSession(); - SessionImplementor sessionImpl = (SessionImplementor) session; - - final JdbcCoordinator jdbcCoordinator = sessionImpl.getJdbcCoordinator(); - LogicalConnectionImplementor logicalConnection = jdbcCoordinator.getLogicalConnection(); - - // set up some tables to use - Statement statement = jdbcCoordinator.getStatementPreparer().createStatement(); - String dropSql = sessionFactory().getJdbcServices().getDialect().getDropTableString( "SANDBOX_JDBC_TST" ); - try { - jdbcCoordinator.getResultSetReturn().execute( statement, dropSql ); - } - catch ( Exception e ) { - // ignore if the DB doesn't support "if exists" and the table doesn't exist - } jdbcCoordinator.getResultSetReturn().execute( statement, "create table SANDBOX_JDBC_TST ( ID integer, NAME varchar(100) )" ); - assertTrue( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ); - assertTrue( logicalConnection.isPhysicallyConnected() ); - jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( statement ); - assertFalse( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ); - assertTrue( logicalConnection.isPhysicallyConnected() ); // after_transaction specified - - // ok, now we can get down to it... - Transaction txn = session.getTransaction(); // same as Session#getTransaction - txn.begin(); - - final BatchBuilder batchBuilder = new BatchBuilderImpl( 2 ); - final BatchKey batchKey = new BasicBatchKey( "this", Expectations.BASIC ); - final Batch insertBatch = batchBuilder.buildBatch( batchKey, jdbcCoordinator ); - assertTrue( "unexpected Batch impl", BatchingBatch.class.isInstance( insertBatch ) ); - - final JournalingBatchObserver batchObserver = new JournalingBatchObserver(); - insertBatch.addObserver( batchObserver ); - - final String insertSql = "insert into SANDBOX_JDBC_TST( ID, NAME ) values ( ?, ? )"; - - PreparedStatement insert = insertBatch.getBatchStatement( insertSql, false ); - insert.setLong( 1, 1 ); - insert.setString( 2, "name" ); - assertEquals( 0, batchObserver.getExplicitExecutionCount() ); - assertEquals( 0, batchObserver.getImplicitExecutionCount() ); - insertBatch.addToBatch(); - assertEquals( 0, batchObserver.getExplicitExecutionCount() ); - assertEquals( 0, batchObserver.getImplicitExecutionCount() ); - assertTrue( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ); - - PreparedStatement insert2 = insertBatch.getBatchStatement( insertSql, false ); - assertSame( insert, insert2 ); - insert = insert2; - insert.setLong( 1, 2 ); - insert.setString( 2, "another name" ); - assertEquals( 0, batchObserver.getExplicitExecutionCount() ); - assertEquals( 0, batchObserver.getImplicitExecutionCount() ); - insertBatch.addToBatch(); - assertEquals( 0, batchObserver.getExplicitExecutionCount() ); - assertEquals( 1, batchObserver.getImplicitExecutionCount() ); - assertTrue( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ); - - insertBatch.execute(); - assertEquals( 1, batchObserver.getExplicitExecutionCount() ); - assertEquals( 1, batchObserver.getImplicitExecutionCount() ); - assertFalse( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ); - - insertBatch.release(); - - txn.commit(); - session.close(); - } - - @Test - public void testSessionBatchingUsage() throws Exception { - Session session = openSession(); - session.setJdbcBatchSize( 3 ); - SessionImplementor sessionImpl = (SessionImplementor) session; - - final JdbcCoordinator jdbcCoordinator = sessionImpl.getJdbcCoordinator(); - LogicalConnectionImplementor logicalConnection = jdbcCoordinator.getLogicalConnection(); - - // set up some tables to use - Statement statement = jdbcCoordinator.getStatementPreparer().createStatement(); - String dropSql = sessionFactory().getJdbcServices().getDialect().getDropTableString( "SANDBOX_JDBC_TST" ); - try { - jdbcCoordinator.getResultSetReturn().execute( statement, dropSql ); - } - catch ( Exception e ) { - // ignore if the DB doesn't support "if exists" and the table doesn't exist - } jdbcCoordinator.getResultSetReturn().execute( statement, "create table SANDBOX_JDBC_TST ( ID integer, NAME varchar(100) )" ); - assertTrue( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ); - assertTrue( logicalConnection.isPhysicallyConnected() ); - jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( statement ); - assertFalse( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ); - assertTrue( logicalConnection.isPhysicallyConnected() ); // after_transaction specified - - // ok, now we can get down to it... - Transaction txn = session.getTransaction(); // same as Session#getTransaction - txn.begin(); - - final BatchBuilder batchBuilder = new BatchBuilderImpl( 2 ); - final BatchKey batchKey = new BasicBatchKey( "this", Expectations.BASIC ); - final Batch insertBatch = batchBuilder.buildBatch( batchKey, jdbcCoordinator ); - assertTrue( "unexpected Batch impl", BatchingBatch.class.isInstance( insertBatch ) ); - - final JournalingBatchObserver batchObserver = new JournalingBatchObserver(); - insertBatch.addObserver( batchObserver ); - - final String insertSql = "insert into SANDBOX_JDBC_TST( ID, NAME ) values ( ?, ? )"; - - PreparedStatement insert = insertBatch.getBatchStatement( insertSql, false ); - insert.setLong( 1, 1 ); - insert.setString( 2, "name" ); - assertEquals( 0, batchObserver.getExplicitExecutionCount() ); - assertEquals( 0, batchObserver.getImplicitExecutionCount() ); - insertBatch.addToBatch(); - assertEquals( 0, batchObserver.getExplicitExecutionCount() ); - assertEquals( 0, batchObserver.getImplicitExecutionCount() ); - assertTrue( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ); - - PreparedStatement insert2 = insertBatch.getBatchStatement( insertSql, false ); - assertSame( insert, insert2 ); - insert = insert2; - insert.setLong( 1, 2 ); - insert.setString( 2, "another name" ); - assertEquals( 0, batchObserver.getExplicitExecutionCount() ); - assertEquals( 0, batchObserver.getImplicitExecutionCount() ); - insertBatch.addToBatch(); - assertEquals( 0, batchObserver.getExplicitExecutionCount() ); - assertEquals( 0, batchObserver.getImplicitExecutionCount() ); - assertTrue( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ); - - PreparedStatement insert3 = insertBatch.getBatchStatement( insertSql, false ); - assertSame( insert, insert3 ); - insert = insert3; - insert.setLong( 1, 3 ); - insert.setString( 2, "yet another name" ); - assertEquals( 0, batchObserver.getExplicitExecutionCount() ); - assertEquals( 0, batchObserver.getImplicitExecutionCount() ); - insertBatch.addToBatch(); - assertEquals( 0, batchObserver.getExplicitExecutionCount() ); - assertEquals( 1, batchObserver.getImplicitExecutionCount() ); - assertTrue( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ); - - insertBatch.execute(); - assertEquals( 1, batchObserver.getExplicitExecutionCount() ); - assertEquals( 1, batchObserver.getImplicitExecutionCount() ); - assertFalse( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ); - - insertBatch.release(); - - txn.commit(); - session.close(); } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/ExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/ExceptionTest.java index 071844c9ad..0a6aabf763 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/ExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/ExceptionTest.java @@ -6,24 +6,24 @@ */ package org.hibernate.orm.test.jpa.exception; -import jakarta.persistence.EntityManager; -import jakarta.persistence.EntityNotFoundException; -import jakarta.persistence.OptimisticLockException; -import jakarta.persistence.PersistenceException; - import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.TiDBDialect; import org.hibernate.exception.ConstraintViolationException; + import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; import org.hibernate.testing.orm.junit.SkipForDialect; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; + +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -75,7 +75,7 @@ public class ExceptionTest { } catch (OptimisticLockException e) { //success - assertEquals( music, e.getEntity() ); + assertThat( e.getEntity() ).isEqualTo( music ); } catch (Exception e) { fail( "Should raise an optimistic lock exception" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractBatchingTest.java new file mode 100644 index 0000000000..ab23778aa2 --- /dev/null +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractBatchingTest.java @@ -0,0 +1,154 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.orm.test.jpa.transaction.batch; + +import java.sql.SQLException; +import java.util.function.Supplier; + +import org.hibernate.engine.jdbc.batch.internal.BatchBuilderImpl; +import org.hibernate.engine.jdbc.batch.spi.Batch; +import org.hibernate.engine.jdbc.batch.spi.BatchKey; +import org.hibernate.engine.jdbc.batch.spi.BatchObserver; +import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; +import org.hibernate.engine.jdbc.mutation.TableInclusionChecker; +import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup; +import org.hibernate.engine.jdbc.spi.JdbcCoordinator; +import org.hibernate.engine.jdbc.spi.JdbcServices; + +import org.hibernate.testing.orm.junit.SettingProvider; + +/** + * @author Steve Ebersole + */ +public abstract class AbstractBatchingTest { + + protected static BatchWrapper batchWrapper; + protected static boolean wasReleaseCalled; + protected static int numberOfStatementsBeforeRelease = -1; + protected static int numberOfStatementsAfterRelease = -1; + + public static class Batch2BuilderSettingProvider implements SettingProvider.Provider { + @Override + public String getSetting() { + return BatchBuilderLocal.class.getName(); + } + } + + public static class BatchBuilderLocal extends BatchBuilderImpl { + private final boolean throwError; + + public BatchBuilderLocal() { + this( false ); + } + + public BatchBuilderLocal(boolean throwError) { + super( 50 ); + this.throwError = throwError; + } + + @Override + public Batch buildBatch( + BatchKey key, + Integer explicitBatchSize, + Supplier statementGroupSupplier, + JdbcCoordinator jdbcCoordinator) { + batchWrapper = new BatchWrapper( + throwError, + super.buildBatch( key, explicitBatchSize, statementGroupSupplier, jdbcCoordinator ), + jdbcCoordinator + ); + return batchWrapper; + } + } + + public static class ErrorBatch2BuilderSettingProvider implements SettingProvider.Provider { + @Override + public String getSetting() { + return ErrorBatchBuilderLocal.class.getName(); + } + } + + public static class ErrorBatchBuilderLocal extends BatchBuilderLocal { + public ErrorBatchBuilderLocal() { + super( true ); + } + } + + public static class BatchWrapper implements Batch { + private final boolean throwError; + private final Batch wrapped; + private final JdbcCoordinator jdbcCoordinator; + + private int numberOfBatches; + private int numberOfSuccessfulBatches; + + public BatchWrapper(boolean throwError, Batch wrapped, JdbcCoordinator jdbcCoordinator) { + this.throwError = throwError; + this.wrapped = wrapped; + this.jdbcCoordinator = jdbcCoordinator; + } + + public int getNumberOfBatches() { + return numberOfBatches; + } + + public int getNumberOfSuccessfulBatches() { + return numberOfSuccessfulBatches; + } + + @Override + public BatchKey getKey() { + return wrapped.getKey(); + } + + @Override + public void addObserver(BatchObserver observer) { + wrapped.addObserver( observer ); + } + + @Override + public PreparedStatementGroup getStatementGroup() { + return wrapped.getStatementGroup(); + } + + @Override + public void addToBatch(JdbcValueBindings jdbcValueBindings, TableInclusionChecker inclusionChecker) { + numberOfBatches++; + wrapped.addToBatch( jdbcValueBindings, inclusionChecker ); + numberOfStatementsBeforeRelease = wrapped.getStatementGroup().getNumberOfStatements(); + + if ( throwError ) { + // Implementations really should call abortBatch() before throwing an exception. + // Purposely skipping the call to abortBatch() to ensure that Hibernate works properly when + // a legacy implementation does not call abortBatch(). + final JdbcServices jdbcServices = jdbcCoordinator.getJdbcSessionOwner() + .getJdbcSessionContext() + .getServiceRegistry() + .getService( JdbcServices.class ); + throw jdbcServices.getSqlExceptionHelper().convert( + new SQLException( "fake SQLException" ), + "could not perform addBatch", + wrapped.getStatementGroup().getSingleStatementDetails().getSqlString() + ); + } + + numberOfSuccessfulBatches++; + } + + @Override + public void execute() { + wrapped.execute(); + } + + @Override + public void release() { + wasReleaseCalled = true; + wrapped.release(); + numberOfStatementsAfterRelease = wrapped.getStatementGroup().getNumberOfActiveStatements(); + } + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractJtaBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractJtaBatchTest.java index 03e2c5d82f..79a6e2de87 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractJtaBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractJtaBatchTest.java @@ -6,15 +6,6 @@ */ package org.hibernate.orm.test.jpa.transaction.batch; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.List; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; import org.hibernate.internal.HEMLogging; @@ -27,41 +18,31 @@ import org.hibernate.testing.orm.logger.LoggerInspectionExtension; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; -import static org.junit.jupiter.api.Assertions.fail; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Andrea Boriero */ -public abstract class AbstractJtaBatchTest { +public abstract class AbstractJtaBatchTest extends AbstractBatchingTest { protected Triggerable triggerable; + @RegisterExtension - public LoggerInspectionExtension logger = LoggerInspectionExtension - .builder().setLogger( - HEMLogging.messageLogger( ProviderChecker.class.getName() ) - ).build(); + public LoggerInspectionExtension logger = LoggerInspectionExtension.builder() + .setLogger( HEMLogging.messageLogger( ProviderChecker.class.getName() ) ) + .build(); @BeforeEach public void setUp() { - triggerable = logger.watchForLogMessages( - "HHH000352: Unable to release batch statement..." ); + triggerable = logger.watchForLogMessages( "HHH000352: Unable to release batch statement..." ); triggerable.reset(); } - protected void assertAllStatementsAreClosed(List statements) { - statements.forEach( statement -> { - try { - assertThat( "A PreparedStatement has not been closed", statement.isClosed(), is( true ) ); - } - catch (SQLException e) { - fail( e.getMessage() ); - } - } ); - } - public static class ConnectionSettingProvider implements SettingProvider.Provider { @Override public String getSetting() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/FailingAddToBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/FailingAddToBatchTest.java index b37f2c74bb..1e43d909eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/FailingAddToBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/FailingAddToBatchTest.java @@ -6,36 +6,23 @@ */ package org.hibernate.orm.test.jpa.transaction.batch; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; -import static org.junit.jupiter.api.Assertions.fail; - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.atomic.AtomicReference; - import org.hibernate.cfg.AvailableSettings; -import org.hibernate.engine.jdbc.batch.internal.BatchBuilderImpl; import org.hibernate.engine.jdbc.batch.internal.BatchBuilderInitiator; -import org.hibernate.engine.jdbc.batch.internal.BatchingBatch; -import org.hibernate.engine.jdbc.batch.spi.Batch; -import org.hibernate.engine.jdbc.batch.spi.BatchKey; -import org.hibernate.engine.jdbc.spi.JdbcCoordinator; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; +import org.hibernate.testing.orm.junit.NotImplementedYet; import org.hibernate.testing.orm.junit.Setting; import org.hibernate.testing.orm.junit.SettingProvider; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; +import jakarta.persistence.PersistenceException; + +import static org.assertj.core.api.Assertions.assertThat; @TestForIssue(jiraKey = "HHH-15082") @Jpa( @@ -48,94 +35,75 @@ import jakarta.persistence.Id; settingProviders = { @SettingProvider( settingName = BatchBuilderInitiator.BUILDER, - provider = FailingAddToBatchTest.BatchBuilderSettingProvider.class + provider = AbstractBatchingTest.ErrorBatch2BuilderSettingProvider.class ) } ) -public class FailingAddToBatchTest { - - private static TestBatch testBatch; - - @BeforeEach - public void setup() { - TestBatch.nextAddToBatchFailure.set( null ); - } +public class FailingAddToBatchTest extends AbstractBatchingTest { @Test public void testInsert(EntityManagerFactoryScope scope) { - RuntimeException simulatedAddToBatchFailure = new RuntimeException( "Simulated RuntimeException" ); - - scope.inTransaction( em -> { - assertThatThrownBy( () -> { - MyEntity entity = new MyEntity(); + try { + scope.inTransaction( em -> { + final MyEntity entity = new MyEntity(); entity.setText( "initial" ); - TestBatch.nextAddToBatchFailure.set( simulatedAddToBatchFailure ); em.persist( entity ); - em.flush(); - } ) - .isSameAs( simulatedAddToBatchFailure ); - - assertAllStatementsAreClosed( testBatch.createdStatements ); - } ); + } ); + } + catch (PersistenceException e) { + assertThat( batchWrapper.getStatementGroup().getNumberOfActiveStatements() ).isEqualTo( 0 ); + assertThat( batchWrapper.getNumberOfBatches() ).isEqualTo( 1 ); + assertThat( batchWrapper.getNumberOfSuccessfulBatches() ).isEqualTo( 0 ); + } } @Test + @NotImplementedYet( reason = "Still need to work on entity update executors", strict = false ) public void testUpdate(EntityManagerFactoryScope scope) { - Long id = scope.fromTransaction( em -> { - MyEntity entity = new MyEntity(); - entity.setText( "initial" ); - em.persist( entity ); - return entity.getId(); - } ); - - RuntimeException simulatedAddToBatchFailure = new RuntimeException( "Simulated RuntimeException" ); - - scope.inTransaction( em -> { - assertThatThrownBy( () -> { - MyEntity entity = em.find( MyEntity.class, id ); - TestBatch.nextAddToBatchFailure.set( simulatedAddToBatchFailure ); - entity.setText( "updated" ); - em.flush(); - } ) - .isSameAs( simulatedAddToBatchFailure ); - - assertAllStatementsAreClosed( testBatch.createdStatements ); - } ); + throw new RuntimeException(); +// final Long id = scope.fromTransaction( (em) -> { +// MyEntity entity = new MyEntity(); +// entity.setText( "initial" ); +// em.persist( entity ); +// return entity.getId(); +// } ); +// +// scope.inEntityManager( (em) -> { +// final MyEntity managed = scope.fromTransaction( em, (e) -> em.find( MyEntity.class, id ) ); +// +// scope.inTransaction( em, (e) -> { +// managed.setText( "updated" ); +// assertThat( batchWrapper.getStatementGroup().getNumberOfStatements() ).isEqualTo( 1 ); +// assertThat( batchWrapper.getNumberOfBatches() ).isEqualTo( 1 ); +// assertThat( batchWrapper.getNumberOfSuccessfulBatches() ).isEqualTo( 0 ); +// } ); +// } ); } @Test + @NotImplementedYet( reason = "Still need to work on entity delete executors", strict = false ) public void testRemove(EntityManagerFactoryScope scope) { - Long id = scope.fromTransaction( em -> { - MyEntity entity = new MyEntity(); - entity.setText( "initial" ); - em.persist( entity ); - return entity.getId(); - } ); - - RuntimeException simulatedAddToBatchFailure = new RuntimeException( "Simulated RuntimeException" ); - - scope.inTransaction( em -> { - assertThatThrownBy( () -> { - MyEntity entity = em.find( MyEntity.class, id ); - TestBatch.nextAddToBatchFailure.set( simulatedAddToBatchFailure ); - em.remove( entity ); - em.flush(); - } ) - .isSameAs( simulatedAddToBatchFailure ); - - assertAllStatementsAreClosed( testBatch.createdStatements ); - } ); - } - - protected void assertAllStatementsAreClosed(List statements) { - statements.forEach( statement -> { - try { - assertThat( "A PreparedStatement has not been closed", statement.isClosed(), is( true ) ); - } - catch (SQLException e) { - fail( e.getMessage() ); - } - } ); + throw new RuntimeException(); +// Long id = scope.fromTransaction( em -> { +// MyEntity entity = new MyEntity(); +// entity.setText( "initial" ); +// em.persist( entity ); +// return entity.getId(); +// } ); +// +// RuntimeException simulatedAddToBatchFailure = new RuntimeException( "Simulated RuntimeException" ); +// +// scope.inTransaction( em -> { +// assertThatThrownBy( () -> { +// MyEntity entity = em.find( MyEntity.class, id ); +//// TestBatch.nextAddToBatchFailure.set( simulatedAddToBatchFailure ); +// em.remove( entity ); +// em.flush(); +// } ) +// .isSameAs( simulatedAddToBatchFailure ); +// +//// assertAllStatementsAreClosed( testBatch.createdStatements ); +// } ); } @Entity(name = "MyEntity") @@ -162,52 +130,4 @@ public class FailingAddToBatchTest { } } - public static class BatchBuilderSettingProvider implements SettingProvider.Provider { - @Override - public String getSetting() { - return TestBatchBuilder.class.getName(); - } - } - - public static class TestBatch extends BatchingBatch { - private static final AtomicReference nextAddToBatchFailure = new AtomicReference<>(); - - private final List createdStatements = new ArrayList<>(); - - public TestBatch(BatchKey key, JdbcCoordinator jdbcCoordinator, int batchSize) { - super( key, jdbcCoordinator, batchSize ); - } - - @Override - public void addToBatch() { - RuntimeException failure = nextAddToBatchFailure.getAndSet( null ); - if ( failure != null ) { - throw failure; - // Implementations really should call abortBatch() before propagating an exception. - // Purposely skipping the call to abortBatch() to ensure that Hibernate works properly when - // an implementation does not call abortBatch(). - } - super.addToBatch(); - } - - @Override - public PreparedStatement getBatchStatement(String sql, boolean callable) { - PreparedStatement batchStatement = super.getBatchStatement( sql, callable ); - createdStatements.add( batchStatement ); - return batchStatement; - } - } - - public static class TestBatchBuilder extends BatchBuilderImpl { - - @Override - public Batch buildBatch(BatchKey key, JdbcCoordinator jdbcCoordinator) { - return buildBatchTest( key, jdbcCoordinator, getJdbcBatchSize() ); - } - - protected BatchingBatch buildBatchTest(BatchKey key, JdbcCoordinator jdbcCoordinator, int jdbcBatchSize) { - testBatch = new TestBatch( key, jdbcCoordinator, jdbcBatchSize ); - return testBatch; - } - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithFailingBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithFailingBatchTest.java index 9967940fe7..280b4eda49 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithFailingBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithFailingBatchTest.java @@ -6,21 +6,8 @@ */ package org.hibernate.orm.test.jpa.transaction.batch; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; -import jakarta.persistence.FlushModeType; -import jakarta.transaction.Status; -import jakarta.transaction.TransactionManager; - import org.hibernate.cfg.AvailableSettings; -import org.hibernate.engine.jdbc.batch.internal.BatchBuilderImpl; import org.hibernate.engine.jdbc.batch.internal.BatchBuilderInitiator; -import org.hibernate.engine.jdbc.batch.internal.BatchingBatch; -import org.hibernate.engine.jdbc.batch.spi.Batch; -import org.hibernate.engine.jdbc.batch.spi.BatchKey; -import org.hibernate.engine.jdbc.spi.JdbcCoordinator; import org.hibernate.orm.test.jpa.transaction.JtaPlatformSettingProvider; import org.hibernate.testing.TestForIssue; @@ -31,13 +18,13 @@ import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.RequiresDialectFeature; import org.hibernate.testing.orm.junit.Setting; import org.hibernate.testing.orm.junit.SettingProvider; - import org.junit.jupiter.api.Test; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertFalse; +import jakarta.persistence.FlushModeType; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; + +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.fail; /** @@ -67,14 +54,12 @@ import static org.junit.jupiter.api.Assertions.fail; ), @SettingProvider( settingName = BatchBuilderInitiator.BUILDER, - provider = JtaWithFailingBatchTest.BatchBuilderSettingProvider.class + provider = AbstractBatchingTest.ErrorBatch2BuilderSettingProvider.class ) } ) public class JtaWithFailingBatchTest extends AbstractJtaBatchTest { - private static TestBatch testBatch; - @Test public void testAllStatementsAreClosedInCaseOfBatchExecutionFailure(EntityManagerFactoryScope scope) { TransactionManager transactionManager = TestingJtaPlatformImpl.INSTANCE.getTransactionManager(); @@ -117,87 +102,14 @@ public class JtaWithFailingBatchTest extends AbstractJtaBatchTest { } } - assertThat( - "AbstractBatchImpl#releaseStatements() has not been callled", - testBatch.calledReleaseStatements, - is( true ) - ); - assertAllStatementsAreClosed( testBatch.createdStatements ); - assertStatementsListIsCleared(); + assertThat( wasReleaseCalled ).isTrue(); + assertThat( numberOfStatementsBeforeRelease ).isEqualTo( 1 ); + assertThat( numberOfStatementsAfterRelease ).isEqualTo( 0 ); - assertFalse( - triggerable.wasTriggered(), - "HHH000352: Unable to release batch statement... has been thrown" - ); + assertThat( triggerable.wasTriggered() ) + .describedAs( "HHH000352: Unable to release batch statement... has been thrown" ) + .isFalse(); } ); } - - private void assertStatementsListIsCleared() { - assertThat( testBatch.createdStatements.size(), not( 0 ) ); - assertThat( - "Not all PreparedStatements have been released", - testBatch.numberOfStatementsAfterReleasing, - is( 0 ) - ); - } - - public static class BatchBuilderSettingProvider implements SettingProvider.Provider { - @Override - public String getSetting() { - return TestBatchBuilder.class.getName(); - } - } - - public static class TestBatch extends BatchingBatch { - private int numberOfStatementsAfterReleasing; - private final List createdStatements = new ArrayList<>(); - private boolean calledReleaseStatements; - - private String currentStatementSql; - - public TestBatch(BatchKey key, JdbcCoordinator jdbcCoordinator, int batchSize) { - super( key, jdbcCoordinator, batchSize ); - } - - @Override - public PreparedStatement getBatchStatement(String sql, boolean callable) { - currentStatementSql = sql; - PreparedStatement batchStatement = super.getBatchStatement( sql, callable ); - createdStatements.add( batchStatement ); - return batchStatement; - } - - @Override - public void addToBatch() { - // Implementations really should call abortBatch() before throwing an exception. - // Purposely skipping the call to abortBatch() to ensure that Hibernate works properly when - // a legacy implementation does not call abortBatch(). - throw sqlExceptionHelper().convert( - new SQLException( "fake SQLException" ), - "could not perform addBatch", - currentStatementSql - ); - } - - @Override - protected void releaseStatements() { - super.releaseStatements(); - calledReleaseStatements = true; - numberOfStatementsAfterReleasing += getStatements().size(); - } - } - - public static class TestBatchBuilder extends BatchBuilderImpl { - - @Override - public Batch buildBatch(BatchKey key, JdbcCoordinator jdbcCoordinator) { - return buildBatchTest( key, jdbcCoordinator, getJdbcBatchSize() ); - } - - protected BatchingBatch buildBatchTest(BatchKey key, JdbcCoordinator jdbcCoordinator, int jdbcBatchSize) { - testBatch = new TestBatch( key, jdbcCoordinator, jdbcBatchSize ); - return testBatch; - } - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithStatementsBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithStatementsBatchTest.java index 4b7347cf39..7712eac597 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithStatementsBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithStatementsBatchTest.java @@ -6,20 +6,8 @@ */ package org.hibernate.orm.test.jpa.transaction.batch; -import java.sql.PreparedStatement; -import java.util.ArrayList; -import java.util.List; -import jakarta.persistence.FlushModeType; -import jakarta.transaction.Status; -import jakarta.transaction.TransactionManager; - import org.hibernate.cfg.AvailableSettings; -import org.hibernate.engine.jdbc.batch.internal.BatchBuilderImpl; import org.hibernate.engine.jdbc.batch.internal.BatchBuilderInitiator; -import org.hibernate.engine.jdbc.batch.internal.BatchingBatch; -import org.hibernate.engine.jdbc.batch.spi.Batch; -import org.hibernate.engine.jdbc.batch.spi.BatchKey; -import org.hibernate.engine.jdbc.spi.JdbcCoordinator; import org.hibernate.orm.test.jpa.transaction.JtaPlatformSettingProvider; import org.hibernate.testing.TestForIssue; @@ -32,9 +20,13 @@ import org.hibernate.testing.orm.junit.Setting; import org.hibernate.testing.orm.junit.SettingProvider; import org.junit.jupiter.api.Test; +import jakarta.persistence.FlushModeType; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; +import org.assertj.core.api.Assertions; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsNot.not; import static org.junit.jupiter.api.Assertions.assertFalse; /** @@ -63,14 +55,12 @@ import static org.junit.jupiter.api.Assertions.assertFalse; ), @SettingProvider( settingName = BatchBuilderInitiator.BUILDER, - provider = JtaWithStatementsBatchTest.BatchBuilderSettingProvider.class + provider = AbstractBatchingTest.Batch2BuilderSettingProvider.class ) } ) public class JtaWithStatementsBatchTest extends AbstractJtaBatchTest { - private static TestBatch testBatch; - @Test public void testUnableToReleaseStatementMessageIsNotLogged(EntityManagerFactoryScope scope) { TransactionManager transactionManager = TestingJtaPlatformImpl.INSTANCE.getTransactionManager(); @@ -97,8 +87,10 @@ public class JtaWithStatementsBatchTest extends AbstractJtaBatchTest { em.persist( comment ); transactionManager.commit(); - assertStatementsListIsCleared(); - assertAllStatementsAreClosed( testBatch.createdStatements ); + + Assertions.assertThat( wasReleaseCalled ).isTrue(); + Assertions.assertThat( numberOfStatementsBeforeRelease ).isEqualTo( 1 ); + Assertions.assertThat( numberOfStatementsAfterRelease ).isEqualTo( 0 ); } catch (Exception | AssertionError e) { try { @@ -160,48 +152,4 @@ public class JtaWithStatementsBatchTest extends AbstractJtaBatchTest { } ); } - - private void assertStatementsListIsCleared() { - assertThat( testBatch.createdStatements.size(), not( 0 ) ); - assertThat( - "Not all PreparedStatements have been released", - testBatch.numberOfStatementsAfterReleasing, - is( 0 ) - ); - } - - public static class BatchBuilderSettingProvider implements SettingProvider.Provider { - @Override - public String getSetting() { - return TestBatchBuilder.class.getName(); - } - } - - public static class TestBatch extends BatchingBatch { - private int numberOfStatementsAfterReleasing; - private List createdStatements = new ArrayList<>(); - - public TestBatch(BatchKey key, JdbcCoordinator jdbcCoordinator, int batchSize) { - super( key, jdbcCoordinator, batchSize ); - } - - protected void releaseStatements() { - createdStatements.addAll( getStatements().values() ); - super.releaseStatements(); - numberOfStatementsAfterReleasing += getStatements().size(); - } - } - - public static class TestBatchBuilder extends BatchBuilderImpl { - - @Override - public Batch buildBatch(BatchKey key, JdbcCoordinator jdbcCoordinator) { - return buildBatchTest( key, jdbcCoordinator, getJdbcBatchSize() ); - } - - protected BatchingBatch buildBatchTest(BatchKey key, JdbcCoordinator jdbcCoordinator, int jdbcBatchSize) { - testBatch = new TestBatch( key, jdbcCoordinator, jdbcBatchSize ); - return testBatch; - } - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/BatchedManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/BatchedManyToManyTest.java index d6d2d5ed27..ba9fc875f6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/BatchedManyToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/BatchedManyToManyTest.java @@ -44,7 +44,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @ServiceRegistry( settings = { @Setting(name = Environment.USE_SECOND_LEVEL_CACHE, value = "false"), - @Setting(name = Environment.BATCH_STRATEGY, value = "org.hibernate.test.manytomany.batchload.TestingBatchBuilder"), + @Setting(name = Environment.STATEMENT_BATCH_SIZE, value = "-1"), } ) public class BatchedManyToManyTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/TestingBatchBuilder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/TestingBatchBuilder.java deleted file mode 100644 index de46c6b7c4..0000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/TestingBatchBuilder.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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 http://www.gnu.org/licenses/lgpl-2.1.html - */ -package org.hibernate.orm.test.manytomany.batchload; - -import org.hibernate.engine.jdbc.batch.internal.BatchBuilderImpl; -import org.hibernate.engine.jdbc.batch.internal.NonBatchingBatch; -import org.hibernate.engine.jdbc.batch.spi.Batch; -import org.hibernate.engine.jdbc.batch.spi.BatchKey; -import org.hibernate.engine.jdbc.spi.JdbcCoordinator; - -public class TestingBatchBuilder extends BatchBuilderImpl { - @Override - public Batch buildBatch(BatchKey key, JdbcCoordinator jdbcCoordinator) { - return new TestingBatch( key, jdbcCoordinator ); - } - - public static class TestingBatch extends NonBatchingBatch { - public TestingBatch(BatchKey key, JdbcCoordinator jdbcCoordinator) { - super( key, jdbcCoordinator ); - } - } -} - diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyListBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyListBidirectionalTest.java index 0b3288d52e..5d5749d42d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyListBidirectionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyListBidirectionalTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.mapping.manytomany; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; +import org.hibernate.internal.util.collections.ArrayHelper; + import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -23,6 +23,8 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.JoinTable; import jakarta.persistence.ManyToMany; +import static org.assertj.core.api.Assertions.assertThat; + @DomainModel( annotatedClasses = { ManyToManyListBidirectionalTest.Book.class, @@ -39,29 +41,31 @@ public class ManyToManyListBidirectionalTest { scope.inTransaction( session -> { final Author author1 = new Author( 1 ); final Author author2 = new Author( 2 ); - - final Book bookByAuthor1 = new Book( 1 ); - bookByAuthor1.addAuthor( author1 ); - - final Book bookByAuthor2 = new Book( 2 ); - bookByAuthor2.addAuthor( author2 ); - - final Book bookByAuthor1AndAuthor2 = new Book( 3 ); - bookByAuthor1AndAuthor2.addAuthor( author1 ); - bookByAuthor1AndAuthor2.addAuthor( author2 ); - session.persist( author1 ); session.persist( author2 ); + + final Book bookByAuthor1 = new Book( 1, author1 ); + final Book bookByAuthor2 = new Book( 2, author2 ); + final Book bookByAuthors1And2 = new Book( 3, author1, author2 ); session.persist( bookByAuthor1 ); session.persist( bookByAuthor2 ); - session.persist( bookByAuthor1AndAuthor2 ); + session.persist( bookByAuthors1And2 ); } ); scope.inTransaction( session -> { - assertThat( session.createQuery( "from Book b", Book.class ).list() ) - .hasSize( 3 ) - .allSatisfy( book -> assertThat( book.authors ) - .allSatisfy( author -> assertThat( author.books ).contains( book ) ) ); + final List books = session.createQuery( "from Book b", Book.class ).list(); + + assertThat( books ).hasSize( 3 ); + books.forEach( (book) -> { + book.authors.forEach( (author) -> { + assertThat( author.books ).contains( book ); + } ); + } ); + +// assertThat( books ) +// .hasSize( 3 ) +// .allSatisfy( book -> assertThat( book.authors ) +// .allSatisfy( author -> assertThat( author.books ).contains( book ) ) ); } ); scope.inTransaction( session -> { @@ -88,6 +92,21 @@ public class ManyToManyListBidirectionalTest { this.id = id; } + public Book(int id, Author author) { + this.id = id; + link( author ); + } + + private void link(Author author) { + authors.add( author ); + author.books.add( this ); + } + + public Book(int id, Author... authors) { + this.id = id; + ArrayHelper.forEach( authors, this::link ); + } + @ManyToMany @JoinTable(name = "book_author", joinColumns = { @JoinColumn(name = "fk_book") }, @@ -95,8 +114,12 @@ public class ManyToManyListBidirectionalTest { private List authors = new ArrayList<>(); public void addAuthor(Author author) { - authors.add( author ); - author.books.add( this ); + link( author ); + } + + @Override + public String toString() { + return "Book(" + id + ")@" + Integer.toHexString( hashCode() ); } } @@ -120,6 +143,11 @@ public class ManyToManyListBidirectionalTest { books.add( book ); book.authors.add( this ); } + + @Override + public String toString() { + return "Author(" + id + ")@" + Integer.toHexString( hashCode() ); + } } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingIdentityTest.java index aacf6a9209..ec4d85fbbb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingIdentityTest.java @@ -6,12 +6,6 @@ */ package org.hibernate.orm.test.persister.entity; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - import org.hibernate.annotations.Loader; import org.hibernate.annotations.NamedNativeQuery; import org.hibernate.annotations.Persister; @@ -22,14 +16,20 @@ import org.hibernate.annotations.SQLUpdate; import org.hibernate.dialect.H2Dialect; import org.hibernate.persister.entity.AbstractEntityPersister; import org.hibernate.persister.entity.SingleTableEntityPersister; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; -import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; - import org.junit.jupiter.api.Test; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -50,9 +50,9 @@ public class CustomSqlSchemaResolvingIdentityTest { String className = CustomEntity.class.getName(); final AbstractEntityPersister persister = (AbstractEntityPersister) scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(className); - String insertQuery = persister.getSQLInsertStrings()[0]; - String updateQuery = persister.getSQLUpdateStrings()[0]; - String deleteQuery = persister.getSQLDeleteStrings()[0]; + String insertQuery = ( (JdbcMutationOperation) persister.getInsertCoordinator().getStaticInsertGroup().getSingleOperation() ).getSqlString(); + String updateQuery = ( (JdbcMutationOperation) persister.getUpdateCoordinator().getStaticUpdateGroup().getSingleOperation() ).getSqlString(); + String deleteQuery = ( (JdbcMutationOperation) persister.getDeleteCoordinator().getStaticDeleteGroup().getSingleOperation() ).getSqlString(); assertEquals( "Incorrect custom SQL for insert in Entity: " + className, "INSERT INTO FOO (name) VALUES (?)", insertQuery ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingTest.java index de4a38f297..c5acf1025e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingTest.java @@ -15,6 +15,7 @@ import org.hibernate.annotations.SQLInsert; import org.hibernate.annotations.SQLUpdate; import org.hibernate.persister.entity.AbstractEntityPersister; import org.hibernate.persister.entity.SingleTableEntityPersister; +import org.hibernate.sql.model.jdbc.JdbcMutationOperation; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -44,9 +45,9 @@ public class CustomSqlSchemaResolvingTest { String className = CustomEntity.class.getName(); final AbstractEntityPersister persister = (AbstractEntityPersister) scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(className); - String insertQuery = persister.getSQLInsertStrings()[0]; - String updateQuery = persister.getSQLUpdateStrings()[0]; - String deleteQuery = persister.getSQLDeleteStrings()[0]; + String insertQuery = ( (JdbcMutationOperation) persister.getInsertCoordinator().getStaticInsertGroup().getSingleOperation() ).getSqlString(); + String updateQuery = ( (JdbcMutationOperation) persister.getUpdateCoordinator().getStaticUpdateGroup().getSingleOperation() ).getSqlString(); + String deleteQuery = ( (JdbcMutationOperation) persister.getDeleteCoordinator().getStaticDeleteGroup().getSingleOperation() ).getSqlString(); assertEquals( "Incorrect custom SQL for insert in Entity: " + className, "INSERT INTO FOO (name, id) VALUES (?, ?)", insertQuery ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/HQLTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/HQLTypeTest.java index 165fec55a5..d2ce69c813 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/HQLTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/HQLTypeTest.java @@ -28,6 +28,27 @@ import static org.junit.jupiter.api.Assertions.assertFalse; @SessionFactory public class HQLTypeTest { + @Test + public void smokeTest(SessionFactoryScope scope) { +// scope.inTransaction( (session) -> { +// final Vehicle vehicle = new Vehicle(); +// final VehicleContract contract = new VehicleContract(); +// vehicle.setContract( contract ); +// +// session.persist( contract ); +// session.persist( vehicle ); +// } ); + + scope.inTransaction( (session) -> { +// final Vehicle vehicle = new Vehicle(); + final VehicleTrackContract contract = new VehicleTrackContract(); +// vehicle.setContract( contract ); + + session.persist( contract ); +// session.persist( vehicle ); + } ); + } + @Test public void test(SessionFactoryScope scope) { VehicleContract contract = scope.fromTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java index 4e3c28f1a2..f2f7659622 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java @@ -15,7 +15,6 @@ import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; import org.hibernate.metamodel.model.convert.spi.EnumValueConverter; import org.hibernate.orm.test.mapping.SmokeTests.Gender; import org.hibernate.orm.test.mapping.SmokeTests.SimpleEntity; -import org.hibernate.spi.NavigablePath; import org.hibernate.query.hql.spi.SqmQueryImplementor; import org.hibernate.query.spi.QueryImplementor; import org.hibernate.query.spi.QueryOptions; @@ -23,6 +22,7 @@ import org.hibernate.query.sqm.internal.QuerySqmImpl; import org.hibernate.query.sqm.sql.SqmTranslation; import org.hibernate.query.sqm.sql.internal.StandardSqmTranslator; import org.hibernate.query.sqm.tree.select.SqmSelectStatement; +import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.spi.StandardSqlAstTranslator; import org.hibernate.sql.ast.tree.expression.ColumnReference; @@ -31,7 +31,7 @@ import org.hibernate.sql.ast.tree.from.FromClause; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.select.SelectClause; import org.hibernate.sql.ast.tree.select.SelectStatement; -import org.hibernate.sql.exec.spi.JdbcSelect; +import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.DomainResultAssembler; import org.hibernate.sql.results.graph.basic.BasicResult; @@ -40,8 +40,6 @@ import org.hibernate.sql.results.internal.SqlSelectionImpl; import org.hibernate.type.CustomType; import org.hibernate.type.EnumType; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; -import org.hibernate.type.internal.BasicTypeImpl; -import org.hibernate.usertype.UserType; import org.hibernate.testing.hamcrest.AssignableMatcher; import org.hibernate.testing.orm.junit.DomainModel; @@ -55,7 +53,6 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; /** @@ -119,13 +116,13 @@ public class SmokeTests { assertThat( sqlSelection.getValuesArrayPosition(), is( 0 ) ); assertThat( sqlSelection.getJdbcValueExtractor(), notNullValue() ); - final JdbcSelect jdbcSelectOperation = new StandardSqlAstTranslator( + final JdbcOperationQuerySelect jdbcSelectOperation = new StandardSqlAstTranslator( session.getSessionFactory(), sqlAst ).translate( null, QueryOptions.NONE ); assertThat( - jdbcSelectOperation.getSql(), + jdbcSelectOperation.getSqlString(), is( "select s1_0.name from mapping_simple_entity s1_0" ) ); } @@ -223,13 +220,13 @@ public class SmokeTests { assertThat( valueConverter, notNullValue() ); assertThat( valueConverter, instanceOf( OrdinalEnumValueConverter.class ) ); - final JdbcSelect jdbcSelectOperation = new StandardSqlAstTranslator( + final JdbcOperationQuerySelect jdbcSelectOperation = new StandardSqlAstTranslator( session.getSessionFactory(), sqlAst ).translate( null, QueryOptions.NONE ); assertThat( - jdbcSelectOperation.getSql(), + jdbcSelectOperation.getSqlString(), is( "select s1_0.gender from mapping_simple_entity s1_0" ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/CustomSqlTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/CustomSqlTests.java new file mode 100644 index 0000000000..3cd8848725 --- /dev/null +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/CustomSqlTests.java @@ -0,0 +1,84 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.orm.test.write; + +import org.hibernate.annotations.SQLDelete; +import org.hibernate.annotations.SQLInsert; +import org.hibernate.annotations.SQLUpdate; + +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.junit.jupiter.api.Test; + +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * @author Steve Ebersole + */ +@DomainModel( annotatedClasses = CustomSqlTests.CustomEntity.class ) +@SessionFactory +public class CustomSqlTests { + @Test + public void testBasicOperations(SessionFactoryScope scope) { + // insert + scope.inTransaction( (session) -> { + session.persist( new CustomEntity( 1, "csutmo" ) ); + } ); + + // update + scope.inTransaction( (session) -> { + final CustomEntity customEntity = session.get( CustomEntity.class, 1 ); + customEntity.setName( "custom" ); + } ); + + // delete + scope.inTransaction( (session) -> { + final CustomEntity customEntity = session.get( CustomEntity.class, 1 ); + assertThat( customEntity.getName() ).isEqualTo( "custom" ); + session.remove( customEntity ); + } ); + } + + @Entity( name = "CustomEntity" ) + @Table( name = "custom_entity" ) + @SQLInsert( sql = "insert into custom_entity (name, id) values (?, ?)" ) + @SQLDelete( sql = "delete from custom_entity where id = ?" ) + @SQLUpdate( sql = "update custom_entity set name = ? where id = ? " ) + public static class CustomEntity { + @Id + private Integer id; + @Basic + private String name; + + private CustomEntity() { + // for use by Hibernate + } + + public CustomEntity(Integer id, String name) { + this.id = id; + this.name = name; + } + + public Integer getId() { + return id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/DynamicUpdateTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/DynamicUpdateTests.java new file mode 100644 index 0000000000..f66c0af524 --- /dev/null +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/DynamicUpdateTests.java @@ -0,0 +1,363 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.orm.test.write; + +import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.OptimisticLockType; +import org.hibernate.annotations.OptimisticLocking; +import org.hibernate.annotations.SelectBeforeUpdate; +import org.hibernate.internal.util.StringHelper; + +import org.hibernate.testing.jdbc.SQLStatementInspector; +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * @author Steve Ebersole + */ +@DomainModel( annotatedClasses = { + DynamicUpdateTests.AttachableJob.class, + DynamicUpdateTests.VersionedJob.class, + DynamicUpdateTests.DirtyJob.class, + DynamicUpdateTests.AllJob.class, +} ) +@SessionFactory( useCollectingStatementInspector = true ) +public class DynamicUpdateTests { + + @Test + public void testAttachableLocking(SessionFactoryScope scope) { + scope.inTransaction( (session) -> { + session.persist( new AttachableJob( 1, "job", "controller-1" ) ); + } ); + + final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); + + scope.inTransaction( (session) -> { + final AttachableJob job1 = session.get( AttachableJob.class, 1 ); + + statementInspector.clear(); + + job1.setCode( "job-1" ); + } ); + + assertThat( statementInspector.getSqlQueries() ).hasSize( 1 ); + // the first should look like + // ``` + // update AttachableJob set code = ? where id = ? + // ``` + assertThat( StringHelper.count( statementInspector.getSqlQueries().get( 0 ), "code" ) ).isEqualTo( 1 ); + assertThat( StringHelper.count( statementInspector.getSqlQueries().get( 0 ), "id" ) ).isEqualTo( 1 ); + assertThat( StringHelper.count( statementInspector.getSqlQueries().get( 0 ), "controller" ) ).isEqualTo( 0 ); + } + + @Test + public void testVersionedAttachableLocking(SessionFactoryScope scope) { + scope.inTransaction( (session) -> { + session.persist( new VersionedJob( 1, "job", "controller-1" ) ); + } ); + + final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); + + scope.inTransaction( (session) -> { + final VersionedJob job1 = session.get( VersionedJob.class, 1 ); + + statementInspector.clear(); + + job1.setCode( "job-1" ); + } ); + + assertThat( statementInspector.getSqlQueries() ).hasSize( 1 ); + + // the first should look like + // ``` + // update VersionedJob set code = ?, version = ? where id = ? and version = ? + // ``` + assertThat( StringHelper.count( statementInspector.getSqlQueries().get( 0 ), "code" ) ).isEqualTo( 1 ); + assertThat( StringHelper.count( statementInspector.getSqlQueries().get( 0 ), "id" ) ).isEqualTo( 1 ); + assertThat( StringHelper.count( statementInspector.getSqlQueries().get( 0 ), "version" ) ).isEqualTo( 2 ); + } + + @Test + public void testDirtyLocking(SessionFactoryScope scope) { + scope.inTransaction( (session) -> { + session.persist( new DirtyJob( 1, "job", "controller-1" ) ); + session.persist( new DirtyJob( 2, null, "controller-1" ) ); + } ); + + final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); + + scope.inTransaction( (session) -> { + final DirtyJob job1 = session.get( DirtyJob.class, 1 ); + final DirtyJob job2 = session.get( DirtyJob.class, 2 ); + + statementInspector.clear(); + + job1.setCode( "job-1" ); + job2.setCode( "job-2" ); + } ); + + assertThat( statementInspector.getSqlQueries() ).hasSize( 2 ); + + // the first should look like + // ``` + // update DirtyJob set code = ? where code = ? and id = ? + // ``` + assertThat( StringHelper.count( statementInspector.getSqlQueries().get( 0 ), "code" ) ).isEqualTo( 2 ); + assertThat( StringHelper.count( statementInspector.getSqlQueries().get( 0 ), "id" ) ).isEqualTo( 1 ); + + // the second should look like + // ``` + // update DirtyJob set code = ? where code is null and id = ? + // ``` + assertThat( StringHelper.count( statementInspector.getSqlQueries().get( 1 ), "code" ) ).isEqualTo( 2 ); + assertThat( StringHelper.count( statementInspector.getSqlQueries().get( 1 ), "id" ) ).isEqualTo( 1 ); + + } + + @Test + public void testAllLocking(SessionFactoryScope scope) { + scope.inTransaction( (session) -> { + session.persist( new AllJob( 1, "job", "controller-1" ) ); + session.persist( new AllJob( 2, null, "controller-1" ) ); + } ); + + final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); + + scope.inTransaction( (session) -> { + final AllJob job1 = session.get( AllJob.class, 1 ); + final AllJob job2 = session.get( AllJob.class, 2 ); + + statementInspector.clear(); + + job1.setCode( "job-1" ); + job2.setCode( "job-2" ); + } ); + + assertThat( statementInspector.getSqlQueries() ).hasSize( 2 ); + + // the first should look like + // ``` + // update AllJob set code = ? where code = ? and controller = ? and id = ? + // ``` + assertThat( StringHelper.count( statementInspector.getSqlQueries().get( 0 ), "code" ) ).isEqualTo( 2 ); + assertThat( StringHelper.count( statementInspector.getSqlQueries().get( 0 ), "controller" ) ).isEqualTo( 1 ); + assertThat( StringHelper.count( statementInspector.getSqlQueries().get( 0 ), "id" ) ).isEqualTo( 1 ); + + // the second should look like + // ``` + // update AllJob set code = ? where code is null and controller = ? and id = ? + // ``` + assertThat( StringHelper.count( statementInspector.getSqlQueries().get( 1 ), "code" ) ).isEqualTo( 2 ); + assertThat( StringHelper.count( statementInspector.getSqlQueries().get( 1 ), "controller" ) ).isEqualTo( 1 ); + assertThat( StringHelper.count( statementInspector.getSqlQueries().get( 1 ), "id" ) ).isEqualTo( 1 ); + + } + + @AfterEach + public void dropTestData(SessionFactoryScope scope) { + scope.inTransaction( (session) -> { + session.createMutationQuery( "delete AttachableJob" ).executeUpdate(); + session.createMutationQuery( "delete VersionedJob" ).executeUpdate(); + session.createMutationQuery( "delete DirtyJob" ).executeUpdate(); + session.createMutationQuery( "delete AllJob" ).executeUpdate(); + } ); + } + + @Entity( name = "DirtyJob" ) + @Table( name = "DirtyJob" ) + @DynamicUpdate + @OptimisticLocking( type = OptimisticLockType.DIRTY ) + public static class DirtyJob { + @Id + private Integer id; + @Basic + private String code; + @Basic + private String controller; + + private DirtyJob() { + // for use by Hibernate + } + + public DirtyJob(Integer id, String code, String controller) { + this.id = id; + this.code = code; + this.controller = controller; + } + + public Integer getId() { + return id; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getController() { + return controller; + } + + public void setController(String controller) { + this.controller = controller; + } + } + + @Entity( name = "AllJob" ) + @Table( name = "AllJob" ) + @DynamicUpdate + @OptimisticLocking( type = OptimisticLockType.ALL ) + public static class AllJob { + @Id + private Integer id; + @Basic + private String code; + @Basic + private String controller; + + private AllJob() { + // for use by Hibernate + } + + public AllJob(Integer id, String code, String controller) { + this.id = id; + this.code = code; + this.controller = controller; + } + + public Integer getId() { + return id; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getController() { + return controller; + } + + public void setController(String controller) { + this.controller = controller; + } + } + + @Entity( name = "VersionedJob" ) + @Table( name = "VersionedJob" ) + @DynamicUpdate + public static class VersionedJob { + @Id + private Integer id; + @Basic + private String code; + @Basic + private String controller; + @Version + private int version; + + private VersionedJob() { + // for use by Hibernate + } + + public VersionedJob(Integer id, String code, String controller) { + this.id = id; + this.code = code; + this.controller = controller; + } + + public Integer getId() { + return id; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getController() { + return controller; + } + + public void setController(String controller) { + this.controller = controller; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + } + + @Entity( name = "AttachableJob" ) + @Table( name = "AttachableJob" ) + @DynamicUpdate + @SelectBeforeUpdate + public static class AttachableJob { + @Id + private Integer id; + @Basic + private String code; + @Basic + private String controller; + + private AttachableJob() { + // for use by Hibernate + } + + public AttachableJob(Integer id, String code, String controller) { + this.id = id; + this.code = code; + this.controller = controller; + } + + public Integer getId() { + return id; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getController() { + return controller; + } + + public void setController(String controller) { + this.controller = controller; + } + } +} + + diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/StaticDeleteTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/StaticDeleteTests.java new file mode 100644 index 0000000000..1d0e088620 --- /dev/null +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/StaticDeleteTests.java @@ -0,0 +1,83 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.orm.test.write; + +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * @author Steve Ebersole + */ +@DomainModel( annotatedClasses = StaticDeleteTests.SimpleEntity.class ) +@SessionFactory +public class StaticDeleteTests { + @Test + public void simpleTest(SessionFactoryScope scope) { + scope.inTransaction( (session) -> { + session.persist( new SimpleEntity( 1, "stuff" ) ); + } ); + + scope.inTransaction( (session) -> { + final SimpleEntity entity = session.get( SimpleEntity.class, 1 ); + assertThat( entity ).isNotNull(); + + session.remove( entity ); + } ); + + scope.inTransaction( (session) -> { + final SimpleEntity entity = session.find( SimpleEntity.class, 1 ); + assertThat( entity ).isNull(); + } ); + } + + @AfterEach + public void dropTestData(SessionFactoryScope scope) { + scope.inTransaction( (session) -> { + session.createMutationQuery( "delete SimpleEntity" ).executeUpdate(); + } ); + } + + @Entity( name = "SimpleEntity" ) + @Table( name = "SimpleEntity" ) + public static class SimpleEntity { + @Id + private Integer id; + @Basic + private String name; + + private SimpleEntity() { + // for use by Hibernate + } + + public SimpleEntity(Integer id, String name) { + this.id = id; + this.name = name; + } + + public Integer getId() { + return id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SimpleStaticInsertTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SimpleStaticInsertTests.java new file mode 100644 index 0000000000..b59b2c1e2c --- /dev/null +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SimpleStaticInsertTests.java @@ -0,0 +1,93 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.orm.test.write.staticinsert; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.hibernate.testing.jdbc.SQLStatementInspector; +import org.hibernate.testing.orm.domain.StandardDomainModel; +import org.hibernate.testing.orm.domain.retail.CardPayment; +import org.hibernate.testing.orm.domain.retail.DomesticVendor; +import org.hibernate.testing.orm.domain.retail.ForeignVendor; +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Simple tests for new "write path" approach in cases of static (non-dynamic) inserts + * + * @author Steve Ebersole + * @author Andrea Boriero + */ +public class SimpleStaticInsertTests { + + @Test + @DomainAndFactory + public void simpleSingleTableWithSecondaryTableTest(SessionFactoryScope scope) { + final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); + statementInspector.clear(); + + scope.inTransaction( (session) -> { + session.persist( new DomesticVendor( 1, "Acme Anvil Inc.", "Acme Worldwide") ); + session.persist( new ForeignVendor( 2, "Acme Train Inc.", "Acme Worldwide") ); + } ); + + // supplemental details are null, so we should have no inserts for the secondary table + assertThat( statementInspector.getSqlQueries() ).hasSize( 2 ); + } + + @Test + @DomainAndFactory + public void simpleSingleTableWithSecondaryTableTest2(SessionFactoryScope scope) { + final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); + statementInspector.clear(); + + scope.inTransaction( (session) -> { + session.persist( new DomesticVendor( 1, "Acme Anvil Inc.", "Acme Worldwide", "supplemental details - domestic" ) ); + session.persist( new ForeignVendor( 2, "Acme Train Inc.", "Acme Worldwide", "supplemental details - foreign" ) ); + } ); + + // supplemental details are non-null, so we should have inserts for the secondary table + assertThat( statementInspector.getSqlQueries() ).hasSize( 4 ); + } + + @Test + @DomainAndFactory + public void simpleJoinedTest(SessionFactoryScope scope) { + final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); + statementInspector.clear(); + + scope.inTransaction( (session) -> { + session.persist( new CardPayment( 1, 123456, 1L, "USD" ) ); + session.persist( new CardPayment( 2, 456789, 200L, "USD" ) ); + } ); + + assertThat( statementInspector.getSqlQueries() ).hasSize( 4 ); + } + + @AfterEach + public void dropTestData(SessionFactoryScope scope) { + scope.inTransaction( (session) -> { + session.createMutationQuery( "delete Vendor" ).executeUpdate(); + session.createMutationQuery( "delete Payment" ).executeUpdate(); + session.createMutationQuery( "delete SalesAssociate" ).executeUpdate(); + } ); + } + + @Target({ ElementType.TYPE, ElementType.METHOD}) + @Retention(RetentionPolicy.RUNTIME) + @DomainModel( standardModels = StandardDomainModel.RETAIL ) + @SessionFactory( useCollectingStatementInspector = true ) + @interface DomainAndFactory {} +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableStaticInsertTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableStaticInsertTests.java new file mode 100644 index 0000000000..efffd81bab --- /dev/null +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableStaticInsertTests.java @@ -0,0 +1,120 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.orm.test.write.staticinsert; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.hibernate.cfg.AvailableSettings; +import org.hibernate.stat.spi.StatisticsImplementor; + +import org.hibernate.testing.jdbc.SQLStatementInspector; +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.ServiceRegistry; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.hibernate.testing.orm.junit.Setting; +import org.junit.jupiter.api.Test; + +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * @author Steve Ebersole + */ +public class SingleTableStaticInsertTests { + @Test + @DomainAndFactory + @ServiceRegistry( + settings = { + @Setting(name = AvailableSettings.GENERATE_STATISTICS, value = "true" ), + @Setting(name = AvailableSettings.STATEMENT_BATCH_SIZE, value = "-1") + } + ) + public void unBatchedSingleTableTest(SessionFactoryScope scope) { + verify( scope, 3 ); + } + + @Test + @DomainAndFactory + @ServiceRegistry( + settings = { + @Setting( name = AvailableSettings.GENERATE_STATISTICS, value = "true" ), + @Setting( name = AvailableSettings.STATEMENT_BATCH_SIZE, value = "5" ) + } + ) + public void batchedSingleTableTest(SessionFactoryScope scope) { + verify( scope, 1 ); + } + + + public void verify(SessionFactoryScope scope, int expectedPrepCount) { + final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); + statementInspector.clear(); + + final StatisticsImplementor statistics = scope.getSessionFactory().getStatistics(); + statistics.clear(); + + scope.inTransaction( (session) -> { + session.persist( new SimpleEntity( 1, "First" ) ); + session.persist( new SimpleEntity( 2, "Second" ) ); + session.persist( new SimpleEntity( 3, "Third" ) ); + } ); + + assertThat( statementInspector.getSqlQueries() ).hasSize( expectedPrepCount ); + assertThat( statistics.getPrepareStatementCount() ).isEqualTo( expectedPrepCount ); + + scope.inTransaction( (session) -> { + final Long count = session + .createSelectionQuery( "select count(1) from SimpleEntity", Long.class ) + .getSingleResult(); + assertThat( count ).isEqualTo( 3L ); + } ); + } + + @Entity( name = "SimpleEntity" ) + @Table( name = "SimpleEntity" ) + public static class SimpleEntity { + @Id + private Integer id; + @Basic + private String name; + + private SimpleEntity() { + // for use by Hibernate + } + + public SimpleEntity(Integer id, String name) { + this.id = id; + this.name = name; + } + + public Integer getId() { + return id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + + @Target({ ElementType.TYPE, ElementType.METHOD}) + @Retention(RetentionPolicy.RUNTIME) + @DomainModel( annotatedClasses = SimpleEntity.class ) + @SessionFactory( useCollectingStatementInspector = true ) + @interface DomainAndFactory {} +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableWithSecondaryTableStaticInsertTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableWithSecondaryTableStaticInsertTests.java new file mode 100644 index 0000000000..6bf0de5077 --- /dev/null +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableWithSecondaryTableStaticInsertTests.java @@ -0,0 +1,113 @@ +/* + * 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 http://www.gnu.org/licenses/lgpl-2.1.html. + */ +package org.hibernate.orm.test.write.staticinsert; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.hibernate.cfg.AvailableSettings; +import org.hibernate.stat.spi.StatisticsImplementor; + +import org.hibernate.testing.jdbc.SQLStatementInspector; +import org.hibernate.testing.orm.domain.StandardDomainModel; +import org.hibernate.testing.orm.domain.retail.DomesticVendor; +import org.hibernate.testing.orm.domain.retail.ForeignVendor; +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.ServiceRegistry; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.hibernate.testing.orm.junit.Setting; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * @author Steve Ebersole + */ +@SingleTableWithSecondaryTableStaticInsertTests.DomainAndFactory +public class SingleTableWithSecondaryTableStaticInsertTests { + @Test + @DomainAndFactory + @ServiceRegistry( + settings = { + @Setting(name = AvailableSettings.GENERATE_STATISTICS, value = "true" ), + @Setting(name = AvailableSettings.STATEMENT_BATCH_SIZE, value = "-1") + } + ) + public void unBatchedSingleTableWithSecondaryTableTest(SessionFactoryScope scope) { + verify( scope, 2 ); + } + + @Test + @DomainAndFactory + @ServiceRegistry( + settings = { + @Setting(name = AvailableSettings.GENERATE_STATISTICS, value = "true" ), + @Setting(name = AvailableSettings.STATEMENT_BATCH_SIZE, value = "5") + } + ) + public void batchedSingleTableWithSecondaryTableTest(SessionFactoryScope scope) { + verify( scope, 2 ); + } + + @AfterEach + public void dropTestData(SessionFactoryScope scope) { + scope.inTransaction( (session) -> { + final int count = session.createMutationQuery( "delete Vendor" ).executeUpdate(); + assertThat( count ).isEqualTo( 2 ); + } ); + } + + private void verify(SessionFactoryScope scope, int expectedPrepCount) { + final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); + statementInspector.clear(); + + final StatisticsImplementor statistics = scope.getSessionFactory().getStatistics(); + statistics.clear(); + + scope.inTransaction( (session) -> { + session.persist( new DomesticVendor( 1, "Acme Anvil Inc.", "Acme Worldwide") ); + session.persist( new ForeignVendor( 2, "Acme Train Inc.", "Acme Worldwide") ); + } ); + + // supplemental details are null, so we should have no inserts for the secondary table + assertThat( statementInspector.getSqlQueries() ).hasSize( expectedPrepCount ); + assertThat( statistics.getPrepareStatementCount() ).isEqualTo( expectedPrepCount ); + + scope.inTransaction( (session) -> { + final Long count = session + .createSelectionQuery( "select count(1) from Vendor", Long.class ) + .getSingleResult(); + + assertThat( count ).isEqualTo( 2 ); + } ); + } + +// @Test +// @SimpleStaticInsertTests.DomainAndFactory +// public void simpleSingleTableWithSecondaryTableTest2(SessionFactoryScope scope) { +// final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); +// statementInspector.clear(); +// +// scope.inTransaction( (session) -> { +// session.persist( new DomesticVendor( 1, "Acme Anvil Inc.", "Acme Worldwide", "supplemental details - domestic" ) ); +// session.persist( new ForeignVendor( 2, "Acme Train Inc.", "Acme Worldwide", "supplemental details - foreign" ) ); +// } ); +// +// // supplemental details are non-null, so we should have inserts for the secondary table +// assertThat( statementInspector.getSqlQueries() ).hasSize( 4 ); +// } + + @Target({ ElementType.TYPE, ElementType.METHOD}) + @Retention(RetentionPolicy.RUNTIME) + @DomainModel( standardModels = StandardDomainModel.RETAIL ) + @SessionFactory( useCollectingStatementInspector = true ) + @interface DomainAndFactory {} +} diff --git a/hibernate-core/src/test/resources/log4j2.properties b/hibernate-core/src/test/resources/log4j2.properties index 49ead2c799..15e35e0591 100644 --- a/hibernate-core/src/test/resources/log4j2.properties +++ b/hibernate-core/src/test/resources/log4j2.properties @@ -30,6 +30,9 @@ logger.subsystem-root.level=info logger.subsystem-root.additivity=false logger.subsystem-root.appenderRef.subsystem.ref=subsystem +logger.jdbc-batch.name=org.hibernate.orm.jdbc.batch +logger.jdbc-batch.level=trace + logger.jdbc-bind.name=org.hibernate.orm.jdbc.bind logger.jdbc-bind.level=trace diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java index a7268d3ecd..ec4e40844c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java @@ -11,6 +11,16 @@ import java.util.Iterator; import java.util.List; import java.util.Objects; +import org.hibernate.envers.AuditReader; +import org.hibernate.envers.Audited; +import org.hibernate.envers.NotAudited; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; + +import org.hibernate.testing.FailureExpected; +import org.hibernate.testing.TestForIssue; +import org.junit.Test; + import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; import jakarta.persistence.EntityManager; @@ -22,14 +32,6 @@ import jakarta.persistence.JoinTable; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; -import org.hibernate.envers.AuditReader; -import org.hibernate.envers.Audited; -import org.hibernate.envers.NotAudited; -import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; -import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -98,6 +100,7 @@ public class ListHashcodeChangeTest extends BaseEnversJPAFunctionalTestCase { } @Test + @FailureExpected( jiraKey = "HHH-15393", message = "Work for HHH-15393 (write-paths) causes a failure" ) // tests that Author has 3 books. public void testAuthorState() { EntityManager entityManager = getEntityManager(); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java index dac9317908..e381ca22c3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java @@ -12,6 +12,16 @@ import java.util.List; import java.util.Objects; import java.util.Set; +import org.hibernate.envers.AuditReader; +import org.hibernate.envers.Audited; +import org.hibernate.envers.NotAudited; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; + +import org.hibernate.testing.FailureExpected; +import org.hibernate.testing.TestForIssue; +import org.junit.Test; + import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; import jakarta.persistence.EntityManager; @@ -23,14 +33,6 @@ import jakarta.persistence.JoinTable; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; -import org.hibernate.envers.AuditReader; -import org.hibernate.envers.Audited; -import org.hibernate.envers.NotAudited; -import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; -import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -99,6 +101,7 @@ public class SetHashcodeChangeTest extends BaseEnversJPAFunctionalTestCase { } @Test + @FailureExpected( jiraKey = "HHH-15393", message = "Work for HHH-15393 (write-paths) causes a failure" ) // tests that Author has 3 books. public void testAuthorState() { EntityManager entityManager = getEntityManager(); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java index b83e299a09..55b23135d1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java @@ -8,17 +8,19 @@ package org.hibernate.orm.test.envers.integration.manytomany.unidirectional; import java.util.Arrays; import java.util.HashSet; -import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.orm.test.envers.entities.manytomany.unidirectional.JoinTableEntity; +import org.hibernate.testing.FailureExpected; import org.hibernate.testing.TestForIssue; import org.junit.Assert; import org.junit.Test; +import jakarta.persistence.EntityManager; + /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ @@ -98,6 +100,7 @@ public class JoinTableDetachedTest extends BaseEnversJPAFunctionalTestCase { } @Test + @FailureExpected( jiraKey = "HHH-15393", message = "Work for HHH-15393 (write-paths) causes a failure" ) public void testRevisionsCounts() { Assert.assertEquals( Arrays.asList( 1, 2, 3, 4, 5 ), getAuditReader().getRevisions( @@ -110,6 +113,7 @@ public class JoinTableDetachedTest extends BaseEnversJPAFunctionalTestCase { } @Test + @FailureExpected( jiraKey = "HHH-15393", message = "Work for HHH-15393 (write-paths) causes a failure" ) public void testHistoryOfCollectionEntity() { // Revision 1 JoinTableEntity collectionEntity = new JoinTableEntity( collectionEntityId, "some data" ); diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneJoinTable.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneJoinTable.java index 8507b6f885..8fa4cc9805 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneJoinTable.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneJoinTable.java @@ -53,13 +53,9 @@ public class EntityWithManyToOneJoinTable { } @ManyToOne - @JoinTable(name = "ENTITY_OTHER", - joinColumns = { - @JoinColumn( name = "LHS_ID") - }, - inverseJoinColumns = { - @JoinColumn(name="RHS_ID") - } + @JoinTable(name = "simple_entity_assoc", + joinColumns = @JoinColumn( name = "entity_fk"), + inverseJoinColumns = @JoinColumn(name="simple_fk") ) public SimpleEntity getOther() { return other; @@ -70,7 +66,10 @@ public class EntityWithManyToOneJoinTable { } @ManyToOne(fetch = FetchType.LAZY) - @JoinTable(name = "ENTITY_ANOTHER") + @JoinTable(name = "basic_entity_assoc", + joinColumns = @JoinColumn(name="entity_fk"), + inverseJoinColumns = @JoinColumn(name="basic_fk") + ) public BasicEntity getLazyOther() { return lazyOther; } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CardPayment.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CardPayment.java index 040b227101..e9c0152daa 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CardPayment.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CardPayment.java @@ -6,13 +6,17 @@ */ package org.hibernate.testing.orm.domain.retail; +import javax.money.Monetary; import javax.money.MonetaryAmount; + import jakarta.persistence.Entity; +import jakarta.persistence.PrimaryKeyJoinColumn; /** * @author Steve Ebersole */ @Entity +@PrimaryKeyJoinColumn(name = "payment_fk", referencedColumnName = "id") public class CardPayment extends Payment { private Integer transactionId; @@ -24,6 +28,16 @@ public class CardPayment extends Payment { this.transactionId = transactionId; } + public CardPayment(Integer id, Integer transactionId, Number amount, String currencyCode) { + super( id, Monetary.getDefaultAmountFactory().setNumber( amount ).setCurrency( currencyCode ).create() ); + this.transactionId = transactionId; + } + + public CardPayment(Integer id, Integer transactionId, Long amount, String currencyCode) { + super( id, Monetary.getDefaultAmountFactory().setNumber( amount ).setCurrency( currencyCode ).create() ); + this.transactionId = transactionId; + } + public Integer getTransactionId() { return transactionId; } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/DomesticVendor.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/DomesticVendor.java index f9051ea6c1..9ecd9b184d 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/DomesticVendor.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/DomesticVendor.java @@ -21,4 +21,8 @@ public class DomesticVendor extends Vendor { public DomesticVendor(Integer id, String name, String billingEntity) { super( id, name, billingEntity ); } + + public DomesticVendor(Integer id, String name, String billingEntity, String supplementalDetail) { + super( id, name, billingEntity, supplementalDetail ); + } } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/ForeignVendor.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/ForeignVendor.java index cfc6259153..b6e85b9d52 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/ForeignVendor.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/ForeignVendor.java @@ -21,4 +21,8 @@ public class ForeignVendor extends Vendor { public ForeignVendor(Integer id, String name, String billingEntity) { super( id, name, billingEntity ); } + + public ForeignVendor(Integer id, String name, String billingEntity, String supplementalDetail) { + super( id, name, billingEntity, supplementalDetail ); + } } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Vendor.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Vendor.java index 3dd9863f8b..574d740104 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Vendor.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Vendor.java @@ -6,6 +6,7 @@ */ package org.hibernate.testing.orm.domain.retail; +import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorColumn; import jakarta.persistence.Entity; import jakarta.persistence.Id; @@ -24,6 +25,7 @@ public class Vendor { private Integer id; private String name; private String billingEntity; + private String supplementalDetail; public Vendor() { } @@ -34,6 +36,13 @@ public class Vendor { this.billingEntity = billingEntity; } + public Vendor(Integer id, String name, String billingEntity, String supplementalDetail) { + this.id = id; + this.name = name; + this.billingEntity = billingEntity; + this.supplementalDetail = supplementalDetail; + } + @Id public Integer getId() { return id; @@ -58,4 +67,13 @@ public class Vendor { public void setBillingEntity(String billingEntity) { this.billingEntity = billingEntity; } + + @Column(table = "vendor_supp") + public String getSupplementalDetail() { + return supplementalDetail; + } + + public void setSupplementalDetail(String supplementalDetail) { + this.supplementalDetail = supplementalDetail; + } }