Remove references to issue 3520503 from privileges test

Multiple places in the regression test mentioned issue 3520503 a reason
for failures. Unfortunately it's not clear what the issue is about (the
comments were added in 10cf12dc51), but the reference seems obsolete
anyway as the queries seem to work fine - the results are the same as
expected on upstream.

diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index 31ee5cc9832834f723ddda75af3ae1661ad9de64..090e4122471384d1fa0274ad3f1061a50e7a6968 100644 (file)
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -335,7 +335,7 @@ SELECT * FROM atestv1; -- ok
 
 SELECT * FROM atestv2; -- fail
 ERROR:  permission denied for relation atestv2
-SELECT * FROM atestv3; -- fail due to issue 3520503, see above
+SELECT * FROM atestv3; -- ok
  one | two | three 
 -----+-----+-------
 (0 rows)
@@ -358,7 +358,7 @@ where x < 0;
 ERROR:  permission denied for relation int8_tbl
 reset constraint_exclusion;
 CREATE VIEW atestv4 AS SELECT * FROM atestv3; -- nested view
-SELECT * FROM atestv4; -- fail due to issue 3520503, see above
+SELECT * FROM atestv4; -- ok
  one | two | three 
 -----+-----+-------
 (0 rows)
@@ -368,7 +368,6 @@ SET SESSION AUTHORIZATION regress_user2;
 -- Two complex cases:
 SELECT * FROM atestv3; -- fail
 ERROR:  permission denied for relation atestv3
--- fail due to issue 3520503, see above
 SELECT * FROM atestv4; -- ok (even though regress_user2 cannot access underlying atestv3)
  one | two | three 
 -----+-----+-------
@@ -469,7 +468,7 @@ SELECT one, two FROM atest5 NATURAL JOIN atest6; -- ok now
 (0 rows)
 
 -- test column-level privileges for INSERT and UPDATE
-INSERT INTO atest5 (two) VALUES (3); -- fail due to issue 3520503, see above
+INSERT INTO atest5 (two) VALUES (3); -- ok
 COPY atest5 FROM stdin; -- fail
 ERROR:  permission denied for relation atest5
 COPY atest5 (two) FROM stdin; -- ok
@@ -604,17 +603,17 @@ SELECT fx FROM atestp2; -- ok
 ----
 (0 rows)
 
-SELECT fy FROM atestp2; -- fail due to issue 3520503, see above
+SELECT fy FROM atestp2; -- ok
  fy 
 ----
 (0 rows)
 
-SELECT atestp2 FROM atestp2; -- fail due to issue 3520503, see above
+SELECT atestp2 FROM atestp2; -- ok
  atestp2 
 ---------
 (0 rows)
 
-SELECT oid FROM atestp2; -- fail due to issue 3520503, see above
+SELECT oid FROM atestp2; -- ok
  oid 
 -----
 (0 rows)
@@ -634,7 +633,7 @@ SELECT fy FROM atestp2; -- ok
 ----
 (0 rows)
 
-SELECT atestp2 FROM atestp2; -- fail due to issue 3520503, see above
+SELECT atestp2 FROM atestp2; -- ok
  atestp2 
 ---------
 (0 rows)
@@ -682,7 +681,7 @@ SELECT testfunc1(5); -- fail
 ERROR:  permission denied for function testfunc1
 SELECT col1 FROM atest2 WHERE col2 = true; -- fail
 ERROR:  permission denied for relation atest2
-SELECT testfunc4(true); -- fail due to issue 3520503, see above
+SELECT testfunc4(true); -- ok
  testfunc4 
 -----------
  bar

diff --git a/src/test/regress/sql/privileges.sql b/src/test/regress/sql/privileges.sql
index 0151e93c70262147ba84493dbba2bffe2647e0f1..09122394a1d5a269506b7075cef487ebb7fe4e30 100644 (file)
--- a/src/test/regress/sql/privileges.sql
+++ b/src/test/regress/sql/privileges.sql
@@ -222,7 +222,7 @@ SET SESSION AUTHORIZATION regress_user4;
 
 SELECT * FROM atestv1; -- ok
 SELECT * FROM atestv2; -- fail
-SELECT * FROM atestv3; -- fail due to issue 3520503, see above
+SELECT * FROM atestv3; -- ok
 SELECT * FROM atestv0; -- fail
 
 -- Appendrels excluded by constraints failed to check permissions in 8.4-9.2.
@@ -241,7 +241,7 @@ where x < 0;
 reset constraint_exclusion;
 
 CREATE VIEW atestv4 AS SELECT * FROM atestv3; -- nested view
-SELECT * FROM atestv4; -- fail due to issue 3520503, see above
+SELECT * FROM atestv4; -- ok
 GRANT SELECT ON atestv4 TO regress_user2;
 
 SET SESSION AUTHORIZATION regress_user2;
@@ -249,7 +249,6 @@ SET SESSION AUTHORIZATION regress_user2;
 -- Two complex cases:
 
 SELECT * FROM atestv3; -- fail
--- fail due to issue 3520503, see above
 SELECT * FROM atestv4; -- ok (even though regress_user2 cannot access underlying atestv3)
 
 SELECT * FROM atest2; -- ok
@@ -299,7 +298,7 @@ SET SESSION AUTHORIZATION regress_user4;
 SELECT one, two FROM atest5 NATURAL JOIN atest6; -- ok now
 
 -- test column-level privileges for INSERT and UPDATE
-INSERT INTO atest5 (two) VALUES (3); -- fail due to issue 3520503, see above
+INSERT INTO atest5 (two) VALUES (3); -- ok
 COPY atest5 FROM stdin; -- fail
 COPY atest5 (two) FROM stdin; -- ok
 1
@@ -403,9 +402,9 @@ GRANT SELECT(fx) ON atestc TO regress_user2;
 
 SET SESSION AUTHORIZATION regress_user2;
 SELECT fx FROM atestp2; -- ok
-SELECT fy FROM atestp2; -- fail due to issue 3520503, see above
-SELECT atestp2 FROM atestp2; -- fail due to issue 3520503, see above
-SELECT oid FROM atestp2; -- fail due to issue 3520503, see above
+SELECT fy FROM atestp2; -- ok
+SELECT atestp2 FROM atestp2; -- ok
+SELECT oid FROM atestp2; -- ok
 SELECT fy FROM atestc; -- fail
 
 SET SESSION AUTHORIZATION regress_user1;
@@ -414,7 +413,7 @@ GRANT SELECT(fy,oid) ON atestc TO regress_user2;
 SET SESSION AUTHORIZATION regress_user2;
 SELECT fx FROM atestp2; -- still ok
 SELECT fy FROM atestp2; -- ok
-SELECT atestp2 FROM atestp2; -- fail due to issue 3520503, see above
+SELECT atestp2 FROM atestp2; -- ok
 SELECT oid FROM atestp2; -- ok
 
 -- privileges on functions, languages
@@ -449,7 +448,7 @@ CREATE FUNCTION testfunc3(int) RETURNS int AS 'select 2 * $1;' LANGUAGE sql; --
 SET SESSION AUTHORIZATION regress_user3;
 SELECT testfunc1(5); -- fail
 SELECT col1 FROM atest2 WHERE col2 = true; -- fail
-SELECT testfunc4(true); -- fail due to issue 3520503, see above
+SELECT testfunc4(true); -- ok
 
 SET SESSION AUTHORIZATION regress_user4;
 SELECT testfunc1(5); -- ok