Merge pull request #2513 from FOCONIS/h2-backward-compat

Test against H2 1.4.199

ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java

@@ -10,6 +10,8 @@ import org.slf4j.LoggerFactory;
 
 import java.util.Properties;
 
+import javax.sql.DataSource;
+
 /**
  * Automatically configure ServerConfig for testing purposes.
  * <p>
@@ -47,6 +49,29 @@ public class AutoConfigureForTesting implements AutoConfigure {
   @Override
   public void postConfigure(DatabaseConfig config) {
     setupProviders(config);
+    
+    if (org.h2.engine.Constants.VERSION_MAJOR == 1) {
+      // This code may be removed later, when droppinv H2 1.xxx compatibility
+      System.err.println("Running tests in H2 1.xxx compatibility mode");
+      System.setProperty("ebean.h2.useV1Syntax", "true");
+      makeV1Compatible(config.getDataSourceConfig());
+      makeV1Compatible(config.getReadOnlyDataSourceConfig());
+    }
+  }
+
+  private void makeV1Compatible(DataSourceConfig ds) {
+    if (ds == null) {
+      return;
+    }
+    String url = ds.getUrl();
+    if (url == null || !url.startsWith("jdbc:h2:")) {
+      return;
+    }
+    // remove illegal URL options
+    url = url.replace(";MODE=LEGACY", "");
+    url = url.replace(";NON_KEYWORDS=KEY,VALUE", "");
+    url = url.replace(";NON_KEYWORDS=KEY", "");
+    ds.setUrl(url);
   }
 
   /**

ebean-test/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java

@@ -112,7 +112,7 @@ public class PlatformNoGeneratedKeysTest {
     config.setDdlRun(true);
     config.getClasses().add(EBasicVer.class);
     config.getClasses().add(BasicDraftableBean.class);
-
+    config.loadFromProperties(); // trigger auto config for H2 1.x
 
     return DatabaseFactory.create(config);
   }

ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java

@@ -11,6 +11,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSqlUpdateUpsert extends BaseTestCase {
 
+  private static boolean useV1Syntax = Boolean.getBoolean("ebean.h2.useV1Syntax");
+  
   @ForPlatform(Platform.H2)
   @Test
   public void h2Merge() throws InterruptedException {
@@ -39,7 +41,11 @@ public class TestSqlUpdateUpsert extends BaseTestCase {
       .setParameter("online", false);
 
     Object key2 = sqlUpdate2.executeGetKey();
-    assertThat(key2).isEqualTo(key);
+    if (useV1Syntax) {
+      assertThat(key2).isNull();
+    } else {
+      assertThat(key2).isEqualTo(key);
+    }
 
 
     EPersonOnline found2 = DB.find(EPersonOnline.class).where().eq("email", email).findOne();