#31 - Add support for NuoDB

Author: rbygrave

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-test</artifactId>
-  <version>11.42.2-SNAPSHOT</version>
+  <version>11.42.3-SNAPSHOT</version>
 
   <parent>
     <groupId>org.avaje</groupId>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>11.42.1</version>
+      <version>11.42.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean.test</groupId>
       <artifactId>ebean-test-docker</artifactId>
-      <version>2.7.2</version>
+      <version>2.10.2</version>
     </dependency>
 
     <!-- Not strictly required but bring in H2 Driver because we use it so much -->

src/main/java/io/ebean/test/config/platform/Config.java

@@ -55,6 +55,11 @@ class Config {
     this.properties = serverConfig.getProperties();
   }
 
+   void setSchemaFromDbName(String newDbName) {
+    this.schema = databaseName;
+    this.databaseName = newDbName;
+  }
+
   /**
    * Set the docker platform name (when it is different from the test platform name).
    * For example test platform name of "postgis" maps to "postgres" docker platform name.
@@ -82,15 +87,17 @@ void ddlMode(String defaultMode) {
         disableMigrationRun();
         break;
       }
-      case "migrationdropcreate":
-      case "migrationsdropcreate": {
+      case "migrationonly":
+      case "migrationsonly": {
         setMigrationRun();
-        containerDropCreate = true;
         break;
       }
+      case "migrationdropcreate":
+      case "migrationsdropcreate":
       case "migration":
       case "migrations": {
         setMigrationRun();
+        containerDropCreate = true;
         break;
       }
       case "createonly": {
@@ -152,15 +159,15 @@ private void setDdlProperty(String key) {
     setProperty("ebean." + db + ".ddl." + key, "true");
   }
 
-  void datasourceDefaults() {
-    datasourceDefaults(platform);
+  DataSourceConfig datasourceDefaults() {
+    return datasourceDefaults(platform);
   }
 
   void extraDatasourceDefaults() {
     datasourceDefaults("extraDb");
   }
 
-  private void datasourceDefaults(String platform) {
+  private DataSourceConfig datasourceDefaults(String platform) {
     // default username to databaseName
     if (username == null) {
       throw new IllegalStateException("username not set?");
@@ -188,6 +195,7 @@ private void datasourceDefaults(String platform) {
         throw new IllegalStateException("JDBC Driver " + driverClass + " does not appear to be in the classpath?");
       }
     }
+    return ds;
   }
 
   String datasourceProperty(String key, String defaultValue) {
@@ -252,6 +260,10 @@ void setUsernameDefault() {
     this.username = getKey("username", defaultValue);
   }
 
+  void setUsernameDefaultSchema() {
+    this.username = getKey("username", schema);
+  }
+
   void setExtraUsernameDefault() {
     this.username = getKey("extraDb.username", this.databaseName);
   }
@@ -350,6 +362,9 @@ private void initDockerProperties() {
 
     dockerProperties.setProperty(dockerKey("port"), String.valueOf(port));
     dockerProperties.setProperty(dockerKey("dbName"), databaseName);
+    if (schema != null) {
+      dockerProperties.setProperty(dockerKey("schema"), schema);
+    }
     dockerProperties.setProperty(dockerKey("username"), username);
     dockerProperties.setProperty(dockerKey("password"), password);
     dockerProperties.setProperty(dockerKey("url"), url);

src/main/java/io/ebean/test/config/platform/NuoDBSetup.java

@@ -0,0 +1,45 @@
+package io.ebean.test.config.platform;
+
+import io.ebean.datasource.DataSourceConfig;
+
+import java.util.Properties;
+
+class NuoDBSetup implements PlatformSetup {
+
+  @Override
+  public Properties setup(Config config) {
+    // use testdb as our standard db name and instead use schema
+    config.setSchemaFromDbName("testdb");
+    config.ddlMode("dropCreate");
+    config.setDefaultPort(8888);
+    config.setUsernameDefaultSchema();
+    config.setPasswordDefault();
+    config.setUrl("jdbc:com.nuodb://localhost/testdb");
+    config.setDriver("com.nuodb.jdbc.Driver");
+
+    final DataSourceConfig dsConfig = config.datasourceDefaults();
+    dsConfig.setSchema(config.getSchema());
+    return dockerProperties(config);
+  }
+
+  private Properties dockerProperties(Config dbConfig) {
+
+    if (!dbConfig.isUseDocker()) {
+      return new Properties();
+    }
+
+    dbConfig.setDockerVersion("4.0.0");
+    return dbConfig.getDockerProperties();
+  }
+
+  @Override
+  public void setupExtraDbDataSource(Config config) {
+    // not supported yet
+  }
+
+  @Override
+  public boolean isLocal() {
+    return false;
+  }
+
+}

src/main/java/io/ebean/test/config/platform/PlatformAutoConfig.java

@@ -26,6 +26,7 @@ public class PlatformAutoConfig {
     KNOWN_PLATFORMS.put("sqlite", new SqliteSetup());
     KNOWN_PLATFORMS.put("postgres", new PostgresSetup());
     KNOWN_PLATFORMS.put("postgis", new PostgisSetup());
+    KNOWN_PLATFORMS.put("nuodb", new NuoDBSetup());
     KNOWN_PLATFORMS.put("mysql", new MySqlSetup());
     KNOWN_PLATFORMS.put("mariadb", new MariaDBSetup());
     KNOWN_PLATFORMS.put("sqlserver", new SqlServerSetup());