|
|
|
@ -294,11 +294,17 @@ public class DatabaseUtils { |
|
|
|
conf.setConnectionTimeout(connectionTimeout); |
|
|
|
conf.setConnectionTimeout(connectionTimeout); |
|
|
|
// in HISinOne-BI context: Set PostgreSQL variables to be consistent with
|
|
|
|
// in HISinOne-BI context: Set PostgreSQL variables to be consistent with
|
|
|
|
// HISinOne itself (which also does some settings - see "DbHandler")
|
|
|
|
// HISinOne itself (which also does some settings - see "DbHandler")
|
|
|
|
if (co.get(DbPropertyName.jdbcDriver.name()).equals(org.postgresql.Driver.class.getCanonicalName()) && |
|
|
|
if (co.get(DbPropertyName.jdbcDriver.name()).equals(org.postgresql.Driver.class.getCanonicalName())) { |
|
|
|
System.getProperty(SuperXManager.SUPER_X_HISINONE_VERSION) != null) { |
|
|
|
if (System.getProperty(SuperXManager.SUPER_X_HISINONE_VERSION) != null) { |
|
|
|
conf.setConnectionInitSql("SET standard_conforming_strings TO 'off'; SET datestyle TO 'ISO, DMY';"); |
|
|
|
conf.setConnectionInitSql( |
|
|
|
|
|
|
|
"SET standard_conforming_strings TO 'off'; SET datestyle TO 'ISO, DMY';" |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
} else if ("eduetl".equals(connectionName)) { |
|
|
|
|
|
|
|
conf.setConnectionInitSql( |
|
|
|
|
|
|
|
"SET datestyle TO 'ISO, DMY';" |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
String minConnectionsStr = co.get("poolsize_min"); |
|
|
|
String minConnectionsStr = co.get("poolsize_min"); |
|
|
|
String maxConnectionsStr = co.get("poolsize_max"); |
|
|
|
String maxConnectionsStr = co.get("poolsize_max"); |
|
|
|
int defaultPoolSize = "eduetl".equals(connectionName) ? AppConfig.EDUETL_POOL_SIZE : AppConfig.DEFAULT_POOL_SIZE; |
|
|
|
int defaultPoolSize = "eduetl".equals(connectionName) ? AppConfig.EDUETL_POOL_SIZE : AppConfig.DEFAULT_POOL_SIZE; |
|
|
|
|