This is an automated email from the ASF dual-hosted git repository.
pradeep pushed a commit to branch RANGER-5217_master
in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 45cf4a0e73e18b1ad519b7d7266827872b70ddf4
Author: Pradeep AgrawaL <prad...@apache.org>
AuthorDate: Fri May 30 18:49:13 2025 +0530
RANGER-5217: Fix mysql db patch 070-add-gds-perm.sql
---
.../db/mysql/patches/070-add-gds-perm.sql | 69 ++++++++++++----------
1 file changed, 39 insertions(+), 30 deletions(-)
diff --git a/security-admin/db/mysql/patches/070-add-gds-perm.sql
b/security-admin/db/mysql/patches/070-add-gds-perm.sql
index e0b1b59e3..792c04ec2 100644
--- a/security-admin/db/mysql/patches/070-add-gds-perm.sql
+++ b/security-admin/db/mysql/patches/070-add-gds-perm.sql
@@ -14,54 +14,63 @@
-- limitations under the License.
+DROP PROCEDURE IF EXISTS getXportalUIdByLoginId;
+
DELIMITER $$
-DROP PROCEDURE if exists getXportalUIdByLoginId$$
CREATE PROCEDURE `getXportalUIdByLoginId`(IN input_val VARCHAR(100), OUT myid
BIGINT)
BEGIN
-SET myid = 0;
-SELECT x_portal_user.id into myid FROM x_portal_user WHERE
x_portal_user.login_id = input_val;
+ SET myid = 0;
+ SELECT x_portal_user.id INTO myid FROM x_portal_user WHERE
x_portal_user.login_id = input_val;
END $$
-
DELIMITER ;
+DROP PROCEDURE IF EXISTS getModulesIdByName;
+
DELIMITER $$
-DROP PROCEDURE if exists getModulesIdByName$$
CREATE PROCEDURE `getModulesIdByName`(IN input_val VARCHAR(100), OUT myid
BIGINT)
BEGIN
-SET myid = 0;
-SELECT x_modules_master.id into myid FROM x_modules_master WHERE
x_modules_master.module = input_val;
+ SET myid = 0;
+ SELECT x_modules_master.id INTO myid FROM x_modules_master WHERE
x_modules_master.module = input_val;
END $$
-
DELIMITER ;
+DROP PROCEDURE IF EXISTS insertRangerPrerequisiteGDSEntries;
DELIMITER $$
-DROP PROCEDURE if exists insertRangerPrerequisiteGDSEntries $$
CREATE PROCEDURE `insertRangerPrerequisiteGDSEntries`()
BEGIN
-DECLARE adminID bigint;
-DECLARE moduleIdGovernedDataSharing bigint;
-DECLARE rangerusersyncID bigint;
-DECLARE rangertagsyncID bigint;
+ DECLARE adminID BIGINT;
+ DECLARE moduleIdGovernedDataSharing BIGINT;
+ DECLARE rangerusersyncID BIGINT;
+ DECLARE rangertagsyncID BIGINT;
+
+ CALL getXportalUIdByLoginId('admin', adminID);
+ CALL getXportalUIdByLoginId('rangerusersync', rangerusersyncID);
+ CALL getXportalUIdByLoginId('rangertagsync', rangertagsyncID);
-call getXportalUIdByLoginId('admin', adminID);
-call getXportalUIdByLoginId('rangerusersync', rangerusersyncID);
-call getXportalUIdByLoginId('rangertagsync', rangertagsyncID);
+ IF NOT EXISTS (SELECT * FROM x_modules_master WHERE module='Governed Data
Sharing') THEN
+ INSERT INTO `x_modules_master`
(`create_time`,`update_time`,`added_by_id`,`upd_by_id`,`module`,`url`)
+ VALUES (UTC_TIMESTAMP(),UTC_TIMESTAMP(),adminID,adminID,'Governed Data
Sharing','');
+ END IF;
-if not exists (select * from x_modules_master where module='Governed Data
Sharing') then
- INSERT INTO `x_modules_master`
(`create_time`,`update_time`,`added_by_id`,`upd_by_id`,`module`,`url`) VALUES
(UTC_TIMESTAMP(),UTC_TIMESTAMP(),adminID,adminID,'Governed Data Sharing','');
-end if;
-call getModulesIdByName('Governed Data Sharing', moduleIdGovernedDataSharing);
-if not exists (select * from x_user_module_perm where user_id=adminID and
module_id=moduleIdGovernedDataSharing) then
- INSERT INTO x_user_module_perm
(user_id,module_id,create_time,update_time,added_by_id,upd_by_id,is_allowed)
VALUES
(adminID,moduleIdGovernedDataSharing,UTC_TIMESTAMP(),UTC_TIMESTAMP(),adminID,adminID,1);
-end if;
-if not exists (select * from x_user_module_perm where user_id=rangerusersyncID
and module_id=moduleIdGovernedDataSharing) then
- INSERT INTO x_user_module_perm
(user_id,module_id,create_time,update_time,added_by_id,upd_by_id,is_allowed)
VALUES
(rangerusersyncID,moduleIdGovernedDataSharing,UTC_TIMESTAMP(),UTC_TIMESTAMP(),adminID,adminID,1);
-end if;
-if not exists (select * from x_user_module_perm where user_id=rangertagsyncID
and module_id=moduleIdGovernedDataSharing) then
- INSERT INTO x_user_module_perm
(user_id,module_id,create_time,update_time,added_by_id,upd_by_id,is_allowed)
VALUES
(rangertagsyncID,moduleIdGovernedDataSharing,UTC_TIMESTAMP(),UTC_TIMESTAMP(),adminID,adminID,1);
-end if;
+ CALL getModulesIdByName('Governed Data Sharing',
moduleIdGovernedDataSharing);
+
+ IF NOT EXISTS (SELECT * FROM x_user_module_perm WHERE user_id=adminID AND
module_id=moduleIdGovernedDataSharing) THEN
+ INSERT INTO x_user_module_perm
(user_id,module_id,create_time,update_time,added_by_id,upd_by_id,is_allowed)
+ VALUES
(adminID,moduleIdGovernedDataSharing,UTC_TIMESTAMP(),UTC_TIMESTAMP(),adminID,adminID,1);
+ END IF;
+
+ IF NOT EXISTS (SELECT * FROM x_user_module_perm WHERE
user_id=rangerusersyncID AND module_id=moduleIdGovernedDataSharing) THEN
+ INSERT INTO x_user_module_perm
(user_id,module_id,create_time,update_time,added_by_id,upd_by_id,is_allowed)
+ VALUES
(rangerusersyncID,moduleIdGovernedDataSharing,UTC_TIMESTAMP(),UTC_TIMESTAMP(),adminID,adminID,1);
+ END IF;
+
+ IF NOT EXISTS (SELECT * FROM x_user_module_perm WHERE
user_id=rangertagsyncID AND module_id=moduleIdGovernedDataSharing) THEN
+ INSERT INTO x_user_module_perm
(user_id,module_id,create_time,update_time,added_by_id,upd_by_id,is_allowed)
+ VALUES
(rangertagsyncID,moduleIdGovernedDataSharing,UTC_TIMESTAMP(),UTC_TIMESTAMP(),adminID,adminID,1);
+ END IF;
END $$
DELIMITER ;
-call insertRangerPrerequisiteGDSEntries();
+
+CALL insertRangerPrerequisiteGDSEntries();
