1 parent
6d8e667bed
commit
1498b27314
1 file changed
+118
-4
@@ -9,8 +9,8 @@ use crate::sql_dialect::{
|
|||||||
firebird_rows_clause, pagination_strategy, quote_table_identifier, PaginationContext, TablePaginationStrategy,
|
firebird_rows_clause, pagination_strategy, quote_table_identifier, PaginationContext, TablePaginationStrategy,
|
||||||
};
|
};
|
||||||
use sqlparser::ast::{
|
use sqlparser::ast::{
|
||||||
visit_expressions, Expr, GroupByExpr, LimitClause, OrderByKind, Select, SelectItem, SetExpr, Statement, Value,
|
visit_expressions, Expr, GroupByExpr, LimitClause, OrderByKind, Select, SelectItem, SelectModifiers, SetExpr,
|
||||||
ValueWithSpan,
|
Statement, TableFactor, Value, ValueWithSpan,
|
||||||
};
|
};
|
||||||
use sqlparser::dialect::{ClickHouseDialect, GenericDialect, MsSqlDialect, MySqlDialect};
|
use sqlparser::dialect::{ClickHouseDialect, GenericDialect, MsSqlDialect, MySqlDialect};
|
||||||
use sqlparser::parser::Parser;
|
use sqlparser::parser::Parser;
|
||||||
@@ -303,6 +303,17 @@ pub fn build_count_query_sql(options: CountQuerySqlOptions) -> QuerySqlBuildResu
|
|||||||
.unwrap_or_else(|| err("unsupported"));
|
.unwrap_or_else(|| err("unsupported"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if options.database_type == Some(DatabaseType::Iris) {
|
||||||
|
// IRIS JDBC can parameterize a derived-table alias as `:%qpar` during
|
||||||
|
// prepare, even when the alias is unquoted. A simple single-table
|
||||||
|
// query does not need a derived table to count rows, so inject COUNT
|
||||||
|
// directly and leave the wrapper fallback for queries whose row
|
||||||
|
// cardinality depends on the original projection.
|
||||||
|
if let Some(sql) = iris_count_sql(&statement) {
|
||||||
|
return ok(format!("{execution_hint}{sql}"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let alias = if options.database_type == Some(DatabaseType::Iris) {
|
let alias = if options.database_type == Some(DatabaseType::Iris) {
|
||||||
// With delimited identifiers disabled, Caché 2016 can parameterize a
|
// With delimited identifiers disabled, Caché 2016 can parameterize a
|
||||||
// double-quoted alias as a string literal, leaving a trailing :%qpar.
|
// double-quoted alias as a string literal, leaving a trailing :%qpar.
|
||||||
@@ -1162,6 +1173,61 @@ fn mysql_wrapped_count_sql(statement: &str) -> String {
|
|||||||
derived_table_sql("SELECT COUNT(*) AS dbx_total_rows FROM", statement, &format!("{alias};"))
|
derived_table_sql("SELECT COUNT(*) AS dbx_total_rows FROM", statement, &format!("{alias};"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn iris_count_sql(statement: &str) -> Option<String> {
|
||||||
|
let dialect = GenericDialect {};
|
||||||
|
let mut statements = Parser::parse_sql(&dialect, statement).ok()?;
|
||||||
|
let [Statement::Query(query)] = statements.as_mut_slice() else {
|
||||||
|
return None;
|
||||||
|
};
|
||||||
|
if query.with.is_some()
|
||||||
|
|| query.limit_clause.is_some()
|
||||||
|
|| query.fetch.is_some()
|
||||||
|
|| !query.locks.is_empty()
|
||||||
|
|| query.for_clause.is_some()
|
||||||
|
{
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
let SetExpr::Select(select) = query.body.as_mut() else {
|
||||||
|
return None;
|
||||||
|
};
|
||||||
|
let group_by_is_empty = matches!(&select.group_by, GroupByExpr::Expressions(expressions, modifiers) if expressions.is_empty() && modifiers.is_empty());
|
||||||
|
if select.from.len() != 1
|
||||||
|
|| !select.from[0].joins.is_empty()
|
||||||
|
|| !matches!(&select.from[0].relation, TableFactor::Table { .. })
|
||||||
|
|| !matches!(select.projection.as_slice(), [SelectItem::Wildcard(_)] | [SelectItem::QualifiedWildcard(_, _)])
|
||||||
|
|| select.distinct.is_some()
|
||||||
|
|| select.top.is_some()
|
||||||
|
|| select.exclude.is_some()
|
||||||
|
|| select.prewhere.is_some()
|
||||||
|
|| select.into.is_some()
|
||||||
|
|| !group_by_is_empty
|
||||||
|
|| select.having.is_some()
|
||||||
|
|| select.qualify.is_some()
|
||||||
|
|| !select.lateral_views.is_empty()
|
||||||
|
|| !select.optimizer_hints.is_empty()
|
||||||
|
|| select.select_modifiers.as_ref().is_some_and(SelectModifiers::is_any_set)
|
||||||
|
|| !select.connect_by.is_empty()
|
||||||
|
|| !select.cluster_by.is_empty()
|
||||||
|
|| !select.distribute_by.is_empty()
|
||||||
|
|| !select.sort_by.is_empty()
|
||||||
|
|| !select.named_window.is_empty()
|
||||||
|
|| select.value_table_mode.is_some()
|
||||||
|
{
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
let count_projection = match Parser::parse_sql(&dialect, "SELECT COUNT(*) AS dbx_total_rows").ok()?.pop()? {
|
||||||
|
Statement::Query(query) => match query.body.as_ref() {
|
||||||
|
SetExpr::Select(select) => select.projection.clone(),
|
||||||
|
_ => return None,
|
||||||
|
},
|
||||||
|
_ => return None,
|
||||||
|
};
|
||||||
|
select.projection = count_projection;
|
||||||
|
query.order_by = None;
|
||||||
|
Some(format!("{query};"))
|
||||||
|
}
|
||||||
|
|
||||||
fn mysql_derived_table_set_projection_safety(set_expr: &SetExpr) -> MysqlDerivedProjectionSafety {
|
fn mysql_derived_table_set_projection_safety(set_expr: &SetExpr) -> MysqlDerivedProjectionSafety {
|
||||||
match set_expr {
|
match set_expr {
|
||||||
SetExpr::Select(select) => mysql_derived_table_select_projection_safety(select),
|
SetExpr::Select(select) => mysql_derived_table_select_projection_safety(select),
|
||||||
@@ -3980,7 +4046,7 @@ WHERE u.id = picked.id;
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn iris_count_query_uses_unquoted_alias_for_legacy_cache() {
|
fn iris_count_query_injects_count_for_legacy_cache_table() {
|
||||||
let result = build_count_query_sql(CountQuerySqlOptions {
|
let result = build_count_query_sql(CountQuerySqlOptions {
|
||||||
original_sql: "SELECT * FROM TATFY WHERE UpdateDate = '2026-07-30' AND UpdateTime > '08:00:00'".to_string(),
|
original_sql: "SELECT * FROM TATFY WHERE UpdateDate = '2026-07-30' AND UpdateTime > '08:00:00'".to_string(),
|
||||||
database_type: Some(DatabaseType::Iris),
|
database_type: Some(DatabaseType::Iris),
|
||||||
@@ -3988,7 +4054,55 @@ WHERE u.id = picked.id;
|
|||||||
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
result.sql.unwrap(),
|
result.sql.unwrap(),
|
||||||
"SELECT COUNT(*) AS dbx_total_rows FROM (SELECT * FROM TATFY WHERE UpdateDate = '2026-07-30' AND UpdateTime > '08:00:00') dbx_count;"
|
"SELECT COUNT(*) AS dbx_total_rows FROM TATFY WHERE UpdateDate = '2026-07-30' AND UpdateTime > '08:00:00';"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn iris_count_query_injects_count_for_simple_select() {
|
||||||
|
let result = build_count_query_sql(CountQuerySqlOptions {
|
||||||
|
original_sql: "select * from PA_Adm".to_string(),
|
||||||
|
database_type: Some(DatabaseType::Iris),
|
||||||
|
});
|
||||||
|
|
||||||
|
assert_eq!(result.sql.as_deref(), Some("SELECT COUNT(*) AS dbx_total_rows FROM PA_Adm;"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn iris_count_query_preserves_simple_select_predicates_without_derived_alias() {
|
||||||
|
let result = build_count_query_sql(CountQuerySqlOptions {
|
||||||
|
original_sql: "SELECT * FROM PA_Adm WHERE status = ? ORDER BY id DESC".to_string(),
|
||||||
|
database_type: Some(DatabaseType::Iris),
|
||||||
|
});
|
||||||
|
|
||||||
|
assert_eq!(result.sql.as_deref(), Some("SELECT COUNT(*) AS dbx_total_rows FROM PA_Adm WHERE status = ?;"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn iris_count_query_keeps_wrapper_for_top_limited_select() {
|
||||||
|
let result = build_count_query_sql(CountQuerySqlOptions {
|
||||||
|
original_sql: "SELECT TOP 10 * FROM PA_Adm ORDER BY id DESC".to_string(),
|
||||||
|
database_type: Some(DatabaseType::Iris),
|
||||||
|
});
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
result.sql.as_deref(),
|
||||||
|
Some("SELECT COUNT(*) AS dbx_total_rows FROM (SELECT TOP 10 * FROM PA_Adm) dbx_count;")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn iris_count_query_keeps_derived_wrapper_for_complex_selects() {
|
||||||
|
let result = build_count_query_sql(CountQuerySqlOptions {
|
||||||
|
original_sql: "SELECT a.id, b.id FROM a JOIN b ON b.a_id = a.id".to_string(),
|
||||||
|
database_type: Some(DatabaseType::Iris),
|
||||||
|
});
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
result.sql.as_deref(),
|
||||||
|
Some(
|
||||||
|
"SELECT COUNT(*) AS dbx_total_rows FROM (SELECT a.id, b.id FROM a JOIN b ON b.a_id = a.id) dbx_count;"
|
||||||
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user