From 1dd7720605e41f0a37dc337e7077b06a77bdc7e7 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Tue, 7 Aug 2018 11:19:09 +1200 Subject: [PATCH] #1462 - DB Migration generation with Postgis types gives us non-strict geometry column DDL --- .../ebeaninternal/dbmigration/DefaultDbMigration.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java index d420a459b..68872221a 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java +++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java @@ -84,6 +84,8 @@ public class DefaultDbMigration implements DbMigration { protected DatabasePlatform databasePlatform; + private boolean vanillaPlatform; + protected List platforms = new ArrayList<>(); protected ServerConfig serverConfig; @@ -192,6 +194,7 @@ public class DefaultDbMigration implements DbMigration { */ @Override public void setPlatform(Platform platform) { + vanillaPlatform = true; setPlatform(getPlatform(platform)); } @@ -556,11 +559,10 @@ public class DefaultDbMigration implements DbMigration { 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 + if (vanillaPlatform || databasePlatform == null) { + // not explicitly set so use the platform of the server databasePlatform = server.getDatabasePlatform(); - logger.debug("set platform to {}", databasePlatform.getName()); + logger.trace("set platform to {}", databasePlatform.getName()); } if (migrationConfig != null) { if (strictMode != null) {