Changeset: ac190cff12ca for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ac190cff12ca
Modified Files:
Branch: default
Log Message:
Merge with default
diffs (163 lines):
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -913,7 +913,7 @@
sql_rel *rel = NULL, *nrel, *lrel, *rrel;
list *exps, *gexps;
int distinct = 0;
- operator_type j = 0;
+ operator_type j = op_basetable;
skipWS(r,pos);
if (r[*pos] == 'd') {
@@ -1086,25 +1086,25 @@
j = op_left;
/* fall through */
case 'r':
- if (!j) {
+ if (j != op_basetable) {
*pos += strlen("right outer join");
j = op_right;
}
/* fall through */
case 'f':
- if (!j) {
+ if (j != op_basetable) {
*pos += strlen("full outer join");
j = op_full;
}
/* fall through */
case 'c':
- if (!j) {
+ if (j != op_basetable) {
*pos += strlen("crossproduct");
j = op_join;
}
/* fall through */
case 'j':
- if (!j) {
+ if (j != op_basetable) {
*pos += strlen("join");
j = op_join;
}
@@ -1134,17 +1134,17 @@
rel->exps = exps;
return rel;
case 'u':
- if (!j) {
+ if (j != op_basetable) {
*pos += strlen("union");
j = op_union;
}
case 'i':
- if (!j) {
+ if (j != op_basetable) {
*pos += strlen("intersect");
j = op_inter;
}
case 'e':
- if (!j) {
+ if (j != op_basetable) {
*pos += strlen("except");
j = op_except;
}
diff --git a/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
b/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
--- a/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
+++ b/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
@@ -79,7 +79,7 @@
# 19:33:23 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=33470
# 19:33:23 >
-MAPI = monetdb@alf:32144
+MAPI = monetdb@alf:36639
QUERY = INSERT INTO "examines" ("docID", "vicID") VALUES
(
(
@@ -94,8 +94,7 @@
)
);
ERROR = !SQLException:zero_or_one:cardinality violation (2>1)
- !SQLException:zero_or_one:cardinality violation (2>1)
-MAPI = monetdb@alf:32144
+MAPI = monetdb@alf:36639
QUERY = INSERT INTO "timelines" ("vicID", "time", "event") VALUES
(
(
diff --git
a/sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
b/sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
---
a/sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
+++
b/sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
@@ -30,7 +30,25 @@
% tinyint # type
% 1 # length
[ 1 ]
-% .tables, sys.tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, .tables #
table_name
+#SELECT * FROM (
+# SELECT 'demo' AS "TABLE_CAT",
+# "schemas"."name" AS "TABLE_SCHEM",
+# "tables"."name" AS "TABLE_NAME",
+# 'SYSTEM TABLE' AS "TABLE_TYPE",
+# '' AS "REMARKS",
+# null AS "TYPE_CAT",
+# null AS "TYPE_SCHEM",
+# null AS "TYPE_NAME",
+# 'rowid' AS "SELF_REFERENCING_COL_NAME",
+# 'SYSTEM' AS "REF_GENERATION"
+# FROM "tables", "schemas"
+# WHERE "tables"."schema_id" = "schemas"."id"
+# AND "tables"."system" = true
+# AND "tables"."type" = 0
+#) AS "tables"
+#WHERE 1 = 1
+# AND ("TABLE_TYPE" LIKE 'TABLE' OR "TABLE_T
+% .tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, .tables #
table_name
% TABLE_CAT, TABLE_SCHEM, TABLE_NAME, TABLE_TYPE, REMARKS,
TYPE_CAT, TYPE_SCHEM, TYPE_NAME, SELF_REFERENCING_COL_NAME,
REF_GENERATION # name
% char, varchar, varchar, char, char, char, char,
char, char, char # type
% 4, 0, 0, 12, 0, 0, 0, 0, 5, 6 #
length
diff --git a/sql/test/leaks/Tests/check0.stable.out
b/sql/test/leaks/Tests/check0.stable.out
--- a/sql/test/leaks/Tests/check0.stable.out
+++ b/sql/test/leaks/Tests/check0.stable.out
@@ -47,6 +47,7 @@
[ "oid", "int", 3155 ]
[ "oid", "int", 3155 ]
[ "oid", "int", 3155 ]
+[ "oid", "lng", 0 ]
[ "oid", "lng", 19 ]
[ "oid", "str", 1 ]
[ "oid", "str", 1 ]
@@ -61,13 +62,13 @@
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 488 ]
+[ "transient", 487 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L3, .bbp # table_name
% L3, L4 # name
% char, wrd # type
% 10, 2 # length
-[ "persistent", 24 ]
+[ "persistent", 25 ]
# 22:02:15 >
# 22:02:15 > Done.
diff --git a/sql/test/mapi/Tests/php_monetdb.stable.out
b/sql/test/mapi/Tests/php_monetdb.stable.out
--- a/sql/test/mapi/Tests/php_monetdb.stable.out
+++ b/sql/test/mapi/Tests/php_monetdb.stable.out
@@ -88,11 +88,11 @@
5082 auths 2000 0 true 0 false 0
5086 privileges 2000 0 true 0 false 0
5199 queryhistory 2000 0 true 0 false 0
-5213 callhistory 2000 0 false 0 false 0
-5230 querylog 2000 create view querylog asnselect qd.*, ql.ctime,
ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock,
ql.oublock from queryhistory qd, callhistory qlnwhere qd.id = ql.id; 1
false 0 false 0
-5656 systemfunctions 2000 0 false 0 false 0
+5213 callhistory 2000 0 true 0 false 0
+5230 querylog 2000 create view querylog asnselect qd.*, ql.ctime,
ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock,
ql.oublock from queryhistory qd, callhistory qlnwhere qd.id = ql.id; 1
true 0 false 0
+5656 systemfunctions 2000 0 true 0 false 0
-# 16:11:14 >
-# 16:11:14 > Done.
-# 16:11:14 >
+# 13:45:42 >
+# 13:45:42 > Done.
+# 13:45:42 >
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
