fix(cache): avoid quoted identifiers and alias lists for cache sql

Closes #8340
This commit is contained in:
t8y2 committed 2026-09-08 01:53:50 +08:00
1 parent 4f2c67e34e
commit abc32f1c71
5 files changed
+124 -6

No files matched your search

+54 -3
View File
@@ -6,7 +6,8 @@ use serde::{Deserialize, Serialize};
use crate::models::connection::DatabaseType;
use crate::sql::{find_statement_at_cursor, find_statement_at_cursor_for_database};
use crate::sql_dialect::{
firebird_rows_clause, pagination_strategy, quote_table_identifier, PaginationContext, TablePaginationStrategy,
firebird_rows_clause, pagination_strategy, quote_iris_identifier, quote_table_identifier, PaginationContext,
TablePaginationStrategy,
};
use sqlparser::ast::{
visit_expressions, Expr, GroupByExpr, LimitClause, ObjectNamePart, OrderByKind, Select, SelectItem,
@@ -391,6 +392,8 @@ pub fn build_sorted_query_sql(options: SortedQuerySqlOptions) -> QuerySqlBuildRe
}
let aliases = build_derived_column_aliases(&options.result_columns);
// Caché/IRIS rejects derived-table column alias lists (`t(col, col)`)
// outright (SQLCODE -25), regardless of delimited-identifier support.
let use_derived_column_aliases = options.database_type != Some(DatabaseType::Mysql)
&& options.database_type != Some(DatabaseType::ClickHouse)
// Doris accepts the derived-table alias but not its column-name list.
@@ -400,7 +403,8 @@ pub fn build_sorted_query_sql(options: SortedQuerySqlOptions) -> QuerySqlBuildRe
&& options.database_type != Some(DatabaseType::Dameng)
&& options.database_type != Some(DatabaseType::Oracle)
&& options.database_type != Some(DatabaseType::OceanbaseOracle)
&& options.database_type != Some(DatabaseType::SapHana);
&& options.database_type != Some(DatabaseType::SapHana)
&& options.database_type != Some(DatabaseType::Iris);
let sort_alias = if use_derived_column_aliases {
aliases
.get(options.column_index)
@@ -422,13 +426,24 @@ pub fn build_sorted_query_sql(options: SortedQuerySqlOptions) -> QuerySqlBuildRe
let use_sort_ordinal = !use_derived_column_aliases
&& matches!(
options.database_type,
Some(DatabaseType::Dameng | DatabaseType::Oracle | DatabaseType::OceanbaseOracle | DatabaseType::SapHana)
Some(
DatabaseType::Dameng
| DatabaseType::Oracle
| DatabaseType::OceanbaseOracle
| DatabaseType::SapHana
| DatabaseType::Iris
)
)
&& options.result_columns.get(options.column_index).is_some_and(|column| {
options.result_columns.iter().filter(|candidate| candidate.eq_ignore_ascii_case(column)).count() > 1
});
let sort_reference = if use_sort_ordinal {
(options.column_index + 1).to_string()
} else if options.database_type == Some(DatabaseType::Iris) {
// With delimited identifiers disabled, a quoted ORDER BY name becomes
// a string literal on Caché and the sort silently degrades to a
// constant. Ordinary names must be sent unquoted.
quote_iris_identifier(&sort_alias, None)
} else {
quote_table_identifier(options.database_type, &sort_alias)
};
@@ -4854,6 +4869,42 @@ WHERE u.id = picked.id;
);
}
#[test]
fn builds_iris_sorted_query_without_derived_column_alias_list() {
// Caché/IRIS rejects `t(col, col)` derived alias lists (SQLCODE -25) and
// a quoted ORDER BY name becomes a string literal when delimited
// identifiers are disabled, so the wrap must stay alias-free and
// unquoted (#8340).
let result = build_sorted_query_sql(SortedQuerySqlOptions {
original_sql: "SELECT ID, Name FROM SQLUser.CT_Country".to_string(),
database_type: Some(DatabaseType::Iris),
result_columns: vec!["ID".to_string(), "Name".to_string()],
column_index: 1,
column: "Name".to_string(),
direction: QuerySortDirection::Asc,
});
let sql = result.sql.unwrap();
assert!(!sql.contains(") t("), "derived column alias list must not be emitted: {sql}");
assert_eq!(sql, "SELECT * FROM (SELECT ID, Name FROM SQLUser.CT_Country) t ORDER BY Name ASC;");
}
#[test]
fn builds_iris_sorted_query_by_ordinal_for_duplicate_columns() {
let result = build_sorted_query_sql(SortedQuerySqlOptions {
original_sql: "SELECT a.id, b.id FROM a JOIN b ON b.a_id = a.id".to_string(),
database_type: Some(DatabaseType::Iris),
result_columns: vec!["ID".to_string(), "id".to_string()],
column_index: 1,
column: "id".to_string(),
direction: QuerySortDirection::Desc,
});
assert_eq!(
result.sql.unwrap(),
"SELECT * FROM (SELECT a.id, b.id FROM a JOIN b ON b.a_id = a.id) t ORDER BY 2 DESC;"
);
}
#[test]
fn mysql_sort_preserves_directives_at_outermost_start() {
for prefix in [