Don't check if property exist before adding

scalar-labs · Dec 25, 2024 · bc66fee · bc66fee
1 parent be71af5
commit bc66fee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/JdbcUtils.java b/core/src/main/java/com/scalar/db/storage/jdbc/JdbcUtils.java
@@ -69,12 +69,8 @@ public static BasicDataSource initDataSource(
     dataSource.setMaxTotal(config.getConnectionPoolMaxTotal());
     dataSource.setPoolPreparedStatements(config.isPreparedStatementsPoolEnabled());
     dataSource.setMaxOpenPreparedStatements(config.getPreparedStatementsPoolMaxOpen());
-    // Add connection properties if it doesn't already exist in the connection string to not
-    // override the user settings
     for (Entry<String, String> entry : rdbEngine.getConnectionProperties().entrySet()) {
-      if (!dataSource.getUrl().contains(entry.getKey())) {
-        dataSource.addConnectionProperty(entry.getKey(), entry.getValue());
-      }
+      dataSource.addConnectionProperty(entry.getKey(), entry.getValue());
     }
 
     return dataSource;

diff --git a/core/src/test/java/com/scalar/db/storage/jdbc/JdbcUtilsTest.java b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcUtilsTest.java
@@ -120,8 +120,7 @@ public void initDataSource_Transactional_ShouldReturnProperDataSource() throws S
   }
 
   @Test
-  public void
-      initDataSource_WithRdbEngineConnectionProperties_ShouldAddPropertiesOnlyIfNotInConnectionString() {
+  public void initDataSource_WithRdbEngineConnectionProperties_ShouldAddProperties() {
     // Arrange
     Properties properties = new Properties();
     properties.setProperty(
@@ -147,7 +146,7 @@ JdbcUtils.class, withSettings().defaultAnswer(Answers.CALLS_REAL_METHODS))) {
       jdbcUtils.when(() -> JdbcUtils.initDataSource(config, rdbEngine)).thenCallRealMethod();
 
       // Assert
-      verify(dataSource, never()).addConnectionProperty("prop1", "prop1Value");
+      verify(dataSource).addConnectionProperty("prop1", "prop1Value");
       verify(dataSource).addConnectionProperty("prop2", "prop2Value");
       verify(dataSource, never()).setConnectionProperties(anyString());
     }