aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-02-09 18:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'fix pragma table_info for views' from Glauber Costa

Browse Source 
We were not generating table_info for views. This PR fixes it.  We were
so far storing columns as strings with just their names - since this is
all we needed - but we will move now to store Columns. We need to
convert the names to Column anyway for table_info to work.

Closes #2625
This commit is contained in:
Jussi Saurio
2025-08-17 14:40:21 +03:00
committed by GitHub
parent cf9851ea9b 03eeabef18
commit c21d9871db
3 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/schema.rs
View File

@@ -10,7 +10,7 @@ pub struct View {
pub name: String,
pub sql: String,
pub select_stmt: ast::Select,
pub columns: Option<Vec<String>>,
pub columns: Option<Vec<Column>>,
}
/// Type alias for regular views collection
@@ -424,18 +424,30 @@ impl Schema {
}
Stmt::CreateView {
view_name: _,
columns,
columns: column_names,
select,
..
} => {
// Extract actual columns from the SELECT statement
let view_columns = crate::util::extract_view_columns(&select, self);
// If column names were provided in CREATE VIEW (col1, col2, ...),
// use them to rename the columns
let mut final_columns = view_columns;
if let Some(ref names) = column_names {
for (i, indexed_col) in names.iter().enumerate() {
if let Some(col) = final_columns.get_mut(i) {
col.name = Some(indexed_col.col_name.to_string());
}
}
}
// Create regular view
let view = View {
name: name.to_string(),
sql: sql.to_string(),
select_stmt: *select,
columns: columns.map(|cols| {
cols.into_iter().map(|c| c.col_name.to_string()).collect()
}),
columns: Some(final_columns),
};
self.add_view(view);
}

4
core/translate/pragma.rs
View File

@@ -451,6 +451,10 @@ fn query_pragma(
} else if let Some(view_mutex) = schema.get_materialized_view(&name) {
let view = view_mutex.lock().unwrap();
emit_columns_for_table_info(&mut program, &view.columns, base_reg);
} else if let Some(view) = schema.get_view(&name) {
if let Some(ref columns) = view.columns {
emit_columns_for_table_info(&mut program, columns, base_reg);
}
}
}
let col_names = ["cid", "name", "type", "notnull", "dflt_value", "pk"];

22
core/util.rs
View File

@@ -229,20 +229,30 @@ pub fn parse_schema_rows(
}
Stmt::CreateView {
view_name: _,
columns,
columns: column_names,
select,
..
} => {
// Extract actual columns from the SELECT statement
let view_columns = extract_view_columns(&select, schema);
// If column names were provided in CREATE VIEW (col1, col2, ...),
// use them to rename the columns
let mut final_columns = view_columns;
if let Some(ref names) = column_names {
for (i, indexed_col) in names.iter().enumerate() {
if let Some(col) = final_columns.get_mut(i) {
col.name = Some(indexed_col.col_name.to_string());
}
}
}
// Create regular view
let view = View {
name: name.to_string(),
sql: sql.to_string(),
select_stmt: *select,
columns: columns.map(|cols| {
cols.into_iter()
.map(|c| c.col_name.to_string())
.collect()
}),
columns: Some(final_columns),
};
schema.add_view(view);
}