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

Merge 'core/translate: rewrite default column value from identifier to string literal' from Preston Thorpe

Browse Source 
closes #3390
closes #3389

Closes #3403
This commit is contained in:
Jussi Saurio
2025-09-28 08:07:11 +03:00
committed by GitHub
parent 1bacd7ff64 03046faccb
commit 618cf2a4e7
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/schema.rs
View File

@@ -1236,7 +1236,11 @@ pub fn create_table(
ast::ColumnConstraint::NotNull { nullable, .. } => {
notnull = !nullable;
}
ast::ColumnConstraint::Default(ref expr) => default = Some(expr),
ast::ColumnConstraint::Default(ref expr) => {
default = Some(
translate_ident_to_string_literal(expr).unwrap_or(expr.clone()),
);
}
// TODO: for now we don't check Resolve type of unique
ast::ColumnConstraint::Unique(on_conflict) => {
if on_conflict.is_some() {
@@ -1271,7 +1275,7 @@ pub fn create_table(
primary_key,
is_rowid_alias: typename_exactly_integer && primary_key,
notnull,
default: default.cloned(),
default,
unique,
collation,
hidden: false,
@@ -1362,6 +1366,19 @@ pub fn create_table(
})
}
pub fn translate_ident_to_string_literal(expr: &Expr) -> Option<Box<Expr>> {
match expr {
// SQLite treats a bare identifier as a string literal in DEFAULT clause
Expr::Name(Name::Ident(str)) | Expr::Id(Name::Ident(str)) => {
Some(Box::new(Expr::Literal(Literal::String(format!("'{str}'")))))
}
Expr::Name(Name::Quoted(str)) | Expr::Id(Name::Quoted(str)) => Some(Box::new(
Expr::Literal(Literal::String(format!("'{}'", normalize_ident(str)))),
)),
_ => None,
}
}
pub fn _build_pseudo_table(columns: &[ResultColumn]) -> PseudoCursorType {
let table = PseudoCursorType::new();
for column in columns {
@@ -1418,7 +1435,8 @@ impl From<&ColumnDefinition> for Column {
ast::ColumnConstraint::NotNull { .. } => notnull = true,
ast::ColumnConstraint::Unique(..) => unique = true,
ast::ColumnConstraint::Default(expr) => {
default.replace(expr.clone());
default
.replace(translate_ident_to_string_literal(expr).unwrap_or(expr.clone()));
}
ast::ColumnConstraint::Collate { collation_name } => {
collation.replace(