fix(snowflake): clear blank connection properties

Author: Aias00

chat2db-community-server/chat2db-community-plugins/chat2db-community-snowflake/src/main/java/ai/chat2db/plugin/snowflake/SnowflakeDBManager.java

@@ -41,8 +41,7 @@ static List<KeyValue> prepareExtendInfo(ConnectInfo connectInfo) {
         List<KeyValue> extendInfo = configuredExtendInfo == null
                 ? new ArrayList<>()
                 : new ArrayList<>(configuredExtendInfo);
-        replacePropertyIfConfigured(extendInfo, DATABASE_PROPERTY, connectInfo.getDatabaseName());
-        replacePropertyIfConfigured(extendInfo, SCHEMA_PROPERTY, connectInfo.getSchemaName());
+        replaceManagedContextProperties(extendInfo, connectInfo);
         replaceProperty(extendInfo, QUERY_RESULT_FORMAT_PROPERTY, QUERY_RESULT_FORMAT_JSON);
         return extendInfo;
     }
@@ -51,9 +50,14 @@ static List<KeyValue> prepareExtendInfo(ConnectInfo connectInfo) {
     // they are always dropped (including manually added entries) before the current value is
     // written back, so clearing a field cannot keep stale context. Configure the Snowflake
     // database/schema through the connection fields, not through extendInfo.
-    private static void replacePropertyIfConfigured(List<KeyValue> extendInfo, String propertyName, String propertyValue) {
-        // Always drop the managed entry first so a reused ConnectInfo cannot keep a stale value after it is cleared.
-        removeProperty(extendInfo, propertyName);
+    private static void replaceManagedContextProperties(List<KeyValue> extendInfo, ConnectInfo connectInfo) {
+        removeProperty(extendInfo, DATABASE_PROPERTY);
+        removeProperty(extendInfo, SCHEMA_PROPERTY);
+        addPropertyIfConfigured(extendInfo, DATABASE_PROPERTY, connectInfo.getDatabaseName());
+        addPropertyIfConfigured(extendInfo, SCHEMA_PROPERTY, connectInfo.getSchemaName());
+    }
+
+    private static void addPropertyIfConfigured(List<KeyValue> extendInfo, String propertyName, String propertyValue) {
         if (StringUtils.isNotBlank(propertyValue)) {
             addProperty(extendInfo, propertyName, propertyValue);
         }

chat2db-community-server/chat2db-community-plugins/chat2db-community-snowflake/src/test/java/ai/chat2db/plugin/snowflake/SnowflakeDBManagerTest.java

@@ -93,6 +93,29 @@ void reconnectWithClearedSchemaNameDropsStaleSchemaProperty() {
         assertFalse(connectInfo.getExtendMap().containsKey("schema"));
     }
 
+    @Test
+    void reconnectWithClearedDatabaseAndSchemaDropsStaleManagedProperties() {
+        ConnectInfo connectInfo = new ConnectInfo();
+        connectInfo.setDatabaseName("analytics");
+        connectInfo.setSchemaName("reporting");
+        connectInfo.setConnection(openConnectionStub());
+        connectInfo.setExtendInfo(List.of(keyValue("role", "analyst")));
+
+        assertSame(connectInfo.getConnection(), dbManager.getConnection(connectInfo));
+        assertProperties(connectInfo.getExtendInfo(),
+                List.of("role", "db", "schema", "JDBC_QUERY_RESULT_FORMAT"),
+                List.of("analyst", "analytics", "reporting", "JSON"));
+
+        connectInfo.setDatabaseName(" ");
+        connectInfo.setSchemaName("");
+        assertSame(connectInfo.getConnection(), dbManager.getConnection(connectInfo));
+        assertProperties(connectInfo.getExtendInfo(),
+                List.of("role", "JDBC_QUERY_RESULT_FORMAT"),
+                List.of("analyst", "JSON"));
+        assertFalse(connectInfo.getExtendMap().containsKey("db"));
+        assertFalse(connectInfo.getExtendMap().containsKey("schema"));
+    }
+
     @Test
     void passesDriverConfigPropertiesToNewConnectionWhenExtendInfoIsMissing() throws Exception {
         assertDriverConfigFallbackIsPassedToNewConnection(null);