From b1277a3c9172e0be79e7c602d1ef442963d51bd3 Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Thu, 31 Mar 2022 12:07:25 +0200
Subject: [PATCH] Upgrade H2 to 2.1.210

Fixes #9354
---
 bom/application/pom.xml                       |  2 +-
 .../h2/deployment/H2DevServicesProcessor.java |  3 +-
 .../jdbc/h2/deployment/JDBCH2Processor.java   |  6 +++
 extensions/jdbc/jdbc-h2/runtime/pom.xml       |  2 +-
 .../jdbc/h2/runtime/graal/CompareMode.java    | 39 -------------------
 .../quarkus/jdbc/h2/runtime/graal/Engine.java |  9 +----
 ...nDisable.java => SessionLocalDisable.java} |  6 +--
 .../jdbc/h2/runtime/graal/SessionRemote.java  | 35 +++++++++++++++++
 .../test/h2/H2DatabaseTestResource.java       |  2 +-
 9 files changed, 51 insertions(+), 53 deletions(-)
 delete mode 100644 extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/CompareMode.java
 rename extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/{SessionDisable.java => SessionLocalDisable.java} (70%)
 create mode 100644 extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/SessionRemote.java

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 24a1858222f90..cf1c48df98c96 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -113,7 +113,7 @@
         <httpasync.version>4.1.5</httpasync.version>
         <cronutils.version>9.1.6</cronutils.version>
         <quartz.version>2.3.2</quartz.version>
-        <h2.version>1.4.197</h2.version>  <!-- keep 1.4.197 as newer versions have severe regressions -->
+        <h2.version>2.1.210</h2.version>
         <postgresql-jdbc.version>42.3.3</postgresql-jdbc.version>
         <mariadb-jdbc.version>3.0.4</mariadb-jdbc.version>
         <mysql-jdbc.version>8.0.28</mysql-jdbc.version>
