svn commit: r448101 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master: grantRevokeDDL.out grantRevokeDDL2.out

[mi...@apache.org]

Author: mikem
Date: Wed Sep 20 00:05:01 2006
New Revision: 448101

URL: http://svn.apache.org/viewvc?view=rev&rev=448101
Log:
DERBY-1834

master updates for previous error message change.


Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL2.out

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out?view=diff&rev=448101&r1=448100&r2=448101
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out Wed Sep 20 00:05:01 2006
@@ -40,19 +40,19 @@
 ij(SATCONNECTION)> -- Revoke table permissions not granted already. This should raise warnings.
 revoke trigger on satheesh.tsat from foo;
 0 rows inserted/updated/deleted
-WARNING 01006: Privilege not revoked from FOO.
+WARNING 01006: Privilege not revoked from user FOO.
 ij(SATCONNECTION)> revoke references on satheesh.tsat from foo;
 0 rows inserted/updated/deleted
-WARNING 01006: Privilege not revoked from FOO.
+WARNING 01006: Privilege not revoked from user FOO.
 ij(SATCONNECTION)> -- This should raise warnings for bar
 revoke insert on satheesh.tsat from foo, bar;
 0 rows inserted/updated/deleted
-WARNING 01006: Privilege not revoked from BAR.
+WARNING 01006: Privilege not revoked from user BAR.
 ij(SATCONNECTION)> -- This should raise warnings for both foo and bar
 revoke insert on satheesh.tsat from foo, bar;
 0 rows inserted/updated/deleted
-WARNING 01006: Privilege not revoked from FOO.
-WARNING 01006: Privilege not revoked from BAR.
+WARNING 01006: Privilege not revoked from user FOO.
+WARNING 01006: Privilege not revoked from user BAR.
 ij(SATCONNECTION)> grant insert on satheesh.tsat to foo;
 0 rows inserted/updated/deleted
 ij(SATCONNECTION)> -- Following revokes should revoke permissions
@@ -87,7 +87,7 @@
 ij(SATCONNECTION)> -- Revoke routine permission not granted already. This should raise a warning.
 revoke execute on function F_ABS(int) from bar RESTRICT;
 0 rows inserted/updated/deleted
-WARNING 01006: Privilege not revoked from BAR.
+WARNING 01006: Privilege not revoked from user BAR.
 ij(SATCONNECTION)> grant execute on function F_ABS to foo;
 0 rows inserted/updated/deleted
 ij(SATCONNECTION)> grant execute on function F_ABS(int) to bar;
@@ -412,10 +412,10 @@
 0 rows inserted/updated/deleted
 ij(SWIPERCONNECTION)> revoke select on swiperTab from satheesh;
 0 rows inserted/updated/deleted
-WARNING 01006: Privilege not revoked from SATHEESH.
+WARNING 01006: Privilege not revoked from user SATHEESH.
 ij(SWIPERCONNECTION)> revoke insert on swiperTab from satheesh;
 0 rows inserted/updated/deleted
-WARNING 01006: Privilege not revoked from SATHEESH.
+WARNING 01006: Privilege not revoked from user SATHEESH.
 ij(SWIPERCONNECTION)> set connection satConnection;
 ij(SATCONNECTION)> -- Should still work, as satheesh is DBA
 select * from swiper.swiperTab;
@@ -435,7 +435,7 @@
 0 rows inserted/updated/deleted
 ij(SATCONNECTION)> revoke insert on swiper.swiperTab from satheesh;
 0 rows inserted/updated/deleted
-WARNING 01006: Privilege not revoked from SATHEESH.
+WARNING 01006: Privilege not revoked from user SATHEESH.
 ij(SATCONNECTION)> -- Test system routines. Some don't need explicit grant and others do
 -- allowing for only DBA use by default
 set connection satConnection;
@@ -573,7 +573,7 @@
 ij(MAMTA4)> set connection mamta1;
 ij(MAMTA1)> revoke all privileges on t11 from PUBLIC;
 0 rows inserted/updated/deleted
-WARNING 01006: Privilege not revoked from PUBLIC.
+WARNING 01006: Privilege not revoked from user PUBLIC.
 ij(MAMTA1)> select * from mamta1.t11;
 C111       
 -----------
@@ -630,7 +630,7 @@
 1 row selected
 ij(MAMTA1)> revoke select on t11 from mamta2, mamta3, mamta4;
 0 rows inserted/updated/deleted
-WARNING 01006: Privilege not revoked from MAMTA4.
+WARNING 01006: Privilege not revoked from user MAMTA4.
 ij(MAMTA1)> revoke update(c111, c112) on t11 from mamta2, mamta3, mamta4;
 0 rows inserted/updated/deleted
 ij(MAMTA1)> drop table t11;
@@ -984,7 +984,7 @@
 ij(SATCONNECTION)> -- have the dba take away select privilege on mamta2.v21ViewTest from mamta3
 revoke select on mamta2.v21ViewTest from mamta3;
 0 rows inserted/updated/deleted
-WARNING 01006: Privilege not revoked from MAMTA3.
+WARNING 01006: Privilege not revoked from user MAMTA3.
 ij(SATCONNECTION)> set connection mamta3;
 ij(MAMTA3)> -- select from mamta2.v21ViewTest will fail this time for mamta3 because dba took away the select privilege on mamta2.v21ViewTest
 select * from mamta2.v21ViewTest;
@@ -1478,7 +1478,7 @@
 ij(MAMTA1)> -- revoke privilege will succeed this time and will drop the dependent view on that privilege
 revoke select on t11ViewTest from mamta2;
 0 rows inserted/updated/deleted
-WARNING 01006: Privilege not revoked from MAMTA2.
+WARNING 01006: Privilege not revoked from user MAMTA2.
 ij(MAMTA1)> set connection mamta2;
 ij(MAMTA2)> -- view doesn't exist anymore
 select * from v21ViewTest;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL2.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL2.out?view=diff&rev=448101&r1=448100&r2=448101
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL2.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL2.out Wed Sep 20 00:05:01 2006
@@ -314,7 +314,7 @@
 ij(USER1)> -- revoking privilege that has not been granted, expect warning
 revoke select,insert,update,delete,trigger,references on t1 from user2;
 0 rows inserted/updated/deleted
-WARNING 01006: Privilege not revoked from USER2.
+WARNING 01006: Privilege not revoked from user USER2.
 ij(USER1)> -- syntax errors, expect errors
 grant select on t1 from user2;
 ERROR: Failed with SQLSTATE 42X01
@@ -487,10 +487,10 @@
 ij(USER1)> -- expect warnings
 revoke update(c2) on t1 from user3;
 0 rows inserted/updated/deleted
-WARNING 01006: Privilege not revoked from USER3.
+WARNING 01006: Privilege not revoked from user USER3.
 ij(USER1)> revoke select(c2) on t1 from user3;
 0 rows inserted/updated/deleted
-WARNING 01006: Privilege not revoked from USER3.
+WARNING 01006: Privilege not revoked from user USER3.
 ij(USER1)> set connection user2;
 ij(USER2)> -- ok
 update user1.t1 set c2 = 'user2';
@@ -582,10 +582,10 @@
 ij(USER1)> -- expect warning
 revoke select(c1) on t3 from user2;
 0 rows inserted/updated/deleted
-WARNING 01006: Privilege not revoked from USER2.
+WARNING 01006: Privilege not revoked from user USER2.
 ij(USER1)> revoke update(c2) on t3 from user2;
 0 rows inserted/updated/deleted
-WARNING 01006: Privilege not revoked from USER2.
+WARNING 01006: Privilege not revoked from user USER2.
 ij(USER1)> set connection user2;
 ij(USER2)> select * from user1.t3;
 C1         |C2        |C3