extend the synchronizer to also work for table generators

Author: gavinking

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

@@ -97,7 +97,7 @@ default void configure(Optimizer optimizer) {
 	 * @param table The table for which this structure is used to generate values
 	 * @param optimizer The {@link Optimizer} for this generator
 	 *
-	 * @see org.hibernate.relational.SchemaManager#resynchronizeSequences()
+	 * @see org.hibernate.relational.SchemaManager#resynchronizeGenerators()
 	 *
 	 * @since 7.2
 	 */

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

@@ -0,0 +1,75 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.id.enhanced;
+
+import org.hibernate.HibernateException;
+import org.hibernate.dialect.Dialect;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+/**
+ * @author Gavin King
+ */
+class ResyncHelper {
+
+	// TODO: Use SqlExceptionHelper, SqlStatementLogger, available in the JdbcContext
+
+	private static long resultValue(PreparedStatement select) throws SQLException {
+		try ( var resultSet = select.executeQuery() ) {
+			resultSet.next();
+			return resultSet.getLong( 1 );
+		}
+	}
+
+	static long getNextSequenceValue(Connection connection, String sequenceName, Dialect dialect) {
+		final String sequenceCurrentValue =
+				dialect.getSequenceSupport()
+						.getSequenceNextValString( sequenceName );
+		try ( var select = connection.prepareStatement( sequenceCurrentValue ) ) {
+			return resultValue( select );
+		}
+		catch (SQLException e) {
+			throw new HibernateException( "Could not fetch the current sequence value from the database", e );
+		}
+	}
+
+	static long getMaxPrimaryKey(Connection connection, String primaryKeyColumnName, String tableName) {
+		final String selectMax =
+				"select max(" + primaryKeyColumnName + ") from " + tableName;
+		try ( var select = connection.prepareStatement( selectMax ) ) {
+			return resultValue( select );
+		}
+		catch (SQLException e) {
+			throw new HibernateException( "Could not fetch the max primary key from the database", e );
+		}
+	}
+
+	static long getCurrentTableValue(Connection connection, String tableName, String columnName) {
+		final String selectCurrent =
+				"select " + columnName + " from " + tableName;
+		try ( var select = connection.prepareStatement( selectCurrent ) ) {
+			return resultValue( select );
+		}
+		catch (SQLException e) {
+			throw new HibernateException( "Could not fetch the current table value from the database", e );
+		}
+	}
+
+	static long getCurrentTableValue(
+			Connection connection, String tableName, String columnName,
+			String segmentColumnName, String segmentValue) {
+		final String selectCurrent =
+				"select " + columnName + " from " + tableName
+					+ " where " + segmentColumnName + " = '" + segmentValue + "'";
+		try ( var select = connection.prepareStatement( selectCurrent ) ) {
+			return resultValue( select );
+		}
+		catch (SQLException e) {
+			throw new HibernateException( "Could not fetch the current table value from the database", e );
+		}
+	}
+}

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

@@ -4,23 +4,22 @@
  */
 package org.hibernate.id.enhanced;
 
-import java.sql.Connection;
 import java.sql.SQLException;
 
 import org.hibernate.AssertionFailure;
-import org.hibernate.HibernateException;
 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.Sequence;
 import org.hibernate.boot.model.relational.SqlStringGenerationContext;
-import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.id.IntegralDataTypeHolder;
 import org.hibernate.mapping.Table;
 
 import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER;
 import static org.hibernate.id.IdentifierGeneratorHelper.getIntegralDataTypeHolder;
+import static org.hibernate.id.enhanced.ResyncHelper.getNextSequenceValue;
+import static org.hibernate.id.enhanced.ResyncHelper.getMaxPrimaryKey;
 
 /**
  * Describes a sequence.
@@ -176,44 +175,14 @@ public void registerExtraExportables(Table table, Optimizer optimizer) {
 			final String tableName = context.format( table.getQualifiedTableName() );
 			final String primaryKeyColumnName = table.getPrimaryKey().getColumn( 0 ).getName();
 			final int adjustment = optimizer.getAdjustment();
-			final long max = getMax( connection, primaryKeyColumnName, tableName );
-			final long current = getCurrent( connection, sequenceName, context.getDialect() );
+			final long max = getMaxPrimaryKey( connection, primaryKeyColumnName, tableName );
+			final long current = getNextSequenceValue( connection, sequenceName, context.getDialect() );
 			final long newValue = Math.max( max + adjustment, current );
 			final String restart = "alter sequence " + sequenceName + " restart with " + newValue;
 			return new InitCommand( restart );
 		} );
 	}
 
-
-	private long getCurrent(Connection connection, String sequenceName, Dialect dialect) {
-		final String sequenceCurrentValue =
-				dialect.getSequenceSupport()
-						.getSequenceNextValString( sequenceName );
-		try ( var select = connection.prepareStatement( sequenceCurrentValue ) ) {
-			try ( var resultSet = select.executeQuery() ) {
-				resultSet.next();
-				return resultSet.getLong(1);
-			}
-		}
-		catch (SQLException e) {
-			throw new HibernateException( "Could not fetch the current sequence value from the database", e );
-		}
-	}
-
-	private static long getMax(Connection connection, String primaryKeyColumnName, String tableName) {
-		final String selectMax =
-				"select max(" + primaryKeyColumnName + ") from " + tableName;
-		try ( var select = connection.prepareStatement( selectMax ) ) {
-			try ( var resultSet = select.executeQuery() ) {
-				resultSet.next();
-				return resultSet.getLong(1);
-			}
-		}
-		catch (SQLException e) {
-			throw new HibernateException( "Could not fetch the max primary key from the database", e );
-		}
-	}
-
 	@Override
 	public boolean isPhysicalSequence() {
 		return true;