Changeset: f4e0dab83bca for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f4e0dab83bca
Added Files:
sql/test/UserDump/Tests/dump.SQL.py
sql/test/UserDump/Tests/dump.stable.out
sql/test/UserDump/Tests/dump_with_test.SQL.py
sql/test/UserDump/Tests/dump_with_test.stable.out
sql/test/UserDump/Tests/dump_with_voc.SQL.py
sql/test/UserDump/Tests/dump_with_voc.stable.out
Modified Files:
sql/test/UserDump/Tests/All
sql/test/UserDump/Tests/create.SQL.py
Branch: mtest
Log Message:
convert sql/test/UserDump/
diffs (283 lines):
diff --git a/sql/test/UserDump/Tests/All b/sql/test/UserDump/Tests/All
--- a/sql/test/UserDump/Tests/All
+++ b/sql/test/UserDump/Tests/All
@@ -1,1 +1,4 @@
create
+dump
+dump_with_voc
+dump_with_test
diff --git a/sql/test/UserDump/Tests/create.SQL.py
b/sql/test/UserDump/Tests/create.SQL.py
--- a/sql/test/UserDump/Tests/create.SQL.py
+++ b/sql/test/UserDump/Tests/create.SQL.py
@@ -1,56 +1,104 @@
-import os, sys
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
+from MonetDBtesting.sqltest import SQLTestCase
-def client(lang, user = 'monetdb', passwd = 'monetdb', input = None):
- with process.client(lang, user = user, passwd = passwd,
- stdin = process.PIPE,
- stdout = process.PIPE,
- stderr = process.PIPE) as clt:
- out, err = clt.communicate(input)
- sys.stdout.write(out)
- sys.stderr.write(err)
+with SQLTestCase() as tc:
+ # optional or default connection
+ tc.connect()
+ tc.execute("""
+ create user voc with password 'voc' name 'VOC Explorer' schema sys;
+ create schema voc authorization voc;
+ alter user voc set schema voc;
+ """, client="mclient").assertSucceeded()
+ tc.connect(username='voc', password='voc')
+ tc.execute("""
+ create table foo (
+ id int,
+ v int,
+ primary key (id)
+ );
+ create view bar as select * from foo;
+ create function b(i int) returns int begin return select v from bar
where id = i; end;
+ create table a (
+ id int
+ );
+ create trigger a after insert on foo insert into a values (1);
+ """, client="mclient").assertSucceeded()
+ tc.connect(username='monetdb', password='monetdb')
+ tc.execute("""
+ create user test with password 'test' name 'Test User' schema sys;
+ create schema test authorization test;
+ alter user test set schema test;
+ """, client="mclient").assertSucceeded()
+ tc.connect(username='test', password='test')
+ tc.execute("""
+ create table foo (
+ id int,
+ v int,
+ primary key (id)
+ );
+ create view bar as select * from foo;
+ create function b(i int) returns int begin return select v from bar
where id = i; end;
+ create table a (
+ id int
+ );
+ create trigger a after insert on foo insert into a values (1);
+ create trigger test.x after insert on foo insert into a values (1);
+ create trigger "test"."z" after insert on "foo" insert into a values
(1);
+ """, client="mclient").assertSucceeded()
+
-client('sql', input = """\
-create user voc with password 'voc' name 'VOC Explorer' schema sys;
-create schema voc authorization voc;
-alter user voc set schema voc;
-""")
-client('sql', user = 'voc', passwd = 'voc', input = """\
-create table foo (
- id int,
- v int,
- primary key (id)
-);
-create view bar as select * from foo;
-create function b(i int) returns int begin return select v from bar where id =
i; end;
-create table a (
- id int
-);
-create trigger a after insert on foo insert into a values (1);
-""")
-client('sql', input = """\
-create user test with password 'test' name 'Test User' schema sys;
-create schema test authorization test;
-alter user test set schema test;
-""")
-client('sql', user = 'test', passwd = 'test', input = '''\
-create table foo (
- id int,
- v int,
- primary key (id)
-);
-create view bar as select * from foo;
-create function b(i int) returns int begin return select v from bar where id =
i; end;
-create table a (
- id int
-);
-create trigger a after insert on foo insert into a values (1);
-create trigger test.x after insert on foo insert into a values (1);
-create trigger "test"."z" after insert on "foo" insert into a values (1);
-''')
-client('sqldump')
-client('sqldump', user = 'voc', passwd = 'voc')
-client('sqldump', user = 'test', passwd = 'test')
+#import os, sys
+#try:
+# from MonetDBtesting import process
+#except ImportError:
+# import process
+#
+#def client(lang, user = 'monetdb', passwd = 'monetdb', input = None):
+# with process.client(lang, user = user, passwd = passwd,
+# stdin = process.PIPE,
+# stdout = process.PIPE,
+# stderr = process.PIPE) as clt:
+# out, err = clt.communicate(input)
+# sys.stdout.write(out)
+# sys.stderr.write(err)
+#
+#client('sql', input = """\
+#create user voc with password 'voc' name 'VOC Explorer' schema sys;
+#create schema voc authorization voc;
+#alter user voc set schema voc;
+#""")
+#client('sql', user = 'voc', passwd = 'voc', input = """\
+#create table foo (
+# id int,
+# v int,
+# primary key (id)
+#);
+#create view bar as select * from foo;
+#create function b(i int) returns int begin return select v from bar where id
= i; end;
+#create table a (
+# id int
+#);
+#create trigger a after insert on foo insert into a values (1);
+#""")
+#client('sql', input = """\
+#create user test with password 'test' name 'Test User' schema sys;
+#create schema test authorization test;
+#alter user test set schema test;
+#""")
+#client('sql', user = 'test', passwd = 'test', input = '''\
+#create table foo (
+# id int,
+# v int,
+# primary key (id)
+#);
+#create view bar as select * from foo;
+#create function b(i int) returns int begin return select v from bar where id
= i; end;
+#create table a (
+# id int
+#);
+#create trigger a after insert on foo insert into a values (1);
+#create trigger test.x after insert on foo insert into a values (1);
+#create trigger "test"."z" after insert on "foo" insert into a values (1);
+#''')
+#client('sqldump')
+#client('sqldump', user = 'voc', passwd = 'voc')
+#client('sqldump', user = 'test', passwd = 'test')
diff --git a/sql/test/UserDump/Tests/dump.SQL.py
b/sql/test/UserDump/Tests/dump.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/UserDump/Tests/dump.SQL.py
@@ -0,0 +1,6 @@
+from MonetDBtesting.sqltest import SQLTestCase
+
+with SQLTestCase() as tc:
+ # dump with default user
+ tc.connect(username='monetdb', password='monetdb')
+ tc.sqldump().assertMatchStableOut(fout='dump.stable.out')
diff --git a/sql/test/UserDump/Tests/dump.stable.out
b/sql/test/UserDump/Tests/dump.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/UserDump/Tests/dump.stable.out
@@ -0,0 +1,35 @@
+START TRANSACTION;
+CREATE USER "test" WITH ENCRYPTED PASSWORD
'ee26b0dd4af7e749aa1a8ee3c10ae9923f618980772e473f8819a5d4940e0db27ac185f8a0e1d5f84f88bc887fd67b143732c304cc5fa9ad8e6f57f50028a8ff'
NAME 'Test User' SCHEMA "sys";
+CREATE USER "voc" WITH ENCRYPTED PASSWORD
'ea45cf4e124b215a28631ec7ff0bf06e82fc26b2be7a066c9594855690fb5d42438be58d6523132384a1738cb4e5139caa1f970ebdfb422d65834d9a4ef61c0e'
NAME 'VOC Explorer' SCHEMA "sys";
+CREATE SCHEMA "test" AUTHORIZATION "test";
+CREATE SCHEMA "voc" AUTHORIZATION "voc";
+ALTER USER "test" SET SCHEMA "test";
+ALTER USER "voc" SET SCHEMA "voc";
+SET SCHEMA "voc";
+CREATE TABLE "voc"."foo" (
+ "id" INTEGER NOT NULL,
+ "v" INTEGER,
+ CONSTRAINT "foo_id_pkey" PRIMARY KEY ("id")
+);
+create view bar as select * from foo;
+create function b(i int) returns int begin return select v from bar where id =
i; end;
+CREATE TABLE "voc"."a" (
+ "id" INTEGER
+);
+create trigger a after insert on foo insert into a values (1);
+SET SCHEMA "test";
+CREATE TABLE "test"."foo" (
+ "id" INTEGER NOT NULL,
+ "v" INTEGER,
+ CONSTRAINT "foo_id_pkey" PRIMARY KEY ("id")
+);
+create view bar as select * from foo;
+create function b(i int) returns int begin return select v from bar where id =
i; end;
+CREATE TABLE "test"."a" (
+ "id" INTEGER
+);
+create trigger a after insert on foo insert into a values (1);
+create trigger test.x after insert on foo insert into a values (1);
+create trigger "test"."z" after insert on "foo" insert into a values (1);
+SET SCHEMA "sys";
+COMMIT;
diff --git a/sql/test/UserDump/Tests/dump_with_test.SQL.py
b/sql/test/UserDump/Tests/dump_with_test.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/UserDump/Tests/dump_with_test.SQL.py
@@ -0,0 +1,6 @@
+from MonetDBtesting.sqltest import SQLTestCase
+
+with SQLTestCase() as tc:
+ # dump with default user
+ tc.connect(username='test', password='test')
+ tc.sqldump().assertMatchStableOut(fout='dump_with_test.stable.out')
diff --git a/sql/test/UserDump/Tests/dump_with_test.stable.out
b/sql/test/UserDump/Tests/dump_with_test.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/UserDump/Tests/dump_with_test.stable.out
@@ -0,0 +1,16 @@
+START TRANSACTION;
+SET SCHEMA "test";
+CREATE TABLE "test"."foo" (
+ "id" INTEGER NOT NULL,
+ "v" INTEGER,
+ CONSTRAINT "foo_id_pkey" PRIMARY KEY ("id")
+);
+create view bar as select * from foo;
+create function b(i int) returns int begin return select v from bar where id =
i; end;
+CREATE TABLE "test"."a" (
+ "id" INTEGER
+);
+create trigger a after insert on foo insert into a values (1);
+create trigger test.x after insert on foo insert into a values (1);
+create trigger "test"."z" after insert on "foo" insert into a values (1);
+COMMIT;
diff --git a/sql/test/UserDump/Tests/dump_with_voc.SQL.py
b/sql/test/UserDump/Tests/dump_with_voc.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/UserDump/Tests/dump_with_voc.SQL.py
@@ -0,0 +1,6 @@
+from MonetDBtesting.sqltest import SQLTestCase
+
+with SQLTestCase() as tc:
+ # dump with default user
+ tc.connect(username='voc', password='voc')
+ tc.sqldump().assertMatchStableOut(fout='dump_with_voc.stable.out')
diff --git a/sql/test/UserDump/Tests/dump_with_voc.stable.out
b/sql/test/UserDump/Tests/dump_with_voc.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/UserDump/Tests/dump_with_voc.stable.out
@@ -0,0 +1,14 @@
+START TRANSACTION;
+SET SCHEMA "voc";
+CREATE TABLE "voc"."foo" (
+ "id" INTEGER NOT NULL,
+ "v" INTEGER,
+ CONSTRAINT "foo_id_pkey" PRIMARY KEY ("id")
+);
+create view bar as select * from foo;
+create function b(i int) returns int begin return select v from bar where id =
i; end;
+CREATE TABLE "voc"."a" (
+ "id" INTEGER
+);
+create trigger a after insert on foo insert into a values (1);
+COMMIT;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
