bigquery: SqlOption might contain expression

Author: lustefaniak

src/ast/mod.rs

@@ -4290,7 +4290,7 @@ pub struct HiveFormat {
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub struct SqlOption {
     pub name: WithSpan<Ident>,
-    pub value: Value,
+    pub value: Expr,
 }
 
 impl fmt::Display for SqlOption {

src/parser/mod.rs

@@ -4693,7 +4693,7 @@ impl<'a> Parser<'a> {
     pub fn parse_sql_option(&mut self) -> Result<SqlOption, ParserError> {
         let name = self.parse_identifier()?;
         self.expect_token(&Token::Eq)?;
-        let value = self.parse_value()?;
+        let value = self.parse_expr()?;
         Ok(SqlOption { name, value })
     }
 

tests/sqlparser_bigquery.rs

@@ -1378,3 +1378,10 @@ fn test_create_table_primary_key_not_enforced() {
         "CREATE TABLE `myproject`.`mydataset`.`mytable` (id INT64, PRIMARY KEY (id) NOT ENFORCED)",
     );
 }
+
+#[test]
+fn test_options_expression() {
+    bigquery().verified_stmt(
+        "CREATE TABLE `myproject`.`mydataset`.`mytable` (id INT64) OPTIONS (max_staleness = INTERVAL '0-0 0 0:15:0' YEAR TO SECOND)",
+    );
+}

tests/sqlparser_common.rs

@@ -2979,11 +2979,11 @@ fn parse_create_table_with_options() {
                 vec![
                     SqlOption {
                         name: Ident::new("foo").empty_span(),
-                        value: Value::SingleQuotedString("bar".into()),
+                        value: Expr::Value(Value::SingleQuotedString("bar".into())),
                     },
                     SqlOption {
                         name: Ident::new("a").empty_span(),
-                        value: number("123"),
+                        value: Expr::Value(number("123")),
                     },
                 ],
                 with_options
@@ -3252,11 +3252,11 @@ fn parse_alter_view_with_options() {
                 vec![
                     SqlOption {
                         name: Ident::new("foo").empty_span(),
-                        value: Value::SingleQuotedString("bar".into()),
+                        value: Expr::Value(Value::SingleQuotedString("bar".into())),
                     },
                     SqlOption {
                         name: Ident::new("a").empty_span(),
-                        value: number("123"),
+                        value: Expr::Value(number("123")),
                     },
                 ],
                 with_options
@@ -5741,11 +5741,11 @@ fn parse_create_view_with_options() {
                 vec![
                     SqlOption {
                         name: Ident::new("foo").empty_span(),
-                        value: Value::SingleQuotedString("bar".into()),
+                        value: Expr::Value(Value::SingleQuotedString("bar".into())),
                     },
                     SqlOption {
                         name: Ident::new("a").empty_span(),
-                        value: number("123"),
+                        value: Expr::Value(number("123")),
                     },
                 ],
                 with_options
@@ -7561,11 +7561,11 @@ fn parse_cache_table() {
             options: vec![
                 SqlOption {
                     name: Ident::with_quote('\'', "K1").empty_span(),
-                    value: Value::SingleQuotedString("V1".into()),
+                    value: Expr::Value(Value::SingleQuotedString("V1".into())),
                 },
                 SqlOption {
                     name: Ident::with_quote('\'', "K2").empty_span(),
-                    value: number("0.88"),
+                    value: Expr::Value(number("0.88")),
                 },
             ],
             query: None,
@@ -7586,11 +7586,11 @@ fn parse_cache_table() {
             options: vec![
                 SqlOption {
                     name: Ident::with_quote('\'', "K1").empty_span(),
-                    value: Value::SingleQuotedString("V1".into()),
+                    value: Expr::Value(Value::SingleQuotedString("V1".into())),
                 },
                 SqlOption {
                     name: Ident::with_quote('\'', "K2").empty_span(),
-                    value: number("0.88"),
+                    value: Expr::Value(number("0.88")),
                 },
             ],
             query: Some(query.clone()),
@@ -7611,11 +7611,11 @@ fn parse_cache_table() {
             options: vec![
                 SqlOption {
                     name: Ident::with_quote('\'', "K1").empty_span(),
-                    value: Value::SingleQuotedString("V1".into()),
+                    value: Expr::Value(Value::SingleQuotedString("V1".into())),
                 },
                 SqlOption {
                     name: Ident::with_quote('\'', "K2").empty_span(),
-                    value: number("0.88"),
+                    value: Expr::Value(number("0.88")),
                 },
             ],
             query: Some(query.clone()),

tests/sqlparser_postgres.rs

@@ -479,15 +479,15 @@ fn parse_create_table_with_defaults() {
                 vec![
                     SqlOption {
                         name: Ident::new("fillfactor").empty_span(),
-                        value: number("20")
+                        value: Expr::Value(number("20")),
                     },
                     SqlOption {
                         name: Ident::new("user_catalog_table").empty_span(),
-                        value: Value::Boolean(true)
+                        value: Expr::Value(Value::Boolean(true)),
                     },
                     SqlOption {
                         name: Ident::new("autovacuum_vacuum_threshold").empty_span(),
-                        value: number("100")
+                        value: Expr::Value(number("100")),
                     },
                 ]
             );