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): count mixed column and wildcard projections correctly

zipge013fffb8a20
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index 4fc510f780..5742f48ded 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -3568,7 +3568,10 @@ const canFetchNextInfiniteScrollSegment = computed(() =>
allRowsLoaded: allRowsLoaded.value,
}),
);
-const canJumpLastPage = computed(() => canGoNextPage.value && (hasKnownPaginationTotalRowCount.value || allRowsLoaded.value || !!props.tableMeta || !!props.countSql || !!props.countTotalRows));
+// Editable query results also carry table metadata, but their SQL predicates
+// are not the table browser's whereInput. Never count that table as a fallback.
+const canCountTableRows = computed(() => props.context !== "results" && !!props.tableMeta);
+const canJumpLastPage = computed(() => canGoNextPage.value && (hasKnownPaginationTotalRowCount.value || allRowsLoaded.value || canCalculateTotalRowCount.value));
const totalRowCountBusy = computed(() => props.totalRowCountLoading === true || manualTotalRowCountLoading.value);
const pageJumpBusy = computed(() => !!props.pageJumpProgress && props.pageJumpProgress.totalRequests > 1);
/** Automatic background counts keep rows interactive; explicit count navigation still blocks the surface. */
@@ -3583,7 +3586,7 @@ watch(
},
{ immediate: true },
);
-const canCalculateTotalRowCount = computed(() => !!props.countTotalRows || (!!props.connectionId && (!!props.tableMeta || !!props.countSql)));
+const canCalculateTotalRowCount = computed(() => !!props.countTotalRows || (!!props.connectionId && (canCountTableRows.value || !!props.countSql)));
const showExactTotalCountAction = computed(() => canCalculateTotalRowCount.value && (totalRowCountIsExact.value === false || typeof displayedTotalRowCount.value !== "number"));
const showRerunTotalCountAction = computed(() =>
showDataGridRerunTotalCountAction({
@@ -4020,7 +4023,7 @@ async function lastPage() {
}
return;
}
- if (props.connectionId && (props.countSql || props.tableMeta)) {
+ if (props.connectionId && (props.countSql || canCountTableRows.value)) {
const generation = await beginManualTotalRowCount();
if (generation === undefined) return;
try {
@@ -4064,7 +4067,7 @@ function handleGridPaginationShortcut(event: KeyboardEvent): boolean {
async function buildCurrentCountTarget(): Promise<{ sql: string; schema?: string } | undefined> {
if (props.countSql) return { sql: props.countSql, schema: props.schema };
- if (props.tableMeta) {
+ if (canCountTableRows.value && props.tableMeta) {
const countHint = resolvedDatabaseType.value === "gaussdb" && props.connectionId ? gaussdbCountQueryDopHint(connectionStore.getConfig(props.connectionId)) : undefined;
const sql = await buildDataGridCountSql({
databaseType: props.databaseType,
diff --git a/apps/desktop/src/components/grid/__tests__/DataGridTotalRowCountRefresh.spec.ts b/apps/desktop/src/components/grid/__tests__/DataGridTotalRowCountRefresh.spec.ts
index 4723742857..6a8535737a 100644
--- a/apps/desktop/src/components/grid/__tests__/DataGridTotalRowCountRefresh.spec.ts
+++ b/apps/desktop/src/components/grid/__tests__/DataGridTotalRowCountRefresh.spec.ts
@@ -33,11 +33,11 @@ function pageResult(): QueryResult {
return markRaw({ columns: ["id"], rows: Array.from({ length: 100 }, (_, i) => [i + 1]), affected_rows: 100, execution_time_ms: 1, has_more: true });
}
-function mountGrid(countTotalRows = vi.fn<() => Promise<number | undefined>>().mockResolvedValue(250)) {
+function mountGrid(countTotalRows = vi.fn<() => Promise<number | undefined>>().mockResolvedValue(250), options: { context?: "results" | "table-data"; withoutQueryCount?: boolean } = {}) {
const pinia = createPinia();
setActivePinia(pinia);
useSettingsStore().updateEditorSettings({ dataGridRenderMode: "canvas", infiniteScroll: false });
- const state = reactive({ result: pageResult(), pageOffset: 0, loading: false, totalRowCount: undefined as number | undefined, countSql: "SELECT COUNT(*) FROM users WHERE active = 1" });
+ const state = reactive({ result: pageResult(), pageOffset: 0, loading: false, totalRowCount: undefined as number | undefined, countSql: options.withoutQueryCount ? "" : "SELECT COUNT(*) FROM users WHERE active = 1" });
const onReload = vi.fn(async () => {
state.loading = true;
await nextTick();
@@ -50,7 +50,22 @@ function mountGrid(countTotalRows = vi.fn<() => Promise<number | undefined>>().m
h(
TooltipProvider,
{ delayDuration: 0 },
- { default: () => h(DataGrid, { ...state, pageLimit: 100, context: "table-data", databaseType: "mysql", connectionId: "test", database: "db", tableMeta: { tableName: "users", schema: "db", columns: [], primaryKeys: [] }, paginationEnabled: true, countTotalRows, onReload, onPaginate }) },
+ {
+ default: () =>
+ h(DataGrid, {
+ ...state,
+ pageLimit: 100,
+ context: options.context ?? "table-data",
+ databaseType: "mysql",
+ connectionId: "test",
+ database: "db",
+ tableMeta: { tableName: "users", schema: "db", columns: [], primaryKeys: [] },
+ paginationEnabled: true,
+ countTotalRows: options.withoutQueryCount ? undefined : countTotalRows,
+ onReload,
+ onPaginate,
+ }),
+ },
),
});
const host = document.createElement("div");
@@ -89,6 +104,26 @@ afterEach(() => {
});
describe("DataGrid manual count freshness", () => {
+ it("does not offer an entire-table count or last-page count for unsupported query results", async () => {
+ const { host, countTotalRows } = mountGrid(undefined, { context: "results", withoutQueryCount: true });
+ await settle();
+ const countLabel = String(i18n.global.t("grid.calculateTotalRowsInline"));
+ expect(Array.from(host.querySelectorAll("button")).some((button) => button.textContent?.trim() === countLabel)).toBe(false);
+ const pageInput = host.querySelector<HTMLInputElement>(`input[aria-label="${i18n.global.t("grid.jumpToPage")}"]`)!;
+ const lastPageButton = pageInput.nextElementSibling!.nextElementSibling as HTMLButtonElement;
+ expect(lastPageButton.disabled).toBe(true);
+ expect(countTotalRows).not.toHaveBeenCalled();
+ });
+
+ it("keeps query-specific counting available for editable query results", async () => {
+ const { host, countTotalRows } = mountGrid(undefined, { context: "results" });
+ await settle();
+ clickButton(host, String(i18n.global.t("grid.calculateTotalRowsInline")));
+ await settle();
+ expect(countTotalRows).toHaveBeenCalledOnce();
+ expect(totalText(host)).toContain("250");
+ });
+
it("invalidates a manual count on refresh and allows counting the updated rows", async () => {
const { host, countTotalRows, onReload } = mountGrid();
await settle();
diff --git a/crates/dbx-sql-data/src/query_result_sql.rs b/crates/dbx-sql-data/src/query_result_sql.rs
index 88451fcc8f..b0673b6743 100644
--- a/crates/dbx-sql-data/src/query_result_sql.rs
+++ b/crates/dbx-sql-data/src/query_result_sql.rs
@@ -1616,10 +1616,13 @@ fn sql_server_count_sql(statement: &str) -> Option<String> {
|| select.from.is_empty()
|| !group_by_is_empty
|| select.having.is_some()
- || !select
- .projection
- .iter()
- .all(|item| matches!(item, SelectItem::Wildcard(_) | SelectItem::QualifiedWildcard(_, _)))
+ || !select.projection.iter().all(|item| match item {
+ SelectItem::Wildcard(_) | SelectItem::QualifiedWildcard(_, _) => true,
+ SelectItem::UnnamedExpr(expr) | SelectItem::ExprWithAlias { expr, .. } => {
+ matches!(expr, Expr::Identifier(_) | Expr::CompoundIdentifier(_))
+ }
+ _ => false,
+ })
{
return None;
}
@@ -3263,6 +3266,45 @@ mod tests {
);
}
+ #[test]
+ fn sqlserver_mixed_wildcard_count_preserves_query_predicates() {
+ for projection in
+ ["x_JtRoomCode, RoomInfo, *", "sr.x_JtRoomCode, sr.RoomInfo, sr.*", "sr.RoomInfo AS info, sr.*"]
+ {
+ let sql = format!("SELECT {projection} FROM s_room sr WHERE sr.RoomInfo LIKE N'%合肥天珺一期%' AND sr.x_JtRoomCode IS NULL ORDER BY sr.RoomInfo");
+ let plan = build_query_pagination_execution_plan(QueryPaginationExecutionPlanOptions {
+ sql: sql.clone(),
+ query_base_sql: sql,
+ database_type: Some(DatabaseType::SqlServer),
+ pagination: QueryPagination { limit: 1000, offset: 0, session_id: None },
+ use_agent_cursor: false,
+ first_page_uses_actual_sql: false,
+ });
+ assert_eq!(plan.count_sql.as_deref(), Some("SELECT COUNT(*) AS dbx_total_rows FROM s_room sr WHERE sr.RoomInfo LIKE N'%合肥天珺一期%' AND sr.x_JtRoomCode IS NULL;"));
+ assert!(plan.sql_to_execute.starts_with("SELECT TOP (1000)"));
+ }
+ }
+
+ #[test]
+ fn sqlserver_mixed_wildcard_count_rejects_semantic_modifiers_and_expressions() {
+ for sql in [
+ "SELECT DISTINCT id, * FROM rooms",
+ "SELECT TOP 10 id, * FROM rooms",
+ "SELECT COUNT(*), * FROM rooms",
+ "SELECT id + 1, * FROM rooms",
+ "SELECT id, * FROM rooms GROUP BY id",
+ ] {
+ assert!(
+ !build_count_query_sql(CountQuerySqlOptions {
+ original_sql: sql.to_string(),
+ database_type: Some(DatabaseType::SqlServer),
+ })
+ .ok,
+ "must not rewrite {sql}"
+ );
+ }
+ }
+
#[test]
fn sqlserver_join_wildcard_count_removes_top_level_order_by() {
let result = build_count_query_sql(CountQuerySqlOptions {