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(pagination): avoid a second LIMIT when the lexical scan misses it
ordinary being1f4e31deef28
diff --git a/crates/dbx-sql-data/src/query_result_sql.rs b/crates/dbx-sql-data/src/query_result_sql.rsindex f776fb0369..769165e91d 100644--- a/crates/dbx-sql-data/src/query_result_sql.rs+++ b/crates/dbx-sql-data/src/query_result_sql.rs@@ -1783,7 +1783,25 @@ fn add_questdb_limit(statement: &str, limit: usize, offset: usize) -> String {}fn has_top_level_limit(sql: &str) -> bool {- top_level_sql_tokens(sql).iter().any(|token| token.text == "LIMIT")+ top_level_sql_tokens(sql).iter().any(|token| token.text == "LIMIT") || ast_top_level_limit(sql).is_some()+}++/// 词法扫描在字符串里的反斜杠(Postgres 标准串、SQLite 等)会让引号配对错乱,+/// 漏掉顶层 LIMIT;AST 解析不受影响,作为 `has_top_level_limit` /+/// `top_level_limit_row_count` 的补位。外层 `None` 表示没有顶层行数上限+/// (单独的 `OFFSET` 不算),内层 `None` 表示有上限但行数不是字面量。+fn ast_top_level_limit(sql: &str) -> Option<Option<usize>> {+ let statements = Parser::parse_sql(&GenericDialect {}, sql).ok()?;+ let [Statement::Query(query)] = statements.as_slice() else {+ return None;+ };+ if let Some(LimitClause::LimitOffset { limit: Some(expr), .. }) = &query.limit_clause {+ return Some(match expr {+ Expr::Value(ValueWithSpan { value: Value::Number(text, _), .. }) => text.to_string().parse().ok(),+ _ => None,+ });+ }+ query.fetch.is_some().then_some(None)}/// True when the statement has a top-level `TOP` clause (SQL Server dialect).@@ -2114,7 +2132,11 @@ fn add_standard_limit(}// A user/top-level LIMIT can still be wider than the selected grid page size.// Wrap it so the first page respects the UI page limit while preserving the user's cap.- if offset > 0 || top_level_limit_row_count(statement).is_some_and(|row_count| row_count > limit) {+ if offset > 0+ || top_level_limit_row_count(statement)+ .or_else(|| ast_top_level_limit(statement).flatten())+ .is_some_and(|row_count| row_count > limit)+ {return add_outer_standard_limit(statement, database_type, limit, offset, "");}return format!("{statement};");@@ -2945,6 +2967,56 @@ mod tests {assert_eq!(result.sql.unwrap(), "SELECT id, name FROM users LIMIT 100 OFFSET 200;");}+ // 词法扫描在标准串(反斜杠)后漏掉顶层 LIMIT 时,不能再追加第二个 LIMIT。+ #[test]+ fn postgres_hidden_limit_is_not_appended_twice() {+ for (offset, expected) in [+ (0usize, "SELECT * FROM t WHERE p = 'C:\\' LIMIT 10;"),+ (500, "SELECT * FROM (SELECT * FROM t WHERE p = 'C:\\' LIMIT 10) \"dbx_page\" LIMIT 500 OFFSET 500;"),+ ] {+ let result = build_paginated_query_sql(PaginatedQuerySqlOptions {+ original_sql: "SELECT * FROM t WHERE p = 'C:\\' LIMIT 10".to_string(),+ database_type: Some(DatabaseType::Postgres),+ limit: 500,+ offset,+ });++ assert!(result.ok);+ assert_eq!(result.sql.unwrap(), expected, "offset {offset}");+ }+ }++ // 隐藏的 LIMIT 比页大小更宽时,与可见场景一致:包一层并保持页大小。+ #[test]+ fn postgres_hidden_limit_over_page_size_is_wrapped() {+ let result = build_paginated_query_sql(PaginatedQuerySqlOptions {+ original_sql: "SELECT * FROM t WHERE p = 'C:\\' LIMIT 1000".to_string(),+ database_type: Some(DatabaseType::Postgres),+ limit: 500,+ offset: 0,+ });++ assert!(result.ok);+ assert_eq!(+ result.sql.unwrap(),+ "SELECT * FROM (SELECT * FROM t WHERE p = 'C:\\' LIMIT 1000) \"dbx_page\" LIMIT 500 OFFSET 0;"+ );+ }++ // 只有 OFFSET 的语句不算已限行,不能被 AST 补位误判成"已有分页"。+ #[test]+ fn postgres_offset_only_query_still_gets_a_limit() {+ let result = build_paginated_query_sql(PaginatedQuerySqlOptions {+ original_sql: "SELECT * FROM t OFFSET 5".to_string(),+ database_type: Some(DatabaseType::Postgres),+ limit: 500,+ offset: 0,+ });++ assert!(result.ok);+ assert_eq!(result.sql.unwrap(), "SELECT * FROM t OFFSET 5 LIMIT 500;");+ }+#[test]fn uses_sqlserver_top_pagination_for_first_page() {let result = build_paginated_query_sql(PaginatedQuerySqlOptions {