Changeset: 70e68ea457e2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=70e68ea457e2
Modified Files:
clients/mapiclient/mclient.c
clients/mapiclient/mhelp.c
sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
sql/server/rel_select.c
sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
sql/test/analytics/Tests/analytics09.sql
sql/test/analytics/Tests/analytics09.stable.out
Branch: Nov2019
Log Message:
Merge with Apr2019
diffs (168 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1933,9 +1933,7 @@ format_result(Mapi mid, MapiHdl hdl, boo
SQLqueryEcho(hdl);
if (formatter == TABLEformatter ||
formatter == ROWCOUNTformatter)
- mnstr_printf(toConsole,
- "auto commit mode: %s\n",
- mapi_get_autocommit(mid) ? "on" :
"off");
+ mnstr_printf(toConsole, "operation
successful\n");
timerHuman(sqloptimizer, maloptimizer, querytime,
singleinstr, false);
continue;
case Q_PREPARE:
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -444,9 +444,9 @@ SQLhelp sqlhelp1[] = {
"See also
https://www.monetdb.org/Documentation/SQLreference/TableExpressions"},
{"SET",
"Assign a value to a variable or column",
- "SET '=' simple_atom",
+ "SET ident '=' simple_atom",
"simple_atom",
- NULL},
+ "See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/Variables"},
{"SET LOCAL TRANSACTION",
"",
"START LOCAL TRANSACTION transactionmode",
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
b/sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
--- a/sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
+++ b/sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
@@ -29,7 +29,7 @@ stdout of test 'Test_JdbcClient` in dire
# 18:15:40 > java nl.cwi.monetdb.client.JdbcClient -h catskill -p 31817 -d
mTests_sql_jdbc_tests --help
# 18:15:40 >
-Usage java -jar jdbcclient.jar
+Usage java -jar jdbcclient.jre7.jar
[-h host[:port]] [-p port] [-f file] [-u user]
[-l language] [-d database] [-e] [-D [table]]
[-X<opt>]
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -5065,18 +5065,34 @@ opt_groupby_add_exp(mvc *sql, sql_rel *p
if (!exp_name(in))
exp_label(sql->sa, in, ++sql->label);
found = exps_find_exp( p->exps, in);
- if (!found)
+ if (!found) {
+ sql_rel *l = p->l;
+ while (l && !is_base(l->op)) {
+ if (!exps_find_exp(l->exps, in))
+ append(l->exps, exp_copy(sql->sa, in));
+ else
+ break;
+ l = l->l;
+ }
append(p->exps, in);
- else
+ } else
in = found;
in = exp_ref(sql->sa, in);
} else if (pp && pp->op == op_groupby) {
if (!exp_name(in))
exp_label(sql->sa, in, ++sql->label);
found = exps_find_exp( p->exps, in);
- if (!found)
+ if (!found) {
+ sql_rel *l = p->l;
+ while (l && !is_base(l->op)) {
+ if (!exps_find_exp(l->exps, in))
+ append(l->exps, exp_copy(sql->sa, in));
+ else
+ break;
+ l = l->l;
+ }
append(p->exps, in);
- else
+ } else
in = found;
in = exp_ref(sql->sa, in);
}
diff --git a/sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
b/sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
--- a/sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
+++ b/sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
@@ -20,50 +20,9 @@ stdout of test 'authorization.SF-1430616
# MonetDB/Python module loaded
# MonetDB/R module loaded
-# SQL catalog created, loading sql scripts once
-# loading sql script: 09_like.sql
-# loading sql script: 10_math.sql
-# loading sql script: 11_times.sql
-# loading sql script: 12_url.sql
-# loading sql script: 13_date.sql
-# loading sql script: 14_inet.sql
-# loading sql script: 15_querylog.sql
-# loading sql script: 16_tracelog.sql
-# loading sql script: 17_temporal.sql
-# loading sql script: 18_index.sql
-# loading sql script: 20_vacuum.sql
-# loading sql script: 21_dependency_functions.sql
-# loading sql script: 22_clients.sql
-# loading sql script: 23_skyserver.sql
-# loading sql script: 25_debug.sql
-# loading sql script: 26_sysmon.sql
-# loading sql script: 27_rejects.sql
-# loading sql script: 39_analytics.sql
-# loading sql script: 39_analytics_hge.sql
-# loading sql script: 40_geom.sql
-# loading sql script: 40_json.sql
-# loading sql script: 40_json_hge.sql
-# loading sql script: 41_md5sum.sql
-# loading sql script: 45_uuid.sql
-# loading sql script: 46_gsl.sql
-# loading sql script: 46_profiler.sql
-# loading sql script: 51_sys_schema_extension.sql
-# loading sql script: 72_fits.sql
-# loading sql script: 74_netcdf.sql
-# loading sql script: 75_lidar.sql
-# loading sql script: 75_shp.sql
-# loading sql script: 75_storagemodel.sql
-# loading sql script: 80_statistics.sql
-# loading sql script: 80_udf.sql
-# loading sql script: 80_udf_hge.sql
-# loading sql script: 85_bam.sql
-# loading sql script: 90_generator.sql
-# loading sql script: 90_generator_hge.sql
-# loading sql script: 99_system.sql
-
-# 17:04:39 >
-# 17:04:39 > "./authorization.SF-1430616.SQL.sh" "authorization.SF-1430616"
-# 17:04:39 >
+# 12:18:29 >
+# 12:18:29 > "./authorization.SF-1430616.SQL.sh" "authorization.SF-1430616"
+# 12:18:29 >
# 17:04:39 >
diff --git a/sql/test/analytics/Tests/analytics09.sql
b/sql/test/analytics/Tests/analytics09.sql
--- a/sql/test/analytics/Tests/analytics09.sql
+++ b/sql/test/analytics/Tests/analytics09.sql
@@ -104,4 +104,7 @@ select min(aa) over (order by sum(bb)) f
select dense_rank() over (partition by sum(aa) order by avg(bb)) from
analytics;
+select avg(sum(aa)) over (rows unbounded preceding),
+ rank() over (partition by sum(aa)) from analytics;
+
drop table analytics;
diff --git a/sql/test/analytics/Tests/analytics09.stable.out
b/sql/test/analytics/Tests/analytics09.stable.out
--- a/sql/test/analytics/Tests/analytics09.stable.out
+++ b/sql/test/analytics/Tests/analytics09.stable.out
@@ -382,6 +382,13 @@ stdout of test 'analytics09` in director
% int # type
% 1 # length
[ 1 ]
+#select avg(sum(aa)) over (rows unbounded preceding),
+# rank() over (partition by sum(aa)) from analytics;
+% sys.L5, sys.L12 # table_name
+% L5, L12 # name
+% double, int # type
+% 24, 1 # length
+[ 46, 1 ]
#drop table analytics;
# 13:13:17 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
