cartodb4/cartodb-postgresql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed cdb_ prefix from local variables

Browse Source
This commit is contained in:
Juan Ignacio Sánchez Lara
2015-08-17 15:23:39 +02:00
parent 653eae21b3
commit 87a955b56a
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts-available/CDB_Groups.sql
+23 -23
View File
@@ -49,16 +49,16 @@ CREATE OR REPLACE
FUNCTION cartodb.CDB_Group_AddMember(group_name text, username text) FUNCTION cartodb.CDB_Group_AddMember(group_name text, username text)
RETURNS VOID AS $$ RETURNS VOID AS $$
DECLARE DECLARE
cdb_group_role TEXT; group_role TEXT;
cdb_user_role TEXT; user_role TEXT;
BEGIN BEGIN
cdb_group_role := cartodb._CDB_Group_GroupRole(group_name); group_role := cartodb._CDB_Group_GroupRole(group_name);
cdb_user_role := cartodb._CDB_User_RoleFromUsername(username); user_role := cartodb._CDB_User_RoleFromUsername(username);
IF(cdb_group_role IS NULL OR cdb_user_role IS NULL) IF(group_role IS NULL OR user_role IS NULL)
THEN THEN
RAISE EXCEPTION 'Group role (%) and user role (%) must be already existing', cdb_group_role, cdb_user_role; RAISE EXCEPTION 'Group role (%) and user role (%) must be already existing', group_role, user_role;
END IF; END IF;
EXECUTE format('GRANT "%s" TO "%s"', cdb_group_role, cdb_user_role); EXECUTE format('GRANT "%s" TO "%s"', group_role, user_role);
PERFORM cartodb._CDB_Group_AddMember_API(current_database(), group_name, username); PERFORM cartodb._CDB_Group_AddMember_API(current_database(), group_name, username);
END END
$$ LANGUAGE PLPGSQL VOLATILE; $$ LANGUAGE PLPGSQL VOLATILE;
@@ -68,12 +68,12 @@ CREATE OR REPLACE
FUNCTION cartodb.CDB_Group_RemoveMember(group_name text, username text) FUNCTION cartodb.CDB_Group_RemoveMember(group_name text, username text)
RETURNS VOID AS $$ RETURNS VOID AS $$
DECLARE DECLARE
cdb_group_role TEXT; group_role TEXT;
cdb_user_role TEXT; user_role TEXT;
BEGIN BEGIN
cdb_group_role := cartodb._CDB_Group_GroupRole(group_name); group_role := cartodb._CDB_Group_GroupRole(group_name);
cdb_user_role := cartodb._CDB_User_RoleFromUsername(username); user_role := cartodb._CDB_User_RoleFromUsername(username);
EXECUTE format('REVOKE "%s" FROM "%s"', cdb_group_role, cdb_user_role); EXECUTE format('REVOKE "%s" FROM "%s"', group_role, user_role);
PERFORM cartodb._CDB_Group_RemoveMember_API(current_database(), group_name, username); PERFORM cartodb._CDB_Group_RemoveMember_API(current_database(), group_name, username);
END END
$$ LANGUAGE PLPGSQL VOLATILE; $$ LANGUAGE PLPGSQL VOLATILE;
@@ -83,11 +83,11 @@ CREATE OR REPLACE
FUNCTION cartodb.CDB_Group_Table_GrantRead(group_name text, username text, table_name text) FUNCTION cartodb.CDB_Group_Table_GrantRead(group_name text, username text, table_name text)
RETURNS VOID AS $$ RETURNS VOID AS $$
DECLARE DECLARE
cdb_group_role TEXT; group_role TEXT;
BEGIN BEGIN
cdb_group_role := cartodb._CDB_Group_GroupRole(group_name); group_role := cartodb._CDB_Group_GroupRole(group_name);
EXECUTE format('GRANT USAGE ON SCHEMA "%s" TO "%s"', username, cdb_group_role); EXECUTE format('GRANT USAGE ON SCHEMA "%s" TO "%s"', username, group_role);
EXECUTE format('GRANT SELECT ON TABLE "%s"."%s" TO "%s"', username, table_name, cdb_group_role ); EXECUTE format('GRANT SELECT ON TABLE "%s"."%s" TO "%s"', username, table_name, group_role );
END END
$$ LANGUAGE PLPGSQL VOLATILE; $$ LANGUAGE PLPGSQL VOLATILE;
@@ -96,11 +96,11 @@ CREATE OR REPLACE
FUNCTION cartodb.CDB_Group_Table_GrantReadWrite(group_name text, username text, table_name text) FUNCTION cartodb.CDB_Group_Table_GrantReadWrite(group_name text, username text, table_name text)
RETURNS VOID AS $$ RETURNS VOID AS $$
DECLARE DECLARE
cdb_group_role TEXT; group_role TEXT;
BEGIN BEGIN
cdb_group_role := cartodb._CDB_Group_GroupRole(group_name); group_role := cartodb._CDB_Group_GroupRole(group_name);
EXECUTE format('GRANT USAGE ON SCHEMA "%s" TO "%s"', username, cdb_group_role); EXECUTE format('GRANT USAGE ON SCHEMA "%s" TO "%s"', username, group_role);
EXECUTE format('GRANT SELECT, INSERT, UPDATE, DELETE ON TABLE "%s"."%s" TO "%s"', username, table_name, cdb_group_role); EXECUTE format('GRANT SELECT, INSERT, UPDATE, DELETE ON TABLE "%s"."%s" TO "%s"', username, table_name, group_role);
END END
$$ LANGUAGE PLPGSQL VOLATILE; $$ LANGUAGE PLPGSQL VOLATILE;
@@ -109,10 +109,10 @@ CREATE OR REPLACE
FUNCTION cartodb.CDB_Group_Table_RevokeAll(group_name text, username text, table_name text) FUNCTION cartodb.CDB_Group_Table_RevokeAll(group_name text, username text, table_name text)
RETURNS VOID AS $$ RETURNS VOID AS $$
DECLARE DECLARE
cdb_group_role TEXT; group_role TEXT;
BEGIN BEGIN
cdb_group_role := cartodb._CDB_Group_GroupRole(group_name); group_role := cartodb._CDB_Group_GroupRole(group_name);
EXECUTE format('REVOKE ALL ON TABLE "%s"."%s" FROM "%s"', username, table_name, cdb_group_role); EXECUTE format('REVOKE ALL ON TABLE "%s"."%s" FROM "%s"', username, table_name, group_role);
END END
$$ LANGUAGE PLPGSQL VOLATILE; $$ LANGUAGE PLPGSQL VOLATILE;