Changeset: e9fc7b085ccc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e9fc7b085ccc
Removed Files:
sql/test/miscellaneous/Tests/view-mul-digits.sql
Modified Files:
sql/server/rel_select.c
sql/test/miscellaneous/Tests/view-mul-digits.test
Branch: default
Log Message:
Merged with Oct2020
diffs (109 lines):
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
@@ -5524,8 +5524,7 @@ rel_select_exp(sql_query *query, sql_rel
*/
pexps = list_merge(pexps, te, (fdup)NULL);
}
- if (rel && is_groupby(rel->op) && !sn->groupby) {
- set_processed(rel);
+ if (rel && is_groupby(rel->op) && !sn->groupby && !is_processed(rel)) {
for (node *n=pexps->h; n; n = n->next) {
sql_exp *ce = n->data;
if (rel->card < ce->card) {
@@ -5536,6 +5535,7 @@ rel_select_exp(sql_query *query, sql_rel
}
}
}
+ set_processed(rel);
}
rel = rel_project(sql->sa, rel, pexps);
diff --git a/sql/test/miscellaneous/Tests/view-mul-digits.test
b/sql/test/miscellaneous/Tests/view-mul-digits.test
--- a/sql/test/miscellaneous/Tests/view-mul-digits.test
+++ b/sql/test/miscellaneous/Tests/view-mul-digits.test
@@ -23,3 +23,72 @@ 0
statement ok
ROLLBACK
+statement ok
+create schema myschema
+
+statement ok
+create table myschema.mygroyp(code varchar(10),amount int)
+
+statement ok
+insert into myschema.mygroyp(code,amount)values('a',1),('a',2),('b',3),('b',4)
+
+query TI rowsort
+select code, cast(sum(amount) as bigint) as eind from myschema.mygroyp group
by code
+----
+a
+3
+b
+7
+
+statement ok
+create view myschema.mygroypview as select code, cast(sum(amount) as bigint)
as eind from myschema.mygroyp group by code
+
+query TI rowsort
+select * from myschema.mygroypview
+----
+a
+3
+b
+7
+
+query TI rowsort
+select code, eind from myschema.mygroypview
+----
+a
+3
+b
+7
+
+query T rowsort
+select code from myschema.mygroypview
+----
+a
+b
+
+query I rowsort
+select eind from myschema.mygroypview
+----
+3
+7
+
+query TI rowsort
+select code, cast(sum(eind) as bigint) from myschema.mygroypview group by code
+----
+a
+3
+b
+7
+
+statement error
+select code, cast(sum(eind) as bigint) from myschema.mygroypview
+
+statement error
+create view myschema.ups as select code, sum(amount) as eind from
myschema.mygroyp
+
+statement error
+create view myschema.ups as select code, amount as eind from myschema.mygroyp
group by code
+
+statement ok
+drop schema myschema cascade
+
+
diff --git a/tools/merovingian/utils/utils.c b/tools/merovingian/utils/utils.c
--- a/tools/merovingian/utils/utils.c
+++ b/tools/merovingian/utils/utils.c
@@ -59,6 +59,8 @@ readConfFile(confkeyval *list, FILE *cnf
while (fgets(buf, 1024, cnf) != NULL) {
/* eliminate fgets' newline */
+ if (buf[0] == '\n' || buf[0] == '#')
+ continue;
buf[strlen(buf) - 1] = '\0';
for (t = list; t->key != NULL; t++) {
len = strlen(t->key);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
