Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

fix(jdbc): avoid unsupported DuckDB timeout properties

heeeex100e71d03e9835e
diff --git a/plugins/jdbc/build.gradle b/plugins/jdbc/build.gradle
index 2e9fc99108..0822280e9d 100644
--- a/plugins/jdbc/build.gradle
+++ b/plugins/jdbc/build.gradle
@@ -42,6 +42,7 @@ dependencies {
runtimeOnly 'org.slf4j:slf4j-nop:1.7.36'
testImplementation 'com.h2database:h2:2.2.224'
+ testRuntimeOnly 'org.duckdb:duckdb_jdbc:2.0.0.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}
diff --git a/plugins/jdbc/src/main/java/app/dbx/jdbc/DbxJdbcPlugin.java b/plugins/jdbc/src/main/java/app/dbx/jdbc/DbxJdbcPlugin.java
index 9a8f29986e..ed2e155bf9 100644
--- a/plugins/jdbc/src/main/java/app/dbx/jdbc/DbxJdbcPlugin.java
+++ b/plugins/jdbc/src/main/java/app/dbx/jdbc/DbxJdbcPlugin.java
@@ -1200,9 +1200,10 @@ public final class DbxJdbcPlugin {
private static void applyConnectTimeout(JsonNode connection, Properties properties) {
int connectTimeoutSecs = positiveInt(connection, "connect_timeout_secs", 30);
DriverManager.setLoginTimeout(connectTimeoutSecs);
- if (isPrestoOrTrinoConnection(connection) || isHive2Connection(connection)) {
- // Hive/Inceptor treat unknown timeout properties inconsistently; keep only
- // DriverManager login timeout and avoid injecting vendor-specific keys.
+ if (isPrestoOrTrinoConnection(connection) || isHive2Connection(connection)
+ || urlMatchesPrefix(jdbcUrl(connection), "jdbc:duckdb:")) {
+ // These drivers reject or inconsistently handle unknown timeout properties.
+ // Keep DriverManager login timeout without injecting vendor-specific keys.
return;
}
String value = Integer.toString(connectTimeoutSecs);
diff --git a/plugins/jdbc/src/test/java/app/dbx/jdbc/DbxJdbcPluginTest.java b/plugins/jdbc/src/test/java/app/dbx/jdbc/DbxJdbcPluginTest.java
index 60944f9616..790e1b92ec 100644
--- a/plugins/jdbc/src/test/java/app/dbx/jdbc/DbxJdbcPluginTest.java
+++ b/plugins/jdbc/src/test/java/app/dbx/jdbc/DbxJdbcPluginTest.java
@@ -6,12 +6,14 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
import java.sql.Connection;
import java.sql.Clob;
import java.sql.DatabaseMetaData;
@@ -1352,6 +1354,66 @@ final class DbxJdbcPluginTest {
assertFalse(properties.containsKey("connectTimeout"));
}
+ @Test
+ void duckDbConnectTimeoutDoesNotInjectUnsupportedProperties() throws Exception {
+ Method method = DbxJdbcPlugin.class.getDeclaredMethod("applyConnectTimeout", JsonNode.class, Properties.class);
+ method.setAccessible(true);
+ int previousTimeout = DriverManager.getLoginTimeout();
+ try {
+ for (String url : List.of("jdbc:duckdb:", "jdbc:duckdb:/tmp/example.duckdb", "JDBC:DUCKDB:")) {
+ JsonNode connection = MAPPER.createObjectNode()
+ .put("connection_string", url)
+ .put("connect_timeout_secs", 45);
+ Properties properties = new Properties();
+ properties.setProperty("duckdb_read_only", "true");
+ method.invoke(null, connection, properties);
+ assertEquals("true", properties.getProperty("duckdb_read_only"));
+ assertFalse(properties.containsKey("loginTimeout"), url);
+ assertFalse(properties.containsKey("connectTimeout"), url);
+ assertEquals(45, DriverManager.getLoginTimeout());
+ }
+ } finally {
+ DriverManager.setLoginTimeout(previousTimeout);
+ }
+ }
+
+ @Test
+ void duckDbInMemoryConnectionExecutesQueries() throws Exception {
+ JsonNode response = request("executeQuery", """
+ {
+ "connection": {
+ "connection_string": "jdbc:duckdb:",
+ "connect_timeout_secs": 45
+ },
+ "sql": "SELECT 42 AS answer"
+ }
+ """);
+ assertFalse(response.has("error"), response.toString());
+ assertEquals(42, response.path("result").path("rows").path(0).path(0).asInt());
+ }
+
+ @Test
+ void duckDbFileConnectionPersistsDataAcrossReconnects(@TempDir Path directory) throws Exception {
+ ObjectNode connection = MAPPER.createObjectNode()
+ .put("connection_string", "jdbc:duckdb:" + directory.resolve("example.duckdb"))
+ .put("connect_timeout_secs", 45);
+ for (String sql : List.of("CREATE TABLE example (id INTEGER)", "INSERT INTO example VALUES (42)")) {
+ ObjectNode requestParams = MAPPER.createObjectNode();
+ requestParams.set("connection", connection);
+ requestParams.put("sql", sql);
+ JsonNode response = request("executeQuery", requestParams.toString());
+ assertFalse(response.has("error"), response.toString());
+ }
+ JsonNode closed = request("close", MAPPER.createObjectNode().set("connection", connection).toString());
+ assertFalse(closed.has("error"), closed.toString());
+ ObjectNode params = MAPPER.createObjectNode();
+ params.set("connection", connection);
+ params.put("sql", "SELECT id FROM example");
+ JsonNode response = request("executeQuery", params.toString());
+ assertFalse(response.has("error"), response.toString());
+ assertEquals(42, response.path("result").path("rows").path(0).path(0).asInt());
+ }
+
@Test
void ordinaryConnectionsEnableAutoCommitWhenDriverDefaultsToManualTransactions() throws Exception {
Method method = DbxJdbcPlugin.class.getDeclaredMethod(