external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/ThomasC02/citus into feature/revoke-cascade-support 

Added Support for CASCADE/RESTRICT in REVOKE statements updated testing
Issue #7105
pull/7958/head
ThomasC02 2025-04-24 13:05:40 -04:00
parent 17e4801314 b233b0a2a6
commit 1f28849d3d
4 changed files with 1474 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/distributed/commands/grant.c
View File

@ -182,6 +182,7 @@ PreprocessGrantStmt(Node *node, const char *queryString,
appendStringInfo(&ddlString, "REVOKE %s%s ON %s FROM %s",
grantOption, privsString.data, targetString.data,
granteesString.data);
<<<<<<< HEAD
if (grantStmt->behavior == DROP_CASCADE)
{
@ -192,7 +193,23 @@ PreprocessGrantStmt(Node *node, const char *queryString,
appendStringInfoString(&ddlString, " RESTRICT");
}
}
=======
>>>>>>> b233b0a2a6d590e6b2565eb8278aeec4e6021773
appendStringInfo(&ddlString, "REVOKE %s%s ON %s FROM %s",
grantOption, privsString.data, targetString.data,
granteesString.data);
if (grantStmt->behavior == DROP_CASCADE)
{
appendStringInfoString(&ddlString, " CASCADE");
}
else
{
appendStringInfoString(&ddlString, " RESTRICT");
}
}
DDLJob *ddlJob = palloc0(sizeof(DDLJob));
ObjectAddressSet(ddlJob->targetObjectAddress, RelationRelationId, relationId);
ddlJob->metadataSyncCommand = pstrdup(ddlString.data);

878
src/test/regress/expected/grant_on_table_propagation.out
View File

File diff suppressed because it is too large Load Diff

878
src/test/regress/expected/grant_on_table_propagation_0.out
View File

File diff suppressed because it is too large Load Diff

15
src/test/regress/sql/grant_on_table_propagation.sql
View File

@ -424,8 +424,19 @@ SELECT id FROM grant_table_propagated_after;
:verify_grant_table ;
:verify_grant_attributes ;
-- cleanup
REVOKE SELECT (id) ON grant_table_propagated_after FROM grant_user_0;
-- cleanup and test revoke
SET citus.log_remote_commands TO on;
set citus.grep_remote_commands = '%REVOKE%';
REVOKE SELECT (id) ON grant_table_propagated_after FROM grant_user_0 CASCADE;
RESET citus.grep_remote_commands;
RESET citus.log_remote_commands;
-- cleanup and test revoke
SET citus.log_remote_commands TO on;
set citus.grep_remote_commands = '%REVOKE%';
REVOKE SELECT (id) ON grant_table_propagated_after FROM grant_user_0 RESTRICT;
RESET citus.grep_remote_commands;
RESET citus.log_remote_commands;
:verify_grant_table ;
:verify_grant_attributes ;