diff --git a/src/test/regress/expected/generated_stored.out b/src/test/regress/expected/generated_stored.out index 09dd36c37c3..e28cc3919da 100644 --- a/src/test/regress/expected/generated_stored.out +++ b/src/test/regress/expected/generated_stored.out @@ -534,18 +534,18 @@ ALTER TABLE gtest10a DROP COLUMN b; INSERT INTO gtest10a (a) VALUES (1); -- privileges CREATE USER regress_user11; -CREATE TABLE gtest11s (a int PRIMARY KEY, b int, c int GENERATED ALWAYS AS (b * 2) STORED); -INSERT INTO gtest11s VALUES (1, 10), (2, 20); -GRANT SELECT (a, c) ON gtest11s TO regress_user11; +CREATE TABLE gtest11 (a int PRIMARY KEY, b int, c int GENERATED ALWAYS AS (b * 2) STORED); +INSERT INTO gtest11 VALUES (1, 10), (2, 20); +GRANT SELECT (a, c) ON gtest11 TO regress_user11; CREATE FUNCTION gf1(a int) RETURNS int AS $$ SELECT a * 3 $$ IMMUTABLE LANGUAGE SQL; REVOKE ALL ON FUNCTION gf1(int) FROM PUBLIC; -CREATE TABLE gtest12s (a int PRIMARY KEY, b int, c int GENERATED ALWAYS AS (gf1(b)) STORED); -INSERT INTO gtest12s VALUES (1, 10), (2, 20); -GRANT SELECT (a, c) ON gtest12s TO regress_user11; +CREATE TABLE gtest12 (a int PRIMARY KEY, b int, c int GENERATED ALWAYS AS (gf1(b)) STORED); +INSERT INTO gtest12 VALUES (1, 10), (2, 20); +GRANT SELECT (a, c) ON gtest12 TO regress_user11; SET ROLE regress_user11; -SELECT a, b FROM gtest11s; -- not allowed -ERROR: permission denied for table gtest11s -SELECT a, c FROM gtest11s; -- allowed +SELECT a, b FROM gtest11; -- not allowed +ERROR: permission denied for table gtest11 +SELECT a, c FROM gtest11; -- allowed a | c ---+---- 1 | 20 @@ -554,7 +554,7 @@ SELECT a, c FROM gtest11s; -- allowed SELECT gf1(10); -- not allowed ERROR: permission denied for function gf1 -SELECT a, c FROM gtest12s; -- allowed +SELECT a, c FROM gtest12; -- allowed a | c ---+---- 1 | 30 @@ -564,9 +564,9 @@ SELECT a, c FROM gtest12s; -- allowed RESET ROLE; DROP FUNCTION gf1(int); -- fail ERROR: cannot drop function gf1(integer) because other objects depend on it -DETAIL: column c of table gtest12s depends on function gf1(integer) +DETAIL: column c of table gtest12 depends on function gf1(integer) HINT: Use DROP ... CASCADE to drop the dependent objects too. -DROP TABLE gtest11s, gtest12s; +DROP TABLE gtest11, gtest12; DROP FUNCTION gf1(int); DROP USER regress_user11; -- check constraints diff --git a/src/test/regress/sql/generated_stored.sql b/src/test/regress/sql/generated_stored.sql index 9623287e517..ec45c93d180 100644 --- a/src/test/regress/sql/generated_stored.sql +++ b/src/test/regress/sql/generated_stored.sql @@ -265,26 +265,26 @@ INSERT INTO gtest10a (a) VALUES (1); -- privileges CREATE USER regress_user11; -CREATE TABLE gtest11s (a int PRIMARY KEY, b int, c int GENERATED ALWAYS AS (b * 2) STORED); -INSERT INTO gtest11s VALUES (1, 10), (2, 20); -GRANT SELECT (a, c) ON gtest11s TO regress_user11; +CREATE TABLE gtest11 (a int PRIMARY KEY, b int, c int GENERATED ALWAYS AS (b * 2) STORED); +INSERT INTO gtest11 VALUES (1, 10), (2, 20); +GRANT SELECT (a, c) ON gtest11 TO regress_user11; CREATE FUNCTION gf1(a int) RETURNS int AS $$ SELECT a * 3 $$ IMMUTABLE LANGUAGE SQL; REVOKE ALL ON FUNCTION gf1(int) FROM PUBLIC; -CREATE TABLE gtest12s (a int PRIMARY KEY, b int, c int GENERATED ALWAYS AS (gf1(b)) STORED); -INSERT INTO gtest12s VALUES (1, 10), (2, 20); -GRANT SELECT (a, c) ON gtest12s TO regress_user11; +CREATE TABLE gtest12 (a int PRIMARY KEY, b int, c int GENERATED ALWAYS AS (gf1(b)) STORED); +INSERT INTO gtest12 VALUES (1, 10), (2, 20); +GRANT SELECT (a, c) ON gtest12 TO regress_user11; SET ROLE regress_user11; -SELECT a, b FROM gtest11s; -- not allowed -SELECT a, c FROM gtest11s; -- allowed +SELECT a, b FROM gtest11; -- not allowed +SELECT a, c FROM gtest11; -- allowed SELECT gf1(10); -- not allowed -SELECT a, c FROM gtest12s; -- allowed +SELECT a, c FROM gtest12; -- allowed RESET ROLE; DROP FUNCTION gf1(int); -- fail -DROP TABLE gtest11s, gtest12s; +DROP TABLE gtest11, gtest12; DROP FUNCTION gf1(int); DROP USER regress_user11;