Merge pull request #3760 from katzyn/compatibility

Restore START sequence option in PostgreSQL mode and improve documentation of MSSQLServer mode
h2database · Mar 19, 2023 · 9ef778d · 9ef778d
2 parents 2113b32 + 5a9755a
commit 9ef778d
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 7 deletions.
diff --git a/h2/src/docsrc/html/changelog.html b/h2/src/docsrc/html/changelog.html
@@ -21,6 +21,10 @@ <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>Issue #3642: AssertionError in mvstore.FileStore.serializeAndStore
+</li>
+<li>Issue #3675: H2 2.x cannot read PostgreSQL-style sequence generator start with option without WITH keyword
+</li>
 <li>Issue #3757: FORMATDATETIME function doesn't handle time with time zone properly
 </li>
 <li>PR #3756: Limit the row list allocation based on the row count

diff --git a/h2/src/docsrc/html/features.html b/h2/src/docsrc/html/features.html
@@ -936,8 +936,9 @@ <h3>HSQLDB Compatibility Mode</h3>
 
 <h3>MS SQL Server Compatibility Mode</h3>
 <p>
-To use the MS SQL Server mode, use the database URL <code>jdbc:h2:~/test;MODE=MSSQLServer</code>
-or the SQL statement <code>SET MODE MSSQLServer</code>.
+To use the MS SQL Server mode, use the database URL
+<code>jdbc:h2:~/test;MODE=MSSQLServer;DATABASE_TO_UPPER=FALSE;CASE_INSENSITIVE_IDENTIFIERS=TRUE</code>.
+Do not change value of DATABASE_TO_LOWER and CASE_INSENSITIVE_IDENTIFIERS after creation of database.
 </p>
 <ul><li>For aliased columns, <code>ResultSetMetaData.getColumnName()</code>
     returns the alias name and <code>getTableName()</code> returns

diff --git a/h2/src/main/org/h2/command/Parser.java b/h2/src/main/org/h2/command/Parser.java
@@ -7874,7 +7874,8 @@ private boolean parseSequenceOptions(SequenceOptions options, CreateSequence com
                             .getSQL(new StringBuilder("CREATE SEQUENCE AS "), HasSQL.TRACE_SQL_FLAGS).toString());
                 }
                 options.setDataType(dataType);
-            } else if (readIf("START", WITH)) {
+            } else if (readIf("START", WITH)
+                    || (database.getMode().getEnum() == ModeEnum.PostgreSQL && readIf("START"))) {
                 options.setStartValue(readExpression());
             } else if (readIf("RESTART")) {
                 options.setRestartValue(readIf(WITH) ? readExpression() : ValueExpression.DEFAULT);

diff --git a/h2/src/main/org/h2/mvstore/FileStore.java b/h2/src/main/org/h2/mvstore/FileStore.java
@@ -1414,10 +1414,17 @@ private void serializeAndStore(boolean syncRun, ArrayList<Page<?,?>> changed, lo
                 // never go backward in time
                 time = Math.max(lastChunk.time, time);
             }
-            C c = createChunk(time, version);
-            WriteBuffer buff = getWriteBuffer();
-            serializeToBuffer(buff, changed, c, lastChunk);
-            chunks.put(c.id, c);
+            C c;
+            WriteBuffer buff;
+            try {
+                c = createChunk(time, version);
+                buff = getWriteBuffer();
+                serializeToBuffer(buff, changed, c, lastChunk);
+                chunks.put(c.id, c);
+            } catch (Throwable t) {
+                lastChunkId = chunkId;
+                throw t;
+            }
 
             bufferSaveExecutorHWM = submitOrRun(bufferSaveExecutor, () -> storeBuffer(c, buff),
                     syncRun, 5, bufferSaveExecutorHWM);

diff --git a/h2/src/test/org/h2/test/scripts/other/sequence.sql b/h2/src/test/org/h2/test/scripts/other/sequence.sql
@@ -488,3 +488,18 @@ SELECT NEXT VALUE FOR SEQ;
 
 DROP SEQUENCE SEQ;
 > ok
+
+CREATE SEQUENCE SEQ START 1;
+> exception SYNTAX_ERROR_1
+
+SET MODE PostgreSQL;
+> ok
+
+CREATE SEQUENCE SEQ START 1;
+> ok
+
+DROP SEQUENCE SEQ;
+> ok
+
+SET MODE Regular;
+> ok