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(sqlserver): fall back to ROWCOUNT paging for ORDER BY blind spots
ordinary being3353411fb6b9
diff --git a/crates/dbx-sql-data/src/query_result_sql.rs b/crates/dbx-sql-data/src/query_result_sql.rsindex b0673b6743..c0ecfcecd6 100644--- a/crates/dbx-sql-data/src/query_result_sql.rs+++ b/crates/dbx-sql-data/src/query_result_sql.rs@@ -776,6 +776,13 @@ fn add_sql_server_offset_fetch(statement: &str, limit: usize, offset: usize) ->return Some(inject_sql_server_top(statement, limit));}+ // 词法扫描对 `#` 临时表、反斜杠字符串等会漏掉结尾 ORDER BY;此时 ROW_NUMBER+ // 包装会把 ORDER BY 留在派生表里并被 SQL Server 拒绝,也不应按 (SELECT NULL)+ // 排序。退回 ROWCOUNT 封顶执行,保留原语句和用户排序。+ if order_by_index.is_none() && sql_server_ast_has_order_by(statement) {+ return Some(add_sql_server_rowcount_pagination(statement, limit, offset));+ }+// The inner query may end with a line comment after removing ORDER BY.// Keep the derived-table closing parenthesis on a new line so it is not// swallowed by `--` / `#` comments.@@ -1923,6 +1930,18 @@ fn sql_server_ast_has_offset_or_fetch(statement: &str) -> bool {has_offset || query.fetch.is_some()}+/// 词法扫描器对 `#` 临时表、反斜杠字符串等会漏掉结尾 ORDER BY,AST 解析不受影响。+/// 用于判断这类语句是否带有无法定位的顶层 ORDER BY:定位不到就不能安全地包派生表。+fn sql_server_ast_has_order_by(statement: &str) -> bool {+ let Ok(statements) = Parser::parse_sql(&MsSqlDialect {}, statement) else {+ return false;+ };+ let [Statement::Query(query)] = statements.as_slice() else {+ return false;+ };+ query.order_by.is_some()+}+fn add_fetch_first_limit(statement: &str, limit: usize, offset: usize) -> String {if has_top_level_fetch_first(statement) {if offset > 0 {@@ -4158,6 +4177,32 @@ WHERE u.id = picked.id;);}+ // `#` 临时表/反斜杠字符串让词法扫描漏掉结尾 ORDER BY 时,offset > 0 不能走+ // ROW_NUMBER 派生表包装(SQL Server 拒绝派生表里的 ORDER BY),退回 ROWCOUNT 封顶。+ #[test]+ fn sqlserver_hidden_order_by_uses_bounded_rowcount_pagination() {+ for (original, expected) in [+ (+ "SELECT * FROM t WHERE p = 'C:\\' ORDER BY id",+ "EXEC sys.sp_executesql N'SET ROWCOUNT 1000; SELECT * FROM t WHERE p = ''C:\\'' ORDER BY id'; /*__dbx_result_offset=500__*/",+ ),+ (+ "SELECT * FROM #t ORDER BY id",+ "EXEC sys.sp_executesql N'SET ROWCOUNT 1000; SELECT * FROM #t ORDER BY id'; /*__dbx_result_offset=500__*/",+ ),+ ] {+ let result = build_paginated_query_sql(PaginatedQuerySqlOptions {+ original_sql: original.to_string(),+ database_type: Some(DatabaseType::SqlServer),+ limit: 500,+ offset: 500,+ });++ assert!(result.ok, "must stay paginatable: {original}");+ assert_eq!(result.sql.unwrap(), expected);+ }+ }+// UNION 顶层的 OFFSET/FETCH 也不能被注入 TOP。#[test]fn keeps_sqlserver_offset_fetch_next_after_union() {