diff --git a/extensions/devservices/h2/src/main/java/io/quarkus/devservices/h2/deployment/H2DevServicesProcessor.java b/extensions/devservices/h2/src/main/java/io/quarkus/devservices/h2/deployment/H2DevServicesProcessor.java
index 1489eccd1af19..9b4fb7a7200aa 100644
--- a/extensions/devservices/h2/src/main/java/io/quarkus/devservices/h2/deployment/H2DevServicesProcessor.java
+++ b/extensions/devservices/h2/src/main/java/io/quarkus/devservices/h2/deployment/H2DevServicesProcessor.java
@@ -34,7 +34,8 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
                     OptionalInt port, LaunchMode launchMode, Optional<Duration> startupTimeout) {
                 try {
                     final Server tcpServer = Server.createTcpServer("-tcpPort",
-                            port.isPresent() ? String.valueOf(port.getAsInt()) : "0");
+                            port.isPresent() ? String.valueOf(port.getAsInt()) : "0",
+                            "-ifNotExists");
                     tcpServer.start();
 
                     StringBuilder additionalArgs = new StringBuilder();
diff --git a/extensions/jdbc/jdbc-h2/deployment/src/main/java/io/quarkus/jdbc/h2/deployment/JDBCH2Processor.java b/extensions/jdbc/jdbc-h2/deployment/src/main/java/io/quarkus/jdbc/h2/deployment/JDBCH2Processor.java
index 6b942aa719835..1f4d7239cf22f 100644
--- a/extensions/jdbc/jdbc-h2/deployment/src/main/java/io/quarkus/jdbc/h2/deployment/JDBCH2Processor.java
+++ b/extensions/jdbc/jdbc-h2/deployment/src/main/java/io/quarkus/jdbc/h2/deployment/JDBCH2Processor.java
@@ -13,6 +13,7 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.SslNativeConfigBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
 import io.quarkus.jdbc.h2.runtime.H2AgroalConnectionConfigurer;
 
 public class JDBCH2Processor {
@@ -49,4 +50,9 @@ void configureAgroalConnection(BuildProducer<AdditionalBeanBuildItem> additional
     void registerDefaultDbType(BuildProducer<DefaultDataSourceDbKindBuildItem> dbKind) {
         dbKind.produce(new DefaultDataSourceDbKindBuildItem(DatabaseKind.H2));
     }
+
+    @BuildStep
+    void runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClasses) {
+        runtimeInitializedClasses.produce(new RuntimeInitializedClassBuildItem("org.h2.store.fs.niomem.FileNioMemData"));
+    }
 }
diff --git a/extensions/jdbc/jdbc-h2/runtime/pom.xml b/extensions/jdbc/jdbc-h2/runtime/pom.xml
index 2d9da9183b185..a0681c7c207e3 100644
--- a/extensions/jdbc/jdbc-h2/runtime/pom.xml
+++ b/extensions/jdbc/jdbc-h2/runtime/pom.xml
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.locationtech.jts</groupId>
             <artifactId>jts-core</artifactId>
-            <version>1.15.0</version>
+            <version>1.17.0</version>
             <!--
                 TODO: Make this an optional dependency?
                 Graal compiler not happy with broken classpaths
diff --git a/extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/CompareMode.java b/extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/CompareMode.java
deleted file mode 100644
index 49eed7216a070..0000000000000
--- a/extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/CompareMode.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.quarkus.jdbc.h2.runtime.graal;
-
-import org.h2.engine.SysProperties;
-
-import com.oracle.svm.core.annotate.Alias;
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.annotate.TargetClass;
-
-@TargetClass(org.h2.value.CompareMode.class)
-public final class CompareMode {
-
-    @Alias
-    private static volatile CompareMode lastUsed;
-
-    //    @Inject
-    //    private static final org.h2.value.CompareMode SINGLE_CHOICE = org.h2.value.CompareMode.getInstance(null, 0, SysProperties.SORT_BINARY_UNSIGNED);
-
-    @Substitute
-    public static CompareMode getInstance(String name, int strength, boolean binaryUnsigned) {
-        if (name != null || strength != 0 || binaryUnsigned != SysProperties.SORT_BINARY_UNSIGNED) {
-            throw new UnsupportedOperationException(
-                    "Only the default Collator can be currently used in native mode; see https://github.com/oracle/graal/issues/839");
-        }
-        CompareMode var3 = lastUsed;
-        if (var3 == null) {
-            var3 = new CompareMode(name, strength, binaryUnsigned);
-            lastUsed = var3;
-        }
-        return var3;
-        //TODO?: Can't create a singleton via @Inject
-        //return SINGLE_CHOICE;
-    }
-
-    @Alias
-    protected CompareMode(String var1, int var2, boolean var3) {
-        //Uses the original code
-    }
-
-}
diff --git a/extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/Engine.java b/extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/Engine.java
index 3fff2fd609fb6..28d954929f296 100644
--- a/extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/Engine.java
+++ b/extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/Engine.java
@@ -11,18 +11,13 @@
 public final class Engine {
 
     @Substitute
-    public static Engine getInstance() {
-        return new Engine();
-    }
-
-    @Substitute
-    public Session createSession(ConnectionInfo ci) {
+    public static Session createSession(ConnectionInfo ci) {
         throw new UnsupportedOperationException(
                 "H2 database compiled into a native-image is only functional as a client: can't create an Embedded Database Session");
     }
 
     @Substitute
-    void close(String name) {
+    static void close(String name) {
         //no-op
     }
 
diff --git a/extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/SessionDisable.java b/extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/SessionLocalDisable.java
similarity index 70%
rename from extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/SessionDisable.java
rename to extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/SessionLocalDisable.java
index fa38a3facdd7a..ea45d89d5d3e9 100644
--- a/extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/SessionDisable.java
+++ b/extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/SessionLocalDisable.java
@@ -4,13 +4,13 @@
 import com.oracle.svm.core.annotate.TargetClass;
 
 /**
- * The org.h2.engine.Session represents the "Embedded Database" in H2.
+ * The org.h2.engine.SessionLocal represents the "Embedded Database" in H2.
  * We remove this explicitly as it pulls in various things we can't support;
  * rather than address them individually it's simpler to make sure this
  * Session doesn't get included by mistake: that will produce errors
  * that are easier to manage.
  */
-@TargetClass(className = "org.h2.engine.Session")
+@TargetClass(className = "org.h2.engine.SessionLocal")
 @Delete
-public final class SessionDisable {
+public final class SessionLocalDisable {
 }
diff --git a/extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/SessionRemote.java b/extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/SessionRemote.java
new file mode 100644
index 0000000000000..1a910c68d0871
--- /dev/null
+++ b/extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/SessionRemote.java
@@ -0,0 +1,35 @@
+package io.quarkus.jdbc.h2.runtime.graal;
+
+import org.h2.engine.ConnectionInfo;
+import org.h2.engine.Session;
+
+import com.oracle.svm.core.annotate.Alias;
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+
+@TargetClass(className = "org.h2.engine.SessionRemote")
+public final class SessionRemote {
+
+    @Alias
+    private ConnectionInfo connectionInfo;
+
+    /**
+     * Even if in SessionRemote, this method originally can instantiate a local engine.
+     * We don't want that as we don't support a local engine.
+     */
+    @Substitute
+    public Session connectEmbeddedOrServer(boolean openNew) {
+        ConnectionInfo ci = connectionInfo;
+        if (ci.isRemote()) {
+            connectServer(ci);
+            return (Session) (Object) this;
+        }
+
+        throw new UnsupportedOperationException(
+                "H2 database compiled into a native-image is only functional as a client: can't create an Embedded Database Session");
+    }
+
+    @Alias
+    private void connectServer(ConnectionInfo ci) {
+    }
+}
diff --git a/test-framework/h2/src/main/java/io/quarkus/test/h2/H2DatabaseTestResource.java b/test-framework/h2/src/main/java/io/quarkus/test/h2/H2DatabaseTestResource.java
index 85841c3d03f09..10749366b1824 100644
--- a/test-framework/h2/src/main/java/io/quarkus/test/h2/H2DatabaseTestResource.java
+++ b/test-framework/h2/src/main/java/io/quarkus/test/h2/H2DatabaseTestResource.java
@@ -16,7 +16,7 @@ public class H2DatabaseTestResource implements QuarkusTestResourceLifecycleManag
     public Map<String, String> start() {
 
         try {
-            tcpServer = Server.createTcpServer();
+            tcpServer = Server.createTcpServer("-ifNotExists");
             tcpServer.start();
             System.out.println("[INFO] H2 database started in TCP server mode; server status: " + tcpServer.getStatus());
         } catch (SQLException e) {