Changeset: 16ee3b34875c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=16ee3b34875c
Added Files:
sql/test/prepare/Tests/prepare-types.Bug-6724.SQL.py
sql/test/prepare/Tests/prepare-types.Bug-6724.sql
sql/test/prepare/Tests/prepare-types.Bug-6724.stable.err
sql/test/prepare/Tests/prepare-types.Bug-6724.stable.out
Removed Files:
sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.sql
sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.stable.err
sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.stable.out
sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.test
Modified Files:
sql/test/BugTracker-2019/Tests/All
sql/test/prepare/Tests/All
Branch: mtest
Log Message:
move prepare-types.Bug-6724
diffs (truncated from 396 to 300 lines):
diff --git a/sql/test/BugTracker-2019/Tests/All
b/sql/test/BugTracker-2019/Tests/All
--- a/sql/test/BugTracker-2019/Tests/All
+++ b/sql/test/BugTracker-2019/Tests/All
@@ -10,7 +10,6 @@ duplicates-not-eliminated-long-CASE-stmt
subselect.Bug-6700
alter_table_set_schema.Bug-6701
crash-in-rel_dependencies.Bug-6703
-prepared-merge-statement.Bug-6706
view-where-cast-error.Bug-6712
correlated-subquery-aggregation.Bug-6714
merge-statement-aliases.Bug-6715
@@ -18,7 +17,6 @@ insert-into-select.Bug-6718
copy-into-unicode-quote.Bug-6716
select_window_function_and_asterisk.Bug-6722
disallow_duplicate_column_aliases.Bug-6723
-prepare-types.Bug-6724
prepare-non-existing-function.Bug-6725
HAVE_LIBPY3?python-aggregate-no-groups.Bug-6726
select-distinct.Bug-6728
diff --git a/sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.sql
b/sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.sql
deleted file mode 100644
--- a/sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-start transaction;
-create function mylength1(s string) returns int begin return length(s); end;
-create function mylength2(s string, i int) returns int begin return length(s)
+ i; end;
-prepare select mylength1(?);
-exec **('abc');
-prepare select mylength2(?, 2);
-exec **('abc');
-rollback;
-
-prepare select coalesce(cast(? as int), 23);
-exec **(1);
-exec **(); --error
diff --git a/sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.stable.err
b/sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.stable.err
deleted file mode 100644
--- a/sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.stable.err
+++ /dev/null
@@ -1,16 +0,0 @@
-stderr of test 'prepare-types.Bug-6724` in directory
'sql/test/BugTracker-2019` itself:
-
-
-# 11:53:57 >
-# 11:53:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30297" "--set"
"mapi_usock=/var/tmp/mtest-26605/.s.monetdb.30297" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Apr2019/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_c=true"
-# 11:53:57 >
-
-MAPI = (monetdb) /var/tmp/mtest-3187108/.s.monetdb.30091
-QUERY = exec 2(); --error
-ERROR = !EXEC called with wrong number of arguments: expected 1, got 0
-CODE = 42000
-
-# 11:53:58 >
-# 11:53:58 > "Done."
-# 11:53:58 >
-
diff --git a/sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.stable.out
b/sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.stable.out
deleted file mode 100644
--- a/sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.stable.out
+++ /dev/null
@@ -1,115 +0,0 @@
-stdout of test 'prepare-types.Bug-6724` in directory
'sql/test/BugTracker-2019` itself:
-
-
-# 11:53:57 >
-# 11:53:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30297" "--set"
"mapi_usock=/var/tmp/mtest-26605/.s.monetdb.30297" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Apr2019/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_c=true"
-# 11:53:57 >
-
-# MonetDB 5 server v11.33.4 (hg id: 551c00fc1950+)
-# This is an unreleased version
-# Serving database 'mTests_sql_test_BugTracker-2019', using 8 threads
-# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
-# Found 15.528 GiB available main-memory.
-# Copyright (c) 1993 - July 2008 CWI.
-# Copyright (c) August 2008 - 2020 MonetDB B.V., all rights reserved
-# Visit https://www.monetdb.org/ for further information
-# Listening for connection requests on
mapi:monetdb://localhost.localdomain:30297/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26605/.s.monetdb.30297
-# 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
-
-# 11:53:57 >
-# 11:53:57 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26605" "--port=30297"
-# 11:53:57 >
-
-#start transaction;
-#create function mylength1(s string) returns int begin return length(s); end;
-#create function mylength2(s string, i int) returns int begin return length(s)
+ i; end;
-#prepare select mylength1(?);
-#prepare select mylength1(?);
-% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
-% type, digits, scale, schema, table, column # name
-% varchar, int, int, str, str, str # type
-% 4, 2, 1, 0, 2, 2 # length
-[ "int", 32, 0, "", "%2", "%2" ]
-[ "clob", 0, 0, NULL, NULL, NULL ]
-#exec 7('abc');
-% .%2 # table_name
-% %2 # name
-% int # type
-% 1 # length
-[ 3 ]
-#prepare select mylength2(cast(? as string), 2);
-#prepare select mylength2(cast(? as string), 2);
-% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
-% type, digits, scale, schema, table, column # name
-% varchar, int, int, str, str, str # type
-% 4, 2, 1, 0, 2, 2 # length
-[ "int", 32, 0, "", "%2", "%2" ]
-[ "clob", 0, 0, NULL, NULL, NULL ]
-#exec 9('abc');
-% .%2 # table_name
-% %2 # name
-% int # type
-% 1 # length
-[ 5 ]
-#rollback;
-#prepare select coalesce(cast(? as int), 23);
-#prepare select coalesce(cast(? as int), 23);
-% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
-% type, digits, scale, schema, table, column # name
-% varchar, int, int, str, str, str # type
-% 3, 3, 1, 0, 2, 2 # length
-[ "int", 32, 0, "", "%3", "%3" ]
-[ "int", 32, 0, NULL, NULL, NULL ]
-#exec 2(1);
-% .%3 # table_name
-% %3 # name
-% int # type
-% 1 # length
-[ 1 ]
-
-# 11:53:58 >
-# 11:53:58 > "Done."
-# 11:53:58 >
-
diff --git a/sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.test
b/sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.test
deleted file mode 100644
--- a/sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.test
+++ /dev/null
@@ -1,34 +0,0 @@
-statement ok
-start transaction
-
-statement ok
-create function mylength1(s string) returns int begin return length(s); end
-
-statement ok
-create function mylength2(s string, i int) returns int begin return length(s)
+ i; end
-
-statement ok
-prepare select mylength1(?)
-
-statement ok
-exec **('abc')
-
-statement ok
-prepare select mylength2(?, 2)
-
-statement ok
-exec **('abc')
-
-statement ok
-rollback
-
-statement ok
-prepare select coalesce(cast(? as int), 23)
-
-statement ok
-exec **(1)
-
-statement error
-exec **()
-
-
diff --git a/sql/test/prepare/Tests/All b/sql/test/prepare/Tests/All
--- a/sql/test/prepare/Tests/All
+++ b/sql/test/prepare/Tests/All
@@ -8,3 +8,4 @@ error-clean-cache.Bug-6351
round-or-truncate.Bug-6193
prepared-statement-with-udf.Bug-6650
prepared-merge-statement.Bug-6706
+prepare-types.Bug-6724
diff --git a/sql/test/prepare/Tests/prepare-types.Bug-6724.SQL.py
b/sql/test/prepare/Tests/prepare-types.Bug-6724.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/prepare/Tests/prepare-types.Bug-6724.SQL.py
@@ -0,0 +1,9 @@
+from MonetDBtesting.sqltest import SQLTestCase
+
+with SQLTestCase() as tc:
+ # optional or default connection
+ tc.connect()
+ with open('prepare-types.Bug-6724.sql') as f:
+ tc.execute(query=None, client='mclient', stdin=f)\
+ .assertMatchStableOut(fout='prepare-types.Bug-6724.stable.out')\
+ .assertMatchStableError(ferr='prepare-types.Bug-6724.stable.err')
diff --git a/sql/test/prepare/Tests/prepare-types.Bug-6724.sql
b/sql/test/prepare/Tests/prepare-types.Bug-6724.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/prepare/Tests/prepare-types.Bug-6724.sql
@@ -0,0 +1,12 @@
+start transaction;
+create function mylength1(s string) returns int begin return length(s); end;
+create function mylength2(s string, i int) returns int begin return length(s)
+ i; end;
+prepare select mylength1(?);
+exec **('abc');
+prepare select mylength2(?, 2);
+exec **('abc');
+rollback;
+
+prepare select coalesce(cast(? as int), 23);
+exec **(1);
+exec **(); --error
diff --git a/sql/test/prepare/Tests/prepare-types.Bug-6724.stable.err
b/sql/test/prepare/Tests/prepare-types.Bug-6724.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/prepare/Tests/prepare-types.Bug-6724.stable.err
@@ -0,0 +1,16 @@
+stderr of test 'prepare-types.Bug-6724` in directory
'sql/test/BugTracker-2019` itself:
+
+
+# 11:53:57 >
+# 11:53:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30297" "--set"
"mapi_usock=/var/tmp/mtest-26605/.s.monetdb.30297" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Apr2019/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_c=true"
+# 11:53:57 >
+
+MAPI = (monetdb) /var/tmp/mtest-3187108/.s.monetdb.30091
+QUERY = exec 2(); --error
+ERROR = !EXEC called with wrong number of arguments: expected 1, got 0
+CODE = 42000
+
+# 11:53:58 >
+# 11:53:58 > "Done."
+# 11:53:58 >
+
diff --git a/sql/test/prepare/Tests/prepare-types.Bug-6724.stable.out
b/sql/test/prepare/Tests/prepare-types.Bug-6724.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/prepare/Tests/prepare-types.Bug-6724.stable.out
@@ -0,0 +1,115 @@
+stdout of test 'prepare-types.Bug-6724` in directory
'sql/test/BugTracker-2019` itself:
+
+
+# 11:53:57 >
+# 11:53:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30297" "--set"
"mapi_usock=/var/tmp/mtest-26605/.s.monetdb.30297" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Apr2019/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_c=true"
+# 11:53:57 >
+
+# MonetDB 5 server v11.33.4 (hg id: 551c00fc1950+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2019', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 15.528 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2020 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://localhost.localdomain:30297/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26605/.s.monetdb.30297
+# MonetDB/GIS module loaded
+# SQL catalog created, loading sql scripts once
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
