Changeset: f3908af4b59b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f3908af4b59b
Modified Files:
sql/server/rel_updates.c
Branch: Dec2011
Log Message:
Merged from Aug2011
diffs (110 lines):
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -411,7 +411,7 @@ insert_into(mvc *sql, dlist *qname, dlis
/* In case of missing project, order by or distinct, we need to add
and projection */
if (r->op != op_project || r->r || need_distinct(r))
- r = rel_project(sql->sa, r, rel_projections(sql, r, NULL, 0,
0));
+ r = rel_project(sql->sa, r, rel_projections(sql, r, NULL, 1,
0));
if ((r->exps && list_length(r->exps) != list_length(collist)) ||
(!r->exps && collist))
return sql_error(sql, 02, "INSERT INTO: query result doesn't
match number of columns in table '%s'", tname);
diff --git
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.sql
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.sql
---
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.sql
+++
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.sql
@@ -2,6 +2,6 @@ create table t1234205 (name varchar(1024
insert into t1234205 values ('niels'),('fabian'),('martin');
prepare select name from t1234205 where name like ?;
-execute 1 ('%');
+execute 3 ('%');
prepare select name from t1234205 where name like 'n%';
-execute 2 ();
+execute 4 ();
diff --git
a/sql/test/BugTracker-2009/Tests/decimal_needs_truncation.SF-2605686.sql
b/sql/test/BugTracker-2009/Tests/decimal_needs_truncation.SF-2605686.sql
--- a/sql/test/BugTracker-2009/Tests/decimal_needs_truncation.SF-2605686.sql
+++ b/sql/test/BugTracker-2009/Tests/decimal_needs_truncation.SF-2605686.sql
@@ -7,7 +7,7 @@ insert into testdec values (0.12345);
select * from testdec;
PREPARE INSERT INTO testdec (testdec) values (?);
-exec 0(0.12345);
+exec 6(0.12345);
select * from testdec;
diff --git
a/sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.sql
b/sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.sql
--- a/sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.sql
+++ b/sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.sql
@@ -3,11 +3,11 @@ create table pce (i int, s string);
commit;
start transaction;
prepare insert into pce (i,s) values (?,?);
-exec 0(1,'test 1');
+exec 2(1,'test 1');
select * from pce;
commit;
start transaction;
-exec 0(2,'test 2');
+exec 2(2,'test 2');
select * from pce;
commit;
drop table pce;
diff --git a/sql/test/BugTracker-2009/Tests/prepare_decimal_bug.SF-2831994.sql
b/sql/test/BugTracker-2009/Tests/prepare_decimal_bug.SF-2831994.sql
--- a/sql/test/BugTracker-2009/Tests/prepare_decimal_bug.SF-2831994.sql
+++ b/sql/test/BugTracker-2009/Tests/prepare_decimal_bug.SF-2831994.sql
@@ -4,6 +4,6 @@ create table "test2831994" (
"value2" DECIMAL (5, 5)
);
prepare insert into "test2831994"("id","value","value2") values (?, ?, ?);
-exec 0 (3,0.0,2.34);
+exec 2 (3,0.0,2.34);
select * from test2831994;
drop table test2831994;
diff --git a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
--- a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
+++ b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
@@ -1,6 +1,6 @@
create table rr (id int);
insert into rr values (1),(2),(3);
prepare select * from rr limit ?;
-exec 1 (1);
+exec 3 (1);
drop table rr;
diff --git a/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.sql
b/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.sql
--- a/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.sql
+++ b/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.sql
@@ -4,4 +4,4 @@ col1 INTEGER,
col2 VARCHAR(5)
) ;
PREPARE select id from data_1mto10m where id > CAST(? AS INTEGER) limit 10;
-exec 0('100');
+exec 2('100');
diff --git a/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err
b/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err
--- a/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err
+++ b/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err
@@ -79,8 +79,8 @@ stderr of test 'bind_with_cast.SF-172093
# 19:38:47 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=37754
# 19:38:47 >
-MAPI = monetdb@ottar:34070
-QUERY = exec 0('100');
+MAPI = monetdb@volund:39146
+QUERY = exec 2('100');
ERROR = !SQLException:sql.prepare:wrong type for argument 1 of prepared
statement: char, expected int
# 19:38:47 >
diff --git a/sql/test/BugTracker/Tests/prepare_decimal_float.SF-1675795.sql
b/sql/test/BugTracker/Tests/prepare_decimal_float.SF-1675795.sql
--- a/sql/test/BugTracker/Tests/prepare_decimal_float.SF-1675795.sql
+++ b/sql/test/BugTracker/Tests/prepare_decimal_float.SF-1675795.sql
@@ -1,6 +1,6 @@
create table xy ( time timestamp, x decimal(6,4), y decimal(6,4));
prepare insert into xy values (?,?,?);
-exec 0 (timestamp '2007-03-07 15:28:16.577', 0.6841, 0.684);
-exec 0 (timestamp '2007-03-07 15:28:16.577', -0.6841, -0.684);
+exec 2 (timestamp '2007-03-07 15:28:16.577', 0.6841, 0.684);
+exec 2 (timestamp '2007-03-07 15:28:16.577', -0.6841, -0.684);
select * from xy;
DROP TABLE xy;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
