Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-4515: Do not set schema when create datasource for tenant

Browse Source
This commit is contained in:
deiflaender 2023-03-31 14:31:18 +02:00
parent ab6b0a5313
commit 8fd0dd5735
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/mulitenancy/DynamicDataSourceBasedMultiTenantConnectionProvider.java
View File

@ -63,7 +63,7 @@ public class DynamicDataSourceBasedMultiTenantConnectionProvider extends Abstrac
numberOfSchemasForSameDataSource++; numberOfSchemasForSameDataSource++;
} }
} }
if (numberOfSchemasForSameDataSource <= 1) { if (numberOfSchemasForSameDataSource == 0) {
HikariDataSource ds = (HikariDataSource) removal.getValue().getDataSource(); HikariDataSource ds = (HikariDataSource) removal.getValue().getDataSource();
ds.close(); // tear down properly ds.close(); // tear down properly
log.info("Closed datasource: {}", ds.getPoolName()); log.info("Closed datasource: {}", ds.getPoolName());
@ -99,7 +99,6 @@ public class DynamicDataSourceBasedMultiTenantConnectionProvider extends Abstrac
var jdbcUrl = JDBCUtils.buildJdbcUrl(tenant.getDatabaseConnection()); var jdbcUrl = JDBCUtils.buildJdbcUrl(tenant.getDatabaseConnection());
ds.setJdbcUrl(jdbcUrl); ds.setJdbcUrl(jdbcUrl);
ds.setSchema(tenant.getDatabaseConnection().getSchema());
ds.setPoolName(jdbcUrl + TENANT_POOL_NAME_SUFFIX); ds.setPoolName(jdbcUrl + TENANT_POOL_NAME_SUFFIX);
log.info("Configured datasource: {}", ds.getPoolName()); log.info("Configured datasource: {}", ds.getPoolName());
@ -139,6 +138,12 @@ public class DynamicDataSourceBasedMultiTenantConnectionProvider extends Abstrac
} }
@Override
public void releaseAnyConnection(Connection connection) throws SQLException {
connection.close();
}
@Override @Override
public void releaseConnection(String tenantIdentifier, Connection connection) throws SQLException { public void releaseConnection(String tenantIdentifier, Connection connection) throws SQLException {
@ -146,4 +151,10 @@ public class DynamicDataSourceBasedMultiTenantConnectionProvider extends Abstrac
releaseAnyConnection(connection); releaseAnyConnection(connection);
} }
@Override
public boolean supportsAggressiveRelease() {
return false;
}
} }