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(sqlserver-legacy): read back table comments

弈秋c7004df28244
diff --git a/agents/drivers/sqlserver-legacy/src/main/java/com/dbx/agent/sqlserverlegacy/SqlServerLegacyAgent.java b/agents/drivers/sqlserver-legacy/src/main/java/com/dbx/agent/sqlserverlegacy/SqlServerLegacyAgent.java
index bbea6ee66c..23e91f8a12 100644
--- a/agents/drivers/sqlserver-legacy/src/main/java/com/dbx/agent/sqlserverlegacy/SqlServerLegacyAgent.java
+++ b/agents/drivers/sqlserver-legacy/src/main/java/com/dbx/agent/sqlserverlegacy/SqlServerLegacyAgent.java
@@ -446,24 +446,42 @@ public final class SqlServerLegacyAgent extends ConfiguredJdbcAgent {
@Override
public String getTableComment(String schema, String table) {
- if (sqlServer2000Mode) {
- return null;
- }
return unchecked(() -> {
- try (PreparedStatement statement = requireConnection().prepareStatement(tableCommentSql())) {
- statement.setString(1, schema);
- statement.setString(2, table);
- try (ResultSet resultSet = statement.executeQuery()) {
- if (resultSet.next()) {
- String comment = resultSet.getString("table_comment");
- return comment != null && !comment.trim().isEmpty() ? comment : null;
- }
- }
+ try {
+ return readTableComment(tableCommentSql(), schema, table);
+ } catch (SQLException | RuntimeException error) {
+ // sys.extended_properties is absent on SQL Server 2000, where the property
+ // lives in sysproperties; the compatibility function answers on every version.
+ // Bailing out on the driver mode instead used to hide a table comment that had
+ // just been written whenever the connection ran on the jTDS fallback. (#11606)
+ System.err.println(
+ "[sqlserver-legacy] sys.extended_properties table comment unavailable; trying compatibility function: "
+ + error.getMessage()
+ );
+ }
+ try {
+ return readTableComment(sqlServer2000TableCommentSql(), schema, table);
+ } catch (SQLException | RuntimeException error) {
+ System.err.println("[sqlserver-legacy] table comment unavailable: " + error.getMessage());
+ return null;
}
- return null;
});
}
+ private String readTableComment(String sql, String schema, String table) throws SQLException {
+ try (PreparedStatement statement = requireConnection().prepareStatement(sql)) {
+ statement.setString(1, schema);
+ statement.setString(2, table);
+ try (ResultSet resultSet = statement.executeQuery()) {
+ if (resultSet.next()) {
+ String comment = resultSet.getString("table_comment");
+ return comment != null && !comment.trim().isEmpty() ? comment : null;
+ }
+ }
+ }
+ return null;
+ }
+
@Override
public List<ColumnInfo> getColumns(String schema, String table) {
String resolvedSchema = metadataSchema(schema, table);
@@ -753,6 +771,16 @@ public final class SqlServerLegacyAgent extends ConfiguredJdbcAgent {
+ "AND s.name = ? AND t.name = ?";
}
+ /**
+ * SQL Server 2000 stores extended properties in sysproperties and has no
+ * sys.extended_properties view; the compatibility function answers on every version,
+ * so a jTDS connection can still read back a comment written as MS_Description. (#11606)
+ */
+ static String sqlServer2000TableCommentSql() {
+ return "SELECT CONVERT(nvarchar(4000), value) AS table_comment "
+ + "FROM ::fn_listextendedproperty(N'MS_Description', N'USER', ?, N'TABLE', ?, NULL, NULL)";
+ }
+
static String appendTableCommentDdl(String ddl, String schema, String table, String comment) {
if (comment == null || comment.trim().isEmpty()) {
return ddl;
diff --git a/agents/drivers/sqlserver-legacy/src/test/java/com/dbx/agent/sqlserverlegacy/SqlServerLegacyAgentTest.java b/agents/drivers/sqlserver-legacy/src/test/java/com/dbx/agent/sqlserverlegacy/SqlServerLegacyAgentTest.java
index ac0cd8d3b3..c751719dd8 100644
--- a/agents/drivers/sqlserver-legacy/src/test/java/com/dbx/agent/sqlserverlegacy/SqlServerLegacyAgentTest.java
+++ b/agents/drivers/sqlserver-legacy/src/test/java/com/dbx/agent/sqlserverlegacy/SqlServerLegacyAgentTest.java
@@ -768,6 +768,17 @@ class SqlServerLegacyAgentTest {
Assertions.assertTrue(sql.contains("s.name = ? AND t.name = ?"));
}
+ @Test
+ void legacyTableCommentFallbackUsesTheCompatibilityFunction() {
+ // #11606: sys.extended_properties is absent on SQL Server 2000, so the table comment
+ // reader falls back to ::fn_listextendedproperty, which answers on every version.
+ String sql = SqlServerLegacyAgent.sqlServer2000TableCommentSql();
+
+ Assertions.assertTrue(sql.contains("fn_listextendedproperty"));
+ Assertions.assertTrue(sql.contains("N'MS_Description'"));
+ Assertions.assertTrue(sql.contains("N'TABLE'"));
+ }
+
@Test
void columnCommentQueryReadsColumnExtendedPropertiesOnly() {
String sql = SqlServerLegacyAgent.columnCommentsSql();