aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-01-22 17:34:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'Fix incorrect "column is ambiguous" error with USING clause' from Jussi Saurio

Browse Source 
Closes #3299

Closes #3343
This commit is contained in:
Pekka Enberg
2025-09-25 21:02:36 +03:00
committed by GitHub
parent c76738c83b 00466aa84e
commit c255e456d6
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/translate/expr.rs
View File

@@ -3392,7 +3392,22 @@ pub fn bind_and_rewrite_expr<'a>(
});
if col_idx.is_some() {
if match_result.is_some() {
crate::bail_parse_error!("Column {} is ambiguous", id.as_str());
let mut ok = false;
// Column name ambiguity is ok if it is in the USING clause because then it is deduplicated
// and the left table is used.
if let Some(join_info) = &joined_table.join_info {
if join_info.using.iter().any(|using_col| {
using_col.as_str().eq_ignore_ascii_case(&normalized_id)
}) {
ok = true;
}
}
if !ok {
crate::bail_parse_error!(
"Column {} is ambiguous",
id.as_str()
);
}
}
let col =
joined_table.table.columns().get(col_idx.unwrap()).unwrap();

14
testing/join.test
View File

@@ -338,4 +338,16 @@ do_execsql_test_on_specific_db {:memory:} left-join-column-crash {
insert into b values (3,3),(4,4);
select * from a left join b on a.x < 2 where a.x < 3 and b.x < 12;
} {1|1|3|3
1|1|4|4}
1|1|4|4}
# Test that column names in USING clause are not ambiguous since they are deduplicated.
# The column 'a' appears in both tables but can be referenced unqualified in the SELECT
# since it's in the USING clause.
do_execsql_test_on_specific_db {:memory:} using-deduplicates-columns {
create table t(a);
create table tt(a);
insert into t values (1),(2),(3),(4),(5);
insert into tt values (4),(5),(6),(7),(8);
select a from t join tt using(a);
} {4
5}