Changeset: 03c6aba99937 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=03c6aba99937
Added Files:
sql/test/Tests/comment-dump.SQL.py
sql/test/Tests/comment-dump.sql
sql/test/Tests/comment-dump.stable.err
sql/test/Tests/comment-dump.stable.out
Modified Files:
sql/test/Tests/All
Branch: comment-on
Log Message:
Test msqldump comment output
diffs (truncated from 309 to 300 lines):
diff --git a/sql/test/Tests/All b/sql/test/Tests/All
--- a/sql/test/Tests/All
+++ b/sql/test/Tests/All
@@ -102,7 +102,7 @@ ifexists
ifexists-views
subqueries
comment-on
-comment-on-routine
+comment-dump
#HAVE_GEOM?trace
diff --git a/sql/test/Tests/comment-dump.SQL.py
b/sql/test/Tests/comment-dump.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/Tests/comment-dump.SQL.py
@@ -0,0 +1,28 @@
+import os, sys
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
+
+c = process.client('sql',
+ stdin = open(os.path.join(os.getenv('TSTSRCDIR'),
+ 'comment-dump.sql')),
+ stdout = process.PIPE, stderr = process.PIPE,
+ log = True)
+out, err = c.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err)
+
+d = process.client('sqldump',
+ stdout = process.PIPE, stderr = process.PIPE,
+ log = True)
+out, err = d.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err)
+
+d2 = process.client('sqldump', args=['-f'],
+ stdout = process.PIPE, stderr = process.PIPE,
+ log = True)
+out, err = d2.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err)
diff --git a/sql/test/Tests/comment-dump.sql b/sql/test/Tests/comment-dump.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/Tests/comment-dump.sql
@@ -0,0 +1,36 @@
+
+DROP SCHEMA IF EXISTS foo;
+CREATE SCHEMA foo;
+SET SCHEMA foo;
+
+COMMENT ON SCHEMA foo IS 'foo foo';
+
+CREATE TABLE tab(i INT, j DECIMAL(4,2));
+COMMENT ON TABLE tab IS 'table';
+COMMENT ON COLUMN tab.j IS 'jj';
+COMMENT ON COLUMN foo.tab.i IS 'ii';
+
+CREATE VIEW vivi AS SELECT * FROM tab;
+COMMENT ON VIEW vivi IS 'phew';
+
+CREATE INDEX idx ON tab(j,i);
+COMMENT ON INDEX idx IS 'index on j';
+
+CREATE SEQUENCE counter AS INT;
+COMMENT ON SEQUENCE counter IS 'counting';
+
+
+CREATE FUNCTION f() RETURNS INT BEGIN RETURN 42; END;
+COMMENT ON FUNCTION f() IS '0 parms';
+
+CREATE FUNCTION f(i INT) RETURNS INT BEGIN RETURN 43; END;
+COMMENT ON FUNCTION f(INT) IS '1 parm';
+
+CREATE FUNCTION f(i INT, j INT) RETURNS INT BEGIN RETURN 44; END;
+COMMENT ON FUNCTION f(INTEGER, INTEGER) IS '2 parms';
+
+CREATE FUNCTION f(i INT, j INT, k INT) RETURNS INT BEGIN RETURN 45; END;
+CREATE FUNCTION f(i INT, j INT, k INT, l INT) RETURNS INT BEGIN RETURN 45; END;
+
+CREATE PROCEDURE g() BEGIN DELETE FROM tab WHERE FALSE; END;
+COMMENT ON PROCEDURE g() IS 'proc';
diff --git a/sql/test/Tests/comment-dump.stable.err
b/sql/test/Tests/comment-dump.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/Tests/comment-dump.stable.err
@@ -0,0 +1,75 @@
+stderr of test 'comment-dump` in directory 'sql/test` itself:
+
+
+# 17:19:14 >
+# 17:19:14 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31727" "--set"
"mapi_usock=/var/tmp/mtest-32446/.s.monetdb.31727" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/Users/joeri/monets/default/var/MonetDB/mTests_sql_test" "--set"
"embedded_r=yes"
+# 17:19:14 >
+
+# builtin opt gdk_dbpath =
/Users/joeri/monets/default/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 = 31727
+# cmdline opt mapi_usock = /var/tmp/mtest-32446/.s.monetdb.31727
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/Users/joeri/monets/default/var/MonetDB/mTests_sql_test
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+#WARNING To speedup sql.password a bulk operator implementation is needed
+# X_233:bat[:str] := mal.multiplex("sql":str, "password":str,
X_208:bat[:str]);
+#WARNING To speedup sql.password a bulk operator implementation is needed
+# X_234:bat[:str] := mal.multiplex("sql":str, "password":str,
X_209:bat[:str]);
+#WARNING To speedup sql.password a bulk operator implementation is needed
+# X_235:bat[:str] := mal.multiplex("sql":str, "password":str,
X_210:bat[:str]);
+#WARNING To speedup sql.password a bulk operator implementation is needed
+# X_236:bat[:str] := mal.multiplex("sql":str, "password":str,
X_211:bat[:str]);
+#WARNING To speedup sql.password a bulk operator implementation is needed
+# X_237:bat[:str] := mal.multiplex("sql":str, "password":str,
X_212:bat[:str]);
+#WARNING To speedup sql.password a bulk operator implementation is needed
+# X_233:bat[:str] := mal.multiplex("sql":str, "password":str,
X_208:bat[:str]);
+#WARNING To speedup sql.password a bulk operator implementation is needed
+# X_234:bat[:str] := mal.multiplex("sql":str, "password":str,
X_209:bat[:str]);
+#WARNING To speedup sql.password a bulk operator implementation is needed
+# X_235:bat[:str] := mal.multiplex("sql":str, "password":str,
X_210:bat[:str]);
+#WARNING To speedup sql.password a bulk operator implementation is needed
+# X_236:bat[:str] := mal.multiplex("sql":str, "password":str,
X_211:bat[:str]);
+#WARNING To speedup sql.password a bulk operator implementation is needed
+# X_237:bat[:str] := mal.multiplex("sql":str, "password":str,
X_212:bat[:str]);
+#WARNING To speedup sql.get_value a bulk operator implementation is needed
+# X_281:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_246:bat[:str], X_256:bat[:str]);
+#WARNING To speedup sql.get_value a bulk operator implementation is needed
+# X_282:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_247:bat[:str], X_257:bat[:str]);
+#WARNING To speedup sql.get_value a bulk operator implementation is needed
+# X_283:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_248:bat[:str], X_258:bat[:str]);
+#WARNING To speedup sql.get_value a bulk operator implementation is needed
+# X_284:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_249:bat[:str], X_259:bat[:str]);
+#WARNING To speedup sql.get_value a bulk operator implementation is needed
+# X_285:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_250:bat[:str], X_260:bat[:str]);
+
+# 17:19:14 >
+# 17:19:14 > "/usr/local/opt/python/bin/python2.7" "comment-dump.SQL.py"
"comment-dump"
+# 17:19:14 >
+
+
+# 17:19:14 >
+# 17:19:14 > Mtimeout -timeout 60 mclient -lsql -ftest -tnone -Eutf-8 -i -e
--host=/var/tmp/mtest-32446 --port=31727 --database=mTests_sql_test <
"/Users/joeri/extr/monet/MonetDB/sql/test/Tests/comment-dump.sql"
+# 17:19:14 >
+
+
+# 17:19:15 >
+# 17:19:15 > Mtimeout -timeout 60 msqldump -q --host=/var/tmp/mtest-32446
--port=31727 --database=mTests_sql_test
+# 17:19:15 >
+
+
+# 17:19:15 >
+# 17:19:15 > "Done."
+# 17:19:15 >
+
diff --git a/sql/test/Tests/comment-dump.stable.out
b/sql/test/Tests/comment-dump.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/Tests/comment-dump.stable.out
@@ -0,0 +1,138 @@
+stdout of test 'comment-dump` in directory 'sql/test` itself:
+
+
+# 17:19:14 >
+# 17:19:14 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31727" "--set"
"mapi_usock=/var/tmp/mtest-32446/.s.monetdb.31727" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/Users/joeri/monets/default/var/MonetDB/mTests_sql_test" "--set"
"embedded_r=yes"
+# 17:19:14 >
+
+# MonetDB 5 server v11.28.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test', using 8 threads
+# Compiled for x86_64-apple-darwin17.3.0/64bit with 128bit integers
+# Found 16.000 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://MacBook-Pro.local:31727/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-32446/.s.monetdb.31727
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+# 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_functions.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: 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: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 97_comments.sql
+# loading sql script: 99_system.sql
+
+# 17:19:14 >
+# 17:19:14 > "/usr/local/opt/python/bin/python2.7" "comment-dump.SQL.py"
"comment-dump"
+# 17:19:14 >
+
+
+# 17:19:14 >
+# 17:19:14 > Mtimeout -timeout 60 mclient -lsql -ftest -tnone -Eutf-8 -i -e
--host=/var/tmp/mtest-32446 --port=31727 --database=mTests_sql_test <
"/Users/joeri/extr/monet/MonetDB/sql/test/Tests/comment-dump.sql"
+# 17:19:14 >
+
+#DROP SCHEMA IF EXISTS foo;
+#CREATE SCHEMA foo;
+#SET SCHEMA foo;
+#CREATE TABLE tab(i INT, j DECIMAL(4,2));
+#CREATE VIEW vivi AS SELECT * FROM tab;
+#CREATE INDEX idx ON tab(j,i);
+#CREATE SEQUENCE counter AS INT;
+#CREATE FUNCTION f() RETURNS INT BEGIN RETURN 42; END;
+#CREATE FUNCTION f(i INT) RETURNS INT BEGIN RETURN 43; END;
+#CREATE FUNCTION f(i INT, j INT) RETURNS INT BEGIN RETURN 44; END;
+#CREATE FUNCTION f(i INT, j INT, k INT) RETURNS INT BEGIN RETURN 45; END;
+#CREATE FUNCTION f(i INT, j INT, k INT, l INT) RETURNS INT BEGIN RETURN 45;
END;
+#CREATE PROCEDURE g() BEGIN DELETE FROM tab WHERE FALSE; END;
+
+# 17:19:15 >
+# 17:19:15 > Mtimeout -timeout 60 msqldump -q --host=/var/tmp/mtest-32446
--port=31727 --database=mTests_sql_test
+# 17:19:15 >
+
+START TRANSACTION;
+CREATE SCHEMA "foo" AUTHORIZATION "monetdb";
+COMMENT ON SCHEMA "foo" IS 'foo foo';
+CREATE SEQUENCE "foo"."counter" AS INTEGER;
+COMMENT ON SEQUENCE "foo"."counter" IS 'counting';
+SET SCHEMA "foo";
+CREATE TABLE "foo"."tab" (
+ "i" INTEGER,
+ "j" DECIMAL(4,2)
+);
+CREATE INDEX "idx" ON "foo"."tab" ("j", "i");
+COMMENT ON TABLE "tab" IS 'table';
+COMMENT ON COLUMN "foo"."tab"."i" IS 'ii';
+COMMENT ON COLUMN "foo"."tab"."j" IS 'jj';
+COMMENT ON INDEX "foo"."idx" IS 'index on j';
+create view vivi as select * from tab;
+create function f() returns int begin return 42; end;
+COMMENT ON FUNCTION "foo"."f"() IS '0 parms';
+create function f(i int) returns int begin return 43; end;
+COMMENT ON FUNCTION "foo"."f"(INTEGER) IS '1 parm';
+create function f(i int, j int) returns int begin return 44; end;
+COMMENT ON FUNCTION "foo"."f"(INTEGER, INTEGER) IS '2 parms';
+create function f(i int, j int, k int) returns int begin return 45; end;
+create function f(i int, j int, k int, l int) returns int begin return 45; end;
+create procedure g() begin delete from tab where false; end;
+COMMENT ON PROCEDURE "foo"."g"() IS 'proc';
+COMMENT ON VIEW "vivi" IS 'foo foo';
+SET SCHEMA "sys";
+ALTER SEQUENCE "foo"."counter" RESTART WITH 1 NO CYCLE;
+COMMIT;
+
+# 17:23:05 >
+# 17:23:05 > Mtimeout -timeout 60 msqldump -q --host=/var/tmp/mtest-32624
--port=37130 --database=mTests_sql_test -f
+# 17:23:05 >
+
+SET SCHEMA "foo";
+create function f() returns int begin return 42; end;
+COMMENT ON FUNCTION "foo"."f"() IS '0 parms';
+create function f(i int) returns int begin return 43; end;
+COMMENT ON FUNCTION "foo"."f"(INTEGER) IS '1 parm';
+create function f(i int, j int) returns int begin return 44; end;
+COMMENT ON FUNCTION "foo"."f"(INTEGER, INTEGER) IS '2 parms';
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
