getPendingDrops() {
- return migrated.getPendingDrops();
- }
-
- /**
- * Create and return the diff of the current model to the migration model.
- */
- public Migration createDiffMigration() {
- ModelDiff diff = new ModelDiff(migrated);
- diff.compareTo(current);
- return diff.isEmpty() ? null : diff.getMigration();
- }
- }
-
- private String generateMigration(Request request, Migration dbMigration, String dropsFor) throws IOException {
-
- String fullVersion = getFullVersion(request.migrationModel, dropsFor);
-
- logger.info("generating migration:{}", fullVersion);
- if (!writeMigrationXml(dbMigration, request.modelDir, fullVersion)) {
- logger.warn("migration already exists, not generating DDL");
- return null;
- } else {
- if (!platforms.isEmpty()) {
- writeExtraPlatformDdl(fullVersion, request.currentModel, dbMigration, request.migrationDir);
-
- } else if (databasePlatform != null) {
- // writer needs the current model to provide table/column details for
- // history ddl generation (triggers, history tables etc)
- DdlWrite write = new DdlWrite(new MConfiguration(), request.current);
- PlatformDdlWriter writer = createDdlWriter(databasePlatform);
- writer.processMigration(dbMigration, write, request.migrationDir, fullVersion);
- }
- return fullVersion;
- }
- }
-
- /**
- * Return true if the next pending drop changeSet should be generated as the next migration.
- */
- private String generatePendingDrop() {
-
- String nextDrop = System.getProperty("ddl.migration.pendingDropsFor");
- if (nextDrop != null) {
- return nextDrop;
- }
- return migrationConfig.getGeneratePendingDrop();
- }
-
- /**
- * Return the full version for the migration being generated.
- *
- * The full version can contain a comment suffix after a "__" double underscore.
- */
- private String getFullVersion(MigrationModel migrationModel, String dropsFor) {
-
- String version = migrationConfig.getVersion();
- if (version == null) {
- version = migrationModel.getNextVersion(initialVersion);
- }
-
- String fullVersion = migrationConfig.getApplyPrefix() + version;
- if (migrationConfig.getName() != null) {
- fullVersion += "__" + toUnderScore(migrationConfig.getName());
-
- } else if (dropsFor != null) {
- fullVersion += "__" + toUnderScore("dropsFor_" + MigrationVersion.trim(dropsFor));
-
- } else if (version.equals(initialVersion)) {
- fullVersion += "__initial";
- }
- return fullVersion;
- }
-
- /**
- * Replace spaces with underscores.
- */
- private String toUnderScore(String name) {
- return name.replace(' ', '_');
- }
-
- /**
- * Write any extra platform ddl.
- */
- protected void writeExtraPlatformDdl(String fullVersion, CurrentModel currentModel, Migration dbMigration, File writePath) throws IOException {
-
- for (Pair pair : platforms) {
- DdlWrite platformBuffer = new DdlWrite(new MConfiguration(), currentModel.read());
- PlatformDdlWriter platformWriter = createDdlWriter(pair.platform);
- File subPath = platformWriter.subPath(writePath, pair.prefix);
- platformWriter.processMigration(dbMigration, platformBuffer, subPath, fullVersion);
-
- generateExtraDdl(subPath, pair.platform);
- }
- }
-
- private PlatformDdlWriter createDdlWriter(DatabasePlatform platform) {
- return new PlatformDdlWriter(platform, serverConfig, migrationConfig);
- }
-
- /**
- * Write the migration xml.
- */
- protected boolean writeMigrationXml(Migration dbMigration, File resourcePath, String fullVersion) {
-
- String modelFile = fullVersion + migrationConfig.getModelSuffix();
- File file = new File(resourcePath, modelFile);
- if (file.exists()) {
- return false;
- }
- String comment = migrationConfig.isIncludeGeneratedFileComment() ? GENERATED_COMMENT : null;
- MigrationXmlWriter xmlWriter = new MigrationXmlWriter(comment);
- xmlWriter.write(dbMigration, file);
- return true;
- }
-
- /**
- * Set default server and platform if necessary.
- */
- protected void setDefaults() {
- if (server == null) {
- setServer(Ebean.getDefaultServer());
- }
- if (databasePlatform == null && platforms.isEmpty()) {
- // not explicitly set not set a list of platforms so
- // default to the platform of the default server
- databasePlatform = server.getDatabasePlatform();
- logger.debug("set platform to {}", databasePlatform.getName());
- }
- }
-
- /**
- * Return the file path to write the xml and sql to.
- */
- protected File getMigrationDirectory() {
-
- // path to src/main/resources in typical maven project
- File resourceRootDir = new File(pathToResources);
- String resourcePath = migrationConfig.getMigrationPath();
-
- // expect to be a path to something like - src/main/resources/dbmigration/model
- File path = new File(resourceRootDir, resourcePath);
- if (!path.exists()) {
- if (!path.mkdirs()) {
- logger.debug("Unable to ensure migration directory exists at {}", path.getAbsolutePath());
- }
- }
- return path;
- }
-
- /**
- * Return the model directory (relative to the migration directory).
- */
- protected File getModelDirectory(File migrationDirectory) {
- String modelPath = migrationConfig.getModelPath();
- if (modelPath == null || modelPath.isEmpty()) {
- return migrationDirectory;
- }
- File modelDir = new File(migrationDirectory, migrationConfig.getModelPath());
- if (!modelDir.exists() && !modelDir.mkdirs()) {
- logger.debug("Unable to ensure migration model directory exists at {}", modelDir.getAbsolutePath());
- }
- return modelDir;
- }
-
- /**
- * Return the DatabasePlatform given the platform key.
- */
- protected DatabasePlatform getPlatform(Platform platform) {
- switch (platform) {
- case H2:
- return new H2Platform();
- case HSQLDB:
- return new HsqldbPlatform();
- case POSTGRES:
- return new PostgresPlatform();
- case MYSQL:
- return new MySqlPlatform();
- case ORACLE:
- return new OraclePlatform();
- case SQLANYWHERE:
- return new SqlAnywherePlatform();
- case SQLSERVER:
- return new SqlServerPlatform();
- case DB2:
- return new DB2Platform();
- case SQLITE:
- return new SQLitePlatform();
- case GENERIC:
- return new DatabasePlatform();
-
- default:
- throw new IllegalArgumentException("Platform missing? " + platform);
- }
- }
-
- /**
- * Holds a platform and prefix. Used to generate multiple platform specific DDL
- * for a single migration.
- */
- public static class Pair {
-
- /**
- * The platform to generate the DDL for.
- */
- public final DatabasePlatform platform;
-
- /**
- * A prefix included into the file/resource names indicating the platform.
- */
- public final String prefix;
-
- public Pair(DatabasePlatform platform, String prefix) {
- this.platform = platform;
- this.prefix = prefix;
- }
- }
-
+ String generateMigration() throws IOException;
}
diff --git a/src/main/java/io/ebean/dbmigration/DbMigrationFactory.java b/src/main/java/io/ebean/dbmigration/DbMigrationFactory.java
new file mode 100644
index 000000000..4256af1f4
--- /dev/null
+++ b/src/main/java/io/ebean/dbmigration/DbMigrationFactory.java
@@ -0,0 +1,16 @@
+package io.ebean.dbmigration;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+class DbMigrationFactory {
+
+ static DbMigration create() {
+
+ Iterator loader = ServiceLoader.load(DbMigration.class).iterator();
+ if (loader.hasNext()) {
+ return loader.next();
+ }
+ throw new IllegalStateException("No service implementation found for DbMigration?");
+ }
+}
diff --git a/src/main/java/io/ebean/dbmigration/package-info.java b/src/main/java/io/ebean/dbmigration/package-info.java
index ad0faf372..3163a3c9a 100644
--- a/src/main/java/io/ebean/dbmigration/package-info.java
+++ b/src/main/java/io/ebean/dbmigration/package-info.java
@@ -1,8 +1,4 @@
/**
- * Generation DDL migration scripts based on changes to the model.
- *
- * You can use DbMigration to compare the entity bean model to its prior state
- * and generate DDL for the differences - adding tables, columns etc.
- *
+ * Generates DDL migration scripts based on changes to the model.
*/
package io.ebean.dbmigration;
diff --git a/src/main/java/io/ebean/dbmigration/DbOffline.java b/src/main/java/io/ebeaninternal/dbmigration/DbOffline.java
similarity index 98%
rename from src/main/java/io/ebean/dbmigration/DbOffline.java
rename to src/main/java/io/ebeaninternal/dbmigration/DbOffline.java
index 36191ceb1..2d0dfa1b3 100644
--- a/src/main/java/io/ebean/dbmigration/DbOffline.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DbOffline.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration;
+package io.ebeaninternal.dbmigration;
import io.ebean.annotation.Platform;
import org.slf4j.Logger;
diff --git a/src/main/java/io/ebean/dbmigration/DdlGenerator.java b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
similarity index 98%
rename from src/main/java/io/ebean/dbmigration/DdlGenerator.java
rename to src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index d3a18ddb5..65826830e 100644
--- a/src/main/java/io/ebean/dbmigration/DdlGenerator.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -1,8 +1,8 @@
-package io.ebean.dbmigration;
+package io.ebeaninternal.dbmigration;
import io.ebean.Transaction;
import io.ebean.config.ServerConfig;
-import io.ebean.dbmigration.model.CurrentModel;
+import io.ebeaninternal.dbmigration.model.CurrentModel;
import io.ebeaninternal.api.SpiEbeanServer;
import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader;
import io.ebean.migration.ddl.DdlRunner;
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
new file mode 100644
index 000000000..95662d04a
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -0,0 +1,578 @@
+package io.ebeaninternal.dbmigration;
+
+import io.ebean.Ebean;
+import io.ebean.EbeanServer;
+import io.ebean.dbmigration.DbMigration;
+import io.ebean.config.DbConstraintNaming;
+import io.ebean.config.DbMigrationConfig;
+import io.ebean.annotation.Platform;
+import io.ebean.config.ServerConfig;
+import io.ebean.config.dbplatform.db2.DB2Platform;
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebean.config.dbplatform.hsqldb.HsqldbPlatform;
+import io.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
+import io.ebean.config.dbplatform.mysql.MySqlPlatform;
+import io.ebean.config.dbplatform.oracle.OraclePlatform;
+import io.ebean.config.dbplatform.postgres.PostgresPlatform;
+import io.ebean.config.dbplatform.sqlanywhere.SqlAnywherePlatform;
+import io.ebean.config.dbplatform.sqlite.SQLitePlatform;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.migration.Migration;
+import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlWriter;
+import io.ebeaninternal.dbmigration.model.CurrentModel;
+import io.ebeaninternal.dbmigration.model.MConfiguration;
+import io.ebeaninternal.dbmigration.model.MigrationModel;
+import io.ebeaninternal.dbmigration.model.MigrationVersion;
+import io.ebeaninternal.dbmigration.model.ModelContainer;
+import io.ebeaninternal.dbmigration.model.ModelDiff;
+import io.ebeaninternal.dbmigration.model.PlatformDdlWriter;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.extraddl.model.DdlScript;
+import io.ebeaninternal.extraddl.model.ExtraDdl;
+import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Generates DB Migration xml and sql scripts.
+ *
+ * Reads the prior migrations and compares with the current model of the EbeanServer
+ * and generates a migration 'diff' in the form of xml document with the logical schema
+ * changes and a series of sql scripts to apply, rollback the applied changes if necessary
+ * and drop objects (drop tables, drop columns).
+ *
+ *
+ * This does not run the migration or ddl scripts but just generates them.
+ *
+ * {@code
+ *
+ * DefaultDbMigration migration = new DefaultDbMigration();
+ * migration.setPathToResources("src/main/resources");
+ * migration.setPlatform(DbPlatformName.ORACLE);
+ *
+ * migration.generateMigration();
+ *
+ * }
+ */
+public class DefaultDbMigration implements DbMigration {
+
+ protected static final Logger logger = LoggerFactory.getLogger(DefaultDbMigration.class);
+
+ private static final String initialVersion = "1.0";
+
+ private static final String GENERATED_COMMENT = "THIS IS A GENERATED FILE - DO NOT MODIFY";
+
+ /**
+ * Set to true if DefaultDbMigration run with online EbeanServer instance.
+ */
+ protected final boolean online;
+
+ protected SpiEbeanServer server;
+
+ protected DbMigrationConfig migrationConfig;
+
+ protected String pathToResources = "src/main/resources";
+
+ protected DatabasePlatform databasePlatform;
+
+ protected List platforms = new ArrayList<>();
+
+ protected ServerConfig serverConfig;
+
+ protected DbConstraintNaming constraintNaming;
+
+ /**
+ * Create for offline migration generation.
+ */
+ public DefaultDbMigration() {
+ this.online = false;
+ }
+
+ /**
+ * Create using online EbeanServer.
+ */
+ public DefaultDbMigration(EbeanServer server) {
+ this.online = true;
+ setServer(server);
+ }
+
+ /**
+ * Set the path from the current working directory to the application resources.
+ *
+ * This defaults to maven style 'src/main/resources'.
+ */
+ @Override
+ public void setPathToResources(String pathToResources) {
+ this.pathToResources = pathToResources;
+ }
+
+ /**
+ * Set the server to use to determine the current model.
+ * Typically this is not called explicitly.
+ */
+ @Override
+ public void setServer(EbeanServer ebeanServer) {
+ this.server = (SpiEbeanServer) ebeanServer;
+ setServerConfig(server.getServerConfig());
+ }
+
+ /**
+ * Set the serverConfig to use. Typically this is not called explicitly.
+ */
+ @Override
+ public void setServerConfig(ServerConfig config) {
+ if (this.serverConfig == null) {
+ this.serverConfig = config;
+ }
+ if (migrationConfig == null) {
+ this.migrationConfig = serverConfig.getMigrationConfig();
+ }
+ if (constraintNaming == null) {
+ this.constraintNaming = serverConfig.getConstraintNaming();
+ }
+ }
+
+ /**
+ * Set the specific platform to generate DDL for.
+ *
+ * If not set this defaults to the platform of the default server.
+ *
+ */
+ @Override
+ public void setPlatform(Platform platform) {
+ setPlatform(getPlatform(platform));
+ }
+
+ /**
+ * Set the specific platform to generate DDL for.
+ *
+ * If not set this defaults to the platform of the default server.
+ *
+ */
+ @Override
+ public void setPlatform(DatabasePlatform databasePlatform) {
+ this.databasePlatform = databasePlatform;
+ if (!online) {
+ DbOffline.setPlatform(databasePlatform.getPlatform());
+ }
+ }
+
+ /**
+ * Add an additional platform to write the migration DDL.
+ *
+ * Use this when you want to generate sql scripts for multiple database platforms
+ * from the migration (e.g. generate migration sql for MySql, Postgres and Oracle).
+ *
+ */
+ @Override
+ public void addPlatform(Platform platform, String prefix) {
+ platforms.add(new Pair(getPlatform(platform), prefix));
+ }
+
+ /**
+ * Generate the next migration xml file and associated apply and rollback sql scripts.
+ *
+ * This does not run the migration or ddl scripts but just generates them.
+ *
+ * Example: Run for a single specific platform
+ * {@code
+ *
+ * DefaultDbMigration migration = new DefaultDbMigration();
+ * migration.setPathToResources("src/main/resources");
+ * migration.setPlatform(DbPlatformName.ORACLE);
+ *
+ * migration.generateMigration();
+ *
+ * }
+ *
+ *
Example: Run migration generating DDL for multiple platforms
+ * {@code
+ *
+ * DefaultDbMigration migration = new DefaultDbMigration();
+ * migration.setPathToResources("src/main/resources");
+ *
+ * migration.addPlatform(DbPlatformName.POSTGRES, "pg");
+ * migration.addPlatform(DbPlatformName.MYSQL, "mysql");
+ * migration.addPlatform(DbPlatformName.ORACLE, "mysql");
+ *
+ * migration.generateMigration();
+ *
+ * }
+ * @return the generated migration or null
+ */
+ @Override
+ public String generateMigration() throws IOException {
+
+ // use this flag to stop other plugins like full DDL generation
+ if (!online) {
+ DbOffline.setGenerateMigration();
+ if (databasePlatform == null && !platforms.isEmpty()) {
+ // for multiple platform generation set the general platform
+ // to H2 so that it runs offline without DB connection
+ setPlatform(platforms.get(0).platform);
+ }
+ }
+ setDefaults();
+ try {
+ Request request = createRequest();
+
+ if (platforms.isEmpty()) {
+ generateExtraDdl(request.migrationDir, databasePlatform);
+ }
+
+ String pendingVersion = generatePendingDrop();
+ if (pendingVersion != null) {
+ return generatePendingDrop(request, pendingVersion);
+ } else {
+ return generateDiff(request);
+ }
+
+ } finally {
+ if (!online) {
+ DbOffline.reset();
+ }
+ }
+ }
+
+ /**
+ * Generate "repeatable" migration scripts.
+ *
+ * These take scrips from extra-dll.xml (typically views) and outputs "repeatable"
+ * migration scripts (starting with "R__") to be run by FlywayDb or Ebean's own
+ * migration runner.
+ *
+ */
+ private void generateExtraDdl(File migrationDir, DatabasePlatform dbPlatform) throws IOException {
+
+ if (dbPlatform != null) {
+ ExtraDdl extraDdl = ExtraDdlXmlReader.read("/extra-ddl.xml");
+ if (extraDdl != null) {
+ List ddlScript = extraDdl.getDdlScript();
+ for (DdlScript script : ddlScript) {
+ if (ExtraDdlXmlReader.matchPlatform(dbPlatform.getName(), script.getPlatforms())) {
+ writeExtraDdl(migrationDir, script);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Write (or override) the "repeatable" migration script.
+ */
+ private void writeExtraDdl(File migrationDir, DdlScript script) throws IOException {
+
+ String fullName = repeatableMigrationName(script.getName());
+
+ logger.info("writing repeatable script {}", fullName);
+
+ File file = new File(migrationDir, fullName);
+ try (FileWriter writer = new FileWriter(file)) {
+ writer.write(script.getValue());
+ writer.flush();
+ }
+ }
+
+ private String repeatableMigrationName(String scriptName) {
+ return "R__" + scriptName.replace(' ', '_') + migrationConfig.getApplySuffix();
+ }
+
+ /**
+ * Generate the diff migration.
+ */
+ private String generateDiff(Request request) throws IOException {
+
+ List pendingDrops = request.getPendingDrops();
+ if (!pendingDrops.isEmpty()) {
+ logger.info("Pending un-applied drops in versions {}", pendingDrops);
+ }
+
+ Migration migration = request.createDiffMigration();
+ if (migration == null) {
+ logger.info("no changes detected - no migration written");
+ return null;
+ } else {
+ // there were actually changes to write
+ return generateMigration(request, migration, null);
+ }
+ }
+
+ /**
+ * Generate the migration based on the pendingDrops from a prior version.
+ */
+ private String generatePendingDrop(Request request, String pendingVersion) throws IOException {
+
+ Migration migration = request.migrationForPendingDrop(pendingVersion);
+
+ String version = generateMigration(request, migration, pendingVersion);
+
+ List pendingDrops = request.getPendingDrops();
+ if (!pendingDrops.isEmpty()) {
+ logger.info("... remaining pending un-applied drops in versions {}", pendingDrops);
+ }
+ return version;
+ }
+
+ private Request createRequest() {
+ return new Request();
+ }
+
+ private class Request {
+
+ final File migrationDir;
+ final File modelDir;
+ final MigrationModel migrationModel;
+ final CurrentModel currentModel;
+ final ModelContainer migrated;
+ final ModelContainer current;
+
+ private Request() {
+ this.migrationDir = getMigrationDirectory();
+ this.modelDir = getModelDirectory(migrationDir);
+ this.migrationModel = new MigrationModel(modelDir, migrationConfig.getModelSuffix());
+ this.migrated = migrationModel.read();
+ this.currentModel = new CurrentModel(server, constraintNaming);
+ this.current = currentModel.read();
+ }
+
+ /**
+ * Return the migration for the pending drops for a given version.
+ */
+ public Migration migrationForPendingDrop(String pendingVersion) {
+
+ Migration migration = migrated.migrationForPendingDrop(pendingVersion);
+
+ // register any remaining pending drops
+ migrated.registerPendingHistoryDropColumns(current);
+ return migration;
+ }
+
+ /**
+ * Return the list of versions that have pending un-applied drops.
+ */
+ public List getPendingDrops() {
+ return migrated.getPendingDrops();
+ }
+
+ /**
+ * Create and return the diff of the current model to the migration model.
+ */
+ public Migration createDiffMigration() {
+ ModelDiff diff = new ModelDiff(migrated);
+ diff.compareTo(current);
+ return diff.isEmpty() ? null : diff.getMigration();
+ }
+ }
+
+ private String generateMigration(Request request, Migration dbMigration, String dropsFor) throws IOException {
+
+ String fullVersion = getFullVersion(request.migrationModel, dropsFor);
+
+ logger.info("generating migration:{}", fullVersion);
+ if (!writeMigrationXml(dbMigration, request.modelDir, fullVersion)) {
+ logger.warn("migration already exists, not generating DDL");
+ return null;
+ } else {
+ if (!platforms.isEmpty()) {
+ writeExtraPlatformDdl(fullVersion, request.currentModel, dbMigration, request.migrationDir);
+
+ } else if (databasePlatform != null) {
+ // writer needs the current model to provide table/column details for
+ // history ddl generation (triggers, history tables etc)
+ DdlWrite write = new DdlWrite(new MConfiguration(), request.current);
+ PlatformDdlWriter writer = createDdlWriter(databasePlatform);
+ writer.processMigration(dbMigration, write, request.migrationDir, fullVersion);
+ }
+ return fullVersion;
+ }
+ }
+
+ /**
+ * Return true if the next pending drop changeSet should be generated as the next migration.
+ */
+ private String generatePendingDrop() {
+
+ String nextDrop = System.getProperty("ddl.migration.pendingDropsFor");
+ if (nextDrop != null) {
+ return nextDrop;
+ }
+ return migrationConfig.getGeneratePendingDrop();
+ }
+
+ /**
+ * Return the full version for the migration being generated.
+ *
+ * The full version can contain a comment suffix after a "__" double underscore.
+ */
+ private String getFullVersion(MigrationModel migrationModel, String dropsFor) {
+
+ String version = migrationConfig.getVersion();
+ if (version == null) {
+ version = migrationModel.getNextVersion(initialVersion);
+ }
+
+ String fullVersion = migrationConfig.getApplyPrefix() + version;
+ if (migrationConfig.getName() != null) {
+ fullVersion += "__" + toUnderScore(migrationConfig.getName());
+
+ } else if (dropsFor != null) {
+ fullVersion += "__" + toUnderScore("dropsFor_" + MigrationVersion.trim(dropsFor));
+
+ } else if (version.equals(initialVersion)) {
+ fullVersion += "__initial";
+ }
+ return fullVersion;
+ }
+
+ /**
+ * Replace spaces with underscores.
+ */
+ private String toUnderScore(String name) {
+ return name.replace(' ', '_');
+ }
+
+ /**
+ * Write any extra platform ddl.
+ */
+ protected void writeExtraPlatformDdl(String fullVersion, CurrentModel currentModel, Migration dbMigration, File writePath) throws IOException {
+
+ for (Pair pair : platforms) {
+ DdlWrite platformBuffer = new DdlWrite(new MConfiguration(), currentModel.read());
+ PlatformDdlWriter platformWriter = createDdlWriter(pair.platform);
+ File subPath = platformWriter.subPath(writePath, pair.prefix);
+ platformWriter.processMigration(dbMigration, platformBuffer, subPath, fullVersion);
+
+ generateExtraDdl(subPath, pair.platform);
+ }
+ }
+
+ private PlatformDdlWriter createDdlWriter(DatabasePlatform platform) {
+ return new PlatformDdlWriter(platform, serverConfig, migrationConfig);
+ }
+
+ /**
+ * Write the migration xml.
+ */
+ protected boolean writeMigrationXml(Migration dbMigration, File resourcePath, String fullVersion) {
+
+ String modelFile = fullVersion + migrationConfig.getModelSuffix();
+ File file = new File(resourcePath, modelFile);
+ if (file.exists()) {
+ return false;
+ }
+ String comment = migrationConfig.isIncludeGeneratedFileComment() ? GENERATED_COMMENT : null;
+ MigrationXmlWriter xmlWriter = new MigrationXmlWriter(comment);
+ xmlWriter.write(dbMigration, file);
+ return true;
+ }
+
+ /**
+ * Set default server and platform if necessary.
+ */
+ protected void setDefaults() {
+ if (server == null) {
+ setServer(Ebean.getDefaultServer());
+ }
+ if (databasePlatform == null && platforms.isEmpty()) {
+ // not explicitly set not set a list of platforms so
+ // default to the platform of the default server
+ databasePlatform = server.getDatabasePlatform();
+ logger.debug("set platform to {}", databasePlatform.getName());
+ }
+ }
+
+ /**
+ * Return the file path to write the xml and sql to.
+ */
+ protected File getMigrationDirectory() {
+
+ // path to src/main/resources in typical maven project
+ File resourceRootDir = new File(pathToResources);
+ String resourcePath = migrationConfig.getMigrationPath();
+
+ // expect to be a path to something like - src/main/resources/dbmigration/model
+ File path = new File(resourceRootDir, resourcePath);
+ if (!path.exists()) {
+ if (!path.mkdirs()) {
+ logger.debug("Unable to ensure migration directory exists at {}", path.getAbsolutePath());
+ }
+ }
+ return path;
+ }
+
+ /**
+ * Return the model directory (relative to the migration directory).
+ */
+ protected File getModelDirectory(File migrationDirectory) {
+ String modelPath = migrationConfig.getModelPath();
+ if (modelPath == null || modelPath.isEmpty()) {
+ return migrationDirectory;
+ }
+ File modelDir = new File(migrationDirectory, migrationConfig.getModelPath());
+ if (!modelDir.exists() && !modelDir.mkdirs()) {
+ logger.debug("Unable to ensure migration model directory exists at {}", modelDir.getAbsolutePath());
+ }
+ return modelDir;
+ }
+
+ /**
+ * Return the DatabasePlatform given the platform key.
+ */
+ protected DatabasePlatform getPlatform(Platform platform) {
+ switch (platform) {
+ case H2:
+ return new H2Platform();
+ case HSQLDB:
+ return new HsqldbPlatform();
+ case POSTGRES:
+ return new PostgresPlatform();
+ case MYSQL:
+ return new MySqlPlatform();
+ case ORACLE:
+ return new OraclePlatform();
+ case SQLANYWHERE:
+ return new SqlAnywherePlatform();
+ case SQLSERVER:
+ return new SqlServerPlatform();
+ case DB2:
+ return new DB2Platform();
+ case SQLITE:
+ return new SQLitePlatform();
+ case GENERIC:
+ return new DatabasePlatform();
+
+ default:
+ throw new IllegalArgumentException("Platform missing? " + platform);
+ }
+ }
+
+ /**
+ * Holds a platform and prefix. Used to generate multiple platform specific DDL
+ * for a single migration.
+ */
+ public static class Pair {
+
+ /**
+ * The platform to generate the DDL for.
+ */
+ public final DatabasePlatform platform;
+
+ /**
+ * A prefix included into the file/resource names indicating the platform.
+ */
+ public final String prefix;
+
+ public Pair(DatabasePlatform platform, String prefix) {
+ this.platform = platform;
+ this.prefix = prefix;
+ }
+ }
+
+}
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/BaseDdlHandler.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java
similarity index 79%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/BaseDdlHandler.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java
index 6effd8e43..d01e08adb 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/BaseDdlHandler.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java
@@ -1,19 +1,19 @@
-package io.ebean.dbmigration.ddlgeneration;
+package io.ebeaninternal.dbmigration.ddlgeneration;
import io.ebean.config.ServerConfig;
-import io.ebean.dbmigration.ddlgeneration.platform.BaseTableDdl;
-import io.ebean.dbmigration.ddlgeneration.platform.PlatformDdl;
-import io.ebean.dbmigration.migration.AddColumn;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.AddTableComment;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.ChangeSet;
-import io.ebean.dbmigration.migration.CreateIndex;
-import io.ebean.dbmigration.migration.CreateTable;
-import io.ebean.dbmigration.migration.DropColumn;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.migration.DropIndex;
-import io.ebean.dbmigration.migration.DropTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.BaseTableDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
+import io.ebeaninternal.dbmigration.migration.AddColumn;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.AddTableComment;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.ChangeSet;
+import io.ebeaninternal.dbmigration.migration.CreateIndex;
+import io.ebeaninternal.dbmigration.migration.CreateTable;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropIndex;
+import io.ebeaninternal.dbmigration.migration.DropTable;
import java.io.IOException;
import java.util.List;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/ColumnDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/ColumnDdl.java
similarity index 68%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/ColumnDdl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/ColumnDdl.java
index 0da9bca71..fa334e88a 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/ColumnDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/ColumnDdl.java
@@ -1,8 +1,8 @@
-package io.ebean.dbmigration.ddlgeneration;
+package io.ebeaninternal.dbmigration.ddlgeneration;
-import io.ebean.dbmigration.migration.AddColumn;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.AddColumn;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
import java.io.IOException;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/DdlBuffer.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlBuffer.java
similarity index 90%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/DdlBuffer.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlBuffer.java
index 12f470e73..2ecbdc8ea 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/DdlBuffer.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlBuffer.java
@@ -1,6 +1,6 @@
-package io.ebean.dbmigration.ddlgeneration;
+package io.ebeaninternal.dbmigration.ddlgeneration;
-import io.ebean.dbmigration.model.MConfiguration;
+import io.ebeaninternal.dbmigration.model.MConfiguration;
import java.io.IOException;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/DdlHandler.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java
similarity index 59%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/DdlHandler.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java
index f3db078d9..66d8c0fe1 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/DdlHandler.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java
@@ -1,16 +1,16 @@
-package io.ebean.dbmigration.ddlgeneration;
+package io.ebeaninternal.dbmigration.ddlgeneration;
-import io.ebean.dbmigration.migration.AddColumn;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.AddTableComment;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.ChangeSet;
-import io.ebean.dbmigration.migration.CreateIndex;
-import io.ebean.dbmigration.migration.CreateTable;
-import io.ebean.dbmigration.migration.DropColumn;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.migration.DropIndex;
-import io.ebean.dbmigration.migration.DropTable;
+import io.ebeaninternal.dbmigration.migration.AddColumn;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.AddTableComment;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.ChangeSet;
+import io.ebeaninternal.dbmigration.migration.CreateIndex;
+import io.ebeaninternal.dbmigration.migration.CreateTable;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropIndex;
+import io.ebeaninternal.dbmigration.migration.DropTable;
import java.io.IOException;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/DdlWrite.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java
similarity index 90%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/DdlWrite.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java
index a616b7efe..699f1324d 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/DdlWrite.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java
@@ -1,9 +1,9 @@
-package io.ebean.dbmigration.ddlgeneration;
+package io.ebeaninternal.dbmigration.ddlgeneration;
-import io.ebean.dbmigration.ddlgeneration.platform.BaseDdlBuffer;
-import io.ebean.dbmigration.model.MConfiguration;
-import io.ebean.dbmigration.model.MTable;
-import io.ebean.dbmigration.model.ModelContainer;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.BaseDdlBuffer;
+import io.ebeaninternal.dbmigration.model.MConfiguration;
+import io.ebeaninternal.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.model.ModelContainer;
/**
* Write context holding the buffers for both apply and rollback DDL.
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/TableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java
similarity index 70%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/TableDdl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java
index 4e6339e27..263c9e136 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/TableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java
@@ -1,15 +1,15 @@
-package io.ebean.dbmigration.ddlgeneration;
+package io.ebeaninternal.dbmigration.ddlgeneration;
-import io.ebean.dbmigration.migration.AddColumn;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.AddTableComment;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.CreateIndex;
-import io.ebean.dbmigration.migration.CreateTable;
-import io.ebean.dbmigration.migration.DropColumn;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.migration.DropIndex;
-import io.ebean.dbmigration.migration.DropTable;
+import io.ebeaninternal.dbmigration.migration.AddColumn;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.AddTableComment;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.CreateIndex;
+import io.ebeaninternal.dbmigration.migration.CreateTable;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropIndex;
+import io.ebeaninternal.dbmigration.migration.DropTable;
import java.io.IOException;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java
similarity index 91%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java
index bf44201b9..fad70f133 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java
@@ -1,7 +1,7 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.model.MConfiguration;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.model.MConfiguration;
import java.io.IOException;
import java.io.StringWriter;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
similarity index 96%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index 0f6cd24bd..38e9f81ea 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -1,29 +1,29 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.DbConstraintNaming;
import io.ebean.config.NamingConvention;
import io.ebean.config.ServerConfig;
import io.ebean.config.dbplatform.DbHistorySupport;
import io.ebean.config.dbplatform.IdType;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.ddlgeneration.TableDdl;
-import io.ebean.dbmigration.ddlgeneration.platform.util.IndexSet;
-import io.ebean.dbmigration.migration.AddColumn;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.AddTableComment;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.Column;
-import io.ebean.dbmigration.migration.CreateIndex;
-import io.ebean.dbmigration.migration.CreateTable;
-import io.ebean.dbmigration.migration.DdlScript;
-import io.ebean.dbmigration.migration.DropColumn;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.migration.DropIndex;
-import io.ebean.dbmigration.migration.DropTable;
-import io.ebean.dbmigration.migration.ForeignKey;
-import io.ebean.dbmigration.migration.UniqueConstraint;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.ddlgeneration.TableDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.util.IndexSet;
+import io.ebeaninternal.dbmigration.migration.AddColumn;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.AddTableComment;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.Column;
+import io.ebeaninternal.dbmigration.migration.CreateIndex;
+import io.ebeaninternal.dbmigration.migration.CreateTable;
+import io.ebeaninternal.dbmigration.migration.DdlScript;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropIndex;
+import io.ebeaninternal.dbmigration.migration.DropTable;
+import io.ebeaninternal.dbmigration.migration.ForeignKey;
+import io.ebeaninternal.dbmigration.migration.UniqueConstraint;
+import io.ebeaninternal.dbmigration.model.MTable;
import io.ebean.util.StringHelper;
import java.io.IOException;
@@ -58,7 +58,7 @@ public class BaseTableDdl implements TableDdl {
* Used when unique constraints specifically for OneToOne can't be created normally (MsSqlServer).
*/
protected List externalUnique = new ArrayList<>();
-
+
protected List externalCompoundUnique = new ArrayList<>();
// counters used when constraint names are truncated due to maximum length
@@ -77,7 +77,7 @@ public class BaseTableDdl implements TableDdl {
private boolean strict;
private final boolean sql2011History;
-
+
/**
* Helper class that is used to execute the migration ddl before and after the migration action.
*/
@@ -100,7 +100,7 @@ public class BaseTableDdl implements TableDdl {
if (column.getBefore().isEmpty() && alterNotNull && defaultValue == null) {
handleStrictError("non-null column has no default value: " + tableName + "." + columnName);
}
-
+
before = getScriptsForPlatform(column.getBefore(), platformDdl.getPlatform().getName());
after = getScriptsForPlatform(column.getAfter(), platformDdl.getPlatform().getName());
@@ -112,10 +112,10 @@ public class BaseTableDdl implements TableDdl {
DdlMigrationHelp(AlterColumn alter) throws IOException {
this.tableName = alter.getTableName();
this.columnName = alter.getColumnName();
-
+
String tmp = alter.getDefaultValue() != null ? alter.getDefaultValue() : alter.getCurrentDefaultValue();
this.defaultValue = platformDdl.convertDefaultValue(tmp);
-
+
boolean alterNotNull = Boolean.TRUE.equals(alter.isNotnull());
// here we add the platform's default update script
if (alter.getBefore().isEmpty() && alterNotNull) {
@@ -126,11 +126,11 @@ public class BaseTableDdl implements TableDdl {
} else {
before = getScriptsForPlatform(alter.getBefore(), platformDdl.getPlatform().getName());
}
-
+
after = getScriptsForPlatform(alter.getAfter(), platformDdl.getPlatform().getName());
-
+
}
-
+
public void writeBefore(DdlBuffer buffer) throws IOException {
if (!before.isEmpty()) {
buffer.end();
@@ -140,7 +140,7 @@ public class BaseTableDdl implements TableDdl {
buffer.endOfStatement();
}
}
-
+
public void writeAfter(DdlBuffer buffer) throws IOException {
// here we run postmigration scripts
for (String ddlScript : after) {
@@ -182,7 +182,7 @@ public class BaseTableDdl implements TableDdl {
System.err.println("Error in DDL: " + message);
}
}
-
+
public String getDefaultValue() {
return defaultValue;
}
@@ -341,7 +341,7 @@ public class BaseTableDdl implements TableDdl {
.append(platformDdl.dropIndex(uqName, tableName))
.endOfStatement();
}
-
+
for (UniqueConstraint constraint : externalCompoundUnique) {
String uqName = constraint.getName();
String[] columnNames = StringHelper.delimitedToArray(constraint.getColumnNames(), ",", false);
@@ -524,7 +524,7 @@ public class BaseTableDdl implements TableDdl {
buffer.append(platformDdl.dropSequence(sequenceName)).endOfStatement();
}
-
+
/**
* Write all the check constraints.
*/
@@ -790,7 +790,7 @@ public class BaseTableDdl implements TableDdl {
public void generate(DdlWrite writer, AlterColumn alterColumn) throws IOException {
DdlMigrationHelp ddlHelp = new DdlMigrationHelp(alterColumn);
ddlHelp.writeBefore(writer.apply());
-
+
if (isTrue(alterColumn.isHistoryExclude())) {
regenerateHistoryTriggers(alterColumn.getTableName(), HistoryTableUpdate.Change.EXCLUDE, alterColumn.getColumnName());
} else if (isFalse(alterColumn.isHistoryExclude())) {
@@ -996,13 +996,13 @@ public class BaseTableDdl implements TableDdl {
}
protected void alterTableAddColumn(DdlBuffer buffer, String tableName, Column column, boolean onHistoryTable) throws IOException {
- DdlMigrationHelp help = new DdlMigrationHelp(tableName, column);
+ DdlMigrationHelp help = new DdlMigrationHelp(tableName, column);
if (!onHistoryTable) {
help.writeBefore(buffer);
}
-
+
platformDdl.alterTableAddColumn(buffer, tableName, column, onHistoryTable, help.getDefaultValue());
-
+
if (!onHistoryTable) {
help.writeAfter(buffer);
}
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DB2Ddl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java
similarity index 94%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DB2Ddl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java
index 06550d803..0a8659421 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DB2Ddl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.dbplatform.DatabasePlatform;
@@ -16,7 +16,7 @@ public class DB2Ddl extends PlatformDdl {
this.identitySuffix = " generated by default as identity";
this.inlineUniqueWhenNullable = false;
}
-
+
@Override
public String alterTableAddUniqueConstraint(String tableName, String uqName, String[] columns, boolean notNull) {
if (notNull) {
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
similarity index 96%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
index 87e3e6c4b..baceee338 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
@@ -1,13 +1,13 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.DbConstraintNaming;
import io.ebean.config.ServerConfig;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.model.MColumn;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.model.MColumn;
+import io.ebeaninternal.dbmigration.model.MTable;
import java.io.IOException;
import java.util.Collection;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java
similarity index 86%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java
index 0206edf43..d36de350c 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java
@@ -1,7 +1,7 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
import java.util.List;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DdlHelp.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlHelp.java
similarity index 89%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DdlHelp.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlHelp.java
index 1e4a8ee2d..1ee1ff53b 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DdlHelp.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlHelp.java
@@ -1,22 +1,22 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
public class DdlHelp {
public static final String DROP_DEFAULT = "DROP DEFAULT";
-
+
public static final String DROP_COMMENT = "DROP COMMENT";
-
+
/**
* Return true if the default value is the special DROP DEFAULT value.
*/
public static boolean isDropDefault(String defaultValue) {
return DROP_DEFAULT.equals(defaultValue);
}
-
+
/**
* Return true if the default value is the special DROP DEFAULT value.
*/
public static boolean isDropComment(String comment) {
return DROP_COMMENT.equals(comment);
}
-
+
}
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java
similarity index 89%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java
index dbd77ee90..87d86c81f 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java
@@ -1,7 +1,7 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.DbConstraintNaming;
-import io.ebean.dbmigration.ddlgeneration.platform.util.VowelRemover;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.util.VowelRemover;
/**
* Default implementation used to truncate or shorten db constraint names as required.
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/H2Ddl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2Ddl.java
similarity index 85%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/H2Ddl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2Ddl.java
index 81d534e44..6a2d2e29f 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/H2Ddl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2Ddl.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.dbplatform.DatabasePlatform;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
similarity index 87%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
index 7705dd248..24463d3ee 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
@@ -1,9 +1,9 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.dbplatform.h2.H2HistoryTrigger;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.model.MTable;
import java.io.IOException;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java
similarity index 96%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java
index 94109cb25..b308c85a2 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/HsqldbDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HsqldbDdl.java
similarity index 82%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/HsqldbDdl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HsqldbDdl.java
index e79e9b9b3..5bca6ef04 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/HsqldbDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HsqldbDdl.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.dbplatform.DatabasePlatform;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MySqlDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
similarity index 93%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MySqlDdl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
index e10d0f507..6e80e4d72 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MySqlDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
@@ -1,10 +1,10 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.dbplatform.DatabasePlatform;
import io.ebean.util.StringHelper;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.Column;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.Column;
import java.io.IOException;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java
similarity index 91%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java
index 969407757..d41fa23e4 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java
@@ -1,8 +1,8 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.model.MTable;
import java.io.IOException;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/NoHistorySupportDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NoHistorySupportDdl.java
similarity index 75%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/NoHistorySupportDdl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NoHistorySupportDdl.java
index ccb812eed..9404bf1ca 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/NoHistorySupportDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NoHistorySupportDdl.java
@@ -1,10 +1,10 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.ServerConfig;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.model.MTable;
import java.io.IOException;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/Oracle10Ddl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10Ddl.java
similarity index 91%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/Oracle10Ddl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10Ddl.java
index d79c1b72d..0a1951a69 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/Oracle10Ddl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10Ddl.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.dbplatform.DatabasePlatform;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
similarity index 95%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformDdl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index ca8a263b7..c1ee013c9 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.DbConstraintNaming;
import io.ebean.config.ServerConfig;
@@ -6,17 +6,17 @@ import io.ebean.config.dbplatform.DatabasePlatform;
import io.ebean.config.dbplatform.DbDefaultValue;
import io.ebean.config.dbplatform.DbIdentity;
import io.ebean.config.dbplatform.IdType;
-import io.ebean.dbmigration.ddlgeneration.BaseDdlHandler;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.ddlgeneration.DdlHandler;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.ddlgeneration.platform.util.PlatformTypeConverter;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.Column;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.migration.IdentityType;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.BaseDdlHandler;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.util.PlatformTypeConverter;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.Column;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.migration.IdentityType;
+import io.ebeaninternal.dbmigration.model.MTable;
import io.ebean.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -418,7 +418,7 @@ public class PlatformDdl {
}
}
-
+
public void alterTableDropColumn(DdlBuffer buffer, String tableName, String columnName) throws IOException {
buffer.append("alter table ").append(tableName).append(" drop column ").append(columnName)
.endOfStatement();
@@ -552,7 +552,7 @@ public class PlatformDdl {
}
apply.append(String.format("comment on table %s is '%s'", tableName, tableComment)).endOfStatement();
}
-
+
/**
* Add column comment as a separate statement.
*/
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java
similarity index 77%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java
index f127d83a8..61bc1362c 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java
@@ -1,10 +1,10 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.ServerConfig;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.model.MTable;
import java.io.IOException;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PostgresDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
similarity index 95%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PostgresDdl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
index 1bbe8b449..774ce97d3 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PostgresDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.dbplatform.DatabasePlatform;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
similarity index 95%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
index 0163b2225..0abc4a710 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
@@ -1,8 +1,8 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.model.MTable;
import java.io.IOException;
import java.util.List;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SQLiteDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SQLiteDdl.java
similarity index 86%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SQLiteDdl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SQLiteDdl.java
index 6ad64b839..0f555d097 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SQLiteDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SQLiteDdl.java
@@ -1,7 +1,7 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
import java.io.IOException;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
similarity index 97%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerDdl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
index 75d7eb46f..5fd7d9175 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
@@ -1,8 +1,8 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
import java.io.IOException;
@@ -39,13 +39,13 @@ public class SqlServerDdl extends PlatformDdl {
String objectId = fkName;
if (pos != -1) {
objectId = tableName.substring(0, pos + 1) + fkName;
- }
+ }
return "IF OBJECT_ID('" + objectId + "', 'F') IS NOT NULL " + super.alterTableDropForeignKey(tableName, fkName);
}
-
+
@Override
public String dropSequence(String sequenceName) {
- return "IF OBJECT_ID('" + sequenceName + "', 'SO') IS NOT NULL drop sequence " + sequenceName;
+ return "IF OBJECT_ID('" + sequenceName + "', 'SO') IS NOT NULL drop sequence " + sequenceName;
}
@Override
@@ -81,7 +81,7 @@ public class SqlServerDdl extends PlatformDdl {
}
return sb.toString();
}
-
+
@Override
public String alterTableDropConstraint(String tableName, String constraintName) {
StringBuilder sb = new StringBuilder();
@@ -122,7 +122,7 @@ public class SqlServerDdl extends PlatformDdl {
sb.append(";");
return sb.toString();
}
-
+
@Override
public String alterColumnDefaultValue(String tableName, String columnName, String defaultValue) {
// Unfortunately, the SqlServer creates default values with a random name.
@@ -191,7 +191,7 @@ public class SqlServerDdl extends PlatformDdl {
// do nothing for MS SQL Server (cause it requires stored procedures etc)
}
-
+
/**
* It is rather complex to delete a column on SqlServer as there must not exist any references
* (constraints, default values, indices and foreign keys). The list is not yet complete, as
@@ -201,7 +201,7 @@ public class SqlServerDdl extends PlatformDdl {
@Override
public void alterTableDropColumn(DdlBuffer buffer, String tableName, String columnName) throws IOException {
buffer.append("-- drop column ").append(tableName).append(".").append(columnName).endOfStatement();
-
+
buffer.append(alterTableDropUniqueConstraint(tableName, naming.uniqueConstraintName(tableName, columnName)));
buffer.endOfStatement();
buffer.append(alterColumnDefaultValue(tableName, columnName, DdlHelp.DROP_DEFAULT));
@@ -214,5 +214,5 @@ public class SqlServerDdl extends PlatformDdl {
buffer.endOfStatement();
super.alterTableDropColumn(buffer, tableName, columnName);
}
-
+
}
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java
similarity index 91%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java
index 817d7aca9..6848b66d8 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java
@@ -1,11 +1,11 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.ServerConfig;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.model.MTable;
import java.io.IOException;
@@ -44,7 +44,7 @@ public class SqlServerHistoryDdl implements PlatformHistoryDdl {
historyTable = "dbo." +historyTable; // so add the default schema, if none was specified.
}
apply.append("alter table ").append(baseTable).append(" set (system_versioning = on (history_table=").append(historyTable).append("))").endOfStatement();
-
+
DdlBuffer drop = writer.dropAll();
drop.append("IF OBJECT_ID('").append(baseTable).append("', 'U') IS NOT NULL alter table ").append(baseTable).append(" set (system_versioning = off)").endOfStatement();
drop.append("IF OBJECT_ID('").append(baseTable).append("_history', 'U') IS NOT NULL drop table ").append(baseTable).append("_history").endOfStatement();
@@ -56,7 +56,7 @@ public class SqlServerHistoryDdl implements PlatformHistoryDdl {
DdlBuffer apply = writer.applyHistory();
apply.append("-- dropping history support for ").append(baseTable).endOfStatement();
// drop default constraints
-
+
apply.append(platformDdl.alterColumnDefaultValue(baseTable, systemPeriodStart, DdlHelp.DROP_DEFAULT)).endOfStatement();
apply.append(platformDdl.alterColumnDefaultValue(baseTable, systemPeriodEnd, DdlHelp.DROP_DEFAULT)).endOfStatement();
// switch of versioning & period
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/IndexColumns.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/IndexColumns.java
similarity index 95%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/IndexColumns.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/IndexColumns.java
index 6b4c149fa..a40386f01 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/IndexColumns.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/IndexColumns.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform.util;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform.util;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/IndexSet.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/IndexSet.java
similarity index 96%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/IndexSet.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/IndexSet.java
index f9c9b8107..b80bb1448 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/IndexSet.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/IndexSet.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform.util;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform.util;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java
similarity index 97%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java
index 3c497e2c8..17300d147 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform.util;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform.util;
import io.ebean.config.dbplatform.DbPlatformType;
import io.ebean.config.dbplatform.DbPlatformTypeMapping;
diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/VowelRemover.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemover.java
similarity index 91%
rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/VowelRemover.java
rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemover.java
index a63d9f3dc..c8058f0f2 100644
--- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/VowelRemover.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemover.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform.util;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform.util;
/**
* Utility to remove vowels (from constraint names primarily for Oracle and DB2).
diff --git a/src/main/java/io/ebean/dbmigration/migration/AddColumn.java b/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java
similarity index 98%
rename from src/main/java/io/ebean/dbmigration/migration/AddColumn.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java
index 6670f9b8c..f3423c852 100644
--- a/src/main/java/io/ebean/dbmigration/migration/AddColumn.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/AddHistoryTable.java b/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java
similarity index 96%
rename from src/main/java/io/ebean/dbmigration/migration/AddHistoryTable.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java
index 35aa160b8..7af32e7da 100644
--- a/src/main/java/io/ebean/dbmigration/migration/AddHistoryTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/AddTableComment.java b/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java
similarity index 97%
rename from src/main/java/io/ebean/dbmigration/migration/AddTableComment.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java
index 9ec82d50f..c9b21ff63 100644
--- a/src/main/java/io/ebean/dbmigration/migration/AddTableComment.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/AlterColumn.java b/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java
similarity index 99%
rename from src/main/java/io/ebean/dbmigration/migration/AlterColumn.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java
index 28d359f6a..4e2ab2b02 100644
--- a/src/main/java/io/ebean/dbmigration/migration/AlterColumn.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import java.util.ArrayList;
import java.util.List;
@@ -58,7 +58,7 @@ public class AlterColumn {
protected List before;
@XmlElement(required = false)
protected List after;
-
+
@XmlAttribute(name = "columnName", required = true)
protected String columnName;
@XmlAttribute(name = "tableName", required = true)
@@ -550,7 +550,7 @@ public class AlterColumn {
}
return before;
}
-
+
public List getAfter() {
if (after == null) {
after = new ArrayList<>();
diff --git a/src/main/java/io/ebean/dbmigration/migration/AlterHistoryTable.java b/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java
similarity index 96%
rename from src/main/java/io/ebean/dbmigration/migration/AlterHistoryTable.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java
index 9e3dbbd16..feb807968 100644
--- a/src/main/java/io/ebean/dbmigration/migration/AlterHistoryTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/Application.java b/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java
similarity index 97%
rename from src/main/java/io/ebean/dbmigration/migration/Application.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/Application.java
index 2cab8b2ec..4ca4ee9fe 100644
--- a/src/main/java/io/ebean/dbmigration/migration/Application.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/Applications.java b/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java
similarity index 97%
rename from src/main/java/io/ebean/dbmigration/migration/Applications.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java
index 770561389..ae24ce457 100644
--- a/src/main/java/io/ebean/dbmigration/migration/Applications.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/Apply.java b/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java
similarity index 95%
rename from src/main/java/io/ebean/dbmigration/migration/Apply.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java
index dd05988ec..5c40b242b 100644
--- a/src/main/java/io/ebean/dbmigration/migration/Apply.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/ChangeSet.java b/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java
similarity index 99%
rename from src/main/java/io/ebean/dbmigration/migration/ChangeSet.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java
index 19f9a2635..b756b7d1d 100644
--- a/src/main/java/io/ebean/dbmigration/migration/ChangeSet.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/ChangeSetType.java b/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java
similarity index 96%
rename from src/main/java/io/ebean/dbmigration/migration/ChangeSetType.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java
index da61a0a76..4537e85c5 100644
--- a/src/main/java/io/ebean/dbmigration/migration/ChangeSetType.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/src/main/java/io/ebean/dbmigration/migration/Column.java b/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java
similarity index 99%
rename from src/main/java/io/ebean/dbmigration/migration/Column.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/Column.java
index 26b995d31..a2385b2a9 100644
--- a/src/main/java/io/ebean/dbmigration/migration/Column.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import java.util.ArrayList;
import java.util.List;
@@ -46,12 +46,12 @@ import javax.xml.bind.annotation.XmlType;
})
@XmlRootElement(name = "column")
public class Column {
-
- @XmlElement(required = false)
+
+ @XmlElement(required = false)
protected List before;
@XmlElement(required = false)
protected List after;
-
+
@XmlAttribute(name = "name", required = true)
protected String name;
@XmlAttribute(name = "type", required = true)
@@ -82,7 +82,7 @@ public class Column {
protected String foreignKeyIndex;
@XmlAttribute(name = "comment")
protected String comment;
-
+
public List getBefore() {
if (before == null) {
@@ -90,14 +90,14 @@ public class Column {
}
return before;
}
-
+
public List getAfter() {
if (after == null) {
after = new ArrayList<>();
}
return after;
}
-
+
/**
* Gets the value of the name property.
*
diff --git a/src/main/java/io/ebean/dbmigration/migration/Configuration.java b/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java
similarity index 96%
rename from src/main/java/io/ebean/dbmigration/migration/Configuration.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java
index b1f8366be..8c84632ba 100644
--- a/src/main/java/io/ebean/dbmigration/migration/Configuration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/CreateIndex.java b/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java
similarity index 98%
rename from src/main/java/io/ebean/dbmigration/migration/CreateIndex.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java
index fed06a0a8..5e753e084 100644
--- a/src/main/java/io/ebean/dbmigration/migration/CreateIndex.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/CreateTable.java b/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java
similarity index 99%
rename from src/main/java/io/ebean/dbmigration/migration/CreateTable.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java
index 0c6ab9d56..d9f0b788a 100644
--- a/src/main/java/io/ebean/dbmigration/migration/CreateTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/DdlScript.java b/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java
similarity index 96%
rename from src/main/java/io/ebean/dbmigration/migration/DdlScript.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java
index 479b8e29e..be259f394 100644
--- a/src/main/java/io/ebean/dbmigration/migration/DdlScript.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import java.util.ArrayList;
import java.util.List;
@@ -49,7 +49,7 @@ public class DdlScript {
public void setDdl(List ddl) {
this.ddl = ddl;
}
-
+
/**
* Gets the value of the platforms property.
*
diff --git a/src/main/java/io/ebean/dbmigration/migration/DefaultTablespace.java b/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java
similarity index 97%
rename from src/main/java/io/ebean/dbmigration/migration/DefaultTablespace.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java
index fc1daaece..2e1981622 100644
--- a/src/main/java/io/ebean/dbmigration/migration/DefaultTablespace.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/DropColumn.java b/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java
similarity index 98%
rename from src/main/java/io/ebean/dbmigration/migration/DropColumn.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java
index 77fd70e3a..9d125415d 100644
--- a/src/main/java/io/ebean/dbmigration/migration/DropColumn.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/DropHistoryTable.java b/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java
similarity index 96%
rename from src/main/java/io/ebean/dbmigration/migration/DropHistoryTable.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java
index f8392a7a4..8471b2c52 100644
--- a/src/main/java/io/ebean/dbmigration/migration/DropHistoryTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/DropIndex.java b/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java
similarity index 97%
rename from src/main/java/io/ebean/dbmigration/migration/DropIndex.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java
index 514662386..71e472a5a 100644
--- a/src/main/java/io/ebean/dbmigration/migration/DropIndex.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/DropTable.java b/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java
similarity index 97%
rename from src/main/java/io/ebean/dbmigration/migration/DropTable.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java
index 77d54d892..6d9a0f076 100644
--- a/src/main/java/io/ebean/dbmigration/migration/DropTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/ForeignKey.java b/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java
similarity index 98%
rename from src/main/java/io/ebean/dbmigration/migration/ForeignKey.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java
index 84bddcf8d..8aa3763d3 100644
--- a/src/main/java/io/ebean/dbmigration/migration/ForeignKey.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/IdentityType.java b/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java
similarity index 96%
rename from src/main/java/io/ebean/dbmigration/migration/IdentityType.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java
index ec88f73f0..4d95169b3 100644
--- a/src/main/java/io/ebean/dbmigration/migration/IdentityType.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/src/main/java/io/ebean/dbmigration/migration/Migration.java b/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java
similarity index 97%
rename from src/main/java/io/ebean/dbmigration/migration/Migration.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java
index 862b66614..fea9ef068 100644
--- a/src/main/java/io/ebean/dbmigration/migration/Migration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/ObjectFactory.java b/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
similarity index 98%
rename from src/main/java/io/ebean/dbmigration/migration/ObjectFactory.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
index dd672488a..1b0e81dd1 100644
--- a/src/main/java/io/ebean/dbmigration/migration/ObjectFactory.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlRegistry;
@@ -186,13 +186,13 @@ public class ObjectFactory {
public Migration createMigration() {
return new Migration();
}
-
+
/**
* Create an instance of {@link DdlScript }
*/
public DdlScript createDdlScript() {
return new DdlScript();
}
-
+
}
diff --git a/src/main/java/io/ebean/dbmigration/migration/RenameColumn.java b/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java
similarity index 98%
rename from src/main/java/io/ebean/dbmigration/migration/RenameColumn.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java
index ab9a095ba..3838725e6 100644
--- a/src/main/java/io/ebean/dbmigration/migration/RenameColumn.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/RenameTable.java b/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java
similarity index 97%
rename from src/main/java/io/ebean/dbmigration/migration/RenameTable.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java
index a4c184b1a..a4eb9185f 100644
--- a/src/main/java/io/ebean/dbmigration/migration/RenameTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/Rollback.java b/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java
similarity index 96%
rename from src/main/java/io/ebean/dbmigration/migration/Rollback.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java
index 2e6e23b75..8647f8d88 100644
--- a/src/main/java/io/ebean/dbmigration/migration/Rollback.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/Sql.java b/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java
similarity index 97%
rename from src/main/java/io/ebean/dbmigration/migration/Sql.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java
index e110ae1cc..f65d32003 100644
--- a/src/main/java/io/ebean/dbmigration/migration/Sql.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/UniqueConstraint.java b/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java
similarity index 97%
rename from src/main/java/io/ebean/dbmigration/migration/UniqueConstraint.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java
index 0fdc50832..cd023273a 100644
--- a/src/main/java/io/ebean/dbmigration/migration/UniqueConstraint.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/io/ebean/dbmigration/migration/package-info.java b/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java
similarity index 77%
rename from src/main/java/io/ebean/dbmigration/migration/package-info.java
rename to src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java
index d78d89ad7..f52bba831 100644
--- a/src/main/java/io/ebean/dbmigration/migration/package-info.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java
@@ -1,2 +1,2 @@
@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/dbmigration", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
diff --git a/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlReader.java b/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java
similarity index 92%
rename from src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlReader.java
rename to src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java
index a3f718e7b..a5b534298 100644
--- a/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlReader.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java
@@ -1,7 +1,7 @@
-package io.ebean.dbmigration.migrationreader;
+package io.ebeaninternal.dbmigration.migrationreader;
-import io.ebean.dbmigration.migration.Migration;
+import io.ebeaninternal.dbmigration.migration.Migration;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
diff --git a/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriter.java b/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java
similarity index 92%
rename from src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriter.java
rename to src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java
index f3737f2d4..9b1152709 100644
--- a/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriter.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java
@@ -1,7 +1,7 @@
-package io.ebean.dbmigration.migrationreader;
+package io.ebeaninternal.dbmigration.migrationreader;
-import io.ebean.dbmigration.migration.Migration;
+import io.ebeaninternal.dbmigration.migration.Migration;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
diff --git a/src/main/java/io/ebean/dbmigration/model/CurrentModel.java b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
similarity index 88%
rename from src/main/java/io/ebean/dbmigration/model/CurrentModel.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
index 80282051a..d404ebf3b 100644
--- a/src/main/java/io/ebean/dbmigration/model/CurrentModel.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
@@ -1,13 +1,13 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
import io.ebean.config.DbConstraintNaming;
-import io.ebean.dbmigration.ddlgeneration.DdlHandler;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.ddlgeneration.platform.DefaultConstraintMaxLength;
-import io.ebean.dbmigration.migration.ChangeSet;
-import io.ebean.dbmigration.model.build.ModelBuildBeanVisitor;
-import io.ebean.dbmigration.model.build.ModelBuildContext;
-import io.ebean.dbmigration.model.visitor.VisitAllUsing;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.DefaultConstraintMaxLength;
+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;
diff --git a/src/main/java/io/ebean/dbmigration/model/MColumn.java b/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java
similarity index 97%
rename from src/main/java/io/ebean/dbmigration/model/MColumn.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java
index fbea21234..1ed8ff067 100644
--- a/src/main/java/io/ebean/dbmigration/model/MColumn.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java
@@ -1,11 +1,11 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
import java.util.List;
-import io.ebean.dbmigration.ddlgeneration.platform.DdlHelp;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.Column;
-import io.ebean.dbmigration.migration.DdlScript;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.DdlHelp;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.Column;
+import io.ebeaninternal.dbmigration.migration.DdlScript;
import io.ebeaninternal.server.deploy.DbMigrationInfo;
/**
@@ -42,7 +42,7 @@ public class MColumn {
private AlterColumn alterColumn;
private boolean draftOnly;
-
+
private List dbMigrationInfos;
public MColumn(Column column) {
@@ -264,7 +264,7 @@ public class MColumn {
c.setComment(comment);
c.setUnique(unique);
c.setUniqueOneToOne(uniqueOneToOne);
-
+
if (dbMigrationInfos != null) {
for (DbMigrationInfo info : dbMigrationInfos) {
if (!info.getPreAdd().isEmpty()) {
@@ -273,7 +273,7 @@ public class MColumn {
script.setPlatforms(info.joinPlatforms());
c.getBefore().add(script);
}
-
+
if (!info.getPostAdd().isEmpty()) {
DdlScript script = new DdlScript();
script.setDdl(info.getPostAdd());
@@ -306,7 +306,7 @@ public class MColumn {
if (tableWithHistory) {
alterColumn.setWithHistory(Boolean.TRUE);
}
-
+
if (dbMigrationInfos != null) {
for (DbMigrationInfo info : dbMigrationInfos) {
if (!info.getPreAlter().isEmpty()) {
@@ -315,7 +315,7 @@ public class MColumn {
script.setPlatforms(info.joinPlatforms());
alterColumn.getBefore().add(script);
}
-
+
if (!info.getPostAlter().isEmpty()) {
DdlScript script = new DdlScript();
script.setDdl(info.getPostAlter());
@@ -335,7 +335,7 @@ public class MColumn {
public void compare(ModelDiff modelDiff, MTable table, MColumn newColumn) {
this.dbMigrationInfos = newColumn.dbMigrationInfos;
-
+
boolean tableWithHistory = table.isWithHistory();
String tableName = table.getName();
@@ -431,7 +431,7 @@ public class MColumn {
public void setDbMigrationInfos(List dbMigrationInfos) {
this.dbMigrationInfos = dbMigrationInfos;
}
-
+
/**
* Apply changes based on the AlterColumn request.
*/
diff --git a/src/main/java/io/ebean/dbmigration/model/MCompoundForeignKey.java b/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundForeignKey.java
similarity index 95%
rename from src/main/java/io/ebean/dbmigration/model/MCompoundForeignKey.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/MCompoundForeignKey.java
index 90f15012a..772856b8b 100644
--- a/src/main/java/io/ebean/dbmigration/model/MCompoundForeignKey.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundForeignKey.java
@@ -1,6 +1,6 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
-import io.ebean.dbmigration.migration.ForeignKey;
+import io.ebeaninternal.dbmigration.migration.ForeignKey;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/io/ebean/dbmigration/model/MCompoundUniqueConstraint.java b/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java
similarity index 95%
rename from src/main/java/io/ebean/dbmigration/model/MCompoundUniqueConstraint.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java
index 6c58455ea..0d4613a96 100644
--- a/src/main/java/io/ebean/dbmigration/model/MCompoundUniqueConstraint.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
/**
* A unique constraint for multiple columns.
diff --git a/src/main/java/io/ebean/dbmigration/model/MConfiguration.java b/src/main/java/io/ebeaninternal/dbmigration/model/MConfiguration.java
similarity index 90%
rename from src/main/java/io/ebean/dbmigration/model/MConfiguration.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/MConfiguration.java
index 41b52ecda..43387a5c7 100644
--- a/src/main/java/io/ebean/dbmigration/model/MConfiguration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MConfiguration.java
@@ -1,7 +1,7 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
-import io.ebean.dbmigration.migration.Configuration;
-import io.ebean.dbmigration.migration.DefaultTablespace;
+import io.ebeaninternal.dbmigration.migration.Configuration;
+import io.ebeaninternal.dbmigration.migration.DefaultTablespace;
/**
* Holds configuration such as the default tablespaces to use for tables,
diff --git a/src/main/java/io/ebean/dbmigration/model/MIndex.java b/src/main/java/io/ebeaninternal/dbmigration/model/MIndex.java
similarity index 94%
rename from src/main/java/io/ebean/dbmigration/model/MIndex.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/MIndex.java
index 4c49467e0..6c5ae2271 100644
--- a/src/main/java/io/ebean/dbmigration/model/MIndex.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MIndex.java
@@ -1,7 +1,7 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
-import io.ebean.dbmigration.migration.CreateIndex;
-import io.ebean.dbmigration.migration.DropIndex;
+import io.ebeaninternal.dbmigration.migration.CreateIndex;
+import io.ebeaninternal.dbmigration.migration.DropIndex;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/src/main/java/io/ebean/dbmigration/model/MTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
similarity index 95%
rename from src/main/java/io/ebean/dbmigration/model/MTable.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
index 515a8d264..2401d6b31 100644
--- a/src/main/java/io/ebean/dbmigration/model/MTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
@@ -1,17 +1,17 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
-import io.ebean.dbmigration.ddlgeneration.platform.DdlHelp;
-import io.ebean.dbmigration.migration.AddColumn;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.AddTableComment;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.Column;
-import io.ebean.dbmigration.migration.CreateTable;
-import io.ebean.dbmigration.migration.DropColumn;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.migration.DropTable;
-import io.ebean.dbmigration.migration.IdentityType;
-import io.ebean.dbmigration.migration.UniqueConstraint;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.DdlHelp;
+import io.ebeaninternal.dbmigration.migration.AddColumn;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.AddTableComment;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.Column;
+import io.ebeaninternal.dbmigration.migration.CreateTable;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropTable;
+import io.ebeaninternal.dbmigration.migration.IdentityType;
+import io.ebeaninternal.dbmigration.migration.UniqueConstraint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/io/ebean/dbmigration/model/MigrationModel.java b/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
similarity index 97%
rename from src/main/java/io/ebean/dbmigration/model/MigrationModel.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
index 07937fd95..f12283c05 100644
--- a/src/main/java/io/ebean/dbmigration/model/MigrationModel.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/io/ebean/dbmigration/model/MigrationResource.java b/src/main/java/io/ebeaninternal/dbmigration/model/MigrationResource.java
similarity index 84%
rename from src/main/java/io/ebean/dbmigration/model/MigrationResource.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/MigrationResource.java
index 0e70aced3..6ef7ce995 100644
--- a/src/main/java/io/ebean/dbmigration/model/MigrationResource.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MigrationResource.java
@@ -1,7 +1,7 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
-import io.ebean.dbmigration.migration.Migration;
-import io.ebean.dbmigration.migrationreader.MigrationXmlReader;
+import io.ebeaninternal.dbmigration.migration.Migration;
+import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlReader;
import java.io.File;
diff --git a/src/main/java/io/ebean/dbmigration/model/MigrationVersion.java b/src/main/java/io/ebeaninternal/dbmigration/model/MigrationVersion.java
similarity index 99%
rename from src/main/java/io/ebean/dbmigration/model/MigrationVersion.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/MigrationVersion.java
index 1a3206f26..4ab62462a 100644
--- a/src/main/java/io/ebean/dbmigration/model/MigrationVersion.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MigrationVersion.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
import java.util.Arrays;
import java.util.regex.Pattern;
diff --git a/src/main/java/io/ebean/dbmigration/model/ModelContainer.java b/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
similarity index 90%
rename from src/main/java/io/ebean/dbmigration/model/ModelContainer.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
index 7c03f526a..08136cd1e 100644
--- a/src/main/java/io/ebean/dbmigration/model/ModelContainer.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
@@ -1,19 +1,19 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
-import io.ebean.dbmigration.ddlgeneration.platform.DdlHelp;
-import io.ebean.dbmigration.migration.AddColumn;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.AddTableComment;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.ChangeSet;
-import io.ebean.dbmigration.migration.ChangeSetType;
-import io.ebean.dbmigration.migration.CreateIndex;
-import io.ebean.dbmigration.migration.CreateTable;
-import io.ebean.dbmigration.migration.DropColumn;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.migration.DropIndex;
-import io.ebean.dbmigration.migration.DropTable;
-import io.ebean.dbmigration.migration.Migration;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.DdlHelp;
+import io.ebeaninternal.dbmigration.migration.AddColumn;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.AddTableComment;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.ChangeSet;
+import io.ebeaninternal.dbmigration.migration.ChangeSetType;
+import io.ebeaninternal.dbmigration.migration.CreateIndex;
+import io.ebeaninternal.dbmigration.migration.CreateTable;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropIndex;
+import io.ebeaninternal.dbmigration.migration.DropTable;
+import io.ebeaninternal.dbmigration.migration.Migration;
import java.util.LinkedHashMap;
import java.util.List;
@@ -135,7 +135,7 @@ public class ModelContainer {
} else if (change instanceof DropHistoryTable) {
applyChange((DropHistoryTable) change);
} else if (change instanceof AddTableComment) {
- applyChange((AddTableComment) change);
+ applyChange((AddTableComment) change);
} else {
throw new IllegalArgumentException("No rule for " + change);
}
@@ -165,7 +165,7 @@ public class ModelContainer {
}
table.setWithHistory(false);
}
-
+
private void applyChange(AddTableComment change) {
MTable table = tables.get(change.getName());
if (table == null) {
diff --git a/src/main/java/io/ebean/dbmigration/model/ModelDiff.java b/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java
similarity index 89%
rename from src/main/java/io/ebean/dbmigration/model/ModelDiff.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java
index a3febc4bf..ec37cf04e 100644
--- a/src/main/java/io/ebean/dbmigration/model/ModelDiff.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java
@@ -1,16 +1,16 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
-import io.ebean.dbmigration.migration.AddColumn;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.AddTableComment;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.ChangeSet;
-import io.ebean.dbmigration.migration.ChangeSetType;
-import io.ebean.dbmigration.migration.CreateIndex;
-import io.ebean.dbmigration.migration.DropColumn;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.migration.DropIndex;
-import io.ebean.dbmigration.migration.Migration;
+import io.ebeaninternal.dbmigration.migration.AddColumn;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.AddTableComment;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.ChangeSet;
+import io.ebeaninternal.dbmigration.migration.ChangeSetType;
+import io.ebeaninternal.dbmigration.migration.CreateIndex;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropIndex;
+import io.ebeaninternal.dbmigration.migration.Migration;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/io/ebean/dbmigration/model/PendingDrops.java b/src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java
similarity index 95%
rename from src/main/java/io/ebean/dbmigration/model/PendingDrops.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java
index b5d0da695..65b9f0cca 100644
--- a/src/main/java/io/ebean/dbmigration/model/PendingDrops.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java
@@ -1,10 +1,10 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
-import io.ebean.dbmigration.migration.ChangeSet;
-import io.ebean.dbmigration.migration.ChangeSetType;
-import io.ebean.dbmigration.migration.DropColumn;
-import io.ebean.dbmigration.migration.DropTable;
-import io.ebean.dbmigration.migration.Migration;
+import io.ebeaninternal.dbmigration.migration.ChangeSet;
+import io.ebeaninternal.dbmigration.migration.ChangeSetType;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.DropTable;
+import io.ebeaninternal.dbmigration.migration.Migration;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/src/main/java/io/ebean/dbmigration/model/PlatformDdlWriter.java b/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
similarity index 89%
rename from src/main/java/io/ebean/dbmigration/model/PlatformDdlWriter.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
index 0ba6ed75b..aa5efaa5a 100644
--- a/src/main/java/io/ebean/dbmigration/model/PlatformDdlWriter.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
@@ -1,14 +1,14 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
import io.ebean.config.DbMigrationConfig;
import io.ebean.config.ServerConfig;
import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.ddlgeneration.DdlHandler;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.migration.ChangeSet;
-import io.ebean.dbmigration.migration.ChangeSetType;
-import io.ebean.dbmigration.migration.Migration;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.migration.ChangeSet;
+import io.ebeaninternal.dbmigration.migration.ChangeSetType;
+import io.ebeaninternal.dbmigration.migration.Migration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/io/ebean/dbmigration/model/build/ModelBuildBeanVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java
similarity index 92%
rename from src/main/java/io/ebean/dbmigration/model/build/ModelBuildBeanVisitor.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java
index 743c49656..bc96b0c87 100644
--- a/src/main/java/io/ebean/dbmigration/model/build/ModelBuildBeanVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java
@@ -1,11 +1,11 @@
-package io.ebean.dbmigration.model.build;
+package io.ebeaninternal.dbmigration.model.build;
import io.ebean.config.dbplatform.DbPlatformType;
import io.ebean.config.dbplatform.IdType;
-import io.ebean.dbmigration.migration.IdentityType;
-import io.ebean.dbmigration.model.MColumn;
-import io.ebean.dbmigration.model.MTable;
-import io.ebean.dbmigration.model.visitor.BeanVisitor;
+import io.ebeaninternal.dbmigration.migration.IdentityType;
+import io.ebeaninternal.dbmigration.model.MColumn;
+import io.ebeaninternal.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.model.visitor.BeanVisitor;
import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.server.deploy.BeanProperty;
import io.ebeaninternal.server.deploy.InheritInfo;
diff --git a/src/main/java/io/ebean/dbmigration/model/build/ModelBuildContext.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java
similarity index 96%
rename from src/main/java/io/ebean/dbmigration/model/build/ModelBuildContext.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java
index d8444171b..c897617a9 100644
--- a/src/main/java/io/ebean/dbmigration/model/build/ModelBuildContext.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java
@@ -1,11 +1,11 @@
-package io.ebean.dbmigration.model.build;
+package io.ebeaninternal.dbmigration.model.build;
import io.ebean.config.DbConstraintNaming;
import io.ebean.config.dbplatform.DbPlatformType;
import io.ebean.config.dbplatform.DbPlatformTypeMapping;
-import io.ebean.dbmigration.model.MColumn;
-import io.ebean.dbmigration.model.MTable;
-import io.ebean.dbmigration.model.ModelContainer;
+import io.ebeaninternal.dbmigration.model.MColumn;
+import io.ebeaninternal.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.model.ModelContainer;
import io.ebeaninternal.server.deploy.BeanProperty;
import io.ebeaninternal.server.type.ScalarType;
diff --git a/src/main/java/io/ebean/dbmigration/model/build/ModelBuildIntersectionTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java
similarity index 94%
rename from src/main/java/io/ebean/dbmigration/model/build/ModelBuildIntersectionTable.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java
index 11a511e54..a0b70e594 100644
--- a/src/main/java/io/ebean/dbmigration/model/build/ModelBuildIntersectionTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java
@@ -1,8 +1,8 @@
-package io.ebean.dbmigration.model.build;
+package io.ebeaninternal.dbmigration.model.build;
-import io.ebean.dbmigration.model.MColumn;
-import io.ebean.dbmigration.model.MCompoundForeignKey;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.model.MColumn;
+import io.ebeaninternal.dbmigration.model.MCompoundForeignKey;
+import io.ebeaninternal.dbmigration.model.MTable;
import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.server.deploy.BeanProperty;
import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
diff --git a/src/main/java/io/ebean/dbmigration/model/build/ModelBuildPropertyVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
similarity index 96%
rename from src/main/java/io/ebean/dbmigration/model/build/ModelBuildPropertyVisitor.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
index bd54f7f5f..719dcbfcc 100644
--- a/src/main/java/io/ebean/dbmigration/model/build/ModelBuildPropertyVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
@@ -1,10 +1,10 @@
-package io.ebean.dbmigration.model.build;
+package io.ebeaninternal.dbmigration.model.build;
-import io.ebean.dbmigration.ddlgeneration.platform.util.IndexSet;
-import io.ebean.dbmigration.model.MColumn;
-import io.ebean.dbmigration.model.MCompoundForeignKey;
-import io.ebean.dbmigration.model.MTable;
-import io.ebean.dbmigration.model.visitor.BaseTablePropertyVisitor;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.util.IndexSet;
+import io.ebeaninternal.dbmigration.model.MColumn;
+import io.ebeaninternal.dbmigration.model.MCompoundForeignKey;
+import io.ebeaninternal.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.model.visitor.BaseTablePropertyVisitor;
import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.server.deploy.BeanProperty;
import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
diff --git a/src/main/java/io/ebean/dbmigration/model/visitor/BaseTablePropertyVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/visitor/BaseTablePropertyVisitor.java
similarity index 95%
rename from src/main/java/io/ebean/dbmigration/model/visitor/BaseTablePropertyVisitor.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/visitor/BaseTablePropertyVisitor.java
index 73d489fb1..5092b57d7 100644
--- a/src/main/java/io/ebean/dbmigration/model/visitor/BaseTablePropertyVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/visitor/BaseTablePropertyVisitor.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.model.visitor;
+package io.ebeaninternal.dbmigration.model.visitor;
import io.ebeaninternal.server.deploy.BeanProperty;
import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
diff --git a/src/main/java/io/ebean/dbmigration/model/visitor/BeanPropertyVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/visitor/BeanPropertyVisitor.java
similarity index 95%
rename from src/main/java/io/ebean/dbmigration/model/visitor/BeanPropertyVisitor.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/visitor/BeanPropertyVisitor.java
index ec6f6f9e3..8081f9b40 100644
--- a/src/main/java/io/ebean/dbmigration/model/visitor/BeanPropertyVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/visitor/BeanPropertyVisitor.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.model.visitor;
+package io.ebeaninternal.dbmigration.model.visitor;
import io.ebeaninternal.server.deploy.BeanProperty;
import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
diff --git a/src/main/java/io/ebean/dbmigration/model/visitor/BeanVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/visitor/BeanVisitor.java
similarity index 77%
rename from src/main/java/io/ebean/dbmigration/model/visitor/BeanVisitor.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/visitor/BeanVisitor.java
index 1e3856ca8..5f6910cb5 100644
--- a/src/main/java/io/ebean/dbmigration/model/visitor/BeanVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/visitor/BeanVisitor.java
@@ -1,6 +1,6 @@
-package io.ebean.dbmigration.model.visitor;
+package io.ebeaninternal.dbmigration.model.visitor;
-import io.ebean.dbmigration.model.build.ModelBuildPropertyVisitor;
+import io.ebeaninternal.dbmigration.model.build.ModelBuildPropertyVisitor;
import io.ebeaninternal.server.deploy.BeanDescriptor;
/**
diff --git a/src/main/java/io/ebean/dbmigration/model/visitor/VisitAllUsing.java b/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java
similarity index 98%
rename from src/main/java/io/ebean/dbmigration/model/visitor/VisitAllUsing.java
rename to src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java
index 4cbff7796..e0d13ec04 100644
--- a/src/main/java/io/ebean/dbmigration/model/visitor/VisitAllUsing.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.model.visitor;
+package io.ebeaninternal.dbmigration.model.visitor;
import io.ebeaninternal.api.SpiEbeanServer;
import io.ebeaninternal.server.deploy.BeanDescriptor;
diff --git a/src/main/java/io/ebeaninternal/dbmigration/package-info.java b/src/main/java/io/ebeaninternal/dbmigration/package-info.java
new file mode 100644
index 000000000..47b224a8f
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * Generation DDL migration scripts based on changes to the model.
+ *
+ * You can use DefaultDbMigration to compare the entity bean model to its prior state
+ * and generate DDL for the differences - adding tables, columns etc.
+ *
+ */
+package io.ebeaninternal.dbmigration;
diff --git a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
index 9595cad5a..496f67cbb 100644
--- a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
+++ b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
@@ -12,7 +12,7 @@ import io.ebean.config.dbplatform.postgres.Postgres8Platform;
import io.ebean.config.dbplatform.postgres.PostgresPlatform;
import io.ebean.config.dbplatform.sqlite.SQLitePlatform;
import io.ebean.config.dbplatform.sqlanywhere.SqlAnywherePlatform;
-import io.ebean.dbmigration.DbOffline;
+import io.ebeaninternal.dbmigration.DbOffline;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index 280054f27..38a08b638 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -12,7 +12,7 @@ import io.ebean.config.TenantMode;
import io.ebean.config.UnderscoreNamingConvention;
import io.ebean.config.dbplatform.DatabasePlatform;
import io.ebean.config.dbplatform.h2.H2Platform;
-import io.ebean.dbmigration.DbOffline;
+import io.ebeaninternal.dbmigration.DbOffline;
import io.ebeaninternal.api.SpiBackgroundExecutor;
import io.ebeaninternal.api.SpiContainerBootup;
import io.ebeaninternal.api.SpiEbeanServer;
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 2ea0ac091..6532d9535 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -39,7 +39,7 @@ import io.ebean.config.EncryptKeyManager;
import io.ebean.config.ServerConfig;
import io.ebean.config.TenantMode;
import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.dbmigration.DdlGenerator;
+import io.ebeaninternal.dbmigration.DdlGenerator;
import io.ebean.event.BeanPersistController;
import io.ebean.config.SlowQueryEvent;
import io.ebean.config.SlowQueryListener;
diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 0bb275ae3..b817f560d 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -10,7 +10,7 @@ import io.ebean.config.ScalarTypeConverter;
import io.ebean.config.ServerConfig;
import io.ebean.config.dbplatform.DatabasePlatform;
import io.ebean.config.dbplatform.DbPlatformType;
-import io.ebean.dbmigration.DbOffline;
+import io.ebeaninternal.dbmigration.DbOffline;
import io.ebean.plugin.ExtraTypeFactory;
import io.ebeaninternal.server.core.bootup.BootupClasses;
import io.ebeaninternal.server.deploy.parse.AnnotationBase;
diff --git a/src/main/resources/META-INF/services/io.ebean.dbmigration.DbMigration b/src/main/resources/META-INF/services/io.ebean.dbmigration.DbMigration
new file mode 100644
index 000000000..d83d5cfd9
--- /dev/null
+++ b/src/main/resources/META-INF/services/io.ebean.dbmigration.DbMigration
@@ -0,0 +1 @@
+io.ebeaninternal.dbmigration.DefaultDbMigration
diff --git a/src/test/java/io/ebean/config/dbplatform/H2PlatformTest.java b/src/test/java/io/ebean/config/dbplatform/H2PlatformTest.java
index d0a454912..b265c0a46 100644
--- a/src/test/java/io/ebean/config/dbplatform/H2PlatformTest.java
+++ b/src/test/java/io/ebean/config/dbplatform/H2PlatformTest.java
@@ -1,7 +1,7 @@
package io.ebean.config.dbplatform;
import io.ebean.config.dbplatform.h2.H2Platform;
-import io.ebean.dbmigration.ddlgeneration.platform.PlatformDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java b/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java
index f95e654e8..83c209489 100644
--- a/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java
+++ b/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java
@@ -3,7 +3,7 @@ package io.ebean.config.dbplatform;
import io.ebean.config.DbTypeConfig;
import io.ebean.config.ServerConfig;
import io.ebean.config.dbplatform.mysql.MySqlPlatform;
-import io.ebean.dbmigration.ddlgeneration.platform.PlatformDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java b/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java
index d73d01601..b91dbd87d 100644
--- a/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java
+++ b/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java
@@ -3,7 +3,7 @@ package io.ebean.config.dbplatform;
import io.ebean.config.DbTypeConfig;
import io.ebean.config.ServerConfig;
import io.ebean.config.dbplatform.oracle.OraclePlatform;
-import io.ebean.dbmigration.ddlgeneration.platform.PlatformDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java b/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java
index e635fd9f6..2219ed924 100644
--- a/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java
+++ b/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java
@@ -2,7 +2,7 @@ package io.ebean.config.dbplatform;
import io.ebean.config.DbTypeConfig;
import io.ebean.config.dbplatform.postgres.PostgresPlatform;
-import io.ebean.dbmigration.ddlgeneration.platform.PlatformDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/io/ebean/dbmigration/DbMigrationGenerateTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
similarity index 97%
rename from src/test/java/io/ebean/dbmigration/DbMigrationGenerateTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
index ad3ef6812..6ea8a19e3 100644
--- a/src/test/java/io/ebean/dbmigration/DbMigrationGenerateTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration;
+package io.ebeaninternal.dbmigration;
import io.ebean.EbeanServer;
import io.ebean.EbeanServerFactory;
@@ -36,7 +36,7 @@ public class DbMigrationGenerateTest {
logger.info("start");
- DbMigration migration = new DbMigration();
+ DefaultDbMigration migration = new DefaultDbMigration();
// We use src/test/resources as output directory (so we see in GIT if files will change)
diff --git a/src/test/java/io/ebean/dbmigration/DbMigrationTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
similarity index 99%
rename from src/test/java/io/ebean/dbmigration/DbMigrationTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
index 27f4504fb..e6469da24 100644
--- a/src/test/java/io/ebean/dbmigration/DbMigrationTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration;
+package io.ebeaninternal.dbmigration;
import io.ebean.BaseTestCase;
import io.ebean.SqlQuery;
diff --git a/src/test/java/io/ebean/dbmigration/ddlgeneration/BaseDdlHandlerTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
similarity index 97%
rename from src/test/java/io/ebean/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
index 7d98415cf..0dd18a380 100644
--- a/src/test/java/io/ebean/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration;
+package io.ebeaninternal.dbmigration.ddlgeneration;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
@@ -6,8 +6,8 @@ import io.ebean.config.ServerConfig;
import io.ebean.config.dbplatform.h2.H2Platform;
import io.ebean.config.dbplatform.postgres.PostgresPlatform;
import io.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
-import io.ebean.dbmigration.migration.ChangeSet;
-import io.ebean.dbmigration.model.CurrentModel;
+import io.ebeaninternal.dbmigration.migration.ChangeSet;
+import io.ebeaninternal.dbmigration.model.CurrentModel;
import io.ebeaninternal.api.SpiEbeanServer;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/src/test/java/io/ebean/dbmigration/ddlgeneration/Helper.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/Helper.java
similarity index 87%
rename from src/test/java/io/ebean/dbmigration/ddlgeneration/Helper.java
rename to src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/Helper.java
index 27be79813..b85bd6fb7 100644
--- a/src/test/java/io/ebean/dbmigration/ddlgeneration/Helper.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/Helper.java
@@ -1,11 +1,11 @@
-package io.ebean.dbmigration.ddlgeneration;
+package io.ebeaninternal.dbmigration.ddlgeneration;
-import io.ebean.dbmigration.migration.AddColumn;
-import io.ebean.dbmigration.migration.ChangeSet;
-import io.ebean.dbmigration.migration.CreateTable;
-import io.ebean.dbmigration.migration.DropColumn;
-import io.ebean.dbmigration.migration.Migration;
-import io.ebean.dbmigration.migrationreader.MigrationXmlReader;
+import io.ebeaninternal.dbmigration.migration.AddColumn;
+import io.ebeaninternal.dbmigration.migration.ChangeSet;
+import io.ebeaninternal.dbmigration.migration.CreateTable;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.Migration;
+import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlReader;
import java.io.IOException;
import java.io.InputStream;
diff --git a/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
similarity index 92%
rename from src/test/java/io/ebean/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
index 27b3b355d..233ae6561 100644
--- a/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
@@ -1,16 +1,16 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.ServerConfig;
import io.ebean.config.dbplatform.h2.H2Platform;
import io.ebean.config.dbplatform.mysql.MySqlPlatform;
import io.ebean.config.dbplatform.oracle.OraclePlatform;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.ddlgeneration.Helper;
-import io.ebean.dbmigration.migration.AddTableComment;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.Column;
-import io.ebean.dbmigration.migration.CreateTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.ddlgeneration.Helper;
+import io.ebeaninternal.dbmigration.migration.AddTableComment;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.Column;
+import io.ebeaninternal.dbmigration.migration.CreateTable;
import org.junit.Test;
import java.io.IOException;
diff --git a/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java
similarity index 93%
rename from src/test/java/io/ebean/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java
index 5f835695a..01fe26553 100644
--- a/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.DbConstraintNormalise;
import org.junit.Test;
diff --git a/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java
similarity index 79%
rename from src/test/java/io/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java
index d1f0c6de3..7755d436f 100644
--- a/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java
@@ -1,11 +1,11 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.Ebean;
import io.ebean.config.dbplatform.h2.H2Platform;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.model.CurrentModel;
-import io.ebean.dbmigration.model.MConfiguration;
-import io.ebean.dbmigration.model.ModelContainer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.model.CurrentModel;
+import io.ebeaninternal.dbmigration.model.MConfiguration;
+import io.ebeaninternal.dbmigration.model.ModelContainer;
import io.ebeaninternal.api.SpiEbeanServer;
import org.junit.Test;
diff --git a/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java
similarity index 93%
rename from src/test/java/io/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java
index 424772504..7e9e2e490 100644
--- a/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import org.junit.Test;
diff --git a/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/IndexSetTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/IndexSetTest.java
similarity index 80%
rename from src/test/java/io/ebean/dbmigration/ddlgeneration/platform/IndexSetTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/IndexSetTest.java
index 94e46aae6..ce91ab2e1 100644
--- a/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/IndexSetTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/IndexSetTest.java
@@ -1,6 +1,6 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
-import io.ebean.dbmigration.ddlgeneration.platform.util.IndexSet;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.util.IndexSet;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
diff --git a/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
similarity index 98%
rename from src/test/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
index d54e2a17d..6b434f809 100644
--- a/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.Ebean;
import io.ebean.config.ServerConfig;
@@ -7,7 +7,7 @@ import io.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
import io.ebean.config.dbplatform.mysql.MySqlPlatform;
import io.ebean.config.dbplatform.oracle.OraclePlatform;
import io.ebean.config.dbplatform.postgres.PostgresPlatform;
-import io.ebean.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -25,7 +25,7 @@ public class PlatformDdl_AlterColumnTest {
{
ServerConfig serverConfig = Ebean.getDefaultServer().getPluginApi().getServerConfig();
sqlServerDdl.configure(serverConfig);
- }
+ }
AlterColumn alterNotNull() {
AlterColumn alterColumn = new AlterColumn();
alterColumn.setTableName("mytab");
diff --git a/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java
similarity index 96%
rename from src/test/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java
index 235533071..2e2df7173 100644
--- a/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.dbplatform.h2.H2Platform;
import io.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
diff --git a/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java
similarity index 96%
rename from src/test/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java
index b5e671624..c6a9d1953 100644
--- a/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java
@@ -1,9 +1,9 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.dbplatform.DbPlatformTypeMapping;
import io.ebean.config.dbplatform.h2.H2Platform;
import io.ebean.config.dbplatform.postgres.PostgresPlatform;
-import io.ebean.dbmigration.ddlgeneration.platform.util.PlatformTypeConverter;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.util.PlatformTypeConverter;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java
similarity index 84%
rename from src/test/java/io/ebean/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java
index c1cfc1f99..894760ce8 100644
--- a/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform.util;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform.util;
import org.junit.Test;
diff --git a/src/test/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriterTest.java b/src/test/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriterTest.java
similarity index 90%
rename from src/test/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriterTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriterTest.java
index 171b5969c..c0b87b47e 100644
--- a/src/test/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriterTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriterTest.java
@@ -1,6 +1,6 @@
-package io.ebean.dbmigration.migrationreader;
+package io.ebeaninternal.dbmigration.migrationreader;
-import io.ebean.dbmigration.migration.Migration;
+import io.ebeaninternal.dbmigration.migration.Migration;
import org.junit.Test;
import java.io.File;
diff --git a/src/test/java/io/ebean/dbmigration/model/EntryTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java
similarity index 95%
rename from src/test/java/io/ebean/dbmigration/model/EntryTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java
index 9f9d9b4be..5bb28386c 100644
--- a/src/test/java/io/ebean/dbmigration/model/EntryTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java
@@ -1,7 +1,7 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
-import io.ebean.dbmigration.migration.ChangeSet;
-import io.ebean.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.ChangeSet;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
import org.jetbrains.annotations.NotNull;
import org.junit.Test;
diff --git a/src/test/java/io/ebean/dbmigration/model/MColumnTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/MColumnTest.java
similarity index 98%
rename from src/test/java/io/ebean/dbmigration/model/MColumnTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/model/MColumnTest.java
index 856aeb80b..45c27f590 100644
--- a/src/test/java/io/ebean/dbmigration/model/MColumnTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/MColumnTest.java
@@ -1,6 +1,6 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
-import io.ebean.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
import org.jetbrains.annotations.NotNull;
import org.junit.Test;
diff --git a/src/test/java/io/ebean/dbmigration/model/MTableTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/MTableTest.java
similarity index 94%
rename from src/test/java/io/ebean/dbmigration/model/MTableTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/model/MTableTest.java
index 29a6e8543..8d9b8a09b 100644
--- a/src/test/java/io/ebean/dbmigration/model/MTableTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/MTableTest.java
@@ -1,11 +1,11 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
-import io.ebean.dbmigration.migration.AddColumn;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.DropColumn;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.migration.DropTable;
+import io.ebeaninternal.dbmigration.migration.AddColumn;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropTable;
import org.junit.Test;
import java.util.List;
diff --git a/src/test/java/io/ebean/dbmigration/model/MigrationVersionTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java
similarity index 99%
rename from src/test/java/io/ebean/dbmigration/model/MigrationVersionTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java
index 191eabacc..cd85b241a 100644
--- a/src/test/java/io/ebean/dbmigration/model/MigrationVersionTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
import org.junit.Test;
diff --git a/src/test/java/io/ebean/dbmigration/model/ModelContainerApplyTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
similarity index 75%
rename from src/test/java/io/ebean/dbmigration/model/ModelContainerApplyTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
index b60ad6a16..bbaedc147 100644
--- a/src/test/java/io/ebean/dbmigration/model/ModelContainerApplyTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
@@ -1,11 +1,11 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
-import io.ebean.dbmigration.migration.AddColumn;
-import io.ebean.dbmigration.migration.ChangeSet;
-import io.ebean.dbmigration.migration.CreateTable;
-import io.ebean.dbmigration.migration.DropColumn;
-import io.ebean.dbmigration.migration.Migration;
-import io.ebean.dbmigration.migrationreader.MigrationXmlReader;
+import io.ebeaninternal.dbmigration.migration.AddColumn;
+import io.ebeaninternal.dbmigration.migration.ChangeSet;
+import io.ebeaninternal.dbmigration.migration.CreateTable;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.Migration;
+import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlReader;
import org.junit.Test;
import java.util.List;
diff --git a/src/test/java/io/ebean/dbmigration/model/ModelContainerTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java
similarity index 94%
rename from src/test/java/io/ebean/dbmigration/model/ModelContainerTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java
index ed6d43f49..ec361ba6f 100644
--- a/src/test/java/io/ebean/dbmigration/model/ModelContainerTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java
@@ -1,8 +1,8 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
-import io.ebean.dbmigration.migration.Migration;
-import io.ebean.dbmigration.migrationreader.MigrationXmlReader;
+import io.ebeaninternal.dbmigration.migration.Migration;
+import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlReader;
import org.jetbrains.annotations.NotNull;
import org.junit.Test;
diff --git a/src/test/java/io/ebean/dbmigration/model/ModelDiffTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/ModelDiffTest.java
similarity index 94%
rename from src/test/java/io/ebean/dbmigration/model/ModelDiffTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/model/ModelDiffTest.java
index d66e3ec4a..e2cdde859 100644
--- a/src/test/java/io/ebean/dbmigration/model/ModelDiffTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/ModelDiffTest.java
@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
import org.junit.Test;
diff --git a/src/test/java/io/ebean/dbmigration/model/PendingDropsTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/PendingDropsTest.java
similarity index 97%
rename from src/test/java/io/ebean/dbmigration/model/PendingDropsTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/model/PendingDropsTest.java
index aa1a79617..276a08ceb 100644
--- a/src/test/java/io/ebean/dbmigration/model/PendingDropsTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/PendingDropsTest.java
@@ -1,8 +1,8 @@
-package io.ebean.dbmigration.model;
+package io.ebeaninternal.dbmigration.model;
-import io.ebean.dbmigration.migration.ChangeSet;
-import io.ebean.dbmigration.migration.DropColumn;
-import io.ebean.dbmigration.migration.Migration;
+import io.ebeaninternal.dbmigration.migration.ChangeSet;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.Migration;
import org.junit.Test;
import java.util.ArrayList;
diff --git a/src/test/java/io/ebean/dbmigration/model/build/ModelBuildBeanVisitorTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java
similarity index 85%
rename from src/test/java/io/ebean/dbmigration/model/build/ModelBuildBeanVisitorTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java
index 83f7da9c4..a62ba120c 100644
--- a/src/test/java/io/ebean/dbmigration/model/build/ModelBuildBeanVisitorTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java
@@ -1,14 +1,14 @@
-package io.ebean.dbmigration.model.build;
+package io.ebeaninternal.dbmigration.model.build;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.config.DbConstraintNaming;
-import io.ebean.dbmigration.ddlgeneration.platform.DefaultConstraintMaxLength;
-import io.ebean.dbmigration.model.MColumn;
-import io.ebean.dbmigration.model.MTable;
-import io.ebean.dbmigration.model.ModelContainer;
-import io.ebean.dbmigration.model.visitor.VisitAllUsing;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.DefaultConstraintMaxLength;
+import io.ebeaninternal.dbmigration.model.MColumn;
+import io.ebeaninternal.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.model.ModelContainer;
+import io.ebeaninternal.dbmigration.model.visitor.VisitAllUsing;
import io.ebeaninternal.api.SpiEbeanServer;
import org.junit.Test;
diff --git a/src/test/java/io/ebean/dbmigration/model/build/ModelBuild_compoundKeyTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java
similarity index 85%
rename from src/test/java/io/ebean/dbmigration/model/build/ModelBuild_compoundKeyTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java
index c4e09ae93..1b29121fa 100644
--- a/src/test/java/io/ebean/dbmigration/model/build/ModelBuild_compoundKeyTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java
@@ -1,15 +1,15 @@
-package io.ebean.dbmigration.model.build;
+package io.ebeaninternal.dbmigration.model.build;
import io.ebean.BaseTestCase;
import io.ebean.EbeanServerFactory;
import io.ebean.config.ServerConfig;
-import io.ebean.dbmigration.ddlgeneration.Helper;
-import io.ebean.dbmigration.migration.Migration;
-import io.ebean.dbmigration.migrationreader.MigrationXmlReader;
-import io.ebean.dbmigration.model.CurrentModel;
-import io.ebean.dbmigration.model.MTable;
-import io.ebean.dbmigration.model.ModelContainer;
+import io.ebeaninternal.dbmigration.ddlgeneration.Helper;
+import io.ebeaninternal.dbmigration.migration.Migration;
+import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlReader;
+import io.ebeaninternal.dbmigration.model.CurrentModel;
+import io.ebeaninternal.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.model.ModelContainer;
import io.ebeaninternal.api.SpiEbeanServer;
import org.tests.model.basic.CKeyAssoc;
import org.tests.model.basic.CKeyDetail;
diff --git a/src/test/java/io/ebean/dbmigration/model/build/ModelBuild_explicitSequencesTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java
similarity index 91%
rename from src/test/java/io/ebean/dbmigration/model/build/ModelBuild_explicitSequencesTest.java
rename to src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java
index 1ba5bdc24..b2f37df0a 100644
--- a/src/test/java/io/ebean/dbmigration/model/build/ModelBuild_explicitSequencesTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java
@@ -1,11 +1,11 @@
-package io.ebean.dbmigration.model.build;
+package io.ebeaninternal.dbmigration.model.build;
import io.ebean.BaseTestCase;
import io.ebean.EbeanServerFactory;
import io.ebean.config.ServerConfig;
-import io.ebean.dbmigration.ddlgeneration.Helper;
-import io.ebean.dbmigration.model.CurrentModel;
+import io.ebeaninternal.dbmigration.ddlgeneration.Helper;
+import io.ebeaninternal.dbmigration.model.CurrentModel;
import io.ebeaninternal.api.SpiEbeanServer;
import org.tests.model.basic.Person;
import org.tests.model.basic.Phone;
diff --git a/src/test/resources/io/ebean/dbmigration/model/1.0.model.xml b/src/test/resources/io/ebeaninternal/dbmigration/model/1.0.model.xml
similarity index 100%
rename from src/test/resources/io/ebean/dbmigration/model/1.0.model.xml
rename to src/test/resources/io/ebeaninternal/dbmigration/model/1.0.model.xml
diff --git a/src/test/resources/io/ebean/dbmigration/model/1.1.model.xml b/src/test/resources/io/ebeaninternal/dbmigration/model/1.1.model.xml
similarity index 100%
rename from src/test/resources/io/ebean/dbmigration/model/1.1.model.xml
rename to src/test/resources/io/ebeaninternal/dbmigration/model/1.1.model.xml
diff --git a/src/test/resources/io/ebean/dbmigration/model/1.1_2__drops.model.xml b/src/test/resources/io/ebeaninternal/dbmigration/model/1.1_2__drops.model.xml
similarity index 100%
rename from src/test/resources/io/ebean/dbmigration/model/1.1_2__drops.model.xml
rename to src/test/resources/io/ebeaninternal/dbmigration/model/1.1_2__drops.model.xml
diff --git a/src/test/resources/io/ebean/dbmigration/model/2.0.model.xml b/src/test/resources/io/ebeaninternal/dbmigration/model/2.0.model.xml
similarity index 100%
rename from src/test/resources/io/ebean/dbmigration/model/2.0.model.xml
rename to src/test/resources/io/ebeaninternal/dbmigration/model/2.0.model.xml
diff --git a/src/test/resources/io/ebean/dbmigration/model/2.1.model.xml b/src/test/resources/io/ebeaninternal/dbmigration/model/2.1.model.xml
similarity index 100%
rename from src/test/resources/io/ebean/dbmigration/model/2.1.model.xml
rename to src/test/resources/io/ebeaninternal/dbmigration/model/2.1.model.xml
diff --git a/src/test/resources/io/ebean/dbmigration/model/2.2__drops.model.xml b/src/test/resources/io/ebeaninternal/dbmigration/model/2.2__drops.model.xml
similarity index 100%
rename from src/test/resources/io/ebean/dbmigration/model/2.2__drops.model.xml
rename to src/test/resources/io/ebeaninternal/dbmigration/model/2.2__drops.model.xml
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index 4085d320c..c032393b1 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -73,7 +73,7 @@
-
+