Merge pull request #1767 from katzyn/sequence

Use Sequence.flush() in AlterSequence to avoid concurrent update exception

h2/src/docsrc/html/changelog.html

@@ -21,6 +21,8 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>Issue #1758: sequence restart issue with 1.4.198
+</li>
 <li>Issue #1759: SELECT &#8230; FOR UPDATE returns old data in 1.4.198
 </li>
 <li>PR #1756: Fix DISTINCT ON in presence of ORDER BY

h2/src/main/org/h2/command/ddl/AlterSequence.java

@@ -7,7 +7,6 @@ package org.h2.command.ddl;
 
 import org.h2.api.ErrorCode;
 import org.h2.command.CommandInterface;
-import org.h2.engine.Database;
 import org.h2.engine.Right;
 import org.h2.engine.Session;
 import org.h2.message.DbException;
@@ -62,7 +61,6 @@ public class AlterSequence extends SchemaCommand {
 
     @Override
     public int update() {
-        Database db = session.getDatabase();
         if (sequence == null) {
             sequence = getSchema().findSequence(sequenceName);
             if (sequence == null) {
@@ -87,7 +85,7 @@ public class AlterSequence extends SchemaCommand {
             sequence.modify(options.getStartValue(session), options.getMinValue(sequence, session),
                     options.getMaxValue(sequence, session), options.getIncrement(session));
         }
-        db.updateMeta(session, sequence);
+        sequence.flush(session);
         return 0;
     }
 

h2/src/test/org/h2/test/scripts/ddl/createSequence.sql

@@ -78,3 +78,23 @@ SELECT SEQUENCE_NAME, CURRENT_VALUE, INCREMENT, CACHE, MIN_VALUE, MAX_VALUE, IS_
 DROP SEQUENCE SEQ;
 > ok
 
+SET AUTOCOMMIT OFF;
+> ok
+
+CREATE SEQUENCE SEQ;
+> ok
+
+ALTER SEQUENCE SEQ RESTART WITH 1;
+> ok
+
+SELECT NEXT VALUE FOR SEQ;
+>> 1
+
+DROP SEQUENCE SEQ;
+> ok
+
+COMMIT;
+> ok
+
+SET AUTOCOMMIT ON;
+> ok