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

Merge 'CURRENT_TIMESTAMP can fallback TK_ID' from Lâm Hoàng Phúc

Browse Source 
fix #2875

Closes #2893
This commit is contained in:
Pekka Enberg
2025-09-02 18:34:19 +03:00
committed by GitHub
parent 52ef7dd675 d0cb3d0d08
commit 36909d4551
1 changed files with 56 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
parser/src/parser.rs
View File

@@ -3061,7 +3061,22 @@ impl<'a> Parser<'a> {
fn parse_default_column_constraint(&mut self) -> Result<ColumnConstraint> {
eat_assert!(self, TK_DEFAULT);
match self.peek_no_eof()?.token_type.unwrap().fallback_id_if_ok() {
let tok = peek_expect!(
self,
TK_NULL,
TK_BLOB,
TK_STRING,
TK_FLOAT,
TK_INTEGER,
TK_CTIME_KW,
TK_LP,
TK_PLUS,
TK_MINUS,
TK_ID,
TK_INDEXED,
);
match tok.token_type.unwrap() {
TK_LP => {
eat_assert!(self, TK_LP);
let expr = self.parse_expr(0)?;
@@ -3084,10 +3099,12 @@ impl<'a> Parser<'a> {
self.parse_term()?,
))))
}
TK_ID | TK_INDEXED => Ok(ColumnConstraint::Default(Box::new(Expr::Id(
TK_NULL | TK_BLOB | TK_STRING | TK_FLOAT | TK_INTEGER | TK_CTIME_KW => {
Ok(ColumnConstraint::Default(self.parse_term()?))
}
_ => Ok(ColumnConstraint::Default(Box::new(Expr::Id(
self.parse_nm()?,
)))),
_ => Ok(ColumnConstraint::Default(self.parse_term()?)),
}
}
@@ -11445,6 +11462,42 @@ mod tests {
}),
})],
),
// issue 2875
(
b"CREATE TABLE \"settings\" (\"enabled\" INTEGER DEFAULT CURRENT_TIMESTAMP NOT NULL)".as_slice(),
vec![Cmd::Stmt(Stmt::CreateTable {
temporary: false,
if_not_exists: false,
tbl_name: QualifiedName {
db_name: None,
name: Name::Quoted("\"settings\"".to_owned()),
alias: None,
},
body: CreateTableBody::ColumnsAndConstraints{
columns: vec![
ColumnDefinition {
col_name: Name::Quoted("\"enabled\"".to_owned()),
col_type: Some(Type {
name: "INTEGER".to_owned(),
size: None,
}),
constraints: vec![
NamedColumnConstraint {
name: None,
constraint: ColumnConstraint::Default(Box::new(Expr::Literal(Literal::CurrentTimestamp))),
},
NamedColumnConstraint {
name: None,
constraint: ColumnConstraint::NotNull { nullable: false, conflict_clause: None }
},
],
}
],
constraints: vec![],
options: TableOptions::NONE,
},
})],
)
];
for (input, expected) in test_cases {