Changeset: d44b06dc4614 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d44b06dc4614
Added Files:
sql/test/rename/Tests/rename00.py
sql/test/rename/Tests/rename00.stable.err
sql/test/rename/Tests/rename00.stable.out
sql/test/rename/Tests/rename05.sql
sql/test/rename/Tests/rename05.stable.err
sql/test/rename/Tests/rename05.stable.out
Modified Files:
sql/backends/monet5/sql_cat.c
sql/server/rel_schema.c
sql/test/rename/Tests/All
sql/test/rename/Tests/rename02.sql
sql/test/rename/Tests/rename02.stable.err
sql/test/rename/Tests/rename02.stable.out
Branch: rename-sql
Log Message:
Added new tests and the possibility to rename the current session schema.
diffs (truncated from 526 to 300 lines):
diff --git a/sql/backends/monet5/sql_cat.c b/sql/backends/monet5/sql_cat.c
--- a/sql/backends/monet5/sql_cat.c
+++ b/sql/backends/monet5/sql_cat.c
@@ -1570,15 +1570,16 @@ SQLrename_schema(Client cntxt, MalBlkPtr
throw(SQL, "sql.rename_schema", SQLSTATE(3F000) "ALTER SCHEMA:
access denied for %s to schema '%s'", stack_get_string(sql, "current_user"),
old_name);
if (s->system)
throw(SQL, "sql.rename_schema", SQLSTATE(3F000) "ALTER SCHEMA:
cannot rename a system schema");
- if (s == cur_schema(sql))
- throw(SQL, "sql.rename_schema", SQLSTATE(3F000) "ALTER SCHEMA:
cannot rename current schema");
if (!new_name || strcmp(new_name, str_nil) == 0)
throw(SQL, "sql.rename_schema", SQLSTATE(3F000) "ALTER SCHEMA:
invalid new schema name");
if (mvc_bind_schema(sql, new_name))
throw(SQL, "sql.rename_schema", SQLSTATE(3F000) "ALTER SCHEMA:
there is a schema named '%s' in the database", new_name);
- if(!sql_trans_rename_schema(sql->session->tr, s->base.id, new_name))
+ if (!sql_trans_rename_schema(sql->session->tr, s->base.id, new_name))
throw(SQL, "sql.rename_schema",SQLSTATE(HY001) MAL_MALLOC_FAIL);
+ if (s == cur_schema(sql))
+ if(!mvc_set_schema(sql, new_name))
+ throw(SQL, "sql.rename_schema",SQLSTATE(HY001)
MAL_MALLOC_FAIL);
return msg;
}
@@ -1607,7 +1608,7 @@ SQLrename_table(Client cntxt, MalBlkPtr
if (mvc_bind_table(sql, s, new_name))
throw(SQL, "sql.rename_table", SQLSTATE(3F000) "ALTER TABLE:
there is a table named '%s' in schema '%s'", new_name, schema_name);
- if(!sql_trans_rename_table(sql->session->tr, s, t->base.id, new_name))
+ if (!sql_trans_rename_table(sql->session->tr, s, t->base.id, new_name))
throw(SQL, "sql.rename_table",SQLSTATE(HY001) MAL_MALLOC_FAIL);
return msg;
}
@@ -1636,13 +1637,13 @@ SQLrename_column(Client cntxt, MalBlkPtr
if (isView(t))
throw(SQL, "sql.rename_column", SQLSTATE(42000) "ALTER TABLE:
cannot rename column '%s': '%s' is a view", old_name, t->base.name);
if (!mvc_bind_column(sql, t, old_name))
- throw(SQL, "sql.rename_column", "ALTER TABLE: no such column
'%s' in table '%s'", old_name, t->base.name);
+ throw(SQL, "sql.rename_column", SQLSTATE(42S22) "ALTER TABLE:
no such column '%s' in table '%s'", old_name, t->base.name);
if (!new_name || strcmp(new_name, str_nil) == 0)
throw(SQL, "sql.rename_column", SQLSTATE(3F000) "ALTER TABLE:
invalid new column name");
if (mvc_bind_column(sql, t, new_name))
throw(SQL, "sql.rename_column", SQLSTATE(3F000) "ALTER TABLE:
there is a column named '%s' in table '%s'", new_name, t->base.name);
- if(!sql_trans_rename_column(sql->session->tr, t, old_name, new_name))
+ if (!sql_trans_rename_column(sql->session->tr, t, old_name, new_name))
throw(SQL, "sql.rename_column",SQLSTATE(HY001) MAL_MALLOC_FAIL);
return msg;
}
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -2449,8 +2449,8 @@ rel_rename_schema(mvc *sql, char *old_na
return sql_error(sql, 02, SQLSTATE(3F000) "ALTER SCHEMA: access
denied for %s to schema '%s'", stack_get_string(sql, "current_user"), old_name);
if (s->system)
return sql_error(sql, 02, SQLSTATE(3F000) "ALTER SCHEMA: cannot
rename a system schema");
- if (s == cur_schema(sql))
- return sql_error(sql, 02, SQLSTATE(3F000) "ALTER SCHEMA: cannot
rename current schema");
+ if (!new_name || strcmp(new_name, str_nil) == 0)
+ return sql_error(sql, 02, SQLSTATE(3F000) "ALTER SCHEMA:
invalid new schema name");
if (mvc_bind_schema(sql, new_name))
return sql_error(sql, 02, SQLSTATE(3F000) "ALTER SCHEMA: there
is a schema named '%s' in the database", new_name);
@@ -2481,7 +2481,7 @@ rel_rename_table(mvc *sql, char* schema_
if (!(t = mvc_bind_table(sql, s, old_name)))
return sql_error(sql, 02,SQLSTATE(42S02) "ALTER TABLE: no such
table '%s' in schema '%s'", old_name, schema_name);
if (t->system)
- return sql_error(sql, 02,SQLSTATE(42000) "ALTER TABLE: cannot
rename system table '%s'", old_name);
+ return sql_error(sql, 02,SQLSTATE(42000) "ALTER TABLE: cannot
rename a system table");
if (!new_name || strcmp(new_name, str_nil) == 0)
return sql_error(sql, 02,SQLSTATE(3F000) "ALTER TABLE: invalid
new table name");
if (mvc_bind_table(sql, s, new_name))
@@ -2515,11 +2515,13 @@ rel_rename_column(mvc *sql, char* schema
if (!(t = mvc_bind_table(sql, s, table_name)))
return sql_error(sql, 02, SQLSTATE(42S02) "ALTER TABLE: no such
table '%s' in schema '%s'", table_name, schema_name);
if (t->system)
- return sql_error(sql, 02, SQLSTATE(42000) "ALTER TABLE: cannot
rename system table '%s'", t->base.name);
+ return sql_error(sql, 02, SQLSTATE(42000) "ALTER TABLE: cannot
rename a column in a system table");
if (isView(t))
return sql_error(sql, 02, SQLSTATE(42000) "ALTER TABLE: cannot
rename column '%s': '%s' is a view", old_name, t->base.name);
if (!mvc_bind_column(sql, t, old_name))
- return sql_error(sql, 02, "ALTER TABLE: no such column '%s' in
table '%s'", old_name, t->base.name);
+ return sql_error(sql, 02, SQLSTATE(42S22) "ALTER TABLE: no such
column '%s' in table '%s'", old_name, t->base.name);
+ if (!new_name || strcmp(new_name, str_nil) == 0)
+ return sql_error(sql, 02, SQLSTATE(3F000) "ALTER TABLE: invalid
new column name");
if (mvc_bind_column(sql, t, new_name))
return sql_error(sql, 02, SQLSTATE(3F000) "ALTER TABLE: there
is a column named '%s' in table '%s'", new_name, t->base.name);
diff --git a/sql/test/rename/Tests/All b/sql/test/rename/Tests/All
--- a/sql/test/rename/Tests/All
+++ b/sql/test/rename/Tests/All
@@ -1,4 +1,6 @@
+rename00
rename01
rename02
rename03
rename04
+rename05
diff --git a/sql/test/rename/Tests/rename00.py
b/sql/test/rename/Tests/rename00.py
new file mode 100644
--- /dev/null
+++ b/sql/test/rename/Tests/rename00.py
@@ -0,0 +1,38 @@
+import sys
+
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
+
+def server_stop(s):
+ out, err = s.communicate()
+ sys.stdout.write(out)
+ sys.stderr.write(err)
+
+def client(input):
+ c = process.client('sql', stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE)
+ out, err = c.communicate(input)
+ sys.stdout.write(out)
+ sys.stderr.write(err)
+
+script1 = '''\
+create table "something" (a int);\
+alter table "something" rename to "newname";\
+insert into "newname" values (1);\
+select "a" from "newname";
+'''
+
+script2 = '''\
+select "name" from sys.tables where "name" = 'newname';\
+insert into "newname" values (2);\
+select "a" from "newname";\
+drop table "newname";
+'''
+
+s = process.server(args=[], stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE)
+client(script1)
+server_stop(s)
+s = process.server(args=[], stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE)
+client(script2)
+server_stop(s)
diff --git a/sql/test/rename/Tests/rename00.stable.err
b/sql/test/rename/Tests/rename00.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/rename/Tests/rename00.stable.err
@@ -0,0 +1,46 @@
+stderr of test 'rename00` in directory 'sql/test/rename` itself:
+
+
+# 10:29:39 >
+# 10:29:39 > "/usr/bin/python" "rename00.py" "rename00"
+# 10:29:39 >
+
+# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-rename-sql/BUILD/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 38500
+# cmdline opt mapi_usock = /var/tmp/mtest-14386/.s.monetdb.38500
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-rename-sql/BUILD/var/MonetDB/mTests_sql_test_rename
+# cmdline opt gdk_debug = 553648138
+# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-rename-sql/BUILD/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 38500
+# cmdline opt mapi_usock = /var/tmp/mtest-14386/.s.monetdb.38500
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-rename-sql/BUILD/var/MonetDB/mTests_sql_test_rename
+# cmdline opt gdk_debug = 553648138
+
+# 10:29:40 >
+# 10:29:40 > "Done."
+# 10:29:40 >
+
diff --git a/sql/test/rename/Tests/rename00.stable.out
b/sql/test/rename/Tests/rename00.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/rename/Tests/rename00.stable.out
@@ -0,0 +1,102 @@
+stdout of test 'rename00` in directory 'sql/test/rename` itself:
+
+
+# 10:29:39 >
+# 10:29:39 > "/usr/bin/python" "rename00.py" "rename00"
+# 10:29:39 >
+
+#create table "something" (a int);alter table "something" rename to
"newname";insert into "newname" values (1);select "a" from "newname";
+#create table "something" (a int);alter table "something" rename to
"newname";insert into "newname" values (1);select "a" from "newname";
+#create table "something" (a int);alter table "something" rename to
"newname";insert into "newname" values (1);select "a" from "newname";
+[ 1 ]
+#create table "something" (a int);alter table "something" rename to
"newname";insert into "newname" values (1);select "a" from "newname";
+% sys.newname # table_name
+% a # name
+% int # type
+% 1 # length
+[ 1 ]
+# MonetDB 5 server v11.32.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_rename', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 15.492 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://wired-142.cwi.nl:38500/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-14386/.s.monetdb.38500
+# MonetDB/GIS module loaded
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 18_index.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_views.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 60_wlcr.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_lidar.sql
+# loading sql script: 75_shp.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+# MonetDB/SQL module loaded
+#select "name" from sys.tables where "name" = 'newname';insert into "newname"
values (2);select "a" from "newname";drop table "newname";
+% .tables # table_name
+% name # name
+% varchar # type
+% 7 # length
+[ "newname" ]
+#select "name" from sys.tables where "name" = 'newname';insert into "newname"
values (2);select "a" from "newname";drop table "newname";
+[ 1 ]
+#select "name" from sys.tables where "name" = 'newname';insert into "newname"
values (2);select "a" from "newname";drop table "newname";
+% sys.newname # table_name
+% a # name
+% int # type
+% 1 # length
+[ 1 ]
+[ 2 ]
+#select "name" from sys.tables where "name" = 'newname';insert into "newname"
values (2);select "a" from "newname";drop table "newname";
+# MonetDB 5 server v11.32.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_rename', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 15.492 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://wired-142.cwi.nl:38500/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-14386/.s.monetdb.38500
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+# 10:29:40 >
+# 10:29:40 > "Done."
+# 10:29:40 >
+
diff --git a/sql/test/rename/Tests/rename02.sql
b/sql/test/rename/Tests/rename02.sql
--- a/sql/test/rename/Tests/rename02.sql
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
