Changeset: c285b6b3b9b4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c285b6b3b9b4
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/mhelp.c
sql/server/sql_parser.y
sql/test/pg_regress/Tests/alter_table.stable.err
sql/test/pg_regress/Tests/alter_table.stable.out
sql/test/pg_regress/Tests/drop.stable.err
sql/test/rename/Tests/rename03.sql
sql/test/rename/Tests/rename03.stable.err
sql/test/rename/Tests/rename04.sql
sql/test/rename/Tests/rename06.sql
sql/test/rename/Tests/rename06.stable.err
Branch: rename-sql
Log Message:
Tests approval and changed rename column syntax.
diffs (truncated from 372 to 300 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -11097,6 +11097,9 @@ Ready.
[ "sqlcatalog", "grant", "pattern sqlcatalog.grant(sname:str,
tbl:str, grantee:str, privs:int, cname:str, gr:int, grantor:int):void ",
"SQLgrant;", "Catalog operation grant" ]
[ "sqlcatalog", "grant_function", "pattern
sqlcatalog.grant_function(sname:str, fcnid:int, grantee:str, privs:int,
grant:int, grantor:int):void ", "SQLgrant_function;", "Catalog
operation grant_function" ]
[ "sqlcatalog", "grant_roles", "pattern
sqlcatalog.grant_roles(sname:str, auth:str, grantor:int, admin:int):void ",
"SQLgrant_roles;", "Catalog operation grant_roles" ]
+[ "sqlcatalog", "rename_column", "pattern
sqlcatalog.rename_column(sname:str, tname:str, cname:str, newnme:str):void ",
"SQLrename_column;", "Catalog operation rename_column" ]
+[ "sqlcatalog", "rename_schema", "pattern
sqlcatalog.rename_schema(sname:str, newnme:str):void ",
"SQLrename_schema;", "Catalog operation rename_schema" ]
+[ "sqlcatalog", "rename_table", "pattern
sqlcatalog.rename_table(sname:str, tname:str, newnme:str):void ",
"SQLrename_table;", "Catalog operation rename_table" ]
[ "sqlcatalog", "rename_user", "pattern
sqlcatalog.rename_user(sname:str, newnme:str, action:int):void ",
"SQLrename_user;", "Catalog operation rename_user" ]
[ "sqlcatalog", "revoke", "pattern sqlcatalog.revoke(sname:str,
tbl:str, grantee:str, privs:int, cname:str, grant:int, grantor:int):void ",
"SQLrevoke;", "Catalog operation revoke" ]
[ "sqlcatalog", "revoke_function", "pattern
sqlcatalog.revoke_function(sname:str, fcnid:int, grantee:str, privs:int,
grant:int, grantor:int):void ", "SQLrevoke_function;", "Catalog
operation revoke_function" ]
@@ -11328,6 +11331,9 @@ Ready.
[ "wlc", "master", "pattern wlc.master():void ", "WLCmaster;",
"Activate the workload-capture-replay process" ]
[ "wlc", "master", "pattern wlc.master(path:str):void ",
"WLCmaster;", "Activate the workload-capture-replay process. Use a different
location for the logs." ]
[ "wlc", "query", "pattern wlc.query(q:str):void ",
"WLCquery;", "Keep the queries for replay." ]
+[ "wlc", "rename_column", "pattern wlc.rename_column(sname:str,
tname:str, cname:str, newnme:str):void ", "WLCgeneric;", "Catalog operation
rename_column" ]
+[ "wlc", "rename_schema", "pattern wlc.rename_schema(sname:str,
newnme:str):void ", "WLCgeneric;", "Catalog operation rename_schema"
]
+[ "wlc", "rename_table", "pattern wlc.rename_table(sname:str, tname:str,
newnme:str):void ", "WLCgeneric;", "Catalog operation rename_table"
]
[ "wlc", "rename_user", "pattern wlc.rename_user(sname:str, newnme:str,
action:int):void ", "WLCgeneric;", "Catalog operation rename_user" ]
[ "wlc", "revoke", "pattern wlc.revoke(sname:str, tbl:str,
grantee:str, privs:int, cname:str, grant:int, grantor:int):void ",
"WLCgeneric;", "Catalog operation revoke" ]
[ "wlc", "revoke_function", "pattern wlc.revoke_function(sname:str,
fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ",
"WLCgeneric;", "Catalog operation revoke_function" ]
@@ -11385,6 +11391,9 @@ Ready.
[ "wlr", "grant", "pattern wlr.grant(sname:str, tbl:str,
grantee:str, privs:int, cname:str, gr:int, grantor:int):void ", "WLRgeneric;",
"Catalog operation grant" ]
[ "wlr", "grant_function", "pattern wlr.grant_function(sname:str,
fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ",
"WLRgeneric;", "Catalog operation grant_function" ]
[ "wlr", "grant_roles", "pattern wlr.grant_roles(sname:str, auth:str,
grantor:int, admin:int):void ", "WLRgeneric;", "Catalog operation
grant_roles" ]
+[ "wlr", "rename_column", "pattern wlr.rename_column(sname:str,
tname:str, cname:str, newnme:str):void ", "WLRgeneric;", "Catalog operation
rename_column" ]
+[ "wlr", "rename_schema", "pattern wlr.rename_schema(sname:str,
newnme:str):void ", "WLRgeneric;", "Catalog operation rename_schema"
]
+[ "wlr", "rename_table", "pattern wlr.rename_table(sname:str, tname:str,
newnme:str):void ", "WLRgeneric;", "Catalog operation rename_table"
]
[ "wlr", "rename_user", "pattern wlr.rename_user(sname:str, newnme:str,
action:int):void ", "WLRgeneric;", "Catalog operation rename_user" ]
[ "wlr", "replicate", "pattern wlr.replicate():void ",
"WLRreplicate;", "Roll the snapshot forward to an up-to-date clone"
]
[ "wlr", "replicate", "pattern wlr.replicate(dbname:str):void ",
"WLRreplicate;", "Roll the snapshot forward to an up-to-date clone"
]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -15314,6 +15314,9 @@ Ready.
[ "sqlcatalog", "grant", "pattern sqlcatalog.grant(sname:str,
tbl:str, grantee:str, privs:int, cname:str, gr:int, grantor:int):void ",
"SQLgrant;", "Catalog operation grant" ]
[ "sqlcatalog", "grant_function", "pattern
sqlcatalog.grant_function(sname:str, fcnid:int, grantee:str, privs:int,
grant:int, grantor:int):void ", "SQLgrant_function;", "Catalog
operation grant_function" ]
[ "sqlcatalog", "grant_roles", "pattern
sqlcatalog.grant_roles(sname:str, auth:str, grantor:int, admin:int):void ",
"SQLgrant_roles;", "Catalog operation grant_roles" ]
+[ "sqlcatalog", "rename_column", "pattern
sqlcatalog.rename_column(sname:str, tname:str, cname:str, newnme:str):void ",
"SQLrename_column;", "Catalog operation rename_column" ]
+[ "sqlcatalog", "rename_schema", "pattern
sqlcatalog.rename_schema(sname:str, newnme:str):void ",
"SQLrename_schema;", "Catalog operation rename_schema" ]
+[ "sqlcatalog", "rename_table", "pattern
sqlcatalog.rename_table(sname:str, tname:str, newnme:str):void ",
"SQLrename_table;", "Catalog operation rename_table" ]
[ "sqlcatalog", "rename_user", "pattern
sqlcatalog.rename_user(sname:str, newnme:str, action:int):void ",
"SQLrename_user;", "Catalog operation rename_user" ]
[ "sqlcatalog", "revoke", "pattern sqlcatalog.revoke(sname:str,
tbl:str, grantee:str, privs:int, cname:str, grant:int, grantor:int):void ",
"SQLrevoke;", "Catalog operation revoke" ]
[ "sqlcatalog", "revoke_function", "pattern
sqlcatalog.revoke_function(sname:str, fcnid:int, grantee:str, privs:int,
grant:int, grantor:int):void ", "SQLrevoke_function;", "Catalog
operation revoke_function" ]
@@ -15546,6 +15549,9 @@ Ready.
[ "wlc", "master", "pattern wlc.master():void ", "WLCmaster;",
"Activate the workload-capture-replay process" ]
[ "wlc", "master", "pattern wlc.master(path:str):void ",
"WLCmaster;", "Activate the workload-capture-replay process. Use a different
location for the logs." ]
[ "wlc", "query", "pattern wlc.query(q:str):void ",
"WLCquery;", "Keep the queries for replay." ]
+[ "wlc", "rename_column", "pattern wlc.rename_column(sname:str,
tname:str, cname:str, newnme:str):void ", "WLCgeneric;", "Catalog operation
rename_column" ]
+[ "wlc", "rename_schema", "pattern wlc.rename_schema(sname:str,
newnme:str):void ", "WLCgeneric;", "Catalog operation rename_schema"
]
+[ "wlc", "rename_table", "pattern wlc.rename_table(sname:str, tname:str,
newnme:str):void ", "WLCgeneric;", "Catalog operation rename_table"
]
[ "wlc", "rename_user", "pattern wlc.rename_user(sname:str, newnme:str,
action:int):void ", "WLCgeneric;", "Catalog operation rename_user" ]
[ "wlc", "revoke", "pattern wlc.revoke(sname:str, tbl:str,
grantee:str, privs:int, cname:str, grant:int, grantor:int):void ",
"WLCgeneric;", "Catalog operation revoke" ]
[ "wlc", "revoke_function", "pattern wlc.revoke_function(sname:str,
fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ",
"WLCgeneric;", "Catalog operation revoke_function" ]
@@ -15603,6 +15609,9 @@ Ready.
[ "wlr", "grant", "pattern wlr.grant(sname:str, tbl:str,
grantee:str, privs:int, cname:str, gr:int, grantor:int):void ", "WLRgeneric;",
"Catalog operation grant" ]
[ "wlr", "grant_function", "pattern wlr.grant_function(sname:str,
fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ",
"WLRgeneric;", "Catalog operation grant_function" ]
[ "wlr", "grant_roles", "pattern wlr.grant_roles(sname:str, auth:str,
grantor:int, admin:int):void ", "WLRgeneric;", "Catalog operation
grant_roles" ]
+[ "wlr", "rename_column", "pattern wlr.rename_column(sname:str,
tname:str, cname:str, newnme:str):void ", "WLRgeneric;", "Catalog operation
rename_column" ]
+[ "wlr", "rename_schema", "pattern wlr.rename_schema(sname:str,
newnme:str):void ", "WLRgeneric;", "Catalog operation rename_schema"
]
+[ "wlr", "rename_table", "pattern wlr.rename_table(sname:str, tname:str,
newnme:str):void ", "WLRgeneric;", "Catalog operation rename_table"
]
[ "wlr", "rename_user", "pattern wlr.rename_user(sname:str, newnme:str,
action:int):void ", "WLRgeneric;", "Catalog operation rename_user" ]
[ "wlr", "replicate", "pattern wlr.replicate():void ",
"WLRreplicate;", "Roll the snapshot forward to an up-to-date clone"
]
[ "wlr", "replicate", "pattern wlr.replicate(dbname:str):void ",
"WLRreplicate;", "Roll the snapshot forward to an up-to-date clone"
]
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2555,6 +2555,9 @@ str remapRef;
str remoteRef;
void removeInstruction(MalBlkPtr mb, InstrPtr p);
void removeInstructionBlock(MalBlkPtr mb, int pc, int cnt);
+str rename_columnRef;
+str rename_schemaRef;
+str rename_tableRef;
str rename_userRef;
str replaceRef;
str replicatorRef;
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -52,7 +52,7 @@ SQLhelp sqlhelp[] = {
"ALTER TABLE [ IF EXISTS ] qname ALTER [ COLUMN ] ident SET [NOT]
NULL\n"
"ALTER TABLE [ IF EXISTS ] qname ALTER [ COLUMN ] ident DROP DEFAULT\n"
"ALTER TABLE [ IF EXISTS ] qname ALTER [ COLUMN ] ident SET STORAGE
{string | NULL}\n"
- "ALTER TABLE [ IF EXISTS ] qname ALTER [ COLUMN ] ident RENAME TO
ident\n"
+ "ALTER TABLE [ IF EXISTS ] qname RENAME [ COLUMN ] ident TO ident\n"
"ALTER TABLE [ IF EXISTS ] qname DROP [ COLUMN ] ident [ RESTRICT |
CASCADE ]\n"
"ALTER TABLE [ IF EXISTS ] qname DROP CONSTRAINT ident [ RESTRICT |
CASCADE ]\n"
"ALTER TABLE [ IF EXISTS ] qname SET { { READ | INSERT } ONLY | READ
WRITE }\n"
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -1123,11 +1123,11 @@ alter_statement:
append_string(l, $7);
append_int(l, $3);
$$ = _symbol_create_list( SQL_RENAME_TABLE, l ); }
- | ALTER TABLE if_exists qname ALTER opt_column ident RENAME TO ident
+ | ALTER TABLE if_exists qname RENAME opt_column ident TO ident
{ dlist *l = L();
append_list(l, $4);
append_string(l, $7);
- append_string(l, $10);
+ append_string(l, $9);
append_int(l, $3);
$$ = _symbol_create_list( SQL_RENAME_COLUMN, l); }
| ALTER USER ident passwd_schema
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
@@ -26,63 +26,31 @@ stderr of test 'alter_table` in director
# cmdline opt gdk_debug = 536870922
-MAPI = (monetdb) /var/tmp/mtest-22572/.s.monetdb.35667
-QUERY = ALTER TABLE tmp RENAME TO tmp_new;
-ERROR = !syntax error, unexpected RENAME, expecting DROP or SET or ALTER or
ADD in: "alter table tmp rename"
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
-QUERY = SELECT * FROM tmp_new;
-ERROR = !SELECT: no such table 'tmp_new'
-CODE = 42S02
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+MAPI = (monetdb) /var/tmp/mtest-12131/.s.monetdb.33576
QUERY = ALTER TABLE tmp RENAME TO tmp_new2;
-ERROR = !syntax error, unexpected RENAME, expecting DROP or SET or ALTER or
ADD in: "alter table tmp rename"
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
-QUERY = SELECT * FROM tmp_new;
-ERROR = !SELECT: no such table 'tmp_new'
+ERROR = !ALTER TABLE: no such table 'tmp' in schema 'sys'
CODE = 42S02
MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
QUERY = SELECT * FROM tmp_new2;
ERROR = !SELECT: no such table 'tmp_new2'
CODE = 42S02
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
-QUERY = DROP TABLE tmp_new;
-ERROR = !DROP TABLE: no such table 'tmp_new'
-CODE = 42S02
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+MAPI = (monetdb) /var/tmp/mtest-12131/.s.monetdb.33576
QUERY = DROP TABLE tmp_new2;
ERROR = !DROP TABLE: no such table 'tmp_new2'
CODE = 42S02
MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
QUERY = ALTER INDEX onek_unique1 RENAME TO tmp_onek_unique1;
-ERROR = !syntax error, unexpected INDEX, expecting USER or SEQUENCE or TABLE
in: "alter index"
+ERROR = !syntax error, unexpected INDEX, expecting USER or SEQUENCE or SCHEMA
or TABLE in: "alter index"
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
QUERY = ALTER INDEX tmp_onek_unique1 RENAME TO onek_unique1;
-ERROR = !syntax error, unexpected INDEX, expecting USER or SEQUENCE or TABLE
in: "alter index"
+ERROR = !syntax error, unexpected INDEX, expecting USER or SEQUENCE or SCHEMA
or TABLE in: "alter index"
CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
-QUERY = ALTER TABLE tmp_view RENAME TO tmp_view_new;
-ERROR = !syntax error, unexpected RENAME, expecting DROP or SET or ALTER or
ADD in: "alter table tmp_view rename"
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+MAPI = (monetdb) /var/tmp/mtest-12131/.s.monetdb.33576
QUERY = ANALYZE tenk1;
ERROR = !Schema 'tenk1' does not exist
CODE = 3F000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
-QUERY = DROP VIEW tmp_view_new;
-ERROR = !DROP VIEW: unknown view 'tmp_view_new'
-CODE = 42S02
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
-QUERY = alter table stud_emp rename to pg_toast_stud_emp;
-ERROR = !syntax error, unexpected RENAME, expecting DROP or SET or ALTER or
ADD in: "alter table stud_emp rename"
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
-QUERY = alter table pg_toast_stud_emp rename to stud_emp;
-ERROR = !syntax error, unexpected RENAME, expecting DROP or SET or ALTER or
ADD in: "alter table pg_toast_stud_emp rename"
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+MAPI = (monetdb) /var/tmp/mtest-12131/.s.monetdb.33576
QUERY = ALTER TABLE tmp3 add constraint tmpconstr foreign key(c) references
tmp2 match full;
ERROR = !CONSTRAINT FOREIGN KEY: no such column 'c' in table 'tmp3'
CODE = 42S22
@@ -557,13 +525,13 @@ ERROR = !syntax error, unexpected NOT, e
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
QUERY = alter table atacc1 rename a to x;
-ERROR = !syntax error, unexpected RENAME, expecting DROP or SET or ALTER or
ADD in: "alter table atacc1 rename"
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+ERROR = !ALTER TABLE: no such column 'a' in table 'atacc1'
+CODE = 42S22
+MAPI = (monetdb) /var/tmp/mtest-19257/.s.monetdb.38172
QUERY = alter table atacc1 rename "........pg.dropped.1........" to x;
-ERROR = !syntax error, unexpected RENAME, expecting DROP or SET or ALTER or
ADD in: "alter table atacc1 rename"
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+ERROR = !ALTER TABLE: no such column '........pg.dropped.1........' in table
'atacc1'
+CODE = 42S22
+MAPI = (monetdb) /var/tmp/mtest-19257/.s.monetdb.38172
QUERY = alter table atacc1 add primary key(a);
ERROR = !CONSTRAINT PRIMARY KEY: no such column 'a' for table 'atacc1'
CODE = 42S22
@@ -677,27 +645,15 @@ QUERY = 31 32
select * from test;
ERROR = !syntax error, unexpected sqlINT in: "31"
CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
-QUERY = alter table renameColumnChild rename column a to d;
-ERROR = !syntax error, unexpected RENAME, expecting DROP or SET or ALTER or
ADD in: "alter table renamecolumnchild rename"
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+MAPI = (monetdb) /var/tmp/mtest-19257/.s.monetdb.38172
QUERY = alter table /* only */ renameColumnChild rename column a to d;
-ERROR = !syntax error, unexpected RENAME, expecting DROP or SET or ALTER or
ADD in: "alter table /* only */ renamecolumnchild rename"
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
-QUERY = alter table /* only */ renameColumn rename column a to d;
-ERROR = !syntax error, unexpected RENAME, expecting DROP or SET or ALTER or
ADD in: "alter table /* only */ renamecolumn rename"
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+ERROR = !ALTER TABLE: no such column 'a' in table 'renamecolumnchild'
+CODE = 42S22
+MAPI = (monetdb) /var/tmp/mtest-19257/.s.monetdb.38172
QUERY = alter table renameColumn rename column a to d;
-ERROR = !syntax error, unexpected RENAME, expecting DROP or SET or ALTER or
ADD in: "alter table renamecolumn rename"
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
-QUERY = alter table renameColumnChild rename column b to a;
-ERROR = !syntax error, unexpected RENAME, expecting DROP or SET or ALTER or
ADD in: "alter table renamecolumnchild rename"
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+ERROR = !ALTER TABLE: no such column 'a' in table 'renamecolumn'
+CODE = 42S22
+MAPI = (monetdb) /var/tmp/mtest-19257/.s.monetdb.38172
QUERY = select f1 from c1;
ERROR = !SELECT: identifier 'f1' unknown
CODE = 42000
@@ -749,11 +705,11 @@ ERROR = !SELECT: identifier 'oid' unknow
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
QUERY = alter table altwithoid set without oids;
-ERROR = !syntax error, unexpected IDENT, expecting INSERT or READ in: "alter
table altwithoid set without"
+ERROR = !syntax error, unexpected IDENT, expecting INSERT or READ or TABLE in:
"alter table altwithoid set without"
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
QUERY = alter table altinhoid set without oids;
-ERROR = !syntax error, unexpected IDENT, expecting INSERT or READ in: "alter
table altinhoid set without"
+ERROR = !syntax error, unexpected IDENT, expecting INSERT or READ or TABLE in:
"alter table altinhoid set without"
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
QUERY = select oid > 0, * from altinhoid; -- fails
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
@@ -114,12 +114,22 @@ Ready.
#CREATE TABLE tmp (regtable int);
#CREATE TEMP TABLE tmp (tmptable int);
#SELECT * FROM tmp;
-% sys.tmp # table_name
+% tmp.tmp # table_name
+% tmptable # name
+% int # type
+% 1 # length
+#SELECT * FROM tmp_new;
+% sys.tmp_new # table_name
% regtable # name
% int # type
% 1 # length
#SELECT * FROM tmp; -- should fail
-% sys.tmp # table_name
+% tmp.tmp # table_name
+% tmptable # name
+% int # type
+% 1 # length
+#SELECT * FROM tmp_new;
+% sys.tmp_new # table_name
% regtable # name
% int # type
% 1 # length
diff --git a/sql/test/pg_regress/Tests/drop.stable.err
b/sql/test/pg_regress/Tests/drop.stable.err
--- a/sql/test/pg_regress/Tests/drop.stable.err
+++ b/sql/test/pg_regress/Tests/drop.stable.err
@@ -192,11 +192,7 @@ MAPI = (monetdb) /var/tmp/mtest-30274/.
QUERY = DROP INDEX bt_f8_index;
ERROR = !DROP INDEX: no such index 'bt_f8_index'
CODE = 42S12
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
-QUERY = DROP TABLE tenk1;
-ERROR = !DROP TABLE: unable to drop table tenk1 (there are database objects
which depend on it)
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+MAPI = (monetdb) /var/tmp/mtest-12131/.s.monetdb.33576
QUERY = DROP TABLE xacttest;
ERROR = !DROP TABLE: no such table 'xacttest'
CODE = 42S02
diff --git a/sql/test/rename/Tests/rename03.sql
b/sql/test/rename/Tests/rename03.sql
--- a/sql/test/rename/Tests/rename03.sql
+++ b/sql/test/rename/Tests/rename03.sql
@@ -18,8 +18,8 @@ select * from "ichanged";
select "name" from sys.columns where "table_id" in (select "id" from
sys.tables where "name" = 'rename');
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
