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(gbase8s): load defaults using the effective SQL mode

New2Niu9444f0439e35
diff --git a/agents/drivers/gbase8s/src/main/java/com/dbx/agent/gbase8s/Gbase8sAgent.java b/agents/drivers/gbase8s/src/main/java/com/dbx/agent/gbase8s/Gbase8sAgent.java
index d9ca578684..141ae89aac 100644
--- a/agents/drivers/gbase8s/src/main/java/com/dbx/agent/gbase8s/Gbase8sAgent.java
+++ b/agents/drivers/gbase8s/src/main/java/com/dbx/agent/gbase8s/Gbase8sAgent.java
@@ -250,12 +250,21 @@ public final class Gbase8sAgent extends ConfiguredJdbcAgent {
}
private static String currentLocaleOf(ConnectParams params) {
- for (String segment : params.getUrl_params().split(";")) {
+ return connectionParameterValue(params.getUrl_params(), "DB_LOCALE");
+ }
+
+ private static String connectionParameterValue(String parameters, String parameterName) {
+ for (String segment : trim(parameters).split(";")) {
int equals = segment.indexOf('=');
if (equals < 0) {
continue;
}
- if (segment.substring(0, equals).trim().equalsIgnoreCase("DB_LOCALE")) {
+ String key = segment.substring(0, equals).trim();
+ int urlPrefix = key.lastIndexOf(':');
+ if (urlPrefix >= 0) {
+ key = key.substring(urlPrefix + 1).trim();
+ }
+ if (key.equalsIgnoreCase(parameterName)) {
return segment.substring(equals + 1).trim();
}
}
@@ -498,7 +507,8 @@ public final class Gbase8sAgent extends ConfiguredJdbcAgent {
Connection conn = requireConnection();
String owner = trim(schema);
Set<Integer> primaryKeyColumns = getPrimaryKeyColumnNumbers(conn, owner, table);
- Map<String, String> columnDefaults = loadColumnDefaults(conn, owner, table);
+ boolean mysqlCompatMode = isMysqlCompatMode(databaseListParams);
+ Map<String, String> columnDefaults = loadColumnDefaults(conn, owner, table, mysqlCompatMode);
List<Object> args = new ArrayList<>();
args.add(table);
StringBuilder sql = new StringBuilder("""
@@ -544,16 +554,21 @@ public final class Gbase8sAgent extends ConfiguredJdbcAgent {
}
}
- private static Map<String, String> loadColumnDefaults(Connection conn, String owner, String table) {
+ private static Map<String, String> loadColumnDefaults(
+ Connection conn,
+ String owner,
+ String table,
+ boolean mysqlCompatMode
+ ) {
List<Object> args = new ArrayList<>();
args.add(table);
StringBuilder sql = new StringBuilder("""
- SELECT c.colname, e.default AS column_default
+ SELECT c.colname, %s AS column_default
FROM systables t
JOIN syscolumns c ON t.tabid = c.tabid
JOIN sysdefaultsexpr e ON c.tabid = e.tabid AND c.colno = e.colno
WHERE t.tabname = ? AND e.type = 'T'
- """.stripIndent().trim());
+ """.formatted(mysqlCompatMode ? "e.`default`" : "e.default").stripIndent().trim());
if (!owner.isEmpty()) {
sql.append(" AND t.owner = ?");
args.add(owner);
@@ -576,6 +591,17 @@ public final class Gbase8sAgent extends ConfiguredJdbcAgent {
return defaults;
}
+ private static boolean isMysqlCompatMode(ConnectParams params) {
+ if (params == null) {
+ return false;
+ }
+ if (params.isMysql_compat_mode()) {
+ return true;
+ }
+ String sqlMode = connectionParameterValue(buildUrl(params), "SQLMODE");
+ return sqlMode.equalsIgnoreCase("mysql");
+ }
+
@Override
public List<IndexInfo> listIndexes(String schema, String table) {
try {
diff --git a/agents/drivers/gbase8s/src/test/java/com/dbx/agent/gbase8s/Gbase8sAgentTest.java b/agents/drivers/gbase8s/src/test/java/com/dbx/agent/gbase8s/Gbase8sAgentTest.java
index 56660cf979..b35db7bfb3 100644
--- a/agents/drivers/gbase8s/src/test/java/com/dbx/agent/gbase8s/Gbase8sAgentTest.java
+++ b/agents/drivers/gbase8s/src/test/java/com/dbx/agent/gbase8s/Gbase8sAgentTest.java
@@ -348,7 +348,7 @@ class Gbase8sAgentTest {
void getColumnsUsesGbase8sSystemCatalog() {
List<String> sql = new ArrayList<>();
Gbase8sAgent agent = new Gbase8sAgent();
- TestSupport.setPrivateConnection(agent, preparedConnection(
+ Connection connection = preparedConnection(
sql,
resultSet(
new String[]{"part1", "part2", "part3", "part4", "part5", "part6", "part7", "part8", "part9", "part10", "part11", "part12", "part13", "part14", "part15", "part16"},
@@ -365,7 +365,11 @@ class Gbase8sAgentTest {
{"price", 5, 3, 3074, "Unit price"}
}
)
- ));
+ );
+ TestSupport.setPrivateConnection(agent, connection);
+ agent.afterConnect(new ConnectParams(
+ "", 0, "", "", "", "NOTSQLMODE=mysql;SQLMODE=ansi", "", false
+ ), connection);
List<ColumnInfo> columns = agent.getColumns("root", "products");
@@ -373,6 +377,7 @@ class Gbase8sAgentTest {
Assertions.assertTrue(sql.get(0).contains("FROM sysconstraints"), sql.get(0));
Assertions.assertTrue(sql.get(0).contains("t.owner = ?"), sql.get(0));
Assertions.assertTrue(sql.get(1).contains("JOIN sysdefaultsexpr"), sql.get(1));
+ Assertions.assertTrue(sql.get(1).contains("e.default AS column_default"), sql.get(1));
Assertions.assertTrue(sql.get(2).contains("FROM syscolumns"), sql.get(2));
Assertions.assertTrue(sql.get(2).contains("t.owner = ?"), sql.get(2));
Assertions.assertEquals(3, columns.size());
@@ -391,10 +396,10 @@ class Gbase8sAgentTest {
}
@Test
- void getColumnsLoadsDefaultsFromDefaultExpressionCatalog() throws Exception {
+ void getColumnsLoadsDefaultsFromDefaultExpressionCatalogInMysqlCompatMode() throws Exception {
List<String> sql = new ArrayList<>();
Gbase8sAgent agent = new Gbase8sAgent();
- TestSupport.setPrivateConnection(agent, preparedConnection(
+ Connection connection = preparedConnection(
sql,
resultSet(
new String[]{"part1", "part2", "part3", "part4", "part5", "part6", "part7", "part8", "part9", "part10", "part11", "part12", "part13", "part14", "part15", "part16"},
@@ -412,20 +417,61 @@ class Gbase8sAgentTest {
{"created_at", 10, 3, 8, null}
}
)
- ));
+ );
+ TestSupport.setPrivateConnection(agent, connection);
+ agent.afterConnect(new ConnectParams(
+ "",
+ 0,
+ "",
+ "",
+ "",
+ "GBASEDBTSERVER=gbase01;SQLMODE=mysql;CLIENT_LOCALE=zh_CN.57372;DB_LOCALE=zh_CN.57372;ifx_lock_mode_wait=60;",
+ "",
+ false
+ ), connection);
List<ColumnInfo> columns = agent.getColumns("root", "system_user");
Assertions.assertEquals(3, sql.size());
Assertions.assertTrue(sql.get(1).contains("JOIN sysdefaultsexpr"), sql.get(1));
Assertions.assertTrue(sql.get(1).contains("e.type = 'T'"), sql.get(1));
- Assertions.assertTrue(sql.get(1).contains("e.default AS column_default"), sql.get(1));
+ Assertions.assertTrue(sql.get(1).contains("e.`default` AS column_default"), sql.get(1));
Assertions.assertTrue(sql.get(1).contains("t.owner = ?"), sql.get(1));
Assertions.assertNull(columns.get(0).getColumn_default());
Assertions.assertEquals("'0'", columns.get(1).getColumn_default());
Assertions.assertEquals("current_timestamp", columns.get(2).getColumn_default());
}
+ @Test
+ void getColumnsUsesMysqlModeFromCustomConnectionStringBeforeUrlParams() {
+ String sql = defaultExpressionSql(
+ "SQLMODE=ansi",
+ "jdbc:gbasedbt-sqli://localhost:9088/appdb:GBASEDBTSERVER=gbase8s;SQLMODE=mysql"
+ );
+
+ Assertions.assertTrue(sql.contains("e.`default` AS column_default"), sql);
+ }
+
+ @Test
+ void getColumnsUsesAnsiModeFromCustomConnectionStringBeforeUrlParams() {
+ String sql = defaultExpressionSql(
+ "SQLMODE=mysql",
+ "jdbc:gbasedbt-sqli://localhost:9088/appdb:GBASEDBTSERVER=gbase8s;SQLMODE=ansi"
+ );
+
+ Assertions.assertTrue(sql.contains("e.default AS column_default"), sql);
+ }
+
+ @Test
+ void getColumnsIgnoresUrlParamsWhenCustomConnectionStringOmitsSqlMode() {
+ String sql = defaultExpressionSql(
+ "SQLMODE=mysql",
+ "jdbc:gbasedbt-sqli://localhost:9088/appdb:GBASEDBTSERVER=gbase8s"
+ );
+
+ Assertions.assertTrue(sql.contains("e.default AS column_default"), sql);
+ }
+
@Test
void getColumnsFallsBackWhenDefaultCatalogQueryFails() {
List<String> sql = new ArrayList<>();
@@ -611,6 +657,28 @@ class Gbase8sAgentTest {
});
}
+ private static String defaultExpressionSql(String urlParams, String connectionString) {
+ List<String> sql = new ArrayList<>();
+ Gbase8sAgent agent = new Gbase8sAgent();
+ Connection connection = preparedConnection(
+ sql,
+ resultSet(
+ new String[]{"part1", "part2", "part3", "part4", "part5", "part6", "part7", "part8", "part9", "part10", "part11", "part12", "part13", "part14", "part15", "part16"},
+ new Object[][]{}
+ ),
+ resultSet(new String[]{"colname", "column_default"}, new Object[][]{}),
+ resultSet(new String[]{"colname", "coltype", "colno", "collength", "comments"}, new Object[][]{})
+ );
+ TestSupport.setPrivateConnection(agent, connection);
+ agent.afterConnect(new ConnectParams(
+ "localhost", 9088, "appdb", "", "", urlParams, connectionString, false
+ ), connection);
+
+ agent.getColumns("root", "system_user");
+
+ return sql.get(1);
+ }
+
private static Connection defaultQueryFailureConnection(List<String> sql, ResultSet... resultSets) {
int[] resultIndex = {0};
return proxy(Connection.class, (method, args) -> {