fix(firebird): use rows syntax for pagination

This commit is contained in:
t8y2 committed 2026-07-03 16:22:31 +08:00
1 parent d205f47a8f
commit 0894334764
8 files changed
+157 -8

No files matched your search

+56 -1
View File
@@ -2,7 +2,9 @@ use serde::{Deserialize, Serialize};
use crate::models::connection::DatabaseType;
use crate::sql::find_statement_at_cursor;
use crate::sql_dialect::{pagination_strategy, quote_table_identifier, PaginationContext, TablePaginationStrategy};
use crate::sql_dialect::{
firebird_rows_clause, pagination_strategy, quote_table_identifier, PaginationContext, TablePaginationStrategy,
};
use sqlparser::ast::{Expr, GroupByExpr, SelectItem, SetExpr, Statement};
use sqlparser::dialect::GenericDialect;
use sqlparser::parser::Parser;
@@ -187,6 +189,7 @@ pub fn build_paginated_query_sql(options: PaginatedQuerySqlOptions) -> QuerySqlB
.unwrap_or_else(|| err("unsupported")),
TablePaginationStrategy::QuestDbLimit => ok(add_questdb_limit(&statement, safe_limit, safe_offset)),
TablePaginationStrategy::InformixFirst => ok(add_informix_first_limit(&statement, safe_limit, safe_offset)),
TablePaginationStrategy::FirebirdRows => ok(add_firebird_rows_limit(&statement, safe_limit, safe_offset)),
TablePaginationStrategy::Db2FetchFirst | TablePaginationStrategy::FetchFirst => {
ok(add_fetch_first_limit(&statement, safe_limit, safe_offset))
}
@@ -790,6 +793,26 @@ fn has_top_level_informix_row_limit(sql: &str) -> bool {
tokens[select_index + 1..from_index].iter().any(|token| token.text == "FIRST" || token.text == "SKIP")
}
fn has_top_level_firebird_row_limit(sql: &str) -> bool {
if has_top_level_fetch_first(sql) {
return true;
}
let tokens = top_level_sql_tokens(sql);
if tokens.iter().any(|token| token.text == "ROWS") {
return true;
}
let Some(select_index) = tokens.iter().position(|token| token.text == "SELECT") else {
return false;
};
let from_index = tokens
.iter()
.enumerate()
.find(|(index, token)| *index > select_index && token.text == "FROM")
.map(|(index, _)| index)
.unwrap_or(tokens.len());
tokens[select_index + 1..from_index].iter().any(|token| token.text == "FIRST" || token.text == "SKIP")
}
fn has_top_level_fetch_first(sql: &str) -> bool {
let tokens = top_level_sql_tokens(sql);
tokens.windows(2).any(|w| w[0].text == "FETCH" && w[1].text == "FIRST")
@@ -822,6 +845,14 @@ fn add_fetch_first_limit(statement: &str, limit: usize, offset: usize) -> String
append_sql_suffix(statement, &format!("{offset_sql} FETCH FIRST {limit} ROWS ONLY;"))
}
fn add_firebird_rows_limit(statement: &str, limit: usize, offset: usize) -> String {
if has_top_level_firebird_row_limit(statement) {
return format!("{statement};");
}
let rows = firebird_rows_clause(limit, offset);
append_sql_suffix(statement, &format!("{rows};"))
}
fn add_rownum_limit(statement: &str, limit: usize, offset: usize) -> String {
if has_top_level_rownum(statement) {
return format!("{statement};");
@@ -1722,6 +1753,30 @@ WHERE u.id = picked.id;
assert_eq!(result.sql.unwrap(), "SELECT FIRST 20 id FROM users;");
}
#[test]
fn uses_rows_pagination_for_firebird() {
let result = build_paginated_query_sql(PaginatedQuerySqlOptions {
original_sql: "SELECT id FROM users WHERE active = 1 ORDER BY id".to_string(),
database_type: Some(DatabaseType::Firebird),
limit: 50,
offset: 100,
});
assert_eq!(result.sql.unwrap(), "SELECT id FROM users WHERE active = 1 ORDER BY id ROWS 101 TO 150;");
}
#[test]
fn firebird_pagination_keeps_existing_rows_clause() {
let result = build_paginated_query_sql(PaginatedQuerySqlOptions {
original_sql: "SELECT id FROM users ROWS 20".to_string(),
database_type: Some(DatabaseType::Firebird),
limit: 50,
offset: 0,
});
assert_eq!(result.sql.unwrap(), "SELECT id FROM users ROWS 20;");
}
#[test]
fn uses_mysql_style_alias_for_pagination() {
let result = build_paginated_query_sql(PaginatedQuerySqlOptions {