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): restore table DDL viewing for Sybase

t8y2fe6b929bcbe7
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 4eb064383b..4b0a338689 100644
--- a/plugins/jdbc/src/main/java/app/dbx/jdbc/DbxJdbcPlugin.java
+++ b/plugins/jdbc/src/main/java/app/dbx/jdbc/DbxJdbcPlugin.java
@@ -2472,6 +2472,21 @@ public final class DbxJdbcPlugin {
}
} catch (SQLException | AbstractMethodError | UnsupportedOperationException ignored) {
}
+ if (primaryColumnsBySequence.isEmpty() && isSybaseConnection(connection) && schemaPattern != null) {
+ try (ResultSet rs = meta.getPrimaryKeys(catalog, null, table)) {
+ while (rs != null && rs.next()) {
+ String name = rs.getString("PK_NAME");
+ if (name != null && !name.isBlank()) {
+ primaryIndexNames.add(name);
+ }
+ String column = rs.getString("COLUMN_NAME");
+ if (column != null && !column.isBlank()) {
+ primaryColumnsBySequence.put((int) rs.getShort("KEY_SEQ"), column);
+ }
+ }
+ } catch (SQLException | AbstractMethodError | UnsupportedOperationException ignored) {
+ }
+ }
// Presto/Trino JDBC throws SQLFeatureNotSupportedException from getIndexInfo, and
// drivers compiled before JDBC 4 surface unimplemented DatabaseMetaData methods as
@@ -2482,12 +2497,24 @@ public final class DbxJdbcPlugin {
appendJdbcIndexes(indexes, primaryIndexNames, rs);
} catch (SQLException | AbstractMethodError | UnsupportedOperationException ignored) {
}
+ if (indexes.isEmpty() && isSybaseConnection(connection) && schemaPattern != null) {
+ try (ResultSet rs = meta.getIndexInfo(catalog, null, table, false, false)) {
+ appendJdbcIndexes(indexes, primaryIndexNames, rs);
+ } catch (SQLException | AbstractMethodError | UnsupportedOperationException ignored) {
+ }
+ }
if (indexes.isEmpty() && catalog != null) {
try (ResultSet rs = meta.getIndexInfo(null, schemaPattern, table, false, false)) {
appendJdbcIndexes(indexes, primaryIndexNames, rs);
} catch (SQLException | AbstractMethodError | UnsupportedOperationException ignored) {
}
}
+ if (indexes.isEmpty() && isSybaseConnection(connection) && schemaPattern != null && catalog != null) {
+ try (ResultSet rs = meta.getIndexInfo(null, null, table, false, false)) {
+ appendJdbcIndexes(indexes, primaryIndexNames, rs);
+ } catch (SQLException | AbstractMethodError | UnsupportedOperationException ignored) {
+ }
+ }
markPrimaryIndexByColumns(indexes.values(), new ArrayList<>(primaryColumnsBySequence.values()));
ArrayNode result = MAPPER.createArrayNode();
indexes.values().forEach(result::add);
@@ -2586,10 +2613,19 @@ public final class DbxJdbcPlugin {
String catalog = metadataCatalog(database, quirks);
String schemaPattern = resolveSchemaPattern(meta, database, schema, quirks);
JdbcMetadataIdentity identity = appendColumns(result, meta, catalog, schemaPattern, table);
+ if (result.isEmpty() && isSybaseConnection(connection) && schemaPattern != null) {
+ identity = appendColumns(result, meta, catalog, null, table);
+ }
if (result.isEmpty() && catalog != null) {
identity = appendColumns(result, meta, null, schemaPattern, table);
+ if (result.isEmpty() && isSybaseConnection(connection) && schemaPattern != null) {
+ identity = appendColumns(result, meta, null, null, table);
+ }
}
Set<String> primaryKeys = safePrimaryKeys(meta, identity.catalog(), identity.schema(), identity.table());
+ if (primaryKeys.isEmpty() && isSybaseConnection(connection) && identity.schema() != null) {
+ primaryKeys = safePrimaryKeys(meta, identity.catalog(), null, identity.table());
+ }
markPrimaryKeyColumns(result, primaryKeys);
if (quirks.useCatalogFallbackSql()) {
mergeShowFullColumnMetadata(conn, result, schemaPattern, table);
@@ -3290,6 +3326,19 @@ public final class DbxJdbcPlugin {
return urlMatchesPrefix(url, "jdbc:kingbase");
}
+ private static boolean isSybaseConnection(JsonNode connection) {
+ String url = optionalText(connection, "connection_string");
+ if (urlMatchesPrefix(url, "jdbc:sybase:") || urlMatchesPrefix(url, "jdbc:jtds:sybase:")) {
+ return true;
+ }
+ String driverClass = optionalText(connection, "jdbc_driver_class");
+ if (driverClass == null) {
+ return false;
+ }
+ String normalized = driverClass.toLowerCase(Locale.ROOT);
+ return normalized.contains("sybdriver") || normalized.contains("sybase");
+ }
+
private static String quoteAnsiIdentifier(String identifier) {
return "\"" + identifier.replace("\"", "\"\"") + "\"";
}
@@ -4092,6 +4141,9 @@ public final class DbxJdbcPlugin {
String catalog = metadataCatalog(database, quirks);
String schemaPattern = resolveSchemaPattern(meta, database, schema, quirks);
foreignKeys = listGenericForeignKeys(meta, catalog, schemaPattern, table);
+ if (foreignKeys.isEmpty() && isSybaseConnection(connection) && schemaPattern != null) {
+ foreignKeys = listGenericForeignKeys(meta, catalog, null, table);
+ }
}
String source = GenericJdbcDdlBuilder.buildTableDdl(
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 b47451d51e..560bea7728 100644
--- a/plugins/jdbc/src/test/java/app/dbx/jdbc/DbxJdbcPluginTest.java
+++ b/plugins/jdbc/src/test/java/app/dbx/jdbc/DbxJdbcPluginTest.java
@@ -4477,6 +4477,117 @@ final class DbxJdbcPluginTest {
);
}
+ private static final class SybaseMetadataDriver implements Driver {
+ private final List<String> calls;
+
+ private SybaseMetadataDriver(List<String> calls) {
+ this.calls = calls;
+ }
+
+ @Override
+ public Connection connect(String url, Properties info) {
+ return acceptsURL(url) ? sybaseMetadataConnection(calls) : null;
+ }
+
+ @Override
+ public boolean acceptsURL(String url) {
+ return url != null && url.startsWith("jdbc:sybase:Tds:sybase-ddl-test:");
+ }
+
+ @Override
+ public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) {
+ return new DriverPropertyInfo[0];
+ }
+
+ @Override
+ public int getMajorVersion() {
+ return 1;
+ }
+
+ @Override
+ public int getMinorVersion() {
+ return 0;
+ }
+
+ @Override
+ public boolean jdbcCompliant() {
+ return false;
+ }
+
+ @Override
+ public java.util.logging.Logger getParentLogger() {
+ return java.util.logging.Logger.getGlobal();
+ }
+ }
+
+ private static Connection sybaseMetadataConnection(List<String> calls) {
+ DatabaseMetaData metadata = (DatabaseMetaData) Proxy.newProxyInstance(
+ DbxJdbcPluginTest.class.getClassLoader(),
+ new Class<?>[] { DatabaseMetaData.class },
+ (proxy, method, args) -> {
+ if ("getColumns".equals(method.getName())) {
+ calls.add("columns:" + metadataArgument(args[0]) + ":" + metadataArgument(args[1]) + ":" + metadataArgument(args[2]));
+ boolean nullSchema = args[1] == null;
+ return nullSchema
+ ? rowsResultSet(
+ new String[] {
+ "TABLE_CAT",
+ "TABLE_SCHEM",
+ "TABLE_NAME",
+ "COLUMN_NAME",
+ "TYPE_NAME",
+ "IS_NULLABLE",
+ "NULLABLE",
+ "COLUMN_DEF",
+ "REMARKS",
+ "COLUMN_SIZE",
+ "DECIMAL_DIGITS"
+ },
+ new Object[][] {
+ { "appdb", "dbo", "orders", "id", "int", "NO", DatabaseMetaData.columnNoNulls, null, null, 10, 0 }
+ }
+ )
+ : rowsResultSet(new String[] { "COLUMN_NAME" }, new Object[0][]);
+ }
+ if ("getPrimaryKeys".equals(method.getName())) {
+ calls.add("primaryKeys:" + metadataArgument(args[0]) + ":" + metadataArgument(args[1]) + ":" + metadataArgument(args[2]));
+ return args[1] == null
+ ? rowsResultSet(
+ new String[] { "PK_NAME", "COLUMN_NAME", "KEY_SEQ" },
+ new Object[][] { { "pk_orders", "id", (short) 1 } }
+ )
+ : rowsResultSet(new String[] { "PK_NAME", "COLUMN_NAME", "KEY_SEQ" }, new Object[0][]);
+ }
+ if ("getIndexInfo".equals(method.getName())) {
+ calls.add("indexInfo:" + metadataArgument(args[0]) + ":" + metadataArgument(args[1]) + ":" + metadataArgument(args[2]));
+ return rowsResultSet(
+ new String[] { "INDEX_NAME", "COLUMN_NAME", "NON_UNIQUE", "TYPE" },
+ new Object[0][]
+ );
+ }
+ if ("getImportedKeys".equals(method.getName())) {
+ calls.add("importedKeys:" + metadataArgument(args[0]) + ":" + metadataArgument(args[1]) + ":" + metadataArgument(args[2]));
+ return rowsResultSet(
+ new String[] { "FK_NAME", "FKCOLUMN_NAME", "PKTABLE_NAME", "PKCOLUMN_NAME" },
+ new Object[0][]
+ );
+ }
+ return defaultValue(method.getReturnType());
+ }
+ );
+ return (Connection) Proxy.newProxyInstance(
+ DbxJdbcPluginTest.class.getClassLoader(),
+ new Class<?>[] { Connection.class },
+ (proxy, method, args) -> switch (method.getName()) {
+ case "getMetaData" -> metadata;
+ case "isClosed" -> false;
+ case "isValid" -> true;
+ case "close", "setCatalog", "setSchema" -> null;
+ default -> defaultValue(method.getReturnType());
+ }
+ );
+ }
+
private static String metadataArgument(Object value) {
return value == null ? "<null>" : String.valueOf(value);
}
@@ -5303,6 +5414,41 @@ final class DbxJdbcPluginTest {
assertEquals(once, DbxJdbcPlugin.enrichDriverHint(connection, once));
}
+ @Test
+ void getObjectSourceBuildsSybaseTableDdlWhenMetadataRequiresNullSchema() throws Exception {
+ List<String> calls = new ArrayList<>();
+ Driver driver = new SybaseMetadataDriver(calls);
+ DriverManager.registerDriver(driver);
+ String connection = """
+ {
+ "connection_string": "jdbc:sybase:Tds:sybase-ddl-test:5000",
+ "connect_timeout_secs": 30
+ }
+ """;
+ try {
+ JsonNode response = request("getObjectSource", """
+ {
+ "connection": %s,
+ "database": "appdb",
+ "schema": "dbo",
+ "name": "orders",
+ "object_type": "TABLE"
+ }
+ """.formatted(connection));
+
+ assertFalse(response.has("error"), response.toString());
+ String source = response.path("result").path("source").asText();
+ assertTrue(source.startsWith("CREATE TABLE \"dbo\".\"orders\""), source);
+ assertTrue(source.contains("\"id\" int NOT NULL"), source);
+ assertTrue(source.contains("PRIMARY KEY (\"id\")"), source);
+ assertTrue(calls.contains("columns:appdb:dbo:orders"), calls.toString());
+ assertTrue(calls.contains("columns:appdb:<null>:orders"), calls.toString());
+ assertTrue(calls.contains("primaryKeys:appdb:<null>:orders"), calls.toString());
+ } finally {
+ closeAndDeregister(connection, driver);
+ }
+ }
+
@Test
void getObjectSourceBuildsExecutableTableDdlForPlainJdbcDrivers() throws Exception {
String sourceDb = "jdbc:h2:mem:dbx_ddl_src;DB_CLOSE_DELAY=-1";