github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-10-23 21:15:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1462 - DB Migration generation with Postgis types gives us non-strict geometry column DDL

Browse Source
This commit is contained in:
rob bygrave
2018-08-07 11:19:09 +12:00
parent 3d2f885e87
commit 1dd7720605
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+6 -4
View File
@@ -84,6 +84,8 @@ public class DefaultDbMigration implements DbMigration {
protected DatabasePlatform databasePlatform;
private boolean vanillaPlatform;
protected List<Pair> 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) {