Fix panic on unknown table option

Fix #44
gwenn · Mar 16, 2024 · a7cd0c1 · a7cd0c1
1 parent 24043e9
commit a7cd0c1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/lexer/sql/test.rs b/src/lexer/sql/test.rs
@@ -287,6 +287,12 @@ fn natural_join_on() {
     );
 }
 
+#[test]
+fn unknown_table_option() {
+    expect_parser_err_msg(b"CREATE TABLE t(x)o", "unknown table option: o");
+    expect_parser_err_msg(b"CREATE TABLE t(x) WITHOUT o", "unknown table option: o");
+}
+
 fn expect_parser_err_msg(input: &[u8], error_msg: &str) {
     expect_parser_err(input, ParserError::Custom(error_msg.to_owned()))
 }

diff --git a/src/parser/parse.y b/src/parser/parse.y
@@ -61,6 +61,7 @@
 // code file that implements the parser.
 //
 %include {
+use crate::custom_err;
 use crate::parser::ast::*;
 use crate::parser::{Context, ParserError};
 use crate::dialect::{from_token, Token, TokenType};
@@ -140,21 +141,19 @@ table_option_set(A) ::= .    {A = TableOptions::NONE;}
 table_option_set(A) ::= table_option(A).
 table_option_set(A) ::= table_option_set(X) COMMA table_option(Y). {A = X|Y;}
 table_option(A) ::= WITHOUT nm(X). {
-  if "rowid".eq_ignore_ascii_case(&X.0) {
+  let option = X;
+  if "rowid".eq_ignore_ascii_case(&option.0) {
     A = TableOptions::WITHOUT_ROWID;
   }else{
-    A = TableOptions::NONE;
-    let msg = format!("unknown table option: {}", &X);
-    self.ctx.sqlite3_error_msg(&msg);
+    return Err(custom_err!("unknown table option: {}", option));
   }
 }
 table_option(A) ::= nm(X). {
-  if "strict".eq_ignore_ascii_case(&X.0) {
+  let option = X;
+  if "strict".eq_ignore_ascii_case(&option.0) {
     A = TableOptions::STRICT;
   }else{
-    A = TableOptions::NONE;
-    let msg = format!("unknown table option: {}", &X);
-    self.ctx.sqlite3_error_msg(&msg);
+    return Err(custom_err!("unknown table option: {}", option));
   }
 }
 %type columnlist {Vec<ColumnDefinition>}