Put default value within aggregate

query_language_reference.md

@@ -653,7 +653,7 @@ Query:
 
 ```
 find {foo: =="group2"}
-return [group(.baz order=asc) default="a", group(.bar order=desc) default="c", count()];
+return [group(.baz default="a" order=asc), group(.bar default="c" order=desc), count()];
 ```
 
 Results:

repl-tests/group.noise

@@ -95,13 +95,13 @@ add {"_id":"13", "foo":"group", "baz": "c"};
 "13"
 
 find {foo: =="group"}
-return {max: max(.bar) default=120};
+return {max: max(.bar default=120)};
 [
 {"max":120}
 ]
 
 find {foo: =="group"}
-return {max: max(.bar) default=1};
+return {max: max(.bar default=1)};
 [
 {"max":3}
 ]
@@ -167,7 +167,7 @@ add {"_id":"9", "foo":"group3", "baz": "a", "bar": "f"};
 "9"
 
 find {foo: =="group3"}
-return [group(.baz order=asc) default="a", group(.bar order=desc) default="c", count()];
+return [group(.baz default="a" order=asc), group(.bar default="c" order=desc), count()];
 [
 ["a","f",1],
 ["a","c",1],

src/parser.rs

@@ -25,6 +25,8 @@ struct Aggregate {
     keypath: ReturnPath,
     // The concat aggregate has an additional "sep" parameter
     sep: Option<JsonValue>,
+    // The default default value is always `null` hence we don't need an option type here
+    default: JsonValue,
 }
 
 pub struct Parser<'a, 'c> {
@@ -242,12 +244,14 @@ impl<'a, 'c> Parser<'a, 'c> {
                     fun: aggregate_fun,
                     bind_name: None,
                     keypath: ReturnPath::new(),
-                    sep: None
+                    sep: None,
+                    default: JsonValue::Null,
                 }))
             } else if aggregate_fun == AggregateFun::Concat {
                 let bind_name_option = self.consume_field();
 
                 if let Some(rp) = try!(self.consume_keypath()) {
+                    let default = self.consume_default()?.unwrap_or(JsonValue::Null);
                     let sep = if self.consume("sep") {
                         try!(self.must_consume("="));
                         JsonValue::String(try!(self.must_consume_string_literal()))
@@ -260,6 +264,7 @@ impl<'a, 'c> Parser<'a, 'c> {
                         bind_name: bind_name_option,
                         keypath: rp,
                         sep: Some(sep),
+                        default: default,
                     }))
                 } else {
                     Err(Error::Parse("Expected keypath or bind variable".to_string()))
@@ -268,6 +273,7 @@ impl<'a, 'c> Parser<'a, 'c> {
                 let bind_name_option = self.consume_field();
 
                 if let Some(rp) = try!(self.consume_keypath()) {
+                    let default = self.consume_default()?.unwrap_or(JsonValue::Null);
                     if self.consume("order") {
                         try!(self.must_consume("="));
                         if self.consume("asc") {
@@ -285,6 +291,7 @@ impl<'a, 'c> Parser<'a, 'c> {
                         bind_name: bind_name_option,
                         keypath: rp,
                         sep: None,
+                        default: default,
                     }))
                 } else {
                     Err(Error::Parse("Expected keypath or bind variable".to_string()))
@@ -1135,19 +1142,18 @@ impl<'a, 'c> Parser<'a, 'c> {
         }
 
         if let Some(aggregate) = try!(self.consume_aggregate()) {
-            let default = self.consume_default()?.unwrap_or(JsonValue::Null);
             match aggregate.bind_name {
                 Some(bind_name) => Ok(Some(Box::new(RetBind {
                     bind_name: bind_name,
                     extra_rp: aggregate.keypath,
                     ag: Some((aggregate.fun, aggregate.sep)),
-                    default: default,
+                    default: aggregate.default,
                     order_info: None,
                 }))),
                 None => Ok(Some(Box::new(RetValue {
                     rp: aggregate.keypath,
                     ag: Some((aggregate.fun, aggregate.sep)),
-                    default: default,
+                    default: aggregate.default,
                     order_info: None,
                 }))),
             }