Changeset: 3477e181cb85 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3477e181cb85 Modified Files: sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py Branch: mtest Log Message:
convert one in sql/test/Users/ using sqltestapi diffs (127 lines): diff --git a/sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py b/sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py --- a/sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py +++ b/sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py @@ -3,51 +3,78 @@ # Drop four users. ### -import os, sys -import pymonetdb - -def error(msg): - print(msg) - sys.exit(-1) +from MonetDBtesting.sqltest import SQLTestCase -db=os.getenv("TSTDB") -port=int(os.getenv("MAPIPORT")) -client = pymonetdb.connect(database=db, port=port, autocommit=True, user='monetdb', password='monetdb') -cursor = client.cursor() - -cursor.execute("CREATE SCHEMA newSchema"); +with SQLTestCase() as tc: + # use default connection + tc.execute("CREATE SCHEMA newSchema").assertSucceed() + tc.execute(\ + """select u.name, u.fullname, s.name from "sys"."users" u left outer join "sys"."schemas" s on u.default_schema = s.id""")\ + .assertSucceed()\ + .assertValue(0, 0, 'monetdb')\ + .assertValue(1, 0, '.snapshot') + tc.execute("CREATE USER user1 with password '1' name '1st user' schema newSchema").assertSucceed() + tc.execute("CREATE USER user2 with password '2' name '2nd user' schema newSchema").assertSucceed() + tc.execute("CREATE USER user3 with password '3' name '3rd user' schema newSchema").assertSucceed() + tc.execute("CREATE USER user4 with password '4' name '4th user' schema newSchema").assertSucceed() + res = tc.execute("""select u.name, u.fullname, s.name from "sys"."users" u left outer join "sys"."schemas" s on u.default_schema = s.id""") + res.assertValue(2, 0, 'user1') + res.assertValue(3, 0, 'user2') + res.assertValue(4, 0, 'user3') + res.assertValue(5, 0, 'user4') + tc.execute("DROP USER user1").assertSucceed() + tc.execute("DROP USER user2").assertSucceed() + tc.execute("DROP USER user3").assertSucceed() + tc.execute("DROP USER user4").assertSucceed() + tc.execute("""select u.name, u.fullname, s.name from "sys"."users" u left outer join "sys"."schemas" s on u.default_schema = s.id""").assertSucceed().assertRowCount(2) -cursor.execute("""select u.name, u.fullname, s.name from "sys"."users" u left outer join "sys"."schemas" s on u.default_schema = s.id""") -users=cursor.fetchall() -if (users[0][0] != 'monetdb'): - error('MonetDB user missing') -if (users[1][0] != '.snapshot'): - error('.snapshot user missing') + -cursor.execute("CREATE USER user1 with password '1' name '1st user' schema newSchema"); -cursor.execute("CREATE USER user2 with password '2' name '2nd user' schema newSchema"); -cursor.execute("CREATE USER user3 with password '3' name '3rd user' schema newSchema"); -cursor.execute("CREATE USER user4 with password '4' name '4th user' schema newSchema"); - -cursor.execute("""select u.name, u.fullname, s.name from "sys"."users" u left outer join "sys"."schemas" s on u.default_schema = s.id""") -users=cursor.fetchall() -if (users[2][0] != 'user1'): - error('user1 user missing') -if (users[3][0] != 'user2'): - error('user2 user missing') -if (users[4][0] != 'user3'): - error('user3 user missing') -if (users[5][0] != 'user4'): - error('user4 user missing') - -cursor.execute("DROP USER user1") -cursor.execute("DROP USER user2") -cursor.execute("DROP USER user3") -cursor.execute("DROP USER user4") - -cursor.execute("""select u.name, u.fullname, s.name from "sys"."users" u left outer join "sys"."schemas" s on u.default_schema = s.id""") -if len(cursor.fetchall()) != 2: - error('users not correctly dropped') - -cursor.close() -client.close() +#import os, sys +#import pymonetdb +# +#def error(msg): +# print(msg) +# sys.exit(-1) +# +#db=os.getenv("TSTDB") +#port=int(os.getenv("MAPIPORT")) +#client = pymonetdb.connect(database=db, port=port, autocommit=True, user='monetdb', password='monetdb') +#cursor = client.cursor() +# +#cursor.execute("CREATE SCHEMA newSchema"); +# +#cursor.execute("""select u.name, u.fullname, s.name from "sys"."users" u left outer join "sys"."schemas" s on u.default_schema = s.id""") +#users=cursor.fetchall() +#if (users[0][0] != 'monetdb'): +# error('MonetDB user missing') +#if (users[1][0] != '.snapshot'): +# error('.snapshot user missing') +# +#cursor.execute("CREATE USER user1 with password '1' name '1st user' schema newSchema"); +#cursor.execute("CREATE USER user2 with password '2' name '2nd user' schema newSchema"); +#cursor.execute("CREATE USER user3 with password '3' name '3rd user' schema newSchema"); +#cursor.execute("CREATE USER user4 with password '4' name '4th user' schema newSchema"); +# +#cursor.execute("""select u.name, u.fullname, s.name from "sys"."users" u left outer join "sys"."schemas" s on u.default_schema = s.id""") +#users=cursor.fetchall() +#if (users[2][0] != 'user1'): +# error('user1 user missing') +#if (users[3][0] != 'user2'): +# error('user2 user missing') +#if (users[4][0] != 'user3'): +# error('user3 user missing') +#if (users[5][0] != 'user4'): +# error('user4 user missing') +# +#cursor.execute("DROP USER user1") +#cursor.execute("DROP USER user2") +#cursor.execute("DROP USER user3") +#cursor.execute("DROP USER user4") +# +#cursor.execute("""select u.name, u.fullname, s.name from "sys"."users" u left outer join "sys"."schemas" s on u.default_schema = s.id""") +#if len(cursor.fetchall()) != 2: +# error('users not correctly dropped') +# +#cursor.close() +#client.close() _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list