From 514047e6808817d26286be74a5ccfdbca9bdcfc3 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Sat, 10 Dec 2016 00:04:41 +1300 Subject: [PATCH] #918 - Remove DbMigrationConfig.generateOnStart() ... migrate to offline generation --- .../avaje/ebean/config/DbMigrationConfig.java | 41 ------------------- .../server/core/DefaultServer.java | 2 - 2 files changed, 43 deletions(-) diff --git a/src/main/java/com/avaje/ebean/config/DbMigrationConfig.java b/src/main/java/com/avaje/ebean/config/DbMigrationConfig.java index d3b7dccc6..b32ff9206 100644 --- a/src/main/java/com/avaje/ebean/config/DbMigrationConfig.java +++ b/src/main/java/com/avaje/ebean/config/DbMigrationConfig.java @@ -384,47 +384,6 @@ public class DbMigrationConfig { dbPassword = properties.get("migration.dbpassword", adminPwd); } - /** - * Return true if the migration should be generated. - *

- * It is expected that when an environment variable ddl.migration.enabled - * is set to true then the DB migration will generate the migration DDL. - *

- */ - public boolean isGenerateOnStart() { - - // environment properties take precedence - String envGenerate = readEnvironment("ddl.migration.generate"); - if (envGenerate != null) { - return "true".equalsIgnoreCase(envGenerate.trim()); - } - return generate; - } - - /** - * Called by EbeanServer on start. - *

- * If enabled this generates the migration xml and DDL scripts. - *

- */ - public void generateOnStart(EbeanServer server) { - - if (isGenerateOnStart()) { - if (platform == null) { - logger.warn("No platform set for migration DDL generation"); - } else { - // generate the migration xml and platform specific DDL - DbMigration migration = new DbMigration(server); - migration.setPlatform(platform); - try { - migration.generateMigration(); - } catch (Exception e) { - throw new RuntimeException("Error generating DB migration", e); - } - } - } - } - /** * Return the migration version (typically FlywayDb compatible). *

diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java index 7c0a8d1ca..7c229d5d7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java @@ -356,8 +356,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { */ public void start() { if (!TenantMode.DB.equals(serverConfig.getTenantMode())) { - DbMigrationConfig migrationConfig = serverConfig.getMigrationConfig(); - migrationConfig.generateOnStart(this); serverConfig.runDbMigration(serverConfig.getDataSource()); } }