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。

feat(spanner): keep index and primary key sort directions in DDL

弈秋92d97836ef03
diff --git a/agents/common/src/main/java/com/dbx/agent/DdlBuilder.java b/agents/common/src/main/java/com/dbx/agent/DdlBuilder.java
index 34f0f000b7..4c15cae386 100644
--- a/agents/common/src/main/java/com/dbx/agent/DdlBuilder.java
+++ b/agents/common/src/main/java/com/dbx/agent/DdlBuilder.java
@@ -113,8 +113,13 @@ public final class DdlBuilder {
if (!index.getIs_primary() || index.getColumns().isEmpty()) {
continue;
}
- for (String column : index.getColumns()) {
- primaryKeys.add(quoteIdent(column, useBacktick));
+ List<String> directions = index.getKey_directions();
+ for (int columnIndex = 0; columnIndex < index.getColumns().size(); columnIndex++) {
+ String renderedColumn = quoteIdent(index.getColumns().get(columnIndex), useBacktick);
+ if (isDescendingKey(directions, columnIndex)) {
+ renderedColumn += " DESC";
+ }
+ primaryKeys.add(renderedColumn);
}
break;
}
@@ -188,6 +193,7 @@ public final class DdlBuilder {
String unique = index.getIs_unique() ? "UNIQUE " : "";
String using = notBlank(index.getIndex_type()) ? " USING " + index.getIndex_type() : "";
List<String> quotedColumns = new ArrayList<>();
+ List<String> directions = index.getKey_directions();
for (int columnIndex = 0; columnIndex < index.getColumns().size(); columnIndex++) {
String column = index.getColumns().get(columnIndex);
String renderedColumn = quoteIdent(column, useBacktick);
@@ -199,6 +205,13 @@ public final class DdlBuilder {
int options = keyOptions.get(columnIndex);
renderedColumn += (options & 1) != 0 ? " DESC" : " ASC";
renderedColumn += (options & 2) != 0 ? " NULLS FIRST" : " NULLS LAST";
+ } else if (isDescendingKey(directions, columnIndex)) {
+ // Explicit key directions (e.g. Spanner's ASC_OR_DESC) must
+ // survive into the DDL: DESC key parts change query plans
+ // and their absence misrepresents the schema (#13484).
+ // ASC is the default and stays implicit, matching the
+ // engine's own DDL output and the index panels.
+ renderedColumn += " DESC";
}
quotedColumns.add(renderedColumn);
}
@@ -460,6 +473,14 @@ public final class DdlBuilder {
return truncated.isEmpty() ? null : truncated;
}
+ private static boolean isDescendingKey(List<String> directions, int columnIndex) {
+ if (directions == null || columnIndex >= directions.size()) {
+ return false;
+ }
+ String direction = directions.get(columnIndex);
+ return direction != null && "DESC".equalsIgnoreCase(direction.trim());
+ }
+
private static boolean notBlank(String value) {
if (value == null) {
return false;
diff --git a/agents/common/src/test/java/com/dbx/agent/DdlBuilderDefaultTest.java b/agents/common/src/test/java/com/dbx/agent/DdlBuilderDefaultTest.java
index 4d53716ce8..8efbe460c8 100644
--- a/agents/common/src/test/java/com/dbx/agent/DdlBuilderDefaultTest.java
+++ b/agents/common/src/test/java/com/dbx/agent/DdlBuilderDefaultTest.java
@@ -24,4 +24,32 @@ class DdlBuilderDefaultTest {
Assertions.assertTrue(ddl.contains("\"empty_default\" INTEGER"));
Assertions.assertFalse(ddl.contains("\"empty_default\" INTEGER NOT NULL DEFAULT"));
}
+
+ @Test
+ void keyDirectionsRenderIntoPrimaryKeyAndSecondaryIndexes() {
+ IndexInfo primaryKey = new IndexInfo(
+ "PRIMARY_KEY", List.of("a", "b"), true, true,
+ null, null, null, null, null
+ );
+ primaryKey.setKey_directions(List.of("ASC", "DESC"));
+ IndexInfo secondary = new IndexInfo(
+ "idx_lookup", List.of("slip_number", "slip_input_date"), true, false,
+ null, null, null, null, null
+ );
+ secondary.setKey_directions(List.of("DESC", "DESC"));
+ IndexInfo ascendingOnly = new IndexInfo(
+ "idx_created", List.of("customer_id", "created_at"), false, false,
+ null, null, null, null, null
+ );
+ ascendingOnly.setKey_directions(List.of("asc", "ASC"));
+
+ String ddl = DdlBuilder.buildTableDdl(
+ "root", "orders", List.of(), List.of(primaryKey, secondary, ascendingOnly), List.of()
+ );
+
+ Assertions.assertTrue(ddl.contains("PRIMARY KEY (\"a\", \"b\" DESC)"), ddl);
+ Assertions.assertTrue(ddl.contains("(\"slip_number\" DESC, \"slip_input_date\" DESC)"), ddl);
+ Assertions.assertTrue(ddl.contains("(\"customer_id\", \"created_at\")"), ddl);
+ Assertions.assertFalse(ddl.contains(" ASC"), "ASC is the default and must stay implicit: " + ddl);
+ }
}
diff --git a/agents/drivers/spanner/src/main/java/com/dbx/agent/spanner/SpannerAgent.java b/agents/drivers/spanner/src/main/java/com/dbx/agent/spanner/SpannerAgent.java
index 7478b75bd9..c3c858ff3b 100644
--- a/agents/drivers/spanner/src/main/java/com/dbx/agent/spanner/SpannerAgent.java
+++ b/agents/drivers/spanner/src/main/java/com/dbx/agent/spanner/SpannerAgent.java
@@ -544,6 +544,7 @@ public final class SpannerAgent extends ConfiguredJdbcAgent {
Map<String, Boolean> uniqueByIndex = new LinkedHashMap<>();
Map<String, List<IndexColumn>> keyColumns = new LinkedHashMap<>();
Map<String, List<String>> storingColumns = new LinkedHashMap<>();
+ Map<String, Map<Integer, String>> keyDirections = new LinkedHashMap<>();
try (ResultSet rs = conn.getMetaData().getIndexInfo(null, schema, table, false, false)) {
while (rs.next()) {
String name = rs.getString("INDEX_NAME");
@@ -562,6 +563,14 @@ public final class SpannerAgent extends ConfiguredJdbcAgent {
}
keyColumns.computeIfAbsent(name, ignored -> new ArrayList<>())
.add(new IndexColumn(ordinal, column));
+ // The Spanner JDBC driver surfaces INFORMATION_SCHEMA
+ // INDEX_COLUMNS.COLUMN_ORDERING as a one-letter ASC_OR_DESC
+ // ('A'/'D'); without it, DESC key parts render direction-less
+ // in DDL and the index panel (issue #13484). Keyed by ordinal
+ // so each direction follows its column through the sort below.
+ String direction = rs.getString("ASC_OR_DESC");
+ keyDirections.computeIfAbsent(name, ignored -> new LinkedHashMap<>())
+ .put(ordinal, "D".equalsIgnoreCase(direction) ? "DESC" : "ASC");
}
}
@@ -570,11 +579,14 @@ public final class SpannerAgent extends ConfiguredJdbcAgent {
String name = entry.getKey();
List<IndexColumn> ordered = keyColumns.getOrDefault(name, new ArrayList<>());
ordered.sort(Comparator.comparingInt(IndexColumn::getOrdinal));
+ Map<Integer, String> directionByOrdinal = keyDirections.getOrDefault(name, Collections.emptyMap());
List<String> columns = new ArrayList<>();
+ List<String> directions = new ArrayList<>();
for (IndexColumn column : ordered) {
columns.add(column.getName());
+ directions.add(directionByOrdinal.getOrDefault(column.getOrdinal(), "ASC"));
}
- result.add(new IndexInfo(
+ IndexInfo index = new IndexInfo(
name,
columns,
Boolean.TRUE.equals(entry.getValue()),
@@ -584,7 +596,9 @@ public final class SpannerAgent extends ConfiguredJdbcAgent {
null,
storingColumns.get(name),
null
- ));
+ );
+ index.setKey_directions(directions.isEmpty() ? null : directions);
+ result.add(index);
}
return result;
});
diff --git a/agents/drivers/spanner/src/test/java/com/dbx/agent/spanner/SpannerAgentTest.java b/agents/drivers/spanner/src/test/java/com/dbx/agent/spanner/SpannerAgentTest.java
index 9826b8f575..d95d25a631 100644
--- a/agents/drivers/spanner/src/test/java/com/dbx/agent/spanner/SpannerAgentTest.java
+++ b/agents/drivers/spanner/src/test/java/com/dbx/agent/spanner/SpannerAgentTest.java
@@ -210,6 +210,34 @@ class SpannerAgentTest extends JdbcFakeExecutionBehaviorTest {
assertFalse(secondary.getIs_primary());
}
+ @Test
+ void keepsKeyDirectionsAlignedWithOrdinalPosition() {
+ Map<String, List<Map<String, Object>>> rows = new LinkedHashMap<>();
+ rows.put("getIndexInfo", Arrays.asList(
+ // The driver reports the one-letter ASC_OR_DESC ('A'/'D'), not ASC/DESC.
+ indexRow("PRIMARY_KEY", "singer_id", 1, false, "A"),
+ indexRow("PRIMARY_KEY", "album_id", 2, false, "D"),
+ // Rows arriving out of ordinal order must not detach a direction from its column,
+ // and the STORING column (NULL ordinal) must not add a direction entry.
+ indexRow("idx_albums_title", "release_ts", 2, true, "D"),
+ indexRow("idx_albums_title", "stored_col", null, true, null),
+ indexRow("idx_albums_title", "title", 1, true, "A")
+ ));
+ SpannerAgent agent = connectedAgent(GOOGLE_SQL_PRODUCT, null, rows);
+
+ List<IndexInfo> indexes = agent.listIndexes("", "albums");
+
+ assertEquals(2, indexes.size());
+ IndexInfo primaryKey = indexes.get(0);
+ assertEquals(Arrays.asList("singer_id", "album_id"), primaryKey.getColumns());
+ assertEquals(Arrays.asList("ASC", "DESC"), primaryKey.getKey_directions());
+
+ IndexInfo secondary = indexes.get(1);
+ assertEquals(Arrays.asList("title", "release_ts"), secondary.getColumns());
+ assertEquals(Arrays.asList("ASC", "DESC"), secondary.getKey_directions());
+ assertEquals(Collections.singletonList("stored_col"), secondary.getIncluded_columns());
+ }
+
@Test
void skipsUnnamedInterleaveRelationshipsReportedAsForeignKeys() {
Map<String, List<Map<String, Object>>> rows = new LinkedHashMap<>();
@@ -737,6 +765,14 @@ class SpannerAgentTest extends JdbcFakeExecutionBehaviorTest {
);
}
+ private static Map<String, Object> indexRow(
+ String indexName, String column, Integer ordinal, boolean nonUnique, String ascOrDesc
+ ) {
+ Map<String, Object> result = indexRow(indexName, column, ordinal, nonUnique);
+ result.put("ASC_OR_DESC", ascOrDesc);
+ return result;
+ }
+
@SuppressWarnings("unchecked")
private static <T> T proxy(Class<T> type, MethodHandler handler) {
InvocationHandler invocationHandler = new InvocationHandler() {
diff --git a/apps/desktop/src/components/grid/DataGridTableInfoPanels.vue b/apps/desktop/src/components/grid/DataGridTableInfoPanels.vue
index 4aae99fb40..5c8373c03a 100644
--- a/apps/desktop/src/components/grid/DataGridTableInfoPanels.vue
+++ b/apps/desktop/src/components/grid/DataGridTableInfoPanels.vue
@@ -172,7 +172,7 @@ const overviewRows = computed(() => {
<span v-if="index.index_type" class="rounded bg-muted px-1.5 py-0.5 text-muted-foreground">{{ index.index_type }}</span>
</div>
<div class="mt-2 font-mono text-[11px] text-muted-foreground break-all">
- {{ index.columns.join(", ") }}
+ {{ index.columns.map((column, columnIndex) => column + (index.key_directions?.[columnIndex]?.toUpperCase() === "DESC" ? " DESC" : "")).join(", ") }}
</div>
</div>
<Button v-if="props.canManageMongoIndexes && !props.isProtectedMongoIndex(index)" variant="ghost" size="sm" class="h-7 shrink-0 px-2 text-[11px] text-destructive hover:text-destructive" @click="emit('requestDropMongoIndex', index)">
diff --git a/apps/desktop/src/components/objects/ObjectBrowser.vue b/apps/desktop/src/components/objects/ObjectBrowser.vue
index 8e771882a0..0ecd4d9846 100644
--- a/apps/desktop/src/components/objects/ObjectBrowser.vue
+++ b/apps/desktop/src/components/objects/ObjectBrowser.vue
@@ -6567,7 +6567,7 @@ function getObjectBrowserMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
<span v-if="index.index_type" class="rounded bg-muted px-1.5 py-0.5 text-muted-foreground">{{ index.index_type }}</span>
</div>
<div class="mt-2 font-mono text-[11px] text-muted-foreground break-all">
- {{ index.columns.join(", ") }}
+ {{ index.columns.map((column, columnIndex) => column + (index.key_directions?.[columnIndex]?.toUpperCase() === "DESC" ? " DESC" : "")).join(", ") }}
</div>
</div>
</div>