Implement sum for durations (#9097)

Closes #7403

---------

Co-authored-by: Aljaž Mur Eržen <aljaz@erzen.si>

Author: Gobot1234

docs/reference/stdlib/set.rst

@@ -638,10 +638,13 @@ Sets
                   std::sum(s: set of float64) -> float64
                   std::sum(s: set of bigint) -> bigint
                   std::sum(s: set of decimal) -> decimal
+                  std::sum(s: set of duration) -> duration
+                  std::sum(s: set of cal::relative_duration) -> cal::relative_duration
+                  std::sum(s: set of cal::date_duration) -> cal::date_duration
 
     .. index:: aggregate
 
-    Returns the sum of the set of numbers.
+    Return the arithmetic sum of values in a set.
 
     The result type depends on the input set type. The general rule of thumb
     is that the type of the input set is preserved (as if a simple

edb/lib/cal.edgeql

@@ -1964,6 +1964,31 @@ std::max(vals: SET OF array<std::cal::date_duration>) -> OPTIONAL array<std::cal
 };
 
 
+CREATE FUNCTION
+std::sum(s: SET OF std::cal::relative_duration) -> std::cal::relative_duration
+{
+    CREATE ANNOTATION std::description :=
+        'Return the arithmetic sum of values in a set.';
+    SET volatility := 'Immutable';
+    SET initial_value := <std::cal::relative_duration>"PT0S";
+    SET force_return_cast := true;
+    USING SQL FUNCTION 'sum';
+};
+
+
+CREATE FUNCTION
+std::sum(s: SET OF std::cal::date_duration) -> std::cal::date_duration
+{
+    CREATE ANNOTATION std::description :=
+        'Return the arithmetic sum of values in a set.';
+    SET volatility := 'Immutable';
+    SET initial_value := <std::cal::date_duration>"PT0S";
+    SET force_return_cast := true;
+    USING SQL FUNCTION 'sum';
+};
+
+
+
 ## Range functions
 
 

edb/lib/std/20-genericfuncs.edgeql

@@ -157,7 +157,7 @@ CREATE FUNCTION
 std::sum(s: SET OF std::bigint) -> std::bigint
 {
     CREATE ANNOTATION std::description :=
-        'Return the sum of the set of numbers.';
+        'Return the arithmetic sum of values in a set.';
     SET volatility := 'Immutable';
     SET initial_value := 0;
     SET force_return_cast := true;
@@ -169,7 +169,7 @@ CREATE FUNCTION
 std::sum(s: SET OF std::decimal) -> std::decimal
 {
     CREATE ANNOTATION std::description :=
-        'Return the sum of the set of numbers.';
+        'Return the arithmetic sum of values in a set.';
     SET volatility := 'Immutable';
     SET initial_value := 0;
     USING SQL FUNCTION 'sum';
@@ -180,7 +180,7 @@ CREATE FUNCTION
 std::sum(s: SET OF std::int32) -> std::int64
 {
     CREATE ANNOTATION std::description :=
-        'Return the sum of the set of numbers.';
+        'Return the arithmetic sum of values in a set.';
     SET volatility := 'Immutable';
     SET initial_value := 0;
     SET force_return_cast := true;
@@ -192,7 +192,7 @@ CREATE FUNCTION
 std::sum(s: SET OF std::int64) -> std::int64
 {
     CREATE ANNOTATION std::description :=
-        'Return the sum of the set of numbers.';
+        'Return the arithmetic sum of values in a set.';
     SET volatility := 'Immutable';
     SET initial_value := 0;
     SET force_return_cast := true;
@@ -204,7 +204,7 @@ CREATE FUNCTION
 std::sum(s: SET OF std::float32) -> std::float32
 {
     CREATE ANNOTATION std::description :=
-        'Return the sum of the set of numbers.';
+        'Return the arithmetic sum of values in a set.';
     SET volatility := 'Immutable';
     SET initial_value := 0;
     USING SQL FUNCTION 'sum';
@@ -215,7 +215,7 @@ CREATE FUNCTION
 std::sum(s: SET OF std::float64) -> std::float64
 {
     CREATE ANNOTATION std::description :=
-        'Return the sum of the set of numbers.';
+        'Return the arithmetic sum of values in a set.';
     SET volatility := 'Immutable';
     SET initial_value := 0;
     USING SQL FUNCTION 'sum';

edb/lib/std/30-datetimefuncs.edgeql

@@ -507,3 +507,17 @@ CREATE CAST FROM std::duration TO std::str {
     SELECT regexp_replace(val::text, '[[:<:]]mon(?=s?[[:>:]])', 'month');
     $$;
 };
+
+
+# std::sum
+
+CREATE FUNCTION
+std::sum(s: SET OF std::duration) -> std::duration
+{
+    CREATE ANNOTATION std::description :=
+        'Return the arithmetic sum of values in a set.';
+    SET volatility := 'Immutable';
+    SET initial_value := <std::duration>"PT0S";
+    SET force_return_cast := true;
+    USING SQL FUNCTION 'sum';
+};

edb/testbase/serutils.py

@@ -73,6 +73,7 @@ def _stringify(o):
 @serialize.register(decimal.Decimal)
 @serialize.register(datetime.timedelta)
 @serialize.register(edgedb.RelativeDuration)
+@serialize.register(edgedb.DateDuration)
 def _scalar(o):
     return o
 

tests/test_edgeql_functions.py

@@ -24,8 +24,10 @@
 import os.path
 import random
 import uuid
+from datetime import timedelta
 
 import edgedb
+import gel
 
 from edb.testbase import server as tb
 from edb.tools import test
@@ -1819,6 +1821,54 @@ async def test_edgeql_functions_sum_04(self):
             [True],
         )
 
+        await self.assert_query_result(
+            r'''SELECT sum(<duration>"PT5S") IS duration;''',
+            [True],
+        )
+
+        await self.assert_query_result(
+            r'''
+                SELECT sum(<std::cal::relative_duration>"PT5S")
+                IS std::cal::relative_duration;
+            ''',
+            [True],
+        )
+
+        await self.assert_query_result(
+            r'''
+                SELECT sum(<cal::date_duration>"PT5S")
+                IS std::cal::date_duration;
+            ''',
+            [True],
+        )
+
+    async def test_edgeql_functions_sum_05(self):
+        await self.assert_query_result(
+            r'''SELECT sum({<duration>"PT5S", <duration>"PT10S"})''',
+            ["PT15S"],
+            [timedelta(seconds=15)],
+        )
+
+    async def test_edgeql_functions_sum_07(self):
+        await self.assert_query_result(
+            r'''
+                SELECT sum({<cal::relative_duration>"PT5S",
+                            <cal::relative_duration>"PT10S"})
+            ''',
+            ["PT15S"],
+            [gel.RelativeDuration(microseconds=15_000_000)],
+        )
+
+    async def test_edgeql_functions_sum_08(self):
+        await self.assert_query_result(
+            r'''
+                SELECT sum({<cal::date_duration>"5 days",
+                            <cal::date_duration>"10 days"})
+            ''',
+            ["P15D"],
+            [gel.DateDuration(days=15)]
+        )
+
     async def test_edgeql_functions_unix_to_datetime_01(self):
         dt = await self.con.query_single(
             'SELECT <str>to_datetime(1590595184.584);'