(iotdb) branch master updated: Fix database hint of CLI when change sql_dialect back to table

[jackietien]

This is an automated email from the ASF dual-hosted git repository.

jackietien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new ee779e2b499 Fix database hint of CLI when change sql_dialect back to 
table
ee779e2b499 is described below

commit ee779e2b499d3ebf4ca9176d8312ae78675a388a
Author: Weihao Li <60659567+wei-hao...@users.noreply.github.com>
AuthorDate: Tue Mar 25 09:29:09 2025 +0800

    Fix database hint of CLI when change sql_dialect back to table
---
 .../jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java  | 7 +++++--
 .../jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java 
b/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
index 69527ae6892..594523ed921 100644
--- a/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
+++ b/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
@@ -644,8 +644,11 @@ public class IoTDBConnection implements Connection {
     params.setDb(database);
   }
 
-  protected void changeDefaultSqlDialect(String sqlDialect) {
-    params.setSqlDialect(sqlDialect);
+  protected void mayChangeDefaultSqlDialect(String sqlDialect) {
+    if (!sqlDialect.equals(params.getSqlDialect())) {
+      params.setSqlDialect(sqlDialect);
+      params.setDb(null);
+    }
   }
 
   public int getTimeFactor() {
diff --git 
a/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java 
b/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
index a3b6205512b..c36d905dd90 100644
--- a/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
+++ b/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
@@ -330,7 +330,7 @@ public class IoTDBStatement implements Statement {
     }
 
     if (execResp.isSetTableModel()) {
-      connection.changeDefaultSqlDialect(execResp.tableModel ? TABLE : TREE);
+      connection.mayChangeDefaultSqlDialect(execResp.tableModel ? TABLE : 
TREE);
     }
 
     if (execResp.isSetColumns()) {