Changeset: 0d6fe51df85e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0d6fe51df85e
Modified Files:
clients/mapiclient/mclient.c
sql/backends/monet5/rel_bin.c
sql/server/rel_exp.c
Branch: default
Log Message:
Merge with Dec2023 branch.
diffs (129 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3771,8 +3771,7 @@ main(int argc, char **argv)
if (mode == SQL)
dump_version(mid, toConsole, "Database:");
- mnstr_printf(toConsole, "FOLLOW US on
https://twitter.com/MonetDB "
- "or
https://github.com/MonetDB/MonetDB\n";
+ mnstr_printf(toConsole, "FOLLOW US on
https://github.com/MonetDB/MonetDB\n";
"Type \\q to quit, \\? for a list of
available commands\n");
if (mode == SQL)
mnstr_printf(toConsole, "auto commit mode: %s\n",
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -4441,6 +4441,8 @@ rel2bin_groupby(backend *be, sql_rel *re
cursub = stmt_list(be, l);
if (cursub == NULL)
return NULL;
+ if (aggrs && !aggrs->h && ext)
+ list_append(l, ext);
for (n = aggrs->h; n; n = n->next) {
sql_exp *aggrexp = n->data;
stmt *aggrstmt = NULL;
diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -2406,7 +2406,7 @@ exp_has_func_or_cmp(sql_exp *e, bool cmp
return exps_have_func_or_cmp(e->f, true);
return 0;
case e_convert:
- return exp_has_func(e->l);
+ return exp_has_func_or_cmp(e->l, cmp);
case e_func:
return 1;
case e_aggr:
diff --git a/sql/test/BugTracker-2024/Tests/All
b/sql/test/BugTracker-2024/Tests/All
--- a/sql/test/BugTracker-2024/Tests/All
+++ b/sql/test/BugTracker-2024/Tests/All
@@ -19,3 +19,5 @@ greatest-as-colname-7444
where-cond-issue-7447
where-cond-issue-7448
function_return_issue
+where_null-7450
+between-boolean-7451
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
deleted file mode 100644
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
+++ /dev/null
@@ -1,78 +0,0 @@
-Running database upgrade commands to update system tables.
-
-Running database upgrade commands:
-create function sys.generate_series(first hugeint, "limit" hugeint)
-returns table (value hugeint)
-external name generator.series;
-create function sys.generate_series(first hugeint, "limit" hugeint, stepsize
hugeint)
-returns table (value hugeint)
-external name generator.series;
-create aggregate stddev_samp(val HUGEINT) returns DOUBLE
- external name "aggr"."stdev";
-GRANT EXECUTE ON AGGREGATE stddev_samp(HUGEINT) TO PUBLIC;
-create window stddev_samp(val HUGEINT) returns DOUBLE
- external name "sql"."stdev";
-GRANT EXECUTE ON WINDOW stddev_samp(HUGEINT) TO PUBLIC;
-create aggregate stddev_pop(val HUGEINT) returns DOUBLE
- external name "aggr"."stdevp";
-GRANT EXECUTE ON AGGREGATE stddev_pop(HUGEINT) TO PUBLIC;
-create window stddev_pop(val HUGEINT) returns DOUBLE
- external name "sql"."stdevp";
-GRANT EXECUTE ON WINDOW stddev_pop(HUGEINT) TO PUBLIC;
-create aggregate var_samp(val HUGEINT) returns DOUBLE
- external name "aggr"."variance";
-GRANT EXECUTE ON AGGREGATE var_samp(HUGEINT) TO PUBLIC;
-create window var_samp(val HUGEINT) returns DOUBLE
- external name "sql"."variance";
-GRANT EXECUTE ON WINDOW var_samp(HUGEINT) TO PUBLIC;
-create aggregate covar_samp(e1 HUGEINT, e2 HUGEINT) returns DOUBLE
- external name "aggr"."covariance";
-GRANT EXECUTE ON AGGREGATE covar_samp(HUGEINT, HUGEINT) TO PUBLIC;
-create window covar_samp(e1 HUGEINT, e2 HUGEINT) returns DOUBLE
- external name "sql"."covariance";
-GRANT EXECUTE ON WINDOW covar_samp(HUGEINT, HUGEINT) TO PUBLIC;
-create aggregate var_pop(val HUGEINT) returns DOUBLE
- external name "aggr"."variancep";
-GRANT EXECUTE ON AGGREGATE var_pop(HUGEINT) TO PUBLIC;
-create window var_pop(val HUGEINT) returns DOUBLE
- external name "sql"."variancep";
-GRANT EXECUTE ON WINDOW var_pop(HUGEINT) TO PUBLIC;
-create aggregate covar_pop(e1 HUGEINT, e2 HUGEINT) returns DOUBLE
- external name "aggr"."covariancep";
-GRANT EXECUTE ON AGGREGATE covar_pop(HUGEINT, HUGEINT) TO PUBLIC;
-create window covar_pop(e1 HUGEINT, e2 HUGEINT) returns DOUBLE
- external name "sql"."covariancep";
-GRANT EXECUTE ON WINDOW covar_pop(HUGEINT, HUGEINT) TO PUBLIC;
-create aggregate median(val HUGEINT) returns HUGEINT
- external name "aggr"."median";
-GRANT EXECUTE ON AGGREGATE median(HUGEINT) TO PUBLIC;
-create aggregate quantile(val HUGEINT, q DOUBLE) returns HUGEINT
- external name "aggr"."quantile";
-GRANT EXECUTE ON AGGREGATE quantile(HUGEINT, DOUBLE) TO PUBLIC;
-create aggregate median_avg(val HUGEINT) returns DOUBLE
- external name "aggr"."median_avg";
-GRANT EXECUTE ON AGGREGATE median_avg(HUGEINT) TO PUBLIC;
-create aggregate quantile_avg(val HUGEINT, q DOUBLE) returns DOUBLE
- external name "aggr"."quantile_avg";
-GRANT EXECUTE ON AGGREGATE quantile_avg(HUGEINT, DOUBLE) TO PUBLIC;
-create aggregate corr(e1 HUGEINT, e2 HUGEINT) returns DOUBLE
- external name "aggr"."corr";
-GRANT EXECUTE ON AGGREGATE corr(HUGEINT, HUGEINT) TO PUBLIC;
-create window corr(e1 HUGEINT, e2 HUGEINT) returns DOUBLE
- external name "sql"."corr";
-GRANT EXECUTE ON WINDOW corr(HUGEINT, HUGEINT) TO PUBLIC;
-create function json.filter(js json, name hugeint)
-returns json external name json.filter;
-GRANT EXECUTE ON FUNCTION json.filter(json, hugeint) TO PUBLIC;
-update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
-update sys.functions set system = true where system <> true and name in
('stddev_samp', 'stddev_pop', 'var_samp', 'covar_samp', 'var_pop', 'covar_pop',
'median', 'median_avg', 'quantile', 'quantile_avg', 'corr') and schema_id =
(select id from sys.schemas where name = 'sys') and type = 3;
-update sys.functions set system = true where system <> true and name in
('stddev_samp', 'stddev_pop', 'var_samp', 'covar_samp', 'var_pop', 'covar_pop',
'corr') and schema_id = (select id from sys.schemas where name = 'sys') and
type = 6;
-update sys.functions set system = true where system <> true and name =
'filter' and schema_id = (select id from sys.schemas where name = 'json') and
type = 1;
-
-Running database upgrade commands:
-drop function json.isvalid(json);
-create function json.isvalid(js json)
-returns bool begin return case when js is NULL then NULL else true end; end;
-GRANT EXECUTE ON FUNCTION json.isvalid(json) TO PUBLIC;
-update sys.functions set system = true where system <> true and name =
'isvalid' and schema_id = (select id from sys.schemas where name = 'json');
-
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
