Changeset: 8d17b23402fd for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8d17b23402fd Modified Files: sql/test/BugDay_2005-11-09_2.9.3/Tests/grant_public.SF-1114580.stable.err sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.err sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.out sql/test/BugTracker/Tests/revoke_role.SF-1691646.stable.err Branch: Jun2020 Log Message:
Approve after sqlstate changes. diffs (104 lines): diff --git a/sql/test/BugDay_2005-11-09_2.9.3/Tests/grant_public.SF-1114580.stable.err b/sql/test/BugDay_2005-11-09_2.9.3/Tests/grant_public.SF-1114580.stable.err --- a/sql/test/BugDay_2005-11-09_2.9.3/Tests/grant_public.SF-1114580.stable.err +++ b/sql/test/BugDay_2005-11-09_2.9.3/Tests/grant_public.SF-1114580.stable.err @@ -17,8 +17,8 @@ CODE = 42S22 MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 QUERY = GRANT INSERT ON test1114580 TO PUBLIC; ERROR = !GRANT: User/role 'public' already has this privilege -CODE = 42M32 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 +CODE = 01007 +MAPI = (monetdb) /var/tmp/mtest-114223/.s.monetdb.38057 QUERY = GRANT INSERT ON test1114580 TO PUBLIC; ERROR = !Current transaction is aborted (please ROLLBACK) CODE = 25005 diff --git a/sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.err b/sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.err --- a/sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.err +++ b/sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.err @@ -16,24 +16,7 @@ CODE = M1M05 MAPI = (monetdb) /var/tmp/mtest-30651/.s.monetdb.34282 QUERY = revoke "sysadmin" from "mydummyuser"; --error ERROR = !REVOKE: User 'mydummyuser' does not have ROLE 'sysadmin' -CODE = 42M32 -# builtin opt gdk_dbpath = /home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/monetdb5/dbfarm/demo -# builtin opt gdk_debug = 0 -# builtin opt gdk_vmtrim = no -# 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 mapi_open = true -# cmdline opt mapi_port = 34282 -# cmdline opt mapi_usock = /var/tmp/mtest-30651/.s.monetdb.34282 -# cmdline opt monet_prompt = -# cmdline opt gdk_dbpath = /home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2018 -# cmdline opt gdk_debug = 553648138 +CODE = 01006 # 17:35:20 > # 17:35:20 > "Done." diff --git a/sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.out b/sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.out --- a/sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.out +++ b/sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.out @@ -7,35 +7,35 @@ stdout of test 'grant-role-not-idempoten #create user "mydummyuser" with password 'mydummyuser' name 'mydummyuser' schema "sys"; #select count(*) from "user_role" where "login_id" in (select "id" from "sys"."auths" where "name" = 'mydummyuser'); -% sys.%3 # table_name -% %3 # name +% sys.%4 # table_name +% %4 # name % bigint # type % 1 # length [ 0 ] #grant sysadmin to mydummyuser; #set role sysadmin; #select count(*) from "user_role" where "login_id" in (select "id" from "sys"."auths" where "name" = 'mydummyuser'); -% sys.%3 # table_name -% %3 # name +% sys.%4 # table_name +% %4 # name % bigint # type % 1 # length [ 1 ] #select count(*) from "user_role" where "login_id" in (select "id" from "sys"."auths" where "name" = 'mydummyuser'); -% sys.%3 # table_name -% %3 # name +% sys.%4 # table_name +% %4 # name % bigint # type % 1 # length [ 1 ] #revoke "sysadmin" from "mydummyuser"; #select count(*) from "user_role" where "login_id" in (select "id" from "sys"."auths" where "name" = 'mydummyuser'); -% sys.%3 # table_name -% %3 # name +% sys.%4 # table_name +% %4 # name % bigint # type % 1 # length [ 0 ] #select count(*) from "user_role" where "login_id" in (select "id" from "sys"."auths" where "name" = 'mydummyuser'); -% sys.%3 # table_name -% %3 # name +% sys.%4 # table_name +% %4 # name % bigint # type % 1 # length [ 0 ] diff --git a/sql/test/BugTracker/Tests/revoke_role.SF-1691646.stable.err b/sql/test/BugTracker/Tests/revoke_role.SF-1691646.stable.err --- a/sql/test/BugTracker/Tests/revoke_role.SF-1691646.stable.err +++ b/sql/test/BugTracker/Tests/revoke_role.SF-1691646.stable.err @@ -13,7 +13,7 @@ stderr of test 'revoke_role.SF-1691646` MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395 QUERY = REVOKE auth1 from user1; ERROR = !REVOKE: no such role 'auth1' or grantee 'user1' -CODE = 42M32 +CODE = 01006 # 09:58:20 > # 09:58:20 > Done. _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
