Changeset: 08b3d2386396 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=08b3d2386396
Modified Files:
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out
sql/test/pg_regress/Tests/alter_table.stable.err
sql/test/pg_regress/Tests/alter_table.stable.out
sql/test/pg_regress/Tests/insert.stable.err
Branch: Jul2017
Log Message:
Merge with Dec2016 branch
diffs (206 lines):
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
---
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
+++
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
@@ -28,12 +28,12 @@ Ready.
% .plan # table_name
% rel # name
% clob # type
-% 198 # length
+% 202 # length
insert(
-| table(sys.cm_tmp) [ cm_tmp.i, cm_tmp.%TID% NOT NULL ]
+| table(sys.cm_tmp) [ "cm_tmp"."i", "cm_tmp"."%TID%" NOT NULL ]
| union (
-| | table sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar
"NULL", varchar "null", varchar "a:\file1", bigint "-1", bigint "0", int "0",
int "0", varchar "NULL"), [ cm_tmp.i ] COUNT ,
-| | table sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar
"NULL", varchar "null", varchar "Z:/file2", bigint "-1", bigint "0", int "0",
int "0", varchar "NULL"), [ cm_tmp.i ] COUNT
+| | table sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar
"NULL", varchar "null", varchar "a:\file1", bigint "-1", bigint "0", int "0",
int "0", varchar "NULL"), [ "cm_tmp"."i" ] COUNT ,
+| | table sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar
"NULL", varchar "null", varchar "Z:/file2", bigint "-1", bigint "0", int "0",
int "0", varchar "NULL"), [ "cm_tmp"."i" ] COUNT
| ) [ int "NULL" ]
)
diff --git a/sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out
b/sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out
--- a/sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out
+++ b/sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out
@@ -33,7 +33,7 @@ Ready.
#SELECT 45 - CASE + + 70 WHEN COUNT ( * ) + SUM ( DISTINCT 91 ) + MIN (
DISTINCT 41 ) / 65 THEN + 98 END * + - 0 - - COUNT ( * ) AS col0;
% .L7 # table_name
% col0 # name
-% bigeint # type
+% bigint # type
% 1 # length
[ NULL ]
diff --git a/sql/test/pg_regress/Tests/alter_table.stable.err
b/sql/test/pg_regress/Tests/alter_table.stable.err
--- a/sql/test/pg_regress/Tests/alter_table.stable.err
+++ b/sql/test/pg_regress/Tests/alter_table.stable.err
@@ -333,32 +333,32 @@ QUERY = insert into atacc1 values (10, 1
ERROR = !INSERT INTO: number of values doesn't match number of columns of
table 'atacc1'
MAPI = (monetdb) /var/tmp/mtest-22572/.s.monetdb.35667
QUERY = insert into atacc1 values (default, 11, 12, 13);
-ERROR = !INSERT INTO: number of values doesn't match number of columns of
table 'atacc1'
-MAPI = (monetdb) /var/tmp/mtest-22572/.s.monetdb.35667
+ERROR = !syntax error, unexpected DEFAULT in: "insert into atacc1 values
(default"
+MAPI = (monetdb) /var/tmp/mtest-22684/.s.monetdb.37188
QUERY = insert into atacc1 (a) values (10);
ERROR = !INSERT INTO: no such column 'atacc1.a'
MAPI = (monetdb) /var/tmp/mtest-22572/.s.monetdb.35667
QUERY = insert into atacc1 (a) values (default);
-ERROR = !INSERT INTO: no such column 'atacc1.a'
-MAPI = (monetdb) /var/tmp/mtest-22572/.s.monetdb.35667
+ERROR = !syntax error, unexpected DEFAULT in: "insert into atacc1 (a) values
(default"
+MAPI = (monetdb) /var/tmp/mtest-22684/.s.monetdb.37188
QUERY = insert into atacc1 (a,b,c,d) values (10,11,12,13);
ERROR = !INSERT INTO: no such column 'atacc1.a'
MAPI = (monetdb) /var/tmp/mtest-22572/.s.monetdb.35667
QUERY = insert into atacc1 (a,b,c,d) values (default,11,12,13);
-ERROR = !INSERT INTO: no such column 'atacc1.a'
-MAPI = (monetdb) /var/tmp/mtest-22572/.s.monetdb.35667
+ERROR = !syntax error, unexpected DEFAULT in: "insert into atacc1 (a,b,c,d)
values (default"
+MAPI = (monetdb) /var/tmp/mtest-22684/.s.monetdb.37188
QUERY = insert into atacc1 ("........pg.dropped.1........") values (10);
ERROR = !INSERT INTO: no such column 'atacc1.........pg.dropped.1........'
MAPI = (monetdb) /var/tmp/mtest-22572/.s.monetdb.35667
QUERY = insert into atacc1 ("........pg.dropped.1........") values (default);
-ERROR = !INSERT INTO: no such column 'atacc1.........pg.dropped.1........'
-MAPI = (monetdb) /var/tmp/mtest-22572/.s.monetdb.35667
+ERROR = !syntax error, unexpected DEFAULT in: "insert into atacc1
("........pg.dropped.1........") values (default"
+MAPI = (monetdb) /var/tmp/mtest-22684/.s.monetdb.37188
QUERY = insert into atacc1 ("........pg.dropped.1........",b,c,d) values
(10,11,12,13);
ERROR = !INSERT INTO: no such column 'atacc1.........pg.dropped.1........'
MAPI = (monetdb) /var/tmp/mtest-22572/.s.monetdb.35667
QUERY = insert into atacc1 ("........pg.dropped.1........",b,c,d) values
(default,11,12,13);
-ERROR = !INSERT INTO: no such column 'atacc1.........pg.dropped.1........'
-MAPI = (monetdb) /var/tmp/mtest-22572/.s.monetdb.35667
+ERROR = !syntax error, unexpected DEFAULT in: "insert into atacc1
("........pg.dropped.1........",b,c,d) values (default"
+MAPI = (monetdb) /var/tmp/mtest-22684/.s.monetdb.37188
QUERY = delete from atacc1 where a = 3;
ERROR = !SELECT: identifier 'a' unknown
MAPI = (monetdb) /var/tmp/mtest-22572/.s.monetdb.35667
@@ -605,13 +605,22 @@ ERROR = !syntax error, unexpected TYPE,
MAPI = (monetdb) /var/tmp/mtest-22572/.s.monetdb.35667
QUERY = alter table foo alter f1 TYPE varchar(10);
ERROR = !syntax error, unexpected TYPE, expecting DROP or SET in: "alter table
foo alter f1 type"
-MAPI = (monetdb) /var/tmp/mtest-22572/.s.monetdb.35667
+MAPI = (monetdb) /var/tmp/mtest-20743/.s.monetdb.31311
+QUERY = insert into anothertab (atcol1, atcol2) values (default, true);
+ERROR = !syntax error, unexpected DEFAULT in: "insert into anothertab (atcol1,
atcol2) values (default"
+MAPI = (monetdb) /var/tmp/mtest-22684/.s.monetdb.37188
+QUERY = insert into anothertab (atcol1, atcol2) values (default, false);
+ERROR = !syntax error, unexpected DEFAULT in: "insert into anothertab (atcol1,
atcol2) values (default"
+MAPI = (monetdb) /var/tmp/mtest-22684/.s.monetdb.37188
QUERY = alter table anothertab alter column atcol1 type boolean; -- fails
ERROR = !syntax error, unexpected TYPE, expecting DROP or SET in: "alter table
anothertab alter column atcol1 type"
MAPI = (monetdb) /var/tmp/mtest-22572/.s.monetdb.35667
QUERY = alter table anothertab alter column atcol1 type integer;
ERROR = !syntax error, unexpected TYPE, expecting DROP or SET in: "alter table
anothertab alter column atcol1 type"
-MAPI = (monetdb) /var/tmp/mtest-22572/.s.monetdb.35667
+MAPI = (monetdb) /var/tmp/mtest-20743/.s.monetdb.31311
+QUERY = insert into anothertab (atcol1, atcol2) values (default, null);
+ERROR = !syntax error, unexpected DEFAULT in: "insert into anothertab (atcol1,
atcol2) values (default"
+MAPI = (monetdb) /var/tmp/mtest-22684/.s.monetdb.37188
QUERY = alter table anothertab alter column atcol2 type text
using case when atcol2 is true then 'IT WAS TRUE'
when atcol2 is false then 'IT WAS FALSE'
diff --git a/sql/test/pg_regress/Tests/alter_table.stable.out
b/sql/test/pg_regress/Tests/alter_table.stable.out
--- a/sql/test/pg_regress/Tests/alter_table.stable.out
+++ b/sql/test/pg_regress/Tests/alter_table.stable.out
@@ -658,10 +658,6 @@ Ready.
[ "zz", "qq" ]
#drop table foo;
#create table anothertab (atcol1 bigint GENERATED ALWAYS AS IDENTITY check
(atcol1 <= 3), atcol2 boolean);
-#insert into anothertab (atcol1, atcol2) values (default, true);
-[ 1 ]
-#insert into anothertab (atcol1, atcol2) values (default, false);
-[ 1 ]
#insert into anothertab (atcol2) values (true);
[ 1 ]
#insert into anothertab (atcol2) values (false);
@@ -673,8 +669,6 @@ Ready.
% 1, 5 # length
[ 1, true ]
[ 2, false ]
-[ 3, true ]
-[ 4, false ]
#select * from anothertab;
% sys.anothertab, sys.anothertab # table_name
% atcol1, atcol2 # name
@@ -682,12 +676,8 @@ Ready.
% 1, 5 # length
[ 1, true ]
[ 2, false ]
-[ 3, true ]
-[ 4, false ]
#insert into anothertab (atcol1, atcol2) values (45, null); -- fails
[ 1 ]
-#insert into anothertab (atcol1, atcol2) values (default, null);
-[ 1 ]
#insert into anothertab (atcol2) values (null);
[ 1 ]
#select * from anothertab;
@@ -697,11 +687,8 @@ Ready.
% 2, 5 # length
[ 1, true ]
[ 2, false ]
-[ 3, true ]
-[ 4, false ]
[ 45, NULL ]
-[ 5, NULL ]
-[ 6, NULL ]
+[ 3, NULL ]
#select * from anothertab;
% sys.anothertab, sys.anothertab # table_name
% atcol1, atcol2 # name
@@ -709,11 +696,8 @@ Ready.
% 2, 5 # length
[ 1, true ]
[ 2, false ]
-[ 3, true ]
-[ 4, false ]
[ 45, NULL ]
-[ 5, NULL ]
-[ 6, NULL ]
+[ 3, NULL ]
#alter table anothertab alter column atcol1 drop default;
#select * from anothertab;
% sys.anothertab, sys.anothertab # table_name
@@ -722,11 +706,8 @@ Ready.
% 2, 5 # length
[ 1, true ]
[ 2, false ]
-[ 3, true ]
-[ 4, false ]
[ 45, NULL ]
-[ 5, NULL ]
-[ 6, NULL ]
+[ 3, NULL ]
#drop table anothertab;
#create table another (f1 int, f2 text);
#insert into another values(1, 'one');
diff --git a/sql/test/pg_regress/Tests/insert.stable.err
b/sql/test/pg_regress/Tests/insert.stable.err
--- a/sql/test/pg_regress/Tests/insert.stable.err
+++ b/sql/test/pg_regress/Tests/insert.stable.err
@@ -31,11 +31,11 @@ stderr of test 'insert` in directory 'sq
MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
QUERY = insert into inserttest (col1, col2, col3) values (DEFAULT, DEFAULT,
DEFAULT);
-ERROR = !INSERT INTO: column 'col1' has no valid default value
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
+ERROR = !syntax error, unexpected DEFAULT in: "insert into inserttest (col1,
col2, col3) values (default"
+MAPI = (monetdb) /var/tmp/mtest-22520/.s.monetdb.34322
QUERY = insert into inserttest (col1, col2, col3) values (DEFAULT, DEFAULT);
-ERROR = !INSERT INTO: number of values doesn't match number of columns of
table 'inserttest'
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
+ERROR = !syntax error, unexpected DEFAULT in: "insert into inserttest (col1,
col2, col3) values (default"
+MAPI = (monetdb) /var/tmp/mtest-22520/.s.monetdb.34322
QUERY = insert into inserttest (col1, col2, col3) values (1, 2);
ERROR = !INSERT INTO: number of values doesn't match number of columns of
table 'inserttest'
MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
@@ -43,7 +43,7 @@ QUERY = insert into inserttest (col1) va
ERROR = !INSERT INTO: number of values doesn't match number of columns of
table 'inserttest'
MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
QUERY = insert into inserttest (col1) values (DEFAULT, DEFAULT);
-ERROR = !INSERT INTO: number of values doesn't match number of columns of
table 'inserttest'
+ERROR = !syntax error, unexpected DEFAULT in: "insert into inserttest (col1)
values (default"
# 17:11:19 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
