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。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
fix(gbase8s): resolve extended column types from sysxtdtypes
lxk955bd700c8b67b3
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.javaindex 9d23b078af..70734e5bf5 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@@ -509,49 +509,83 @@ public final class Gbase8sAgent extends ConfiguredJdbcAgent {Set<Integer> primaryKeyColumns = getPrimaryKeyColumnNumbers(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("""+ try {+ return loadColumns(conn, owner, table, true, primaryKeyColumns, columnDefaults);+ } catch (Exception ignored) {+ return loadColumns(conn, owner, table, false, primaryKeyColumns, columnDefaults);+ }+ } catch (Exception e) {+ throw new RuntimeException(e);+ }+ }++ private List<ColumnInfo> loadColumns(+ Connection conn,+ String owner,+ String table,+ boolean includeExtendedTypes,+ Set<Integer> primaryKeyColumns,+ Map<String, String> columnDefaults+ ) throws Exception {+ List<Object> args = new ArrayList<>();+ args.add(table);+ StringBuilder sql = new StringBuilder();+ if (includeExtendedTypes) {+ sql.append("""+ SELECT c.colname, c.coltype, c.colno, c.collength, cc.comments, x.name AS extended_name+ FROM syscolumns c+ JOIN systables t ON t.tabid = c.tabid+ LEFT JOIN sysxtdtypes x ON x.extended_id = c.extended_id+ LEFT JOIN syscolcomms cc ON cc.tabid = c.tabid AND cc.colno = c.colno+ WHERE t.tabid >= 100 AND t.tabname = ?+ """.stripIndent().trim());+ } else {+ sql.append("""SELECT c.colname, c.coltype, c.colno, c.collength, cc.commentsFROM syscolumns cJOIN systables t ON t.tabid = c.tabidLEFT JOIN syscolcomms cc ON cc.tabid = c.tabid AND cc.colno = c.colnoWHERE t.tabid >= 100 AND t.tabname = ?""".stripIndent().trim());- if (!owner.isEmpty()) {- sql.append(" AND t.owner = ?");- args.add(owner);- }- sql.append(" ORDER BY c.colno");+ }+ if (!owner.isEmpty()) {+ sql.append(" AND t.owner = ?");+ args.add(owner);+ }+ sql.append(" ORDER BY c.colno");- List<ColumnInfo> result = new ArrayList<>();- try (PreparedStatement stmt = conn.prepareStatement(sql.toString())) {- bind(stmt, args);- try (ResultSet rs = stmt.executeQuery()) {- while (rs.next()) {- String name = trim(rs.getString("colname"));- int coltype = rs.getInt("coltype");- int baseType = baseColType(coltype);- int length = rs.getInt("collength");- result.add(new ColumnInfo(- name,- mapColType(baseType),- (coltype & 256) == 0,- columnDefaults.get(name),- primaryKeyColumns.contains(rs.getInt("colno")),- null,- emptyToNull(trim(rs.getString("comments"))),- numericPrecision(baseType, length),- numericScale(baseType, length),- characterMaximumLength(baseType, length)- ));+ List<ColumnInfo> result = new ArrayList<>();+ try (PreparedStatement stmt = conn.prepareStatement(sql.toString())) {+ bind(stmt, args);+ try (ResultSet rs = stmt.executeQuery()) {+ while (rs.next()) {+ String name = trim(rs.getString("colname"));+ int coltype = rs.getInt("coltype");+ int baseType = baseColType(coltype);+ int length = rs.getInt("collength");+ String extendedName = "";+ if (includeExtendedTypes) {+ try {+ extendedName = trim(rs.getString("extended_name"));+ } catch (Exception ignored) {+ }}+ result.add(new ColumnInfo(+ name,+ mapColType(baseType, length, extendedName),+ (coltype & 256) == 0,+ columnDefaults.get(name),+ primaryKeyColumns.contains(rs.getInt("colno")),+ null,+ emptyToNull(trim(rs.getString("comments"))),+ numericPrecision(baseType, length),+ numericScale(baseType, length),+ characterMaximumLength(baseType, length)+ ));}}- return result;- } catch (Exception e) {- throw new RuntimeException(e);}+ return result;}private static Map<String, String> loadColumnDefaults(@@ -952,7 +986,25 @@ public final class Gbase8sAgent extends ConfiguredJdbcAgent {}public static String mapColType(int coltype) {- return switch (baseColType(coltype)) {+ return mapColType(coltype, 0, null);+ }++ public static String mapColType(int coltype, String extendedName) {+ return mapColType(coltype, 0, extendedName);+ }++ public static String mapColType(int coltype, int length, String extendedName) {+ if (extendedName != null && !extendedName.trim().isEmpty()) {+ return extendedName.trim().toUpperCase(Locale.ROOT);+ }+ int baseType = baseColType(coltype);+ if (baseType == 41) {+ if (length == 72) {+ return "BLOB";+ }+ return "BOOLEAN";+ }+ return switch (baseType) {case 0 -> "CHAR";case 1 -> "SMALLINT";case 2 -> "INTEGER";@@ -989,7 +1041,7 @@ public final class Gbase8sAgent extends ConfiguredJdbcAgent {case 67 -> "TINYINT";case 68 -> "MEDIUMINT";case 69 -> "BIT";- default -> "UNKNOWN(" + baseColType(coltype) + ")";+ default -> "UNKNOWN(" + baseType + ")";};}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.javaindex 16fe71dca2..d771c4434e 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@@ -432,6 +432,104 @@ class Gbase8sAgentTest {""", ddl);}+ @Test+ void mapsExtendedDataTypesFromCatalogAndFallbacks() {+ // Extended types resolved from sysxtdtypes.name+ Assertions.assertEquals("BLOB", Gbase8sAgent.mapColType(41, 72, "blob"));+ Assertions.assertEquals("CLOB", Gbase8sAgent.mapColType(41, 72, "clob"));+ Assertions.assertEquals("BOOLEAN", Gbase8sAgent.mapColType(41, 1, "boolean"));+ Assertions.assertEquals("LVARCHAR", Gbase8sAgent.mapColType(40, 255, "lvarchar"));+ Assertions.assertEquals("JSON", Gbase8sAgent.mapColType(41, 0, "json"));+ Assertions.assertEquals("BSON", Gbase8sAgent.mapColType(41, 0, "bson"));+ Assertions.assertEquals("USER_DEFINED", Gbase8sAgent.mapColType(41, 16, "user_defined"));++ // Fallback when extended_name is empty or null: length 72 is smart LOB (BLOB), length 1 is BOOLEAN+ Assertions.assertEquals("BLOB", Gbase8sAgent.mapColType(41, 72, null));+ Assertions.assertEquals("BOOLEAN", Gbase8sAgent.mapColType(41, 1, null));+ Assertions.assertEquals("BOOLEAN", Gbase8sAgent.mapColType(41, 0, ""));+ Assertions.assertEquals("BOOLEAN", Gbase8sAgent.mapColType(41));+ }++ @Test+ void getColumnsResolvesExtendedTypesSuchAsBlobClobAndBoolean() {+ List<String> sql = new ArrayList<>();+ Gbase8sAgent agent = new Gbase8sAgent();+ TestSupport.setPrivateConnection(agent, preparedConnection(+ sql,+ resultSet(new String[]{"part1"}, new Object[][]{}),+ resultSet(new String[]{"colname", "column_default"}, new Object[][]{}),+ resultSet(+ new String[]{"colname", "coltype", "colno", "collength", "comments", "extended_name"},+ new Object[][]{+ {"photo", 41, 1, 72, "Profile image", "blob"},+ {"document", 41, 2, 72, null, "clob"},+ {"is_active", 41 + 256, 3, 1, null, "boolean"},+ {"notes", 40, 4, 2000, null, "lvarchar"},+ {"meta", 41, 5, 0, null, "json"}+ }+ )+ ));++ List<ColumnInfo> columns = agent.getColumns("root", "media");++ Assertions.assertTrue(sql.get(2).contains("LEFT JOIN sysxtdtypes x ON x.extended_id = c.extended_id"), sql.get(2));+ Assertions.assertEquals(5, columns.size());++ // BLOB and CLOB must NOT be misidentified as BOOLEAN+ Assertions.assertEquals("BLOB", columns.get(0).getData_type());+ Assertions.assertNull(columns.get(0).getCharacter_maximum_length());+ Assertions.assertTrue(columns.get(0).getIs_nullable());+ Assertions.assertEquals("Profile image", columns.get(0).getComment());++ Assertions.assertEquals("CLOB", columns.get(1).getData_type());+ Assertions.assertNull(columns.get(1).getCharacter_maximum_length());+ Assertions.assertTrue(columns.get(1).getIs_nullable());++ Assertions.assertEquals("BOOLEAN", columns.get(2).getData_type());+ Assertions.assertFalse(columns.get(2).getIs_nullable());++ Assertions.assertEquals("LVARCHAR", columns.get(3).getData_type());+ Assertions.assertEquals(2000, columns.get(3).getCharacter_maximum_length());++ Assertions.assertEquals("JSON", columns.get(4).getData_type());++ String ddl = DdlBuilder.buildTableDdl("root", "media", columns, List.of(), List.of());+ Assertions.assertEquals("""+ CREATE TABLE "root"."media" (+ "photo" BLOB,+ "document" CLOB,+ "is_active" BOOLEAN NOT NULL,+ "notes" LVARCHAR,+ "meta" JSON+ );+ """, ddl);+ }++ @Test+ void getColumnsFallsBackWhenSysxtdtypesQueryFailsAndInfersBlobByLength() {+ List<String> sql = new ArrayList<>();+ Gbase8sAgent agent = new Gbase8sAgent();+ TestSupport.setPrivateConnection(agent, fallbackOnSysxtdtypesFailureConnection(+ sql,+ resultSet(new String[]{"part1"}, new Object[][]{}),+ resultSet(new String[]{"colname", "column_default"}, new Object[][]{}),+ // When query with sysxtdtypes fails, fallback query without sysxtdtypes succeeds+ resultSet(+ new String[]{"colname", "coltype", "colno", "collength", "comments"},+ new Object[][]{+ {"blob_col", 41, 1, 72, null},+ {"bool_col", 41, 2, 1, null}+ }+ )+ ));++ List<ColumnInfo> columns = agent.getColumns("root", "mixed");++ Assertions.assertEquals(2, columns.size());+ Assertions.assertEquals("BLOB", columns.get(0).getData_type());+ Assertions.assertEquals("BOOLEAN", columns.get(1).getData_type());+ }+@Testvoid getColumnsLoadsDefaultsFromDefaultExpressionCatalogInMysqlCompatMode() throws Exception {List<String> sql = new ArrayList<>();@@ -742,6 +840,32 @@ class Gbase8sAgentTest {});}+ private static Connection fallbackOnSysxtdtypesFailureConnection(List<String> sql, ResultSet... resultSets) {+ int[] resultIndex = {0};+ return proxy(Connection.class, (method, args) -> {+ if ("getCatalog".equals(method.getName())) {+ return "appdb";+ }+ if ("prepareStatement".equals(method.getName())) {+ String query = String.valueOf(args[0]);+ sql.add(query);+ return proxy(PreparedStatement.class, (statementMethod, statementArgs) -> {+ if ("executeQuery".equals(statementMethod.getName())) {+ if (query.contains("sysxtdtypes")) {+ throw new SQLException("sysxtdtypes table query failed");+ }+ return resultSets[resultIndex[0]++];+ }+ return defaultValue(statementMethod.getReturnType());+ });+ }+ if ("isClosed".equals(method.getName())) {+ return false;+ }+ return defaultValue(method.getReturnType());+ });+ }+private static Connection schemaConnection(boolean supportsSchemasInDml, List<String> sql, ResultSet resultSet) {DatabaseMetaData metadata = proxy(DatabaseMetaData.class, (method, args) -> {if ("supportsSchemasInDataManipulation".equals(method.getName())) {