Add VALUES clause (#117)

Author: jpschorr

partiql-ast/src/ast.rs

@@ -268,6 +268,7 @@ pub enum QuerySet {
     SetOp(Box<SetExprAst>),
     Select(Box<SelectAst>),
     Expr(Box<Expr>),
+    Values(Vec<Box<Expr>>),
 }
 
 #[derive(Clone, Debug, PartialEq)]

partiql-parser/src/lexer.rs

@@ -592,6 +592,8 @@ pub enum Token<'input> {
     Using,
     #[regex("(?i:Value)")]
     Value,
+    #[regex("(?i:Values)")]
+    Values,
     #[regex("(?i:Where)")]
     Where,
     #[regex("(?i:With)")]
@@ -690,6 +692,7 @@ impl<'input> fmt::Display for Token<'input> {
             | Token::Unpivot
             | Token::Using
             | Token::Value
+            | Token::Values
             | Token::Where
             | Token::With => {
                 write!(f, "{}", format!("{:?}", self).to_uppercase())
@@ -717,7 +720,7 @@ mod tests {
             "WiTH Where Value uSiNg Unpivot UNION True Select right Preserve pivoT Outer Order Or \
              On Offset Nulls Null Not Natural Missing Limit Like Left Lateral Last Join \
              Intersect Is Inner In Having Group From Full First False Except Escape Desc \
-             Cross By Between At As And Asc All";
+             Cross By Between At As And Asc All Values";
         let symbols = symbols.split(' ').chain(primitives.split(' '));
         let keywords = keywords.split(' ');
 
@@ -737,7 +740,7 @@ mod tests {
             "LIMIT", "/", "LIKE", "^", "LEFT", ".", "LATERAL", "||", "LAST", ":", "JOIN",
             "--", "INTERSECT", "/**/", "IS", "<ident:IDENT>", "INNER", "<atident:@IDENT>", "IN",
             "HAVING", "GROUP", "FROM", "FULL", "FIRST", "FALSE", "EXCEPT", "ESCAPE", "DESC",
-            "CROSS", "BY", "BETWEEN", "AT", "AS", "AND", "ASC", "ALL"
+            "CROSS", "BY", "BETWEEN", "AT", "AS", "AND", "ASC", "ALL", "VALUES"
         ];
         let displayed = toks
             .into_iter()

partiql-parser/src/parse/mod.rs

@@ -384,6 +384,15 @@ mod tests {
         }
     }
 
+    mod values {
+        use super::*;
+
+        #[test]
+        fn values() {
+            parse!("VALUES ('A', `5e0`), ('B', 3.0), ('X', 9.0)");
+        }
+    }
+
     mod set_ops {
         use super::*;
 

partiql-parser/src/parse/partiql.lalrpop

@@ -91,6 +91,16 @@ pub SingleQuery: ast::QuerySetAst = {
         }
     },
     <lo:@L> <sfw:SfwQuery> <hi:@R> => ast::QuerySet::Select( Box::new(sfw) ).ast(lo..hi),
+    <lo:@L> <values:Values> <hi:@R> => values,
+}
+
+Values: ast::QuerySetAst = {
+    <lo:@L> "VALUES" <rows:CommaSepPlus<ValueRow>> <hi:@R> => ast::QuerySet::Values( rows ).ast(lo..hi)
+}
+
+#[inline]
+ValueRow: Box<ast::Expr> = {
+    <array:ExprTermArrayParens> => Box::new(array)
 }
 
 // ------------------------------------------------------------------------------ //
@@ -735,11 +745,34 @@ pub ExprTerm: ast::Expr = {
     "(" <q:Query> ")" => *q,
     <lo:@L> <lit:Literal> <hi:@R> => ast::Expr{ kind: ast::ExprKind::Lit( lit.ast(lo..hi) ) },
     <lo:@L> <path:PathExpr> <hi:@R> => ast::Expr{ kind: ast::ExprKind::Path( path.ast(lo..hi) ) },
-    <lo:@L> "{" <fields:CommaTermStar<ExprPair>> "}" <hi:@R> => ast::Expr{ kind: ast::ExprKind::Struct( ast::Struct{fields}.ast(lo..hi) ) },
-    <lo:@L> "[" <values:CommaTermStar<ExprQuery>> "]" <hi:@R> => ast::Expr{ kind: ast::ExprKind::List( ast::List{values}.ast(lo..hi) ) },
+    <ExprTermArray>,
+    <ExprTermBag>,
+    <ExprTermTuple>,
+    ! => { errors.push(<>); ast::Expr{ kind: ast::ExprKind::Error} },
+}
+
+#[inline]
+ExprTermArray: ast::Expr = {
+    <ExprTermArrayBrackets>,
+    <ExprTermArrayParens>
+}
+#[inline]
+ExprTermArrayBrackets: ast::Expr = {
+    <lo:@L> "[" <values:CommaTermStar<ExprQuery>> "]" <hi:@R> => ast::Expr{ kind: ast::ExprKind::List( ast::List{values}.ast(lo..hi) ) }
+}
+#[inline]
+ExprTermArrayParens: ast::Expr = {
     <lo:@L> "(" <values:CommaTermPlus<ExprQuery>> ")" <hi:@R> => ast::Expr{ kind: ast::ExprKind::List( ast::List{values}.ast(lo..hi) ) },
+}
+
+#[inline]
+ExprTermBag: ast::Expr = {
     <lo:@L> "<<" <values:CommaTermStar<ExprQuery>> ">>" <hi:@R> => ast::Expr{ kind: ast::ExprKind::Bag( ast::Bag{values}.ast(lo..hi) ) },
-    ! => { errors.push(<>); ast::Expr{ kind: ast::ExprKind::Error} },
+}
+
+#[inline]
+ExprTermTuple: ast::Expr = {
+    <lo:@L> "{" <fields:CommaTermStar<ExprPair>> "}" <hi:@R> => ast::Expr{ kind: ast::ExprKind::Struct( ast::Struct{fields}.ast(lo..hi) ) }
 }
 
 ExprPair: ast::ExprPair = {
@@ -1035,6 +1068,7 @@ extern {
         "UNPIVOT" => lexer::Token::Unpivot,
         "USING" => lexer::Token::Using,
         "VALUE" => lexer::Token::Value,
+        "VALUES" => lexer::Token::Values,
         "WHERE" => lexer::Token::Where,
         "WITH" => lexer::Token::With,
     }