#1147 - Refactor move DbMigration internals into io.ebeaninternal - change to use DbMigration.create() - move PlatformDdl into internal

src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java

@@ -2,13 +2,10 @@ package io.ebean.config.dbplatform;
 
 import io.ebean.BackgroundExecutor;
 import io.ebean.Query;
-import io.ebean.config.CustomDbTypeMapping;
-import io.ebean.config.DbTypeConfig;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
-import io.ebean.config.ServerConfig;
-import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
-import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
+import io.ebean.config.CustomDbTypeMapping;
+import io.ebean.config.DbTypeConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -162,8 +159,6 @@ public class DatabasePlatform {
    */
   protected PersistBatch persistBatchOnCascade = PersistBatch.ALL;
 
-  protected PlatformDdl platformDdl;
-
   /**
    * The maximum length of table names - used specifically when derived
    * default table names for intersection tables.
@@ -276,23 +271,6 @@ public class DatabasePlatform {
     return maxConstraintNameLength;
   }
 
-  /**
-   * Return the platform specific DDL.
-   */
-  public PlatformDdl getPlatformDdl() {
-    return platformDdl;
-  }
-
-  /**
-   * Create and return a DDL handler for generating DDL scripts.
-   */
-  public DdlHandler createDdlHandler(ServerConfig serverConfig) {
-    if (platformDdl == null) {
-      throw new IllegalStateException("Platform " + getName() + " has no DDL Handler");
-    }
-    return platformDdl.createDdlHandler(serverConfig);
-  }
-
   /**
    * Return true if the JDBC driver does not allow additional queries to execute
    * when a resultSet is being 'streamed' as is the case with findEach() etc.

src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java

@@ -8,7 +8,6 @@ import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.SqlErrorCodes;
-import io.ebeaninternal.dbmigration.ddlgeneration.platform.DB2Ddl;
 
 import javax.sql.DataSource;
 import java.sql.Types;
@@ -24,7 +23,6 @@ public class DB2Platform extends DatabasePlatform {
     this.maxTableNameLength = 18;
     this.maxConstraintNameLength = 18;
     this.sqlLimiter = new Db2SqlLimiter();
-    this.platformDdl = new DB2Ddl(this);
 
     this.dbIdentity.setSupportsGetGeneratedKeys(true);
     this.dbIdentity.setSupportsSequence(true);

src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java

@@ -1,15 +1,14 @@
 package io.ebean.config.dbplatform.h2;
 
 import io.ebean.BackgroundExecutor;
-import io.ebean.annotation.Platform;
 import io.ebean.Query;
+import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.SqlErrorCodes;
-import io.ebeaninternal.dbmigration.ddlgeneration.platform.H2Ddl;
 
 import javax.sql.DataSource;
 
@@ -22,7 +21,6 @@ public class H2Platform extends DatabasePlatform {
     super();
     this.platform = Platform.H2;
     this.dbEncrypt = new H2DbEncrypt();
-    this.platformDdl = new H2Ddl(this);
     this.historySupport = new H2HistorySupport();
     this.nativeUuidType = true;
     this.dbDefaultValue.setNow("now()");

src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java

@@ -9,7 +9,6 @@ import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.h2.H2DbEncrypt;
 import io.ebean.config.dbplatform.h2.H2SequenceIdGenerator;
-import io.ebeaninternal.dbmigration.ddlgeneration.platform.HsqldbDdl;
 
 import javax.sql.DataSource;
 
@@ -22,7 +21,6 @@ public class HsqldbPlatform extends DatabasePlatform {
     super();
     this.platform = Platform.HSQLDB;
     this.dbEncrypt = new H2DbEncrypt();
-    this.platformDdl = new HsqldbDdl(this);
 
     this.dbIdentity.setIdType(IdType.IDENTITY);
     this.dbIdentity.setSupportsGetGeneratedKeys(true);

src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java

@@ -1,15 +1,14 @@
 package io.ebean.config.dbplatform.mysql;
 
 import io.ebean.BackgroundExecutor;
-import io.ebean.annotation.Platform;
 import io.ebean.Query;
+import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.SqlErrorCodes;
-import io.ebeaninternal.dbmigration.ddlgeneration.platform.MySqlDdl;
 
 import javax.sql.DataSource;
 import java.sql.Types;
@@ -32,7 +31,6 @@ public class MySqlPlatform extends DatabasePlatform {
     this.useExtraTransactionOnIterateSecondaryQueries = true;
     this.selectCountWithAlias = true;
     this.dbEncrypt = new MySqlDbEncrypt();
-    this.platformDdl = new MySqlDdl(this);
     this.historySupport = new MySqlHistorySupport();
     this.columnAliasPrefix = null;
 

src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java

@@ -1,8 +1,8 @@
 package io.ebean.config.dbplatform.oracle;
 
 import io.ebean.BackgroundExecutor;
-import io.ebean.annotation.Platform;
 import io.ebean.Query;
+import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.BasicSqlAnsiLimiter;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
@@ -10,7 +10,6 @@ import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.RownumSqlLimiter;
-import io.ebeaninternal.dbmigration.ddlgeneration.platform.Oracle10Ddl;
 
 import javax.sql.DataSource;
 import java.sql.Types;
@@ -28,7 +27,6 @@ public class OraclePlatform extends DatabasePlatform {
     this.dbEncrypt = new OracleDbEncrypt();
     this.sqlLimiter = new RownumSqlLimiter();
     this.basicSqlLimiter = new BasicSqlAnsiLimiter();
-    this.platformDdl = new Oracle10Ddl(this);
     this.historySupport = new OracleDbHistorySupport();
 
     // Not using getGeneratedKeys as instead we will

src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java

@@ -1,17 +1,14 @@
 package io.ebean.config.dbplatform.postgres;
 
 import io.ebean.BackgroundExecutor;
-import io.ebean.annotation.Platform;
 import io.ebean.Query;
-import io.ebean.config.ServerConfig;
+import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.SqlErrorCodes;
-import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
-import io.ebeaninternal.dbmigration.ddlgeneration.platform.PostgresDdl;
 
 import javax.sql.DataSource;
 import java.sql.Types;
@@ -36,7 +33,6 @@ public class PostgresPlatform extends DatabasePlatform {
 
     this.dbEncrypt = new PostgresDbEncrypt();
     this.historySupport = new PostgresHistorySupport();
-    this.platformDdl = new PostgresDdl(this);
 
     // Use Identity and getGeneratedKeys
     this.dbIdentity.setIdType(IdType.IDENTITY);
@@ -90,14 +86,6 @@ public class PostgresPlatform extends DatabasePlatform {
     return new DbPlatformType("geometry(" + type + "," + srid + ")");
   }
 
-  /**
-   * Return a DdlHandler instance for generating DDL for the specific platform.
-   */
-  @Override
-  public DdlHandler createDdlHandler(ServerConfig serverConfig) {
-    return this.platformDdl.createDdlHandler(serverConfig);
-  }
-
   /**
    * Create a Postgres specific sequence IdGenerator.
    */

src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java

@@ -5,7 +5,6 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
-import io.ebeaninternal.dbmigration.ddlgeneration.platform.SQLiteDdl;
 
 import java.sql.Types;
 
@@ -14,8 +13,6 @@ public class SQLitePlatform extends DatabasePlatform {
   public SQLitePlatform() {
     super();
     this.platform = Platform.SQLITE;
-    this.platformDdl = new SQLiteDdl(this);
-
     this.dbIdentity.setIdType(IdType.IDENTITY);
     this.dbIdentity.setSupportsGetGeneratedKeys(false);
     this.dbIdentity.setSupportsSequence(false);

src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java

@@ -7,7 +7,7 @@ import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.SqlErrorCodes;
-import io.ebeaninternal.dbmigration.ddlgeneration.platform.SqlServerDdl;
+
 import java.sql.Types;
 
 /**
@@ -25,7 +25,6 @@ public class SqlServerPlatform extends DatabasePlatform {
     this.selectCountWithAlias = true;
     this.sqlLimiter = new SqlServerSqlLimiter();
     this.basicSqlLimiter = new SqlServerBasicSqlLimiter();
-    this.platformDdl = new SqlServerDdl(this);
     this.historySupport = new SqlServerHistorySupport();
     this.dbIdentity.setIdType(IdType.IDENTITY);
     this.dbIdentity.setSupportsGetGeneratedKeys(true);

src/main/java/io/ebeaninternal/api/SpiEbeanServer.java

@@ -13,6 +13,7 @@ import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.query.CQuery;
@@ -210,4 +211,9 @@ public interface SpiEbeanServer extends EbeanServer, BeanLoader, BeanCollectionL
    * Check for slow query event.
    */
   void slowQueryCheck(long executionTimeMicros, int rowCount, SpiQuery<?> query);
+
+  /**
+   * Create DDL handler given the platform and configuration of the server.
+   */
+  DdlHandler createDdlHandler();
 }

src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java

@@ -1,6 +1,7 @@
 package io.ebeaninternal.dbmigration.model;
 
 import io.ebean.config.DbConstraintNaming;
+import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.DefaultConstraintMaxLength;
@@ -8,7 +9,6 @@ import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.model.build.ModelBuildBeanVisitor;
 import io.ebeaninternal.dbmigration.model.build.ModelBuildContext;
 import io.ebeaninternal.dbmigration.model.visitor.VisitAllUsing;
-import io.ebeaninternal.api.SpiEbeanServer;
 
 import java.io.IOException;
 
@@ -147,7 +147,7 @@ public class CurrentModel {
    * Return the platform specific DdlHandler (to generate DDL).
    */
   private DdlHandler handler() {
-    return server.getDatabasePlatform().createDdlHandler(server.getServerConfig());
+    return server.createDdlHandler();
   }
 
   /**

src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java

@@ -6,9 +6,11 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
 import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.migration.ChangeSetType;
 import io.ebeaninternal.dbmigration.migration.Migration;
+import io.ebeaninternal.server.core.PlatformDdlBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,12 +29,12 @@ public class PlatformDdlWriter {
 
   private final ServerConfig serverConfig;
 
-  private final DatabasePlatform platform;
-
   private final DbMigrationConfig config;
 
+  private final PlatformDdl platformDdl;
+
   public PlatformDdlWriter(DatabasePlatform platform, ServerConfig serverConfig, DbMigrationConfig config) {
-    this.platform = platform;
+    this.platformDdl = PlatformDdlBuilder.create(platform);
     this.serverConfig = serverConfig;
     this.config = config;
   }
@@ -106,7 +108,7 @@ public class PlatformDdlWriter {
    * Return the platform specific DdlHandler (to generate DDL).
    */
   protected DdlHandler handler() {
-    return platform.createDdlHandler(serverConfig);
+    return platformDdl.createDdlHandler(serverConfig);
   }
 
   /**

src/main/java/io/ebeaninternal/server/core/DefaultServer.java

@@ -53,6 +53,7 @@ import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
 import io.ebeaninternal.api.*;
 import io.ebeaninternal.api.SpiQuery.Type;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
 import io.ebeaninternal.server.autotune.AutoTuneService;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
@@ -329,6 +330,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return databasePlatform;
   }
 
+  @Override
+  public DdlHandler createDdlHandler() {
+    return PlatformDdlBuilder.create(databasePlatform).createDdlHandler(serverConfig);
+  }
+
   @Override
   public DataTimeZone getDataTimeZone() {
     return dataTimeZone;

src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java

@@ -0,0 +1,44 @@
+package io.ebeaninternal.server.core;
+
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.DB2Ddl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.H2Ddl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.HsqldbDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.MySqlDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.Oracle10Ddl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.PostgresDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.SQLiteDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.SqlServerDdl;
+
+public class PlatformDdlBuilder {
+
+
+  public static PlatformDdl create(DatabasePlatform platform) {
+
+    switch (platform.getPlatform()) {
+      case H2:
+        return new H2Ddl(platform);
+      case DB2:
+        return new DB2Ddl(platform);
+      case MYSQL:
+        return new MySqlDdl(platform);
+      case HSQLDB:
+        return new HsqldbDdl(platform);
+      case ORACLE:
+        return new Oracle10Ddl(platform);
+      case SQLITE:
+        return new SQLiteDdl(platform);
+      case GENERIC:
+        return new PlatformDdl(platform);
+      case POSTGRES:
+        return new PostgresDdl(platform);
+      case SQLSERVER:
+        return new SqlServerDdl(platform);
+      case SQLANYWHERE:
+        return new PlatformDdl(platform);
+      default:
+        return new PlatformDdl(platform);
+    }
+  }
+}