Changeset: 8ddaa9d25503 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8ddaa9d25503
Added Files:
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320-Windows.test
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.test
sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300-1.test
sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300-2.reqtests
sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300-2.test
sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300-3.reqtests
sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300-3.test
sql/test/BugTracker-2015/Tests/grantMonetdbToRegularUser.Bug-3771-1.test
sql/test/BugTracker-2015/Tests/grantMonetdbToRegularUser.Bug-3771-2.reqtests
sql/test/BugTracker-2015/Tests/grantMonetdbToRegularUser.Bug-3771-2.test
sql/test/BugTracker-2015/Tests/grantMonetdbToSchemaOwner.Bug-3771-1.test
sql/test/BugTracker-2015/Tests/grantMonetdbToSchemaOwner.Bug-3771-2.reqtests
sql/test/BugTracker-2015/Tests/grantMonetdbToSchemaOwner.Bug-3771-2.test
sql/test/BugTracker-2015/Tests/grantPrivilegesNonDefaultRole.Bug-3365-1.test
sql/test/BugTracker-2015/Tests/grantPrivilegesNonDefaultRole.Bug-3365-2.reqtests
sql/test/BugTracker-2015/Tests/grantPrivilegesNonDefaultRole.Bug-3365-2.test
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-1.test
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-10.reqtests
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-10.test
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-11.reqtests
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-11.test
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-12.reqtests
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-12.test
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-13.reqtests
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-13.test
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-14.reqtests
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-14.test
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-15.reqtests
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-15.test
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-2.reqtests
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-2.test
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-3.reqtests
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-3.test
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-4.reqtests
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-4.test
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-5.reqtests
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-5.test
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-6.reqtests
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-6.test
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-7.reqtests
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-7.test
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-8.reqtests
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-8.test
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-9.reqtests
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765-9.test
Removed Files:
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.SQL.py
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.py
sql/test/BugTracker-2009/dumping_tables.SF-2776908.sql
sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.SQL.py
sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300.SQL.py
sql/test/BugTracker-2013/Tests/python-explain.Bug-3380.SQL.py
sql/test/BugTracker-2015/Tests/grantMonetdbToRegularUser.Bug-3771.SQL.py
sql/test/BugTracker-2015/Tests/grantMonetdbToSchemaOwner.Bug-3771.SQL.py
sql/test/BugTracker-2015/Tests/grantPrivilegesNonDefaultRole.Bug-3365.SQL.py
sql/test/BugTracker-2015/Tests/grantRevokeAndGrantAgain.Bug-3765.SQL.py
Modified Files:
sql/test/BugTracker-2009/Tests/All
sql/test/BugTracker-2013/Tests/All
sql/test/BugTracker-2015/Tests/All
Branch: Jan2022
Log Message:
Converted a bunch of tests.
diffs (truncated from 1108 to 300 lines):
diff --git a/sql/test/BugTracker-2009/Tests/All
b/sql/test/BugTracker-2009/Tests/All
--- a/sql/test/BugTracker-2009/Tests/All
+++ b/sql/test/BugTracker-2009/Tests/All
@@ -111,7 +111,8 @@ orderby_with_row_number.SF-2895791
leftjoin_undefined.SF-2879011
like_bug.SF-2878994
use_order_column_first.SF-2686008
-copy_multiple_files.SF-2902320
+NOT_WIN32?copy_multiple_files.SF-2902320
+!NOT_WIN32?copy_multiple_files.SF-2902320-Windows
not_invalidtable_crash.SF-2927174
drop-sequence-crash.SF-2854195
arithmetic-small-values-null.SF-2921310
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320-Windows.test
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320-Windows.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320-Windows.test
@@ -0,0 +1,43 @@
+statement ok
+create table cm_tmp(i int)
+
+statement error
+plan copy into cm_tmp from '/file1','/file2'
+
+query T nosort
+plan copy into cm_tmp from E'\\file1',E'\\file2'
+----
+insert(
+| table("sys"."cm_tmp") [ "cm_tmp"."i", "cm_tmp"."%TID%" NOT NULL ]
+| union (
+| | project (
+| | | table ("sys"."copyfrom"(table("cm_tmp"), varchar "|", varchar "\n",
varchar NULL, varchar "null", varchar "\\file1", bigint(18) "-1", bigint(18)
"0", int(9) "0", varchar NULL, int(9) "0", int(9) "1"),
+| | | ) [ "cm_tmp"."i" ]
+| | ) [ "cm_tmp"."i" ],
+| | project (
+| | | table ("sys"."copyfrom"(table("cm_tmp"), varchar "|", varchar "\n",
varchar NULL, varchar "null", varchar "\\file2", bigint(18) "-1", bigint(18)
"0", int(9) "0", varchar NULL, int(9) "0", int(9) "1"),
+| | | ) [ "cm_tmp"."i" ]
+| | ) [ "cm_tmp"."i" ]
+| ) [ int(32) NULL ]
+)
+
+query T nosort
+plan copy into cm_tmp from E'a:\\file1','Z:/file2'
+----
+insert(
+| table("sys"."cm_tmp") [ "cm_tmp"."i", "cm_tmp"."%TID%" NOT NULL ]
+| union (
+| | project (
+| | | table ("sys"."copyfrom"(table("cm_tmp"), varchar "|", varchar "\n",
varchar NULL, varchar "null", varchar "a:\\file1", bigint(18) "-1", bigint(18)
"0", int(9) "0", varchar NULL, int(9) "0", int(9) "1"),
+| | | ) [ "cm_tmp"."i" ]
+| | ) [ "cm_tmp"."i" ],
+| | project (
+| | | table ("sys"."copyfrom"(table("cm_tmp"), varchar "|", varchar "\n",
varchar NULL, varchar "null", varchar "Z:/file2", bigint(18) "-1", bigint(18)
"0", int(9) "0", varchar NULL, int(9) "0", int(9) "1"),
+| | | ) [ "cm_tmp"."i" ]
+| | ) [ "cm_tmp"."i" ]
+| ) [ int(32) NULL ]
+)
+
+statement ok
+drop table cm_tmp
+
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.SQL.py
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.SQL.py
deleted file mode 100644
--- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.SQL.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from MonetDBtesting.sqltest import SQLTestCase
-import platform
-
-if platform.system() == 'Windows':
- suffix = '.Windows'
-else:
- suffix = ''
-
-with SQLTestCase() as tc:
- # optional or default connection
- tc.connect()
- with open('copy_multiple_files.SF-2902320.sql') as f:
- tc.execute(query=None, client='mclient', stdin=f)\
-
.assertMatchStableOut(fout='copy_multiple_files.SF-2902320.stable.out%s' %
(suffix))\
-
.assertMatchStableError(ferr='copy_multiple_files.SF-2902320.stable.err%s' %
(suffix))
diff --git a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql
deleted file mode 100644
--- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-create table cm_tmp(i int);
-plan copy into cm_tmp from '/file1','/file2';
-plan copy into cm_tmp from E'\\file1',E'\\file2';
-plan copy into cm_tmp from E'a:\\file1','Z:/file2';
-drop table cm_tmp;
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err
deleted file mode 100644
--- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err
+++ /dev/null
@@ -1,8 +0,0 @@
-MAPI = (monetdb) /var/tmp/mtest-20069/.s.monetdb.34504
-QUERY = plan copy into cm_tmp from E'\\file1',E'\\file2';
-ERROR = !COPY INTO: filename must have absolute path: "\\file1"
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-20069/.s.monetdb.34504
-QUERY = plan copy into cm_tmp from E'a:\\file1','Z:/file2';
-ERROR = !COPY INTO: filename must have absolute path: "a:\\file1"
-CODE = 42000
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows
deleted file mode 100644
---
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows
+++ /dev/null
@@ -1,4 +0,0 @@
-MAPI = (monetdb) /var/tmp/mtest-10609/.s.monetdb.34310
-QUERY = plan copy into cm_tmp from '/file1','/file2';
-ERROR = !COPY INTO: filename must have absolute path: "/file1"
-CODE = 42000
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
deleted file mode 100644
--- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
+++ /dev/null
@@ -1,17 +0,0 @@
-% .plan # table_name
-% rel # name
-% clob # type
-% 206 # length
-insert(
-| table("sys"."cm_tmp") [ "cm_tmp"."i", "cm_tmp"."%TID%" NOT NULL ]
-| union (
-| | project (
-| | | table ("sys"."copyfrom"(table("cm_tmp"), varchar "|", varchar "\n",
varchar NULL, varchar "null", varchar "/file1", bigint(18) "-1", bigint(18)
"0", int(9) "0", varchar NULL, int(9) "0", int(9) "1"),
-| | | ) [ "cm_tmp"."i" ]
-| | ) [ "cm_tmp"."i" ],
-| | project (
-| | | table ("sys"."copyfrom"(table("cm_tmp"), varchar "|", varchar "\n",
varchar NULL, varchar "null", varchar "/file2", bigint(18) "-1", bigint(18)
"0", int(9) "0", varchar NULL, int(9) "0", int(9) "1"),
-| | | ) [ "cm_tmp"."i" ]
-| | ) [ "cm_tmp"."i" ]
-| ) [ int(32) NULL ]
-)
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
deleted file mode 100644
---
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
+++ /dev/null
@@ -1,37 +0,0 @@
-#create table cm_tmp(i int);
-#plan copy into cm_tmp from E'\\file1',E'\\file2';
-% .plan # table_name
-% rel # name
-% clob # type
-% 207 # length
-insert(
-| table("sys"."cm_tmp") [ "cm_tmp"."i", "cm_tmp"."%TID%" NOT NULL ]
-| union (
-| | project (
-| | | table ("sys"."copyfrom"(table("cm_tmp"), varchar "|", varchar "\n",
varchar NULL, varchar "null", varchar "\\file1", bigint(18) "-1", bigint(18)
"0", int(9) "0", varchar NULL, int(9) "0", int(9) "1"),
-| | | ) [ "cm_tmp"."i" ]
-| | ) [ "cm_tmp"."i" ],
-| | project (
-| | | table ("sys"."copyfrom"(table("cm_tmp"), varchar "|", varchar "\n",
varchar NULL, varchar "null", varchar "\\file2", bigint(18) "-1", bigint(18)
"0", int(9) "0", varchar NULL, int(9) "0", int(9) "1"),
-| | | ) [ "cm_tmp"."i" ]
-| | ) [ "cm_tmp"."i" ]
-| ) [ int(32) NULL ]
-)
-#plan copy into cm_tmp from E'a:\\file1','Z:/file2';
-% .plan # table_name
-% rel # name
-% clob # type
-% 209 # length
-insert(
-| table("sys"."cm_tmp") [ "cm_tmp"."i", "cm_tmp"."%TID%" NOT NULL ]
-| union (
-| | project (
-| | | table ("sys"."copyfrom"(table("cm_tmp"), varchar "|", varchar "\n",
varchar NULL, varchar "null", varchar "a:\\file1", bigint(18) "-1", bigint(18)
"0", int(9) "0", varchar NULL, int(9) "0", int(9) "1"),
-| | | ) [ "cm_tmp"."i" ]
-| | ) [ "cm_tmp"."i" ],
-| | project (
-| | | table ("sys"."copyfrom"(table("cm_tmp"), varchar "|", varchar "\n",
varchar NULL, varchar "null", varchar "Z:/file2", bigint(18) "-1", bigint(18)
"0", int(9) "0", varchar NULL, int(9) "0", int(9) "1"),
-| | | ) [ "cm_tmp"."i" ]
-| | ) [ "cm_tmp"."i" ]
-| ) [ int(32) NULL ]
-)
diff --git a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.test
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.test
@@ -0,0 +1,29 @@
+statement ok
+create table cm_tmp(i int)
+
+query T nosort
+plan copy into cm_tmp from '/file1','/file2'
+----
+insert(
+| table("sys"."cm_tmp") [ "cm_tmp"."i", "cm_tmp"."%TID%" NOT NULL UNIQUE ]
+| union (
+| | project (
+| | | table ("sys"."copyfrom"(table("cm_tmp"), varchar "|", varchar "\n",
varchar NULL, varchar "null", varchar "/file1", bigint(18) "-1", bigint(18)
"0", int(9) "0", varchar NULL, int(9) "0", int(9) "1"),
+| | | ) [ "cm_tmp"."i" ]
+| | ) [ "cm_tmp"."i" ],
+| | project (
+| | | table ("sys"."copyfrom"(table("cm_tmp"), varchar "|", varchar "\n",
varchar NULL, varchar "null", varchar "/file2", bigint(18) "-1", bigint(18)
"0", int(9) "0", varchar NULL, int(9) "0", int(9) "1"),
+| | | ) [ "cm_tmp"."i" ]
+| | ) [ "cm_tmp"."i" ]
+| ) [ int(32) NULL ]
+)
+
+statement error
+plan copy into cm_tmp from E'\\file1',E'\\file2'
+
+statement error
+plan copy into cm_tmp from E'a:\\file1','Z:/file2'
+
+statement ok
+drop table cm_tmp
+
diff --git a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.py
b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.py
deleted file mode 100644
--- a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os, sys
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
-
-with process.client('sql',
- stdin = open(os.path.join(os.getenv('TSTSRCDIR'),
- os.path.pardir,
-
'dumping_tables.SF-2776908.sql')),
- stdout = process.PIPE, stderr = process.PIPE) as c:
- out, err = c.communicate()
- sys.stdout.write(out)
- sys.stderr.write(err)
diff --git a/sql/test/BugTracker-2009/dumping_tables.SF-2776908.sql
b/sql/test/BugTracker-2009/dumping_tables.SF-2776908.sql
deleted file mode 100644
--- a/sql/test/BugTracker-2009/dumping_tables.SF-2776908.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-\d
-\d triggers
-\d args
-create table node_tags (id integer);
-select * from node_tags;
-insert into node_tags values (1);
-select * from node_tags;
-drop table node_tags;
diff --git
a/sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.SQL.py
b/sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.SQL.py
deleted file mode 100644
--- a/sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.SQL.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import sys
-from MonetDBtesting.sqltest import SQLTestCase
-
-with SQLTestCase() as tc:
- # optional or default connection
- tc.connect()
- with open('fixed_limit_for_prepare.Bug-3208.sql') as f:
- tr = tc.execute(query=None, client='mclient', stdin=f)\
- .assertSucceeded()\
-
.assertMatchStableOut('fixed_limit_for_prepare.Bug-3208.stable.out')
- # make it pass the old way with Mtest as well
- print(tr.data)
-
diff --git a/sql/test/BugTracker-2013/Tests/All
b/sql/test/BugTracker-2013/Tests/All
--- a/sql/test/BugTracker-2013/Tests/All
+++ b/sql/test/BugTracker-2013/Tests/All
@@ -21,7 +21,9 @@ corrupt-after-restart.Bug-3282
db_users.Bug-3287
create_table_with_func.Bug-3286
add_boolean.Bug-3289
-psm_functions_and_accessrights.Bug-3300
+psm_functions_and_accessrights.Bug-3300-1
+USER=psm&PASSWD=psm?psm_functions_and_accessrights.Bug-3300-2
+psm_functions_and_accessrights.Bug-3300-3
decimal-cast.Bug-3310
hashed_exp.Bug-3313
mitosis-floor.Bug-3330
@@ -50,7 +52,6 @@ crash_after_creation_of_unique_key.Bug-3
alter_resets_readonly.Bug-3362
env_errors.Bug-3370
swapped_likejoin.Bug-3375
-python-explain.Bug-3380
case-orderby.Bug-3388
unop_vs_aggr.Bug-3885
singleton-median.Bug-3389
diff --git
a/sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300-1.test
b/sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300-1.test
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300-1.test
@@ -0,0 +1,3 @@
+statement ok
+CREATE USER "psm" WITH PASSWORD 'psm' NAME 'PSM' SCHEMA "sys"
+
diff --git
a/sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300-2.reqtests
b/sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300-2.reqtests
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300-2.reqtests
@@ -0,0 +1,1 @@
+psm_functions_and_accessrights.Bug-3300-1
diff --git
a/sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300-2.test
b/sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300-2.test
new file mode 100644
--- /dev/null
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
