MonetDB: Nov2019 - Merge with Apr2019 branch.

[Sjoerd Mullender]

Changeset: 4f773a582e89 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4f773a582e89
Modified Files:
        sql/common/sql_types.c
        sql/server/sql_scan.c
Branch: Nov2019
Log Message:

Merge with Apr2019 branch.


diffs (23 lines):

diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -1663,6 +1663,9 @@ sqltypeinit( sql_allocator *sa)
 #endif
        sql_create_aggr(sa, "avg", "aggr", "avg", FLT, DBL);
 
+       sql_create_aggr(sa, "avg", "aggr", "avg", MONINT, DBL);
+       sql_create_aggr(sa, "avg", "aggr", "avg", SECINT, DBL);
+
        sql_create_aggr(sa, "count_no_nil", "aggr", "count_no_nil", NULL, LNG);
        sql_create_aggr(sa, "count", "aggr", "count", NULL, LNG);
 
@@ -1850,6 +1853,9 @@ sqltypeinit( sql_allocator *sa)
                sql_create_analytic(sa, "avg", "sql", "avg", HGE, DBL, 
SCALE_NONE);
 #endif
 
+       sql_create_analytic(sa, "avg", "sql", "avg", MONINT, DBL, SCALE_NONE);
+       sql_create_analytic(sa, "avg", "sql", "avg", SECINT, DBL, SCALE_NONE);
+
 #if 0
        t = decimals; // BTE
        sql_create_analytic(sa, "avg", "sql", "avg", *(t), DBL, SCALE_NONE);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list