merging

lib/logical_plan.ml

@@ -43,7 +43,6 @@ and tables_to_logical tables =
   | None -> None
   | Some(t) -> aux t
 
-
 let pp_logical_plan plan =
   match plan with 
   | Project(_, name) -> (String.concat ";" name)

test/test_ast.ml

@@ -405,25 +405,26 @@ let test_where_equals () =
   in
   Alcotest.(check query_testable) query q1 ast1
 
-(*
-let test_aggregtes () =
+let test_aggregates () =
   let query = "SELECT AVG(a) FROM t" in
   let q1 = parse query in
-  let ast1 = Query(
+  let ast1 =
     Select(
       [
       ],
-      Some(
-        [
-          Table("t")
-        ]
-      ),
-      None
+      TableExpression(
+        Some(
+          [
+            Table("t")
+          ]
+        ),
+        None,
+        None
+      )
     )
-  ) in
+  in
   Alcotest.(check query_testable) query q1 ast1
 
-*)
 
 let simple_select_set  = [ ("Equals", `Quick, test_simple_select) ]
 
@@ -445,11 +446,16 @@ let where_clauses_set = [
   ("Where Equals", `Quick, test_where_equals)
 ]
 
+let aggregate_clause = [
+  ("AVG", `Quick, test_aggregates)
+]
+
 let () =
   Alcotest.run "Ast tests"
     [
       ("Simple Selects", simple_select_set); 
       ("Simple Joins", simple_join_set);
       ("Multiple Joins", multiple_joins_set);
-      ("Where Clauses", where_clauses_set)
+      ("Where Clauses", where_clauses_set);
+      ("Aggregates", aggregate_clause)
     ]