fix(sql): centralize table pagination strategies
This commit is contained in:
1 parent
e27d34a34a
commit
535d247ae1
7 files changed
+355
-159
No files matched your search
@@ -4,7 +4,7 @@ use std::sync::LazyLock;
|
||||
|
||||
use crate::models::connection::DatabaseType;
|
||||
use crate::sql::find_statement_at_cursor;
|
||||
use crate::sql_dialect::{quote_table_identifier, uses_fetch_first};
|
||||
use crate::sql_dialect::{pagination_strategy, quote_table_identifier, PaginationContext, TablePaginationStrategy};
|
||||
|
||||
static LIMIT_OFFSET_STRIP_RE: LazyLock<Regex> = LazyLock::new(|| {
|
||||
Regex::new(r"(?i)(\s+LIMIT\s+\d+(\s+OFFSET\s+\d+)?|\s+LIMIT\s+\d+(\s*,\s*\d+)?|\s+OFFSET\s+\d+(\s+LIMIT\s+\d+)?|\s+OFFSET\s+\d+\s+ROWS?\s+FETCH\s+(?:FIRST|NEXT)\s+\d+\s+ROWS?\s+ONLY|\s+FETCH\s+(?:FIRST|NEXT)\s+\d+\s+ROWS?\s+ONLY)\s*$").unwrap()
|
||||
@@ -167,21 +167,6 @@ pub fn build_paginated_query_sql(options: PaginatedQuerySqlOptions) -> QuerySqlB
|
||||
let safe_limit = options.limit.max(1);
|
||||
let safe_offset = options.offset;
|
||||
|
||||
if options.database_type == Some(DatabaseType::SqlServer) {
|
||||
if safe_offset > 0 {
|
||||
return err("unsupported");
|
||||
}
|
||||
return ok(add_sql_server_top(&statement, safe_limit));
|
||||
}
|
||||
|
||||
if options.database_type == Some(DatabaseType::Mysql) {
|
||||
return ok(add_mysql_limit(&statement, safe_limit, safe_offset));
|
||||
}
|
||||
|
||||
if options.database_type == Some(DatabaseType::Questdb) {
|
||||
return ok(add_questdb_limit(&statement, safe_limit, safe_offset));
|
||||
}
|
||||
|
||||
if options.database_type == Some(DatabaseType::Elasticsearch) {
|
||||
// If the user wrote their own LIMIT, leave the SQL alone — they
|
||||
// explicitly bounded the result set and the front-end will paginate
|
||||
@@ -195,24 +180,24 @@ pub fn build_paginated_query_sql(options: PaginatedQuerySqlOptions) -> QuerySqlB
|
||||
return ok(format!("{statement} LIMIT {safe_limit} OFFSET {safe_offset};"));
|
||||
}
|
||||
|
||||
if options.database_type == Some(DatabaseType::Oracle) {
|
||||
return ok(format!("{statement};"));
|
||||
match pagination_strategy(options.database_type, PaginationContext::UserQuery) {
|
||||
TablePaginationStrategy::SqlServerTop => {
|
||||
if safe_offset > 0 {
|
||||
err("unsupported")
|
||||
} else {
|
||||
ok(add_sql_server_top(&statement, safe_limit))
|
||||
}
|
||||
}
|
||||
TablePaginationStrategy::QuestDbLimit => ok(add_questdb_limit(&statement, safe_limit, safe_offset)),
|
||||
TablePaginationStrategy::InformixFirst => ok(add_informix_first_limit(&statement, safe_limit, safe_offset)),
|
||||
TablePaginationStrategy::Db2FetchFirst | TablePaginationStrategy::FetchFirst => {
|
||||
ok(add_fetch_first_limit(&statement, safe_limit, safe_offset))
|
||||
}
|
||||
TablePaginationStrategy::Rownum => ok(add_rownum_limit(&statement, safe_limit, safe_offset)),
|
||||
TablePaginationStrategy::AgentMaxRows | TablePaginationStrategy::Unbounded => ok(format!("{statement};")),
|
||||
TablePaginationStrategy::IrisTop => ok(add_iris_top_limit(&statement, safe_limit)),
|
||||
TablePaginationStrategy::LimitOffset => ok(add_standard_limit(&statement, safe_limit, safe_offset)),
|
||||
}
|
||||
|
||||
if options.database_type == Some(DatabaseType::Informix) {
|
||||
return ok(add_informix_first_limit(&statement, safe_limit, safe_offset));
|
||||
}
|
||||
|
||||
if options.database_type.is_some_and(uses_fetch_first) {
|
||||
return ok(add_fetch_first_limit(&statement, safe_limit, safe_offset));
|
||||
}
|
||||
|
||||
// JDBC connections avoid SQL-level LIMIT; the agent truncates rows while reading.
|
||||
if options.database_type == Some(DatabaseType::Jdbc) {
|
||||
return ok(format!("{statement};"));
|
||||
}
|
||||
|
||||
ok(add_standard_limit(&statement, safe_limit, safe_offset))
|
||||
}
|
||||
|
||||
pub fn build_count_query_sql(options: CountQuerySqlOptions) -> QuerySqlBuildResult {
|
||||
@@ -411,14 +396,6 @@ fn sql_server_statement_for_derived_table(statement: &str) -> String {
|
||||
statement[..order_by].trim_end().to_string()
|
||||
}
|
||||
|
||||
fn add_mysql_limit(statement: &str, limit: usize, offset: usize) -> String {
|
||||
if has_top_level_limit(statement) {
|
||||
return format!("{statement};");
|
||||
}
|
||||
let offset_sql = if offset > 0 { format!(" OFFSET {offset}") } else { String::new() };
|
||||
format!("{statement} LIMIT {limit}{offset_sql};")
|
||||
}
|
||||
|
||||
fn add_informix_first_limit(statement: &str, limit: usize, offset: usize) -> String {
|
||||
if has_top_level_informix_row_limit(statement) {
|
||||
return format!("{statement};");
|
||||
@@ -440,6 +417,18 @@ fn add_informix_first_limit(statement: &str, limit: usize, offset: usize) -> Str
|
||||
format!("SELECT {row_limit} * FROM ({statement}) dbx_page;")
|
||||
}
|
||||
|
||||
fn add_iris_top_limit(statement: &str, limit: usize) -> String {
|
||||
if has_top_level_select_top(statement) {
|
||||
return format!("{statement};");
|
||||
}
|
||||
if statement.len() >= 6 && statement[..6].eq_ignore_ascii_case("SELECT") {
|
||||
let rest = &statement[6..];
|
||||
format!("SELECT TOP {limit}{rest};")
|
||||
} else {
|
||||
format!("SELECT TOP {limit} * FROM ({statement}) dbx_page;")
|
||||
}
|
||||
}
|
||||
|
||||
fn add_questdb_limit(statement: &str, limit: usize, offset: usize) -> String {
|
||||
if has_top_level_limit(statement) {
|
||||
return format!("{statement};");
|
||||
@@ -478,6 +467,10 @@ fn has_top_level_fetch_first(sql: &str) -> bool {
|
||||
tokens.windows(2).any(|w| w[0].text == "FETCH" && w[1].text == "FIRST")
|
||||
}
|
||||
|
||||
fn has_top_level_rownum(sql: &str) -> bool {
|
||||
top_level_sql_tokens(sql).iter().any(|token| token.text == "ROWNUM")
|
||||
}
|
||||
|
||||
fn has_top_level_offset_fetch_next(sql: &str) -> bool {
|
||||
let tokens = top_level_sql_tokens(sql);
|
||||
let has_offset = tokens.iter().any(|token| token.text == "OFFSET");
|
||||
@@ -493,6 +486,19 @@ fn add_fetch_first_limit(statement: &str, limit: usize, offset: usize) -> String
|
||||
format!("{statement}{offset_sql} FETCH FIRST {limit} ROWS ONLY;")
|
||||
}
|
||||
|
||||
fn add_rownum_limit(statement: &str, limit: usize, offset: usize) -> String {
|
||||
if has_top_level_rownum(statement) {
|
||||
return format!("{statement};");
|
||||
}
|
||||
if offset == 0 {
|
||||
return format!("SELECT * FROM ({statement}) WHERE ROWNUM <= {limit};");
|
||||
}
|
||||
let end = offset + limit;
|
||||
format!(
|
||||
"SELECT * FROM (SELECT dbx_inner.*, ROWNUM AS \"__dbx_row_num\" FROM ({statement}) dbx_inner WHERE ROWNUM <= {end}) WHERE \"__dbx_row_num\" > {offset};"
|
||||
)
|
||||
}
|
||||
|
||||
fn add_standard_limit(statement: &str, limit: usize, offset: usize) -> String {
|
||||
if has_top_level_limit(statement) {
|
||||
return format!("{statement};");
|
||||
@@ -882,6 +888,33 @@ mod tests {
|
||||
assert_eq!(result.sql.unwrap(), "SELECT id FROM users;");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn oceanbase_oracle_pagination_wraps_with_rownum() {
|
||||
let result = build_paginated_query_sql(PaginatedQuerySqlOptions {
|
||||
original_sql: "SELECT id FROM users ORDER BY id".to_string(),
|
||||
database_type: Some(DatabaseType::OceanbaseOracle),
|
||||
limit: 100,
|
||||
offset: 0,
|
||||
});
|
||||
|
||||
assert_eq!(result.sql.unwrap(), "SELECT * FROM (SELECT id FROM users ORDER BY id) WHERE ROWNUM <= 100;");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn oceanbase_oracle_pagination_wraps_offset_with_rownum_bounds() {
|
||||
let result = build_paginated_query_sql(PaginatedQuerySqlOptions {
|
||||
original_sql: "SELECT id FROM users ORDER BY id".to_string(),
|
||||
database_type: Some(DatabaseType::OceanbaseOracle),
|
||||
limit: 100,
|
||||
offset: 200,
|
||||
});
|
||||
|
||||
assert_eq!(
|
||||
result.sql.unwrap(),
|
||||
"SELECT * FROM (SELECT dbx_inner.*, ROWNUM AS \"__dbx_row_num\" FROM (SELECT id FROM users ORDER BY id) dbx_inner WHERE ROWNUM <= 300) WHERE \"__dbx_row_num\" > 200;"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn uses_fetch_first_pagination_for_db2() {
|
||||
let result = build_paginated_query_sql(PaginatedQuerySqlOptions {
|
||||
|
||||
Reference in new issue
Block a user