aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-02-23 08:55:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix autoindex creation not detecting if column existed in created table declaration using transmute to avoid cloning

Browse Source
This commit is contained in:
pedrocarlo
2025-05-17 12:58:00 -03:00
parent 0fa4ebaec2
commit 166dc2184e
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/translate/schema.rs
View File

@@ -291,10 +291,22 @@ fn check_automatic_pk_index_required(
let primary_key_column_results: Vec<Result<PrimaryKeyColumnInfo>> = pk_cols
.iter()
.map(|col| match &col.expr {
ast::Expr::Id(name) => Ok(PrimaryKeyColumnInfo {
name: &name.0,
is_descending: matches!(col.order, Some(ast::SortOrder::Desc)),
}),
ast::Expr::Id(name) => {
let key: &ast::Name = unsafe { std::mem::transmute(name) };
if !columns.contains_key(key) {
return Err(LimboError::ParseError(format!(
"no such column: {}",
name.0,
)));
}
Ok(PrimaryKeyColumnInfo {
name: &name.0,
is_descending: matches!(
col.order,
Some(ast::SortOrder::Desc)
),
})
}
_ => Err(LimboError::ParseError(
"expressions prohibited in PRIMARY KEY and UNIQUE constraints"
.to_string(),
@@ -303,9 +315,6 @@ fn check_automatic_pk_index_required(
.collect();
for result in primary_key_column_results {
if let Err(e) = result {
bail_parse_error!("{}", e);
}
let pk_info = result?;
let column_name = pk_info.name;
@@ -339,24 +348,29 @@ fn check_automatic_pk_index_required(
}
}
} else if let ast::TableConstraint::Unique {
columns,
columns: unique_columns,
conflict_clause,
} = &constraint.constraint
{
if conflict_clause.is_some() {
unimplemented!("ON CONFLICT not implemented");
}
let col_names: HashSet<String> = columns
let col_names = unique_columns
.iter()
.map(|column| match &column.expr {
limbo_sqlite3_parser::ast::Expr::Id(id) => {
crate::util::normalize_ident(&id.0)
let key: &ast::Name = unsafe { std::mem::transmute(id) };
if !columns.contains_key(key) {
crate::bail_parse_error!("no such column: {}", id.0);
}
Ok(crate::util::normalize_ident(&id.0))
}
_ => {
todo!("Unsupported unique expression");
}
})
.collect();
.collect::<Result<HashSet<String>>>()?;
unique_sets.push(col_names);
}
}

2
vendored/sqlite3-parser/src/parser/ast/mod.rs
View File

@@ -1034,6 +1034,7 @@ pub struct GroupBy {
/// identifier or one of several keywords or `INDEXED`
#[derive(Clone, Debug, PartialEq, Eq)]
#[repr(transparent)] // Repr transparent needed as we do transmute between Name and Id
pub struct Id(pub String);
impl Id {
@@ -1047,6 +1048,7 @@ impl Id {
/// identifier or string or `CROSS` or `FULL` or `INNER` or `LEFT` or `NATURAL` or `OUTER` or `RIGHT`.
#[derive(Clone, Debug, Eq)]
#[repr(transparent)] // Repr transparent needed as we do transmute between Name and Id
pub struct Name(pub String); // TODO distinction between Name and "Name"/[Name]/`Name`
impl Name {