Merge pull request #254 from jongleb/support-json_arrayagg

jongleb · web-flow · commit ae9493cb6e28 · 2025-12-19T16:33:41.000+04:00
Support `JSON_ARRAYAGG`
diff --git a/lib/sql.ml b/lib/sql.ml
@@ -588,6 +588,7 @@ and row_values = {
 and order = (expr * direction option) list
 and agg_with_order_kind = 
     | Group_concat
+    | Json_arrayagg
 and agg_fun = Self (* self means that it returns the same type what aggregated columns have. ie: max, min *) 
     | Count (* count it's count function which never returns null  *) 
     | Avg (* avg it's avg function that returns float *)
@@ -715,6 +716,7 @@ let pp_func pp f =
   | Agg Avg -> fprintf pp "|'a| -> float"
   | Agg Count -> fprintf pp "|'a| -> int"
   | Agg (With_order { with_order_kind = Group_concat; _ }) -> fprintf pp "|'a| -> text"
+  | Agg (With_order { with_order_kind = Json_arrayagg; _ }) -> fprintf pp "|'a| -> json"
   | Ret ret -> fprintf pp "_ -> %s" (Type.show ret)
   | F (ret, args) -> fprintf pp "%s -> %s" (String.concat " -> " @@ List.map Type.string_of_tyvar args) (Type.string_of_tyvar ret)
   | Col_assign { ret_t=ret; col_t; arg_t } -> aux (F (ret, [col_t; arg_t]))
diff --git a/lib/sql_lexer.mll b/lib/sql_lexer.mll
@@ -91,6 +91,7 @@ let keywords =
    "group",GROUP;
    "group_concat", GROUP_CONCAT;
    "having",HAVING;
+   "json_arrayagg", JSON_ARRAYAGG;
    "hour_microsecond", HOUR_MICROSECOND;
    "hour_minute", HOUR_MINUTE;
    "hour_second", HOUR_SECOND;
diff --git a/lib/sql_parser.mly b/lib/sql_parser.mly
@@ -51,6 +51,7 @@
        DAY_MICROSECOND DAY_SECOND DAY_MINUTE DAY_HOUR EXTRACT
        YEAR_MONTH FALSE TRUE DUPLICATE
 %token GROUP_CONCAT SEPARATOR
+%token JSON_ARRAYAGG
 %token NUM_DIV_OP NUM_EQ_OP NUM_CMP_OP PLUS MINUS NOT_DISTINCT_OP NUM_BIT_SHIFT NUM_BIT_OR NUM_BIT_AND
 %token JSON_EXTRACT_OP JSON_UNQUOTE_EXTRACT_OP
 %token T_INTEGER T_BIG_INTEGER T_BLOB T_TEXT T_FLOAT T_BOOLEAN T_DATETIME T_UUID T_DECIMAL T_JSON
@@ -503,6 +504,10 @@ expr:
       {
         Fun { kind = Agg ( With_order({ with_order_kind = Group_concat; order })); parameters = p; is_over_clause = false } 
       }
+    | JSON_ARRAYAGG LPAREN p=func_params order=loption(order) limit_t? RPAREN
+      {
+        Fun { kind = Agg ( With_order({ with_order_kind = Json_arrayagg; order })); parameters = p; is_over_clause = false } 
+      }
     | CAST LPAREN e=expr AS f=cast_as RPAREN { f e }
     | f=table_name LPAREN p=func_params RPAREN { Fun { kind = (Function.lookup f.tn (List.length p)); parameters = p; is_over_clause = false } }
     | e=expr IS NOT? NULL { poly (strict Bool) [e] }
diff --git a/lib/syntax.ml b/lib/syntax.ml
@@ -629,8 +629,12 @@ and assign_types env expr =
         | Agg Count, ([] (* asterisk *) | [_]) -> strict Int, types
         | Agg Avg, [_] -> consider_agg_nullability @@ nullable Float, types
         | Agg Self, [typ] -> consider_agg_nullability typ, types
-        | Agg (With_order { with_order_kind = Group_concat; _ }), [t1] -> 
+        | Agg (With_order { with_order_kind = Group_concat; _ }), ((_ :: _) as params) -> 
           let ret = depends Text in
+          let nullability = common_nullability (ret :: params) in
+          consider_agg_nullability @@ (undepend ret nullability), types
+        | Agg (With_order { with_order_kind = Json_arrayagg; _ }), [t1] -> 
+          let ret = depends Json in
           let nullability = common_nullability [ret; t1] in
           consider_agg_nullability @@ (undepend ret nullability), types
         | Agg _, _ -> fail "cannot use this grouping function with %d parameters" (List.length types)
@@ -810,7 +814,7 @@ and get_params_of_res_expr env (e:res_expr) =
     | ResInparam (p, m) -> SingleIn (p, m)::acc
     | ResFun { parameters; kind; _ } -> 
       let p1 = match kind with
-      | Agg (With_order { with_order_kind = Group_concat; order; _ }) -> List.rev @@ params_of_order order [] env
+      | Agg (With_order { order; _ }) -> List.rev @@ params_of_order order [] env
       | _ -> [] in
       p1 @ List.fold_left loop acc parameters
     | ResInTupleList _
diff --git a/test/cram/test.t b/test/cram/test.t
