hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 2 Activity

WIP: introduce separate database schemas #102

Closed
hsh-michaelhoennig wants to merge 57 commits from introduce-separate-database-schemas into master
pull from: introduce-separate-database-schemas
merge into: hostsharing:master
Conversation 0 Commits 57 Files Changed 293 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5183dcd044 - Show all commits

2
src/main/resources/db/changelog/1-rbac/1051-rbac-user-grant.sql
View File

@ -4,7 +4,7 @@
--changeset rbac-user-grant-GRANT-ROLE-TO-USER:1 endDelimiter:--// --changeset rbac-user-grant-GRANT-ROLE-TO-USER:1 endDelimiter:--//
-- ---------------------------------------------------------------------------- -- ----------------------------------------------------------------------------
create or replace function assumedRoleUuid() create or replace function rbac.assumedRoleUuid()
returns uuid returns uuid
stable -- leakproof stable -- leakproof
language plpgsql as $$ language plpgsql as $$

2
src/main/resources/db/changelog/1-rbac/1055-rbac-views.sql
View File

@ -150,7 +150,7 @@ create or replace function insertRbacGrant()
declare declare
newGrant RbacGrants_RV; newGrant RbacGrants_RV;
begin begin
call grantRoleToUser(assumedRoleUuid(), new.grantedRoleUuid, new.userUuid, new.assumed); call grantRoleToUser(rbac.assumedRoleUuid(), new.grantedRoleUuid, new.userUuid, new.assumed);
select grv.* select grv.*
from RbacGrants_RV grv from RbacGrants_RV grv
where grv.userUuid=new.userUuid and grv.grantedRoleUuid=new.grantedRoleUuid where grv.userUuid=new.userUuid and grv.grantedRoleUuid=new.grantedRoleUuid