Skip to content

armgit / dbx

Public Imported from GitHub
0

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。

fix(hive): keep CTE outside count subquery

Eveed29ef9eedd0
diff --git a/crates/dbx-core/src/query_result_sql.rs b/crates/dbx-core/src/query_result_sql.rs
index 5fb85f7e82..c21187603c 100644
--- a/crates/dbx-core/src/query_result_sql.rs
+++ b/crates/dbx-core/src/query_result_sql.rs
@@ -345,6 +345,19 @@ pub fn build_count_query_sql(options: CountQuerySqlOptions) -> QuerySqlBuildResu
} else {
quote_table_identifier(options.database_type, "dbx_count")
};
+ if options.database_type == Some(DatabaseType::Hive) && starts_with_cte(&statement) {
+ if let Some(main_query_start) = top_level_sql_tokens(&statement)
+ .into_iter()
+ .find(|token| matches!(token.text.as_str(), "SELECT" | "FROM"))
+ .map(|token| token.start)
+ {
+ let (with_clause, main_query) = statement.split_at(main_query_start);
+ return ok(format!(
+ "{execution_hint}{with_clause}{}",
+ derived_table_sql("SELECT COUNT(*) AS dbx_total_rows FROM", main_query, &format!("{alias};"))
+ ));
+ }
+ }
let wrapped_sql = match options.database_type {
Some(DatabaseType::Iris) => iris_statement_for_derived_table(&statement),
_ => statement,
@@ -4100,6 +4113,32 @@ WHERE u.id = picked.id;
);
}
+ #[test]
+ fn hive_count_keeps_cte_outside_derived_table() {
+ let result = build_count_query_sql(CountQuerySqlOptions {
+ original_sql: "WITH cte AS (SELECT 1 AS id) SELECT * FROM cte".to_string(),
+ database_type: Some(DatabaseType::Hive),
+ });
+
+ assert_eq!(
+ result.sql.unwrap(),
+ "WITH cte AS (SELECT 1 AS id) SELECT COUNT(*) AS dbx_total_rows FROM (SELECT * FROM cte) `dbx_count`;"
+ );
+ }
+
+ #[test]
+ fn hive_count_keeps_from_style_query_inside_derived_table() {
+ let result = build_count_query_sql(CountQuerySqlOptions {
+ original_sql: "WITH cte AS (SELECT 1 AS id) FROM cte SELECT *".to_string(),
+ database_type: Some(DatabaseType::Hive),
+ });
+
+ assert_eq!(
+ result.sql.unwrap(),
+ "WITH cte AS (SELECT 1 AS id) SELECT COUNT(*) AS dbx_total_rows FROM (FROM cte SELECT *) `dbx_count`;"
+ );
+ }
+
#[test]
fn mysql_count_rewrites_ambiguous_join_projection() {
for sql in [