Changeset: a6b1af188043 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a6b1af188043
Modified Files:
sql/server/rel_select.c
sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Tests/trace.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
Branch: Mar2011
Log Message:
fixed bug 'correlated update'
approved output of test because of not so recent changes (mostly
related to config file removal)...
diffs (truncated from 1155 to 300 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
@@ -4363,9 +4363,10 @@
around this inner relation.
*/
if (!is_project(inner->op)) {
- if (outer && pre_prj)
+ if (outer && pre_prj) {
inner = rel_project(sql->sa, inner,
pre_prj);
- else
+ pre_prj = rel_projections(sql, inner,
NULL, 1, 1);
+ } else
inner = rel_project(sql->sa, inner,
new_exp_list(sql->sa));
}
rel_project_add_exp(sql, inner, ce);
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
b/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
--- a/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
+++ b/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
@@ -114,12 +114,6 @@
# 14:58:14 >
START TRANSACTION;
-CREATE SCHEMA "rdf" AUTHORIZATION "monetdb";
-SET SCHEMA "rdf";
-CREATE TABLE "rdf"."graph" (
- "gname" CHARACTER LARGE OBJECT,
- "gid" INTEGER
-);
SET SCHEMA "sys";
CREATE TABLE "sys"."allnewtriples" (
"id" INTEGER NOT NULL,
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
--- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
+++ b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
@@ -29,7 +29,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 97 # length
+% 98 # length
insert(
| table(sys.cm_tmp) [ cm_tmp.i, cm_tmp.%TID% NOT NULL ]
| union (
diff --git
a/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
b/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
---
a/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
+++
b/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
@@ -50,7 +50,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 66 # length
+% 67 # length
project (
| group by (
| | table(sys.sorted) [ sorted.a, sorted.b, sorted.%TID% NOT NULL ]
@@ -59,7 +59,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 66 # length
+% 67 # length
project (
| group by (
| | table(sys.sorted) [ sorted.a, sorted.b, sorted.%TID% NOT NULL ]
diff --git
a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
--- a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
+++ b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
@@ -33,7 +33,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 48 # length
+% 49 # length
project (
| table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
) [ oblo.a ]
@@ -41,7 +41,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 50 # length
+% 51 # length
top N (
| project (
| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
@@ -51,7 +51,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 50 # length
+% 51 # length
top N (
| project (
| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
@@ -61,7 +61,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 50 # length
+% 51 # length
top N (
| project (
| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
@@ -71,7 +71,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 50 # length
+% 51 # length
top N (
| project (
| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
@@ -81,7 +81,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 48 # length
+% 49 # length
project (
| table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
) [ oblo.a ASC ] [ oblo.a ]
@@ -89,7 +89,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 50 # length
+% 51 # length
top N (
| project (
| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
@@ -99,7 +99,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 50 # length
+% 51 # length
top N (
| project (
| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
@@ -109,7 +109,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 50 # length
+% 51 # length
top N (
| project (
| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
@@ -119,7 +119,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 50 # length
+% 51 # length
top N (
| project (
| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
diff --git
a/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
b/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
---
a/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
+++
b/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
@@ -62,7 +62,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 58 # length
+% 59 # length
project (
| distinct union (
| | distinct project (
@@ -91,7 +91,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 58 # length
+% 59 # length
project (
| distinct union (
| | distinct project (
@@ -120,7 +120,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 58 # length
+% 59 # length
project (
| distinct union (
| | distinct project (
@@ -149,7 +149,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 58 # length
+% 59 # length
project (
| except (
| | distinct project (
@@ -172,7 +172,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 58 # length
+% 59 # length
project (
| except (
| | distinct project (
@@ -195,7 +195,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 58 # length
+% 59 # length
project (
| except (
| | distinct project (
@@ -218,7 +218,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 58 # length
+% 59 # length
project (
| intersect (
| | distinct project (
@@ -241,7 +241,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 58 # length
+% 59 # length
project (
| intersect (
| | distinct project (
@@ -264,7 +264,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 58 # length
+% 59 # length
project (
| intersect (
| | distinct project (
@@ -287,7 +287,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 58 # length
+% 59 # length
project (
| distinct union (
| | distinct project (
@@ -316,7 +316,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 58 # length
+% 59 # length
project (
| except (
| | distinct project (
@@ -339,7 +339,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 58 # length
+% 59 # length
project (
| intersect (
| | distinct project (
diff --git
a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
--- a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
+++ b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
@@ -80,12 +80,12 @@
# 21:00:43 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=38808
# 21:00:43 >
-MAPI = monetdb@alf:38517
+MAPI = monetdb@alf:35848
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
ERROR = !SQLException:zero_or_one:cardinality violation (53>1)
-MAPI = monetdb@alf:38517
+MAPI = monetdb@alf:35848
QUERY = select * from columns where name = (select columns.name from _tables,
columns where _tables.id = columns.table_id);
-ERROR = !SQLException:zero_or_one:cardinality violation (299>1)
+ERROR = !SQLException:zero_or_one:cardinality violation (297>1)
# 21:00:43 >
diff --git
a/sql/test/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out
b/sql/test/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out
--- a/sql/test/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out
+++ b/sql/test/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out
@@ -27,12 +27,6 @@
# 16:17:36 >
START TRANSACTION;
-CREATE SCHEMA "rdf" AUTHORIZATION "monetdb";
-SET SCHEMA "rdf";
-CREATE TABLE "rdf"."graph" (
- "gname" CHARACTER LARGE OBJECT,
- "gid" INTEGER
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
