Test against H2 1.4.199

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

@@ -101,7 +101,7 @@ public class PlatformNoGeneratedKeysTest {
     config.setDatabasePlatform(platform);
     config.getDataSourceConfig().setUsername("sa");
     config.getDataSourceConfig().setPassword("");
-    config.getDataSourceConfig().setUrl("jdbc:h2:mem:withPCQuery;MODE=LEGACY");
+    config.getDataSourceConfig().setUrl("jdbc:h2:mem:withPCQuery");
     config.getDataSourceConfig().setDriver("org.h2.Driver");
 
     config.setDisableLazyLoading(true);

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();

ebean-test/src/test/resources/ebean.properties

@@ -72,7 +72,7 @@ datasource.db.databaseDriver=org.h2.Driver
 
 datasource.h2.username=sa
 datasource.h2.password=
-datasource.h2.url=jdbc:h2:mem:testsMem;DB_CLOSE_ON_EXIT=FALSE;NON_KEYWORDS=KEY,VALUE
+datasource.h2.url=jdbc:h2:mem:testsMem;DB_CLOSE_ON_EXIT=FALSE
 datasource.h2.poolListener=org.tests.basic.MyTestDataSourcePoolListener
 #datasource.h2.minConnections=1
 #datasource.h2.maxConnections=25

ebean-test/src/test/resources/test-ebean.properties

@@ -8,5 +8,5 @@ ebean.jodaLocalTimeMode=normal
 
 datasource.someotherdb.username=sa
 datasource.someotherdb.password=
-datasource.someotherdb.databaseUrl=jdbc:h2:mem:someotherdb;NON_KEYWORDS=KEY,VALUE
+datasource.someotherdb.databaseUrl=jdbc:h2:mem:someotherdb
 datasource.someotherdb.databaseDriver=org.h2.Driver