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

Merge 'Fix planner alias and table name handling' from

Browse Source 
closes: #2817
```
turso> select * from simple_view as "v" where "v"."x" = 1;
┌───┐
│ x │
├───┤
│ 1 │
└───┘
turso> select "s"."x" from simple as "s" where "s"."x" = 1;
┌───┐
│ x │
├───┤
│ 1 │
└───
```

Reviewed-by: Preston Thorpe <preston@turso.tech>
Reviewed-by: Jussi Saurio <jussi.saurio@gmail.com>

Closes #2818
This commit is contained in:
Pekka Enberg
2025-08-28 07:39:47 +03:00
committed by GitHub
parent 591914a63b 79a9f4743e
commit b4eba8b456
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/translate/planner.rs
View File

@@ -373,9 +373,10 @@ fn parse_from_clause_table(
let cur_table_index = table_references.joined_tables().len();
let identifier = maybe_alias
.map(|a| match a {
ast::As::As(id) => id.as_str().to_string(),
ast::As::Elided(id) => id.as_str().to_string(),
ast::As::As(id) => id,
ast::As::Elided(id) => id,
})
.map(|id| normalize_ident(id.as_str()))
.unwrap_or(format!("subquery_{cur_table_index}"));
table_references.add_joined_table(JoinedTable::new_subquery(
identifier,
@@ -438,7 +439,7 @@ fn parse_table(
ast::As::As(id) => id,
ast::As::Elided(id) => id,
})
.map(|a| a.as_str().to_string());
.map(|a| normalize_ident(a.as_str()));
let internal_id = table_ref_counter.next();
let tbl_ref = if let Table::Virtual(tbl) = table.as_ref() {
transform_args_into_where_terms(args, internal_id, vtab_predicates, table.as_ref())?;
@@ -494,14 +495,17 @@ fn parse_table(
if let Some(view) = view {
// Create a virtual table wrapper for the view
// We'll use the view's columns from the schema
let vtab = crate::vtab_view::create_view_virtual_table(table_name.as_str(), view.clone())?;
let vtab = crate::vtab_view::create_view_virtual_table(
normalize_ident(table_name.as_str()).as_str(),
view.clone(),
)?;
let alias = maybe_alias
.map(|a| match a {
ast::As::As(id) => id,
ast::As::Elided(id) => id,
})
.map(|a| a.as_str().to_string());
.map(|a| normalize_ident(a.as_str()));
table_references.add_joined_table(JoinedTable {
op: Operation::Scan(Scan::VirtualTable {