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): exempt TOP and OFFSET-FETCH from hidden ORDER BY guards

ordinary being381b4a9dd5d0
diff --git a/crates/dbx-sql-data/src/query_result_sql.rs b/crates/dbx-sql-data/src/query_result_sql.rs
index 15f234c501..1a7eea0f8e 100644
--- a/crates/dbx-sql-data/src/query_result_sql.rs
+++ b/crates/dbx-sql-data/src/query_result_sql.rs
@@ -555,6 +555,19 @@ pub fn build_sorted_query_sql(options: SortedQuerySqlOptions) -> QuerySqlBuildRe
} else {
quote_table_identifier(options.database_type, &sort_alias)
};
+ if options.database_type == Some(DatabaseType::SqlServer)
+ && find_top_level_trailing_order_by(statement).is_none()
+ && sql_server_ast_has_order_by(statement)
+ && !has_top_level_select_top(statement)
+ && !sql_server_ast_has_offset_or_fetch(statement)
+ {
+ // 词法定位不到结尾 ORDER BY(`#` 临时表/反斜杠字符串)时无法把它从
+ // 派生表包装里剥掉,SQL Server 会拒绝包装后的语句。
+ // 例外:带 TOP 或 OFFSET/FETCH 的语句在派生表里允许保留 ORDER BY
+ // (T-SQL Msg 1033 的豁免条件),`sql_server_statement_for_derived_table`
+ // 对这类语句本就原样包装,无需剥除。
+ return err("unsupported");
+ }
let wrapped_statement = if options.database_type == Some(DatabaseType::SqlServer) {
sql_server_statement_for_derived_table(statement)
} else {
@@ -1581,16 +1594,26 @@ fn sql_server_count_sql(statement: &str) -> Option<String> {
}
let dialect = MsSqlDialect {};
let mut statements = Parser::parse_sql(&dialect, statement).ok()?;
- let derived_table_projection_safe = {
+ let (derived_table_projection_safe, ast_has_order_by) = {
let [Statement::Query(query)] = statements.as_slice() else {
return None;
};
let SetExpr::Select(select) = query.body.as_ref() else {
return None;
};
- sql_server_derived_table_select_projection_safe(select)
+ (sql_server_derived_table_select_projection_safe(select), query.order_by.is_some())
};
- if derived_table_projection_safe {
+ // 词法扫描在 `#` 临时表、反斜杠字符串后会漏掉结尾 ORDER BY(见
+ // sql_server_ast_has_order_by)。定位不到就不能原样塞进派生表:SQL Server
+ // 拒绝派生表里的 ORDER BY。改走下面的 AST 重写分支,由它剥掉 ORDER BY。
+ // 例外:带 TOP 或 OFFSET/FETCH 的语句在派生表里允许保留 ORDER BY
+ // (T-SQL Msg 1033 的豁免条件),而且 AST 重写分支遇 TOP 会放弃精确计数,
+ // 因此这类语句仍走原样包装,保住精确行数。
+ let hidden_order_by = ast_has_order_by
+ && find_top_level_trailing_order_by(statement).is_none()
+ && !has_top_level_select_top(statement)
+ && !sql_server_ast_has_offset_or_fetch(statement);
+ if derived_table_projection_safe && !hidden_order_by {
let alias = quote_table_identifier(Some(DatabaseType::SqlServer), "dbx_count");
let wrapped_sql = sql_server_statement_for_derived_table(statement);
return Some(derived_table_sql("SELECT COUNT(*) AS dbx_total_rows FROM", &wrapped_sql, &format!("{alias};")));
@@ -3430,6 +3453,47 @@ mod tests {
}
}
+ // 词法扫描漏检的结尾 ORDER BY 不能原样塞进 COUNT 派生表(SQL Server 拒绝),
+ // 走 AST 重写分支剥离后再计数。
+ #[test]
+ fn sqlserver_count_strips_lexically_hidden_order_by() {
+ for (original, expected) in [
+ (
+ "SELECT * FROM t WHERE p = 'C:\\' ORDER BY id",
+ "SELECT COUNT(*) AS dbx_total_rows FROM t WHERE p = 'C:\\';",
+ ),
+ ("SELECT id FROM #t ORDER BY id", "SELECT COUNT(*) AS dbx_total_rows FROM #t;"),
+ ] {
+ let result = build_count_query_sql(CountQuerySqlOptions {
+ original_sql: original.to_string(),
+ database_type: Some(DatabaseType::SqlServer),
+ });
+
+ assert!(result.ok, "must stay countable: {original}");
+ assert_eq!(result.sql.unwrap(), expected);
+ }
+ }
+
+ #[test]
+ fn sqlserver_count_wraps_top_with_lexically_hidden_order_by() {
+ // T-SQL 允许派生表在带 TOP / OFFSET-FETCH 时保留 ORDER BY(Msg 1033 豁免),
+ // 这类语句即使词法定位不到 ORDER BY 也应原样包装,保住精确行数。
+ for original in [
+ "SELECT TOP (100) * FROM #Orders ORDER BY id",
+ "SELECT * FROM #Orders ORDER BY id OFFSET 10 ROWS FETCH NEXT 20 ROWS ONLY",
+ ] {
+ let result = build_count_query_sql(CountQuerySqlOptions {
+ original_sql: original.to_string(),
+ database_type: Some(DatabaseType::SqlServer),
+ });
+
+ assert!(result.ok, "must stay countable: {original}");
+ let sql = result.sql.unwrap();
+ assert!(sql.contains("COUNT(*)"), "{original} -> {sql}");
+ assert!(sql.contains("ORDER BY"), "derived table must keep ORDER BY: {original} -> {sql}");
+ }
+ }
+
#[test]
fn sqlserver_join_wildcard_uses_bounded_rowcount_pagination() {
let sql = "SELECT * FROM WZ_CKGL_WZLLDSQ_DETAIL d LEFT JOIN WZ_CKGL_WZLLDSQ_MAIN AS m ON m.ID = d.ParentID";
@@ -6162,6 +6226,47 @@ WHERE u.id = picked.id;
);
}
+ // 词法扫描漏检的结尾 ORDER BY 无法从排序包装里剥离,直接拒绝而不是生成非法 SQL。
+ #[test]
+ fn sqlserver_sort_rejects_lexically_hidden_order_by() {
+ for original in ["SELECT * FROM t WHERE p = 'C:\\' ORDER BY id", "SELECT id FROM #t ORDER BY id"] {
+ let result = build_sorted_query_sql(SortedQuerySqlOptions {
+ original_sql: original.to_string(),
+ database_type: Some(DatabaseType::SqlServer),
+ result_columns: vec!["id".to_string()],
+ column_index: 0,
+ column: "id".to_string(),
+ direction: QuerySortDirection::Asc,
+ });
+
+ assert!(!result.ok, "must refuse the unsafe wrap: {original}");
+ assert_eq!(result.reason.as_deref(), Some("unsupported"), "{original}");
+ }
+ }
+
+ #[test]
+ fn sqlserver_sort_wraps_top_with_lexically_hidden_order_by() {
+ // T-SQL 允许派生表在带 TOP / OFFSET-FETCH 时保留 ORDER BY(Msg 1033 豁免),
+ // 排序包装应照常生成而不是拒绝。
+ for original in [
+ "SELECT TOP (100) * FROM #Orders ORDER BY id",
+ "SELECT * FROM #Orders ORDER BY id OFFSET 10 ROWS FETCH NEXT 20 ROWS ONLY",
+ ] {
+ let result = build_sorted_query_sql(SortedQuerySqlOptions {
+ original_sql: original.to_string(),
+ database_type: Some(DatabaseType::SqlServer),
+ result_columns: vec!["id".to_string()],
+ column_index: 0,
+ column: "id".to_string(),
+ direction: QuerySortDirection::Asc,
+ });
+
+ assert!(result.ok, "must keep the wrap legal: {original}");
+ let sql = result.sql.unwrap();
+ assert!(sql.contains("ORDER BY"), "{original} -> {sql}");
+ }
+ }
+
#[test]
fn builds_dameng_sorted_query_without_alias_list() {
let result = build_sorted_query_sql(SortedQuerySqlOptions {