diff --git a/ebean-test/src/main/java/io/ebean/test/config/platform/PostgresSetup.java b/ebean-test/src/main/java/io/ebean/test/config/platform/PostgresSetup.java index e5d1206f7..836532f76 100644 --- a/ebean-test/src/main/java/io/ebean/test/config/platform/PostgresSetup.java +++ b/ebean-test/src/main/java/io/ebean/test/config/platform/PostgresSetup.java @@ -6,41 +6,33 @@ class PostgresSetup implements PlatformSetup { @Override public Properties setup(Config config) { - int defaultPort = config.isUseDocker() ? 6432 : 5432; - config.ddlMode("dropCreate"); config.setDefaultPort(defaultPort); config.setUsernameDefault(); config.setPasswordDefault(); config.setUrl("jdbc:postgresql://${host}:${port}/${databaseName}"); - String schema = config.getSchema(); if (schema != null && !schema.equals(config.getUsername())) { config.urlAppend("?currentSchema=" + schema); } config.setDriver("org.postgresql.Driver"); config.datasourceDefaults(); - return dockerProperties(config); } private Properties dockerProperties(Config config) { - if (!config.isUseDocker()) { return new Properties(); } - - config.setDockerVersion("12"); + config.setDockerVersion("14"); config.setExtensions("hstore,pgcrypto"); return config.getDockerProperties(); } @Override public void setupExtraDbDataSource(Config config) { - int defaultPort = config.isUseDocker() ? 6432 : 5432; - config.setDefaultPort(defaultPort); config.setExtraUsernameDefault(); config.setExtraDbPasswordDefault();