correct sequence restart syntax for Oracle

Author: gavinking

hibernate-core/src/main/java/org/hibernate/dialect/sequence/OracleSequenceSupport.java

@@ -51,4 +51,9 @@ public boolean sometimesNeedsStartingValue() {
 	public String getDropSequenceString(String sequenceName) throws MappingException {
 		return "drop sequence " + (supportsIfExists ? "if exists " : "") + sequenceName;
 	}
+
+	@Override
+	public String getRestartSequenceString(String sequenceName, long startWith) {
+		return "alter sequence " + sequenceName + " restart start with " + startWith;
+	}
 }

hibernate-core/src/main/java/org/hibernate/dialect/sequence/SequenceSupport.java

@@ -145,7 +145,7 @@ default String[] getCreateSequenceStrings(String sequenceName, int initialValue,
 	}
 
 	/**
-	 * Typically dialects which support sequences can create a sequence with
+	 * Typically, dialects which support sequences can create a sequence with
 	 * a single command. This method is a convenience making it easier to
 	 * implement {@link #getCreateSequenceStrings(String,int,int)} for these
 	 * dialects.
@@ -169,7 +169,7 @@ default String getCreateSequenceString(String sequenceName) throws MappingExcept
 	}
 
 	/**
-	 * Typically dialects which support sequences can create a sequence with
+	 * Typically, dialects which support sequences can create a sequence with
 	 * a single command. This method is a convenience making it easier to
 	 * implement {@link #getCreateSequenceStrings(String,int,int)} for these
 	 * dialects.
@@ -212,9 +212,9 @@ default String[] getDropSequenceStrings(String sequenceName) throws MappingExcep
 	}
 
 	/**
-	 * Typically dialects which support sequences can drop a sequence
-	 * with a single command.  This is convenience form of
-	 * {@link #getDropSequenceStrings} to help facilitate that.
+	 * Typically, dialects which support sequences can drop a sequence
+	 * with a single command. This is a convenience form of
+	 * {@link #getDropSequenceStrings} which facilitates that.
 	 * <p>
 	 * Dialects which support sequences and can drop a sequence in a
 	 * single command need *only* override this method.  Dialects
@@ -229,6 +229,17 @@ default String getDropSequenceString(String sequenceName) throws MappingExceptio
 		return "drop sequence " + sequenceName;
 	}
 
+	/**
+	 * A DDL statement to restart a sequence with a given value.
+	 *
+	 * @param sequenceName The name of the sequence
+	 * @param startWith The value to restart at
+	 * @return The {@code alter sequence ... restart} command
+	 */
+	default String getRestartSequenceString(String sequenceName, long startWith) {
+		return "alter sequence " + sequenceName + " restart with " + startWith;
+	}
+
 	/**
 	 * Do we need to explicitly specify {@code minvalue} or
 	 * {@code maxvalue} when the initial value doesn't have

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

@@ -12,8 +12,8 @@
 import org.hibernate.mapping.Table;
 
 /**
- * Encapsulates definition of the underlying data structure backing a
- * sequence-style generator.
+ * Encapsulates definition of the underlying data structure backing
+ * a {@linkplain SequenceStyleGenerator sequence-style} generator.
  *
  * @author Steve Ebersole
  */

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

@@ -24,7 +24,7 @@
 class ExportableColumnHelper {
 
 	static Column column(Database database, Table table, String segmentColumnName, BasicType<?> type, String typeName) {
-		final Column column = new Column( segmentColumnName );
+		final var column = new Column( segmentColumnName );
 		column.setSqlType( typeName );
 		column.setValue( new Value() {
 			@Override

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

@@ -177,9 +177,9 @@ public void registerExtraExportables(Table table, Optimizer optimizer) {
 			final int adjustment = optimizer.getAdjustment();
 			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 );
+			final long startWith = Math.max( max + adjustment, current );
+			return new InitCommand( context.getDialect().getSequenceSupport()
+					.getRestartSequenceString( sequenceName, startWith ) );
 		} );
 	}