Changeset: a3d2bbce308d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3d2bbce308d
Added Files:
sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.SQL.py
Removed Files:
sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.sql
sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.test
sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.sql
sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.stable.err
sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.stable.out
sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.test
Modified Files:
sql/test/BugTracker-2009/Tests/temp_table_fail_leaves_data.SF-2793286.test
sql/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.test
sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.stable.err
sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.stable.out
sql/test/BugTracker-2015/Tests/All
Branch: mtest
Log Message:
Fixed a few tests.
diffs (truncated from 502 to 300 lines):
diff --git
a/sql/test/BugTracker-2009/Tests/temp_table_fail_leaves_data.SF-2793286.test
b/sql/test/BugTracker-2009/Tests/temp_table_fail_leaves_data.SF-2793286.test
--- a/sql/test/BugTracker-2009/Tests/temp_table_fail_leaves_data.SF-2793286.test
+++ b/sql/test/BugTracker-2009/Tests/temp_table_fail_leaves_data.SF-2793286.test
@@ -1,8 +1,12 @@
statement ok
create temporary table testpk (hello int, primary key(hello))
+query TT nosort
+select s.name, t.name from sys.tables t, sys.schemas s where t.name = 'testpk'
and t.schema_id = s.id
+----
+tmp
+testpk
+
statement error
-\d testpk
create temporary table testpk (hello int, primary key(hello))
-
diff --git
a/sql/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.test
b/sql/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.test
--- a/sql/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.test
+++ b/sql/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.test
@@ -3,12 +3,14 @@ create table t2748 (x varchar(1))
statement ok
copy 1 records into t2748 from stdin
+<COPY_INTO_DATA>
+\\
-statement error
-\\
+query T rowsort
select * from t2748
+----
+\
statement ok
drop table t2748
-
diff --git
a/sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.SQL.py
b/sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.SQL.py
@@ -0,0 +1,49 @@
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
+
+queries = r'''
+\f csv
+select 'bla';
+select '"'||'bla';
+select '"bla"' '"blah"';
+select 'blah''s nork';
+select E'blah\'nork';
+select E'blah\,blah';
+select E'blah \tthe \n black';
+select E'blah \t the \\n black';
+select E'blah\\blah';
+select E'\n';
+select E'\t';
+select E'\\n';
+select E'\\t';
+select E'\"blah\"';
+select '"blah"';
+'''
+
+output = r'''bla
+"""bla"
+"""bla""""blah"""
+blah's nork
+blah'nork
+"blah,blah"
+"blah \tthe \n black"
+"blah \t the \\n black"
+"blah\\blah"
+"\n"
+"\t"
+"\\n"
+"\\t"
+"""blah"""
+"""blah"""
+'''
+
+with process.client('sql', stdout=process.PIPE, stderr=process.PIPE,
+ stdin=process.PIPE, interactive=True, echo=False) as c:
+ c.stdin.write(queries)
+ out, err = c.communicate()
+ if out != output:
+ print(out)
+ if err:
+ print(err, file=sys.stderr)
diff --git
a/sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.sql
b/sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.sql
deleted file mode 100644
--- a/sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-\f csv
-select 'bla';
-select '"'||'bla';
-select '"bla"' '"blah"';
-select 'blah''s nork';
-select E'blah\'nork';
-select E'blah\,blah';
-select E'blah \tthe \n black';
-select E'blah \t the \\n black';
-select E'blah\\blah';
-select E'\n';
-select E'\t';
-select E'\\n';
-select E'\\t';
-select E'\"blah\"';
-select '"blah"';
diff --git
a/sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.stable.err
b/sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.stable.err
--- a/sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.stable.err
+++ b/sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.stable.err
@@ -1,36 +1,12 @@
stderr of test 'strange_escaping_in_csv.Bug-2133` in directory
'sql/test/BugTracker-2012` itself:
-# 16:17:11 >
-# 16:17:11 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/export/scratch2/gawade/bugDay/MonetDB/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=30788" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
-# 16:17:11 >
-
-# builtin opt gdk_dbname = demo
-# builtin opt gdk_dbfarm =
/export/scratch2/gawade/bugDay/MonetDB/var/monetdb5/dbfarm
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = yes
-# 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 gdk_dbfarm = /export/scratch2/gawade/bugDay/MonetDB/var/MonetDB
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 30788
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbname = mTests_test_BugTracker-2012
-# cmdline opt mal_listing = 0
-
-# 16:17:12 >
-# 16:17:12 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=cologne"
"--port=30788"
-# 16:17:12 >
+# 20:32:55 >
+# 20:32:55 > "/usr/bin/python3.9" "strange_escaping_in_csv.Bug-2133.SQL.py"
"strange_escaping_in_csv.Bug-2133"
+# 20:32:55 >
-# 16:17:12 >
-# 16:17:12 > "Done."
-# 16:17:12 >
+# 20:32:56 >
+# 20:32:56 > "Done."
+# 20:32:56 >
diff --git
a/sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.stable.out
b/sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.stable.out
--- a/sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.stable.out
+++ b/sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.stable.out
@@ -1,77 +1,12 @@
stdout of test 'strange_escaping_in_csv.Bug-2133` in directory
'sql/test/BugTracker-2012` itself:
-# 16:17:11 >
-# 16:17:11 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/export/scratch2/gawade/bugDay/MonetDB/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=30788" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
-# 16:17:11 >
+# 20:32:55 >
+# 20:32:55 > "/usr/bin/python3.9" "strange_escaping_in_csv.Bug-2133.SQL.py"
"strange_escaping_in_csv.Bug-2133"
+# 20:32:55 >
-# MonetDB 5 server v11.13.6
-# This is an unreleased version
-# Serving database 'mTests_test_BugTracker-2012', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 15.629 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://cologne.ins.cwi.nl:30788/
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL 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_history.sql
-# loading sql script: 16_tracelog.sql
-# loading sql script: 17_compress.sql
-# loading sql script: 18_dictionary.sql
-# loading sql script: 19_cluster.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: 24_zorder.sql
-# loading sql script: 25_debug.sql
-# loading sql script: 39_analytics.sql
-# loading sql script: 40_geom.sql
-# loading sql script: 80_udf.sql
-# loading sql script: 99_system.sql
-
-# 16:17:12 >
-# 16:17:12 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=cologne"
"--port=30788"
-# 16:17:12 >
+# 20:32:56 >
+# 20:32:56 > "Done."
+# 20:32:56 >
-bla
-"""bla"
-"""bla""""blah"""
-blah's nork
-#select E'blah\'nork';
-blah'nork
-#select E'blah\,blah';
-"blah,blah"
-"blah \tthe \n black"
-#select 'blah \t the \\n black';
-"blah \t the \\n black"
-#select 'blah\\blah';
-"blah\\blah"
-#select '\n';
-"\n"
-#select '\t';
-"\t"
-#select '\\n';
-"\\n"
-#select '\\t';
-"\\t"
-#select '\"blah\"';
-"""blah"""
-#select '"blah"';
-"""blah"""
-
-# 16:17:12 >
-# 16:17:12 > "Done."
-# 16:17:12 >
-
diff --git
a/sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.test
b/sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.test
deleted file mode 100644
--- a/sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.test
+++ /dev/null
@@ -1,75 +0,0 @@
-statement error
-\f csv
-select 'bla'
-
-query T rowsort
-select '"'||'bla'
-----
-"bla
-
-query T rowsort
-select '"bla"' '"blah"'
-----
-"bla""blah"
-
-query T rowsort
-select 'blah''s nork'
-----
-blah's nork
-
-query T rowsort
-select E'blah\'nork'
-----
-blah'nork
-
-query T rowsort
-select E'blah\,blah'
-----
-blah,blah
-
-query T rowsort
-select E'blah \tthe \n black'
-----
-blah @the @ black
-
-query T rowsort
-select E'blah \t the \\n black'
-----
-blah @ the \n black
-
-query T rowsort
-select E'blah\\blah'
-----
-blah\blah
-
-query T rowsort
-select E'\n'
-----
-@
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
