Changeset: b8367e69fcdc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b8367e69fcdc
Added Files:
sql/test/miscellaneous/Tests/declared_tables.sql
sql/test/miscellaneous/Tests/declared_tables.stable.err
sql/test/miscellaneous/Tests/declared_tables.stable.out
Modified Files:
sql/server/rel_schema.c
sql/server/rel_semantic.c
sql/test/miscellaneous/Tests/All
Branch: Aug2018
Log Message:
A table can be declared outside of a sequential block as well.
diffs (168 lines):
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
@@ -2336,6 +2336,7 @@ rel_schemas(mvc *sql, symbol *s)
l->h->next->data.i_val, /* drop_action */
l->h->next->next->data.i_val); /* if exists */
} break;
+ case SQL_DECLARE_TABLE:
case SQL_CREATE_TABLE:
{
dlist *l = s->data.lval;
diff --git a/sql/server/rel_semantic.c b/sql/server/rel_semantic.c
--- a/sql/server/rel_semantic.c
+++ b/sql/server/rel_semantic.c
@@ -129,6 +129,7 @@ rel_semantic(mvc *sql, symbol *s)
case SQL_CREATE_SCHEMA:
case SQL_DROP_SCHEMA:
+ case SQL_DECLARE_TABLE:
case SQL_CREATE_TABLE:
case SQL_CREATE_VIEW:
case SQL_DROP_TABLE:
diff --git a/sql/test/miscellaneous/Tests/All b/sql/test/miscellaneous/Tests/All
--- a/sql/test/miscellaneous/Tests/All
+++ b/sql/test/miscellaneous/Tests/All
@@ -1,2 +1,3 @@
+declared_tables
#now
trace_test
diff --git a/sql/test/miscellaneous/Tests/declared_tables.sql
b/sql/test/miscellaneous/Tests/declared_tables.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/miscellaneous/Tests/declared_tables.sql
@@ -0,0 +1,6 @@
+start transaction;
+declare table iamdeclared (a int, b varchar(16));
+insert into iamdeclared values (1, 'one');
+select a, b from iamdeclared;
+drop table iamdeclared;
+rollback;
diff --git a/sql/test/miscellaneous/Tests/declared_tables.stable.err
b/sql/test/miscellaneous/Tests/declared_tables.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/miscellaneous/Tests/declared_tables.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'declared_tables` in directory 'sql/test/miscellaneous` itself:
+
+
+# 14:29:32 >
+# 14:29:32 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39353" "--set"
"mapi_usock=/var/tmp/mtest-20678/.s.monetdb.39353" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_miscellaneous"
"--set" "embedded_c=true"
+# 14:29:32 >
+
+# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Aug2018/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 = 39353
+# cmdline opt mapi_usock = /var/tmp/mtest-20678/.s.monetdb.39353
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_miscellaneous
+# cmdline opt embedded_c = true
+# cmdline opt gdk_debug = 553648138
+
+# 14:29:32 >
+# 14:29:32 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20678" "--port=39353"
+# 14:29:32 >
+
+
+# 14:29:33 >
+# 14:29:33 > "Done."
+# 14:29:33 >
+
diff --git a/sql/test/miscellaneous/Tests/declared_tables.stable.out
b/sql/test/miscellaneous/Tests/declared_tables.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/miscellaneous/Tests/declared_tables.stable.out
@@ -0,0 +1,83 @@
+stdout of test 'declared_tables` in directory 'sql/test/miscellaneous` itself:
+
+
+# 14:29:32 >
+# 14:29:32 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39353" "--set"
"mapi_usock=/var/tmp/mtest-20678/.s.monetdb.39353" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_miscellaneous"
"--set" "embedded_c=true"
+# 14:29:32 >
+
+# MonetDB 5 server v11.31.4
+# This is an unreleased version
+# Serving database 'mTests_sql_test_miscellaneous', 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:39353/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-20678/.s.monetdb.39353
+# 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
+
+Ready.
+
+# 14:29:32 >
+# 14:29:32 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20678" "--port=39353"
+# 14:29:32 >
+
+#start transaction;
+#declare table iamdeclared (a int, b varchar(16));
+#insert into iamdeclared values (1, 'one');
+[ 1 ]
+#select a, b from iamdeclared;
+% sys.iamdeclared, sys.iamdeclared # table_name
+% a, b # name
+% int, varchar # type
+% 1, 3 # length
+[ 1, "one" ]
+#drop table iamdeclared;
+#rollback;
+
+# 14:29:33 >
+# 14:29:33 > "Done."
+# 14:29:33 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
