Support H2 1.4 & 2.0 in H2SequenceMaxValueIncrementer

Prior to this commit, H2SequenceMaxValueIncrementer only supported H2
database 1.4.

This commit updates H2SequenceMaxValueIncrementer's getSequenceQuery()
method so that the syntax used supports version 1.4 and 2.0 of the H2
database.

This commit also updates several test schemas so that they work with H2
1.4 and 2.0 as well as HSQL.

Closes gh-27870

spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.java

@@ -47,7 +47,7 @@ public class H2SequenceMaxValueIncrementer extends AbstractSequenceMaxValueIncre
 
 	@Override
 	protected String getSequenceQuery() {
-		return "select " + getIncrementerName() + ".nextval from dual";
+		return "values next value for " + getIncrementerName();
 	}
 
 }

spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2002-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.jdbc.support.incrementer;
+
+import javax.sql.DataSource;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Henning Pöttker
+ */
+class H2SequenceMaxValueIncrementerTests {
+
+	@Test
+	void testH2SequenceMaxValueIncrementer() {
+		DataSource dataSource = new EmbeddedDatabaseBuilder()
+				.setType(EmbeddedDatabaseType.H2)
+				.addScript("classpath:/org/springframework/jdbc/support/incrementer/schema.sql")
+				.build();
+		H2SequenceMaxValueIncrementer incrementer = new H2SequenceMaxValueIncrementer(dataSource, "SEQ");
+
+		assertThat(incrementer.nextIntValue()).isEqualTo(1);
+		assertThat(incrementer.nextStringValue()).isEqualTo("2");
+	}
+
+}

spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-schema-without-separator.sql

@@ -1,5 +1,5 @@
 CREATE TABLE users (
-	id INTEGER NOT NULL IDENTITY,
+	id INTEGER GENERATED BY DEFAULT AS IDENTITY,
 	first_name VARCHAR(50) NOT NULL,
 	last_name VARCHAR(50) NOT NULL
 )

spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-schema.sql

@@ -1,7 +1,7 @@
 DROP TABLE users IF EXISTS;
 
 CREATE TABLE users (
-	id INTEGER NOT NULL IDENTITY,
+	id INTEGER GENERATED BY DEFAULT AS IDENTITY,
 	first_name VARCHAR(50) NOT NULL,
 	last_name VARCHAR(50) NOT NULL
 );

spring-jdbc/src/test/resources/org/springframework/jdbc/support/incrementer/schema.sql

@@ -0,0 +1 @@
+CREATE SEQUENCE SEQ;

spring-r2dbc/src/test/resources/org/springframework/r2dbc/connection/init/users-schema.sql

@@ -1,7 +1,7 @@
 DROP TABLE users IF EXISTS;
 
 CREATE TABLE users (
-	id INTEGER NOT NULL IDENTITY,
+	id INTEGER GENERATED BY DEFAULT AS IDENTITY,
 	first_name VARCHAR(50) NOT NULL,
 	last_name VARCHAR(50) NOT NULL
 );

spring-test/src/test/resources/org/springframework/test/context/junit4/orm/db-schema.sql

@@ -2,7 +2,7 @@ DROP TABLE drivers_license IF EXISTS;
 DROP TABLE person IF EXISTS;
 
 CREATE TABLE person (
-	id INTEGER NOT NULL IDENTITY,
+	id INTEGER GENERATED BY DEFAULT AS IDENTITY,
 	name VARCHAR(50) NOT NULL,
 	drivers_license_id INTEGER NOT NULL
 );
@@ -10,7 +10,7 @@ CREATE UNIQUE INDEX person_name ON person(name);
 CREATE UNIQUE INDEX person_drivers_license_id ON person(drivers_license_id);
 
 CREATE TABLE drivers_license (
-	id INTEGER NOT NULL IDENTITY,
+	id INTEGER GENERATED BY DEFAULT AS IDENTITY,
 	license_number INTEGER NOT NULL
 );
 CREATE UNIQUE INDEX drivers_license_license_number ON drivers_license(license_number);

spring-test/src/test/resources/org/springframework/test/context/junit4/spr8849/spr8849-schema.sql

@@ -1,3 +1,3 @@
 CREATE TABLE enigma (
-	id INTEGER NOT NULL IDENTITY
+	id INTEGER GENERATED BY DEFAULT AS IDENTITY
 );