Support generalized round/floor/ceil functions.

Author: cristianberneanu

src/OpenDiffix.Core.Tests/Expression.Tests.fs

@@ -272,12 +272,26 @@ module DefaultFunctionsTests =
         Null, Null
       ]
 
+    runsBinary
+      Round
+      [
+        Integer 3L, Integer 2L, Integer 4L
+        Integer 3L, Real 2.5, Real 2.5
+        Integer 3L, Integer -1L, Null
+        Real 2.5, Integer 2L, Integer 2L
+        Real 3.5, Real 2.0, Real 4.0
+        Integer 1L, Real 0.5, Real 1.0
+        Real 1.3245, Real 0.5, Real 1.5
+      ]
+
     fails
       Round
       [ //
         [ Integer 5L ]
         [ Boolean true ]
         [ String "a" ]
+        [ Integer 5L; String "a" ]
+        [ String "a"; Real 1.0 ]
       ]
 
   [<Fact>]
@@ -292,12 +306,26 @@ module DefaultFunctionsTests =
         Null, Null
       ]
 
+    runsBinary
+      Ceil
+      [
+        Integer 3L, Integer 2L, Integer 4L
+        Integer 3L, Real 2.5, Real 5.0
+        Integer 3L, Integer -1L, Null
+        Real 2.5, Integer 2L, Integer 4L
+        Real 3.5, Real 2.0, Real 4.0
+        Integer 1L, Real 0.5, Real 1.0
+        Real 1.233, Real 0.5, Real 1.5
+      ]
+
     fails
       Ceil
       [ //
         [ Integer 5L ]
         [ Boolean true ]
         [ String "a" ]
+        [ Integer 5L; String "a" ]
+        [ String "a"; Real 1.0 ]
       ]
 
   [<Fact>]
@@ -312,12 +340,26 @@ module DefaultFunctionsTests =
         Null, Null
       ]
 
+    runsBinary
+      Floor
+      [
+        Integer 3L, Integer 2L, Integer 2L
+        Integer 3L, Real 2.5, Real 2.5
+        Integer 3L, Integer -1L, Null
+        Real 2.5, Integer 2L, Integer 2L
+        Real 3.5, Real 2.0, Real 2.0
+        Integer 1L, Real 0.5, Real 1.0
+        Real 1.3245, Real 0.5, Real 1.0
+      ]
+
     fails
       Floor
       [ //
         [ Integer 5L ]
         [ Boolean true ]
         [ String "a" ]
+        [ Integer 5L; String "a" ]
+        [ String "a"; Real 1.0 ]
       ]
 
   [<Fact>]

src/OpenDiffix.Core.Tests/QueryEngine.Tests.fs

@@ -166,6 +166,18 @@ type Tests(db: DBFixture) =
     let queryResult = runQuery "SELECT id FROM products LIMIT 3"
     queryResult |> should equal expected
 
+  [<Fact>]
+  let ``query 12 - group with rounding`` () =
+    let queryResult = runQuery "SELECT round(age, 5), count(*) FROM customers_small GROUP BY 1"
+
+    let expected =
+      {
+        Columns = [ { Name = "round"; Type = IntegerType }; { Name = "count"; Type = IntegerType } ]
+        Rows = [ [| Integer 25L; Integer 7L |]; [| Integer 30L; Integer 7L |]; [| Integer 35L; Integer 6L |] ]
+      }
+
+    queryResult |> should equal expected
+
   [<Fact>]
   let ``Subquery wrappers produce consistent results`` () =
     equivalentQueries

src/OpenDiffix.Core/Expression.fs

@@ -33,7 +33,11 @@ let typeOfScalarFunction fn args =
   | Length -> IntegerType
   | Round
   | Floor
-  | Ceil -> IntegerType
+  | Ceil ->
+    match args with
+    | [ _ ] -> IntegerType
+    | [ _; amount ] -> typeOf amount
+    | _ -> failwith $"Invalid arguments supplied to function `#{fn}`."
   | Abs -> args |> List.exactlyOne |> typeOf
   | Lower
   | Upper
@@ -104,6 +108,38 @@ let rec evaluateScalarFunction fn args =
   | And, [ Boolean b1; Boolean b2 ] -> Boolean(b1 && b2)
   | Or, [ Boolean b1; Boolean b2 ] -> Boolean(b1 || b2)
 
+  | Round, [ Real r ] -> r |> round |> int64 |> Integer
+  | Round, [ _; Integer amount ] when amount <= 0L -> Null
+  | Round, [ _; Real amount ] when amount <= 0.0 -> Null
+  | Round, [ Integer value; Integer amount ] -> (float value / float amount) |> round |> int64 |> (*) amount |> Integer
+  | Round, [ Integer value; Real amount ] -> (float value / amount) |> round |> (*) amount |> Real
+  | Round, [ Real value; Integer amount ] -> (value / float amount) |> round |> int64 |> (*) amount |> Integer
+  | Round, [ Real value; Real amount ] -> (value / amount) |> round |> (*) amount |> Real
+
+  | Ceil, [ Real r ] -> r |> ceil |> int64 |> Integer
+  | Ceil, [ _; Integer amount ] when amount <= 0L -> Null
+  | Ceil, [ _; Real amount ] when amount <= 0.0 -> Null
+  | Ceil, [ Integer value; Integer amount ] -> (float value / float amount) |> ceil |> int64 |> (*) amount |> Integer
+  | Ceil, [ Integer value; Real amount ] -> (float value / amount) |> ceil |> (*) amount |> Real
+  | Ceil, [ Real value; Integer amount ] -> (value / float amount) |> ceil |> int64 |> (*) amount |> Integer
+  | Ceil, [ Real value; Real amount ] -> (value / amount) |> ceil |> (*) amount |> Real
+
+  | Floor, [ Real r ] -> r |> floor |> int64 |> Integer
+  | Floor, [ _; Integer amount ] when amount <= 0L -> Null
+  | Floor, [ _; Real amount ] when amount <= 0.0 -> Null
+  | Floor, [ Integer value; Integer amount ] -> (float value / float amount) |> floor |> int64 |> (*) amount |> Integer
+  | Floor, [ Integer value; Real amount ] -> (float value / amount) |> floor |> (*) amount |> Real
+  | Floor, [ Real value; Integer amount ] -> (value / float amount) |> floor |> int64 |> (*) amount |> Integer
+  | Floor, [ Real value; Real amount ] -> (value / amount) |> floor |> (*) amount |> Real
+
+  | Abs, [ Real r ] -> r |> abs |> Real
+  | Abs, [ Integer i ] -> i |> abs |> Integer
+
+  | WidthBucket, [ Integer v; Integer b; Integer t; Integer c ] ->
+    widthBucket (float v) (float b) (float t) c |> Integer
+  | WidthBucket, [ Real v; Real b; Real t; Integer c ] -> widthBucket v b t c |> Integer
+
+  // Treat mixed integer/real binary operations as real/real operations.
   | _, [ Integer i; Real r ] -> evaluateScalarFunction fn [ Real(double i); Real r ]
   | _, [ Real r; Integer i ] -> evaluateScalarFunction fn [ Real r; Real(double i) ]
 
@@ -124,16 +160,6 @@ let rec evaluateScalarFunction fn args =
   | Gt, [ v1; v2 ] -> Boolean(v1 > v2)
   | GtE, [ v1; v2 ] -> Boolean(v1 >= v2)
 
-  | Round, [ Real r ] -> r |> round |> int64 |> Integer
-  | Ceil, [ Real r ] -> r |> ceil |> int64 |> Integer
-  | Floor, [ Real r ] -> r |> floor |> int64 |> Integer
-  | Abs, [ Real r ] -> r |> abs |> Real
-  | Abs, [ Integer i ] -> i |> abs |> Integer
-
-  | WidthBucket, [ Integer v; Integer b; Integer t; Integer c ] ->
-    widthBucket (float v) (float b) (float t) c |> Integer
-  | WidthBucket, [ Real v; Real b; Real t; Integer c ] -> widthBucket v b t c |> Integer
-
   | Length, [ String s ] -> Integer(int64 s.Length)
 
   | Lower, [ String s ] -> String(s.ToLower())