Fixed #3722 auto-increment column starting with a custom value no lon…

…ger works with H2 v1 (#4013) * Fixed #3722 auto-increment column starting with a custom value no longer works with H2 v1 * Add auto-increment with custom value changeset to validate H2 auto-increment fix. --------- Co-authored-by: Daniel Mallorga <dmallorga@liquibase.com>
liquibase · May 3, 2023 · 8fc5ccc · 8fc5ccc
1 parent ab98dae
commit 8fc5ccc
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/liquibase-integration-tests/src/test/resources/changelogs/h2/complete/root.changelog.xml b/liquibase-integration-tests/src/test/resources/changelogs/h2/complete/root.changelog.xml
@@ -403,5 +403,11 @@
         <preConditions onFail="MARK_RAN"><tableExists tableName="NOT_EXISTENT_TABLE"/></preConditions>
         <dropTable tableName="NOT_EXISTENT_TABLE_DOESNT_MATTER"/>
     </changeSet>
+    <changeSet id="addAutoIncrementColumnWithCustomValue" author="mallod">
+        <createTable tableName="autoIncrementColumnStartingWithCustomValueTest">
+            <column name="id" type="BIGINT" autoIncrement="true" startWith="100"/>
+            <column name="name" type="int"/>
+        </createTable>
+    </changeSet>
 
 </databaseChangeLog>
diff --git a/liquibase-standard/src/main/java/liquibase/database/core/H2Database.java b/liquibase-standard/src/main/java/liquibase/database/core/H2Database.java
@@ -304,6 +304,32 @@ protected String getAutoIncrementClause() {
         }
     }
 
+    @Override
+    protected String getAutoIncrementStartWithClause() {
+        try {
+            if (getDatabaseMajorVersion() == 1) {
+                return "%d";
+            } else {
+                return super.getAutoIncrementStartWithClause();
+            }
+        } catch (DatabaseException e) {
+            return "%d";
+        }
+    }
+
+    @Override
+    protected String getAutoIncrementByClause() {
+        try {
+            if (getDatabaseMajorVersion() == 1) {
+                return "%d";
+            } else {
+                return super.getAutoIncrementByClause();
+            }
+        } catch (DatabaseException e) {
+            return "%d";
+        }
+    }
+
     @Override
     public String getAutoIncrementClause(BigInteger startWith, BigInteger incrementBy, String generationType, Boolean defaultOnNull) {
         final String clause = super.getAutoIncrementClause(startWith, incrementBy, generationType, defaultOnNull);