github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2536 from ebean-orm/feature/ebeantest-pg14

Browse Source 
ebean-test - bump Postgres default container to 14
This commit is contained in:
Rob Bygrave
2022-02-01 13:46:09 +13:00
committed by GitHub
parent 7f5370c709 a412873da6
commit 2dcd17830a
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-test/src/main/java/io/ebean/test/config/platform/PostgresSetup.java
+1 -9
View File
@@ -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();