Merge pull request #2537 from aashanand/master

Add Date::add and Date::subtract to SQL compiler
darklang · Jun 7, 2020 · c28de56 · c28de56
2 parents e50e2e0 + 7d3bdcc
commit c28de56
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/backend/libbackend/sql_compiler.ml b/backend/libbackend/sql_compiler.ml
@@ -15,6 +15,7 @@ let binop_to_sql (op : string) : tipe_ * tipe_ * tipe_ * string =
   let allInts str = (TInt, TInt, TInt, str) in
   let allFloats str = (TFloat, TFloat, TFloat, str) in
   let boolOp tipe str = (tipe, tipe, TBool, str) in
+  let dateOp str = (TDate, TDate, TDate, str) in
   match op with
   | ">" | "<" | "<=" | ">=" ->
       boolOp TInt op
@@ -28,6 +29,10 @@ let binop_to_sql (op : string) : tipe_ * tipe_ * tipe_ * string =
       boolOp TDate "<="
   | "Date::>=" | "Date::greaterThanOrEqualTo" ->
       boolOp TDate ">="
+  | "Date::subtract" ->
+      dateOp "-"
+  | "Date::add" ->
+      dateOp "+"
   | "Int::mod" ->
       allInts "%"
   | "Int::add" ->

diff --git a/backend/test/test_db_libs.ml b/backend/test/test_db_libs.ml
@@ -1185,6 +1185,24 @@ let t_db_query_works () =
     (DList [cat; rachel; chandler])
     ( queryv (binop "Date::>" (field "v" "dob") (fn "Date::parse" [ross_dob]))
     |> execs ) ;
+  check_dval
+    "Date::add"
+    (DList [cat; rachel; chandler; ross])
+    ( queryv
+        (binop
+           "Date::<="
+           (field "v" "dob")
+           (fn "Date::add" [fn "Date::now" []; int 1]))
+    |> execs ) ;
+  check_dval
+    "Date::subtract"
+    (DList [cat; rachel; chandler; ross])
+    ( queryv
+        (binop
+           "Date::<="
+           (field "v" "dob")
+           (fn "Date::subtract" [fn "Date::now" []; int 1]))
+    |> execs ) ;
   check_dval
     "string::trim"
     (DList [chandler])