proof of concept for SchemaManager.resynchronizeSequences()

Author: gavinking

hibernate-core/src/main/java/org/hibernate/boot/model/relational/InitCommand.java

@@ -4,6 +4,8 @@
  */
 package org.hibernate.boot.model.relational;
 
+import java.util.Arrays;
+
 /**
  * A general SQL command to be used while initializing a schema.
  *
@@ -14,4 +16,15 @@ public record InitCommand(String... initCommands) {
 	public String[] getInitCommands() {
 		return initCommands;
 	}
+
+	@Override
+	public boolean equals(Object object) {
+		return object instanceof InitCommand that
+			&& Arrays.equals( this.initCommands, that.initCommands );
+	}
+
+	@Override
+	public int hashCode() {
+		return Arrays.hashCode( initCommands );
+	}
 }

hibernate-core/src/main/java/org/hibernate/generator/GeneratorCreationContext.java

@@ -12,6 +12,7 @@
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.RootClass;
+import org.hibernate.mapping.Value;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.type.Type;
 
@@ -64,6 +65,11 @@ public interface GeneratorCreationContext {
 	 */
 	Property getProperty();
 
+	/**
+	 * The identifier.
+	 */
+	Value getValue();
+
 	/**
 	 * Mapping details for the identifier type.
 	 */

hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java

@@ -11,6 +11,7 @@
 import org.hibernate.MappingException;
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.model.relational.Database;
+import org.hibernate.boot.model.relational.InitCommand;
 import org.hibernate.boot.model.relational.QualifiedName;
 import org.hibernate.boot.model.relational.QualifiedNameParser;
 import org.hibernate.boot.model.relational.SqlStringGenerationContext;
@@ -24,6 +25,7 @@
 import org.hibernate.id.IdentifierGenerator;
 import org.hibernate.id.PersistentIdentifierGenerator;
 import org.hibernate.id.SequenceMismatchStrategy;
+import org.hibernate.mapping.Table;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.tool.schema.Action;
 import org.hibernate.tool.schema.extract.spi.SequenceInformation;
@@ -151,6 +153,7 @@ public class SequenceStyleGenerator
 	private DatabaseStructure databaseStructure;
 	private Optimizer optimizer;
 	private Type identifierType;
+	private Table table;
 
 	/**
 	 * Getter for property 'databaseStructure'.
@@ -190,6 +193,7 @@ public void configure(GeneratorCreationContext creationContext, Properties param
 		final var dialect = jdbcEnvironment.getDialect();
 
 		identifierType = creationContext.getType();
+		table = creationContext.getValue().getTable();
 
 		final var sequenceName = determineSequenceName( parameters, jdbcEnvironment, serviceRegistry );
 		final int initialValue = determineInitialValue( parameters );
@@ -329,6 +333,17 @@ private boolean isSchemaToBeRecreated(String contributor, ConfigurationService c
 	@Override
 	public void registerExportables(Database database) {
 		databaseStructure.registerExportables( database );
+		table.addResyncCommand( context -> {
+			final String sequenceName = context.format( databaseStructure.getPhysicalName() );
+			final String tableName = context.format( table.getQualifiedTableName() );
+			final String primaryKeyColumnName = table.getPrimaryKey().getColumn( 0 ).getName();
+			final String sequenceCurrentValue =
+					database.getDialect().getSequenceSupport()
+							.getSelectSequenceNextValString( sequenceName );
+			final int increment = databaseStructure.getIncrementSize();
+			return new InitCommand( "alter sequence %s restart with select greatest(max(%s)+%d,%s) from %s"
+					.formatted( sequenceName, primaryKeyColumnName, increment, sequenceCurrentValue, tableName ) );
+		} );
 	}
 
 	@Override
@@ -380,7 +395,7 @@ private static QualifiedName sequenceName(
 
 	/**
 	 * Determine the name of the column used to store the generator value in
-	 * the db.
+	 * the database.
 	 * <p>
 	 * Called during {@linkplain #configure configuration} <b>when resolving to a
 	 * physical table</b>.
@@ -409,8 +424,8 @@ protected int determineInitialValue(Properties params) {
 	}
 
 	/**
-	 * Determine the increment size to be applied.  The exact implications of
-	 * this value depends on the {@linkplain #getOptimizer() optimizer} being used.
+	 * Determine the increment size to be applied. The exact implications of
+	 * this value depend on the {@linkplain #getOptimizer() optimizer} in use.
 	 * <p>
 	 * Called during {@linkplain #configure configuration}.
 	 *
@@ -438,7 +453,7 @@ protected OptimizerDescriptor determineOptimizationStrategy(Properties params, i
 
 	/**
 	 * In certain cases we need to adjust the increment size based on the
-	 * selected optimizer.  This is the hook to achieve that.
+	 * selected optimizer. This is the hook to achieve that.
 	 *
 	 * @param optimizationStrategy The optimizer strategy (name)
 	 * @param incrementSize The {@link #determineIncrementSize determined increment size}

hibernate-core/src/main/java/org/hibernate/mapping/Property.java

@@ -602,6 +602,11 @@ public Property getProperty() {
 			return Property.this;
 		}
 
+		@Override
+		public Value getValue() {
+			return value;
+		}
+
 		@Override
 		public SqlStringGenerationContext getSqlStringGenerationContext() {
 			return context.getSqlStringGenerationContext();

hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java

@@ -422,7 +422,7 @@ public Generator createGenerator(
 			Property property,
 			GeneratorSettings defaults) {
 		if ( customIdGeneratorCreator != null ) {
-			final var context = new IdGeneratorCreationContext( rootClass, property, defaults );
+			final var context = new IdGeneratorCreationContext( this, rootClass, property, defaults );
 			final var generator = customIdGeneratorCreator.createGenerator( context );
 			if ( generator.allowAssignedIdentifiers() && nullValue == null ) {
 				setNullValueUndefined();
@@ -1074,11 +1074,13 @@ public Long[] getColumnLengths() {
 	}
 
 	private class IdGeneratorCreationContext implements GeneratorCreationContext {
+		private final SimpleValue identifier;
 		private final RootClass rootClass;
 		private final Property property;
 		private final GeneratorSettings defaults;
 
-		public IdGeneratorCreationContext(RootClass rootClass, Property property, GeneratorSettings defaults) {
+		public IdGeneratorCreationContext(SimpleValue identifier, RootClass rootClass, Property property, GeneratorSettings defaults) {
+			this.identifier = identifier;
 			this.rootClass = rootClass;
 			this.property = property;
 			this.defaults = defaults;
@@ -1124,6 +1126,11 @@ public Property getProperty() {
 			return property;
 		}
 
+		@Override
+		public Value getValue() {
+			return identifier;
+		}
+
 		@Override
 		public Type getType() {
 			return SimpleValue.this.getType();

hibernate-core/src/main/java/org/hibernate/mapping/Table.java

@@ -72,6 +72,7 @@ public class Table implements Serializable, ContributableDatabaseObject {
 	private String options;
 
 	private List<Function<SqlStringGenerationContext, InitCommand>> initCommandProducers;
+	private List<Function<SqlStringGenerationContext, InitCommand>> resyncCommandProducers;
 
 	@Deprecated(since="6.2", forRemoval = true)
 	public Table() {
@@ -808,16 +809,28 @@ public void addInitCommand(Function<SqlStringGenerationContext, InitCommand> com
 	}
 
 	public List<InitCommand> getInitCommands(SqlStringGenerationContext context) {
-		if ( initCommandProducers == null ) {
-			return emptyList();
-		}
-		else {
-			final List<InitCommand> initCommands = new ArrayList<>();
-			for ( Function<SqlStringGenerationContext, InitCommand> producer : initCommandProducers ) {
-				initCommands.add( producer.apply( context ) );
-			}
-			return unmodifiableList( initCommands );
+		return initCommandProducers == null
+				? emptyList()
+				: initCommandProducers.stream()
+						.map( producer -> producer.apply( context ) )
+						.toList();
+	}
+
+	public void addResyncCommand(Function<SqlStringGenerationContext, InitCommand> commandProducer) {
+		if ( resyncCommandProducers == null ) {
+			resyncCommandProducers = new ArrayList<>();
 		}
+		resyncCommandProducers.add( commandProducer );
+	}
+
+	public List<InitCommand> getResyncCommands(SqlStringGenerationContext context) {
+		return resyncCommandProducers == null
+				? emptyList()
+				: resyncCommandProducers.stream()
+						.map( producer -> producer.apply( context ) )
+						.distinct()
+						.toList();
+
 	}
 
 	public String getOptions() {

hibernate-core/src/main/java/org/hibernate/relational/SchemaManager.java

@@ -95,6 +95,16 @@ public interface SchemaManager extends jakarta.persistence.SchemaManager {
 	@Incubating
 	void populate();
 
+	/**
+	 * Resynchronize sequences after importing test data.
+	 * <p>
+	 * Programmatic way to run {@link org.hibernate.tool.schema.spi.SequenceSynchronizer}.
+	 *
+	 * @since 7.2
+	 */
+	@Incubating
+	void resynchronizeSequences();
+
 	/**
 	 * Obtain an instance which targets the given schema.
 	 * <p>

hibernate-core/src/main/java/org/hibernate/relational/internal/SchemaManagerImpl.java

@@ -142,6 +142,20 @@ public void populate() {
 		);
 	}
 
+	@Override
+	public void resynchronizeSequences() {
+		Map<String, Object> properties = new HashMap<>( sessionFactory.getProperties() );
+		properties.put( JAKARTA_HBM2DDL_DATABASE_ACTION, Action.SYNCHRONIZE );
+		properties.put( JAKARTA_HBM2DDL_SCRIPTS_ACTION, Action.NONE );
+		addSchemaAndCatalog( properties );
+		SchemaManagementToolCoordinator.process(
+				metadata,
+				sessionFactory.getServiceRegistry(),
+				properties,
+				action -> {}
+		);
+	}
+
 	@Override
 	public void create(boolean createSchemas) {
 		exportMappedObjects( createSchemas );

hibernate-core/src/main/java/org/hibernate/tool/schema/Action.java

@@ -116,7 +116,17 @@ public enum Action {
 	 *
 	 * @since 7.0
 	 */
-	POPULATE;
+	POPULATE,
+	/**
+	 * Synchronize sequences with the data held in tables.
+	 *
+	 * @apiNote This action is not defined by JPA.
+	 *
+	 * @see org.hibernate.tool.schema.spi.SchemaPopulator
+	 *
+	 * @since 7.2
+	 */
+	SYNCHRONIZE;
 
 	/**
 	 * @see #NONE
@@ -150,6 +160,10 @@ public enum Action {
 	 * @see #POPULATE
 	 */
 	public static final String ACTION_POPULATE = "populate";
+	/**
+	 * @see #SYNCHRONIZE
+	 */
+	public static final String ACTION_SYNCHRONIZE = "synchronize";
 
 	/**
 	 * @see #NONE
@@ -197,6 +211,7 @@ public String getExternalHbm2ddlName() {
 			case VALIDATE -> ACTION_VALIDATE;
 			case UPDATE -> ACTION_UPDATE;
 			case POPULATE -> ACTION_POPULATE;
+			case SYNCHRONIZE -> ACTION_SYNCHRONIZE;
 			default -> null;
 		};
 	}

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaMigrator.java

@@ -179,7 +179,7 @@ private void performMigration(
 		final Set<String> exportIdentifiers = CollectionHelper.setOfSize( 50 );
 
 		final Database database = metadata.getDatabase();
-		Exporter<AuxiliaryDatabaseObject> auxiliaryExporter = dialect.getAuxiliaryDatabaseObjectExporter();
+		final Exporter<AuxiliaryDatabaseObject> auxiliaryExporter = dialect.getAuxiliaryDatabaseObjectExporter();
 
 		// Drop all AuxiliaryDatabaseObjects
 		for ( AuxiliaryDatabaseObject auxiliaryDatabaseObject : database.getAuxiliaryDatabaseObjects() ) {
@@ -255,7 +255,7 @@ private void performMigration(
 			}
 		}
 
-		//NOTE : Foreign keys must be created *after* all tables of all namespaces for cross namespace fks. see HHH-10420
+		//NOTE: Foreign keys must be created *after* all tables of all namespaces for cross-namespace fks. see HHH-10420
 		for ( Namespace namespace : database.getNamespaces() ) {
 			if ( schemaFilter.includeNamespace( namespace ) ) {
 				final NameSpaceTablesInformation nameSpaceTablesInformation = tablesInformation.get( namespace );