From a5e654e251b2cc69234d917adad44c281fc0af95 Mon Sep 17 00:00:00 2001 From: abhishek8shankar Date: Mon, 6 Jul 2026 02:07:53 +0530 Subject: [PATCH] 1899 Updated db_upgrade scripts for resident Signed-off-by: abhishek8shankar --- .../sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql | 4 +-- .../sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql | 28 +++++++++---------- .../sql/1.2.0.1_to_1.2.1.0_rollback.sql | 8 +++--- .../sql/1.2.0.1_to_1.2.1.0_upgrade.sql | 8 +++--- .../sql/1.2.1.2_to_1.3.0_rollback.sql | 2 +- .../sql/1.2.1.2_to_1.3.0_upgrade.sql | 2 +- .../mosip_resident/upgrade.properties | 1 + db_upgrade_scripts/mosip_resident/upgrade.sh | 6 ++-- 8 files changed, 30 insertions(+), 29 deletions(-) diff --git a/db_upgrade_scripts/mosip_resident/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql b/db_upgrade_scripts/mosip_resident/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql index 4f4a27f976b..2501bb8f159 100644 --- a/db_upgrade_scripts/mosip_resident/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql +++ b/db_upgrade_scripts/mosip_resident/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql @@ -1,5 +1,5 @@ -- ------------------------------------------------------------------------------------------------- --- Database Name: mosip_resident +-- Database Name: :mosipdbname -- Release Version : 1.2.1 -- Purpose : Database scripts for Resident Service DB. -- Create By : Manoj SP @@ -10,7 +10,7 @@ -- April-2022 Manoj SP Added otp_transaction table creation scripts with comments. -- April-2022 Kamesh Shekhar Prasad Added resident_transaction table creation scripts with comments. ----------------------------------------------------------------------------------------------------- -\c mosip_resident +\c :mosipdbname DROP TABLE IF EXISTS resident.otp_transaction; DROP TABLE IF EXISTS resident.resident_transaction; diff --git a/db_upgrade_scripts/mosip_resident/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql b/db_upgrade_scripts/mosip_resident/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql index 2685aed5031..bab672fabfd 100644 --- a/db_upgrade_scripts/mosip_resident/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql +++ b/db_upgrade_scripts/mosip_resident/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql @@ -1,4 +1,4 @@ -CREATE DATABASE mosip_resident +CREATE DATABASE :mosipdbname ENCODING = 'UTF8' LC_COLLATE = 'en_US.UTF-8' LC_CTYPE = 'en_US.UTF-8' @@ -6,31 +6,31 @@ CREATE DATABASE mosip_resident OWNER = postgres TEMPLATE = template0; -COMMENT ON DATABASE mosip_resident IS 'Resident service database stores all the data related to transactions done in resident services'; +COMMENT ON DATABASE :mosipdbname IS 'Resident service database stores all the data related to transactions done in resident services'; -\c mosip_resident +\c :mosipdbname DROP SCHEMA IF EXISTS resident CASCADE; CREATE SCHEMA resident; ALTER SCHEMA resident OWNER TO postgres; -ALTER DATABASE mosip_resident SET search_path TO resident,pg_catalog,public; +ALTER DATABASE :mosipdbname SET search_path TO resident,pg_catalog,public; -CREATE ROLE residentuser WITH +CREATE ROLE :dbuname WITH INHERIT LOGIN PASSWORD 'dbuserpwd'; GRANT CONNECT - ON DATABASE mosip_resident - TO residentuser; + ON DATABASE :mosipdbname + TO :dbuname; GRANT USAGE ON SCHEMA resident - TO residentuser; + TO :dbuname; GRANT SELECT,INSERT,UPDATE,DELETE,REFERENCES ON ALL TABLES IN SCHEMA resident - TO residentuser; + TO :dbuname; -- This Table is used to save the OTP for the user whenever user requests for one using the email id / phone number to log into the application. CREATE TABLE resident.otp_transaction( @@ -69,7 +69,7 @@ COMMENT ON COLUMN resident.otp_transaction.del_dtimes IS 'Date and Timestamp whe ----------------------------------------------------------------------------------------------------- GRANT SELECT, INSERT, TRUNCATE, REFERENCES, UPDATE, DELETE ON resident.otp_transaction - TO residentuser; + TO :dbuname; -- This Table is used to save the resident_grievance_ticket table values. CREATE TABLE resident.resident_grievance_ticket( @@ -111,7 +111,7 @@ COMMENT ON COLUMN resident.resident_grievance_ticket.del_dtimes IS 'Deleted time -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- GRANT SELECT, INSERT, TRUNCATE, REFERENCES, UPDATE, DELETE ON resident.resident_grievance_ticket - TO residentuser; + TO :dbuname; -- This Table is used to save the user actions for the user actions table. @@ -135,7 +135,7 @@ COMMENT ON COLUMN resident.resident_session.machine_type IS 'The OS of device us GRANT SELECT, INSERT, TRUNCATE, REFERENCES, UPDATE, DELETE ON resident.resident_session - TO residentuser; + TO :dbuname; -- This Table is used to save the transaction related to residents. CREATE TABLE resident.resident_transaction( @@ -215,7 +215,7 @@ COMMENT ON COLUMN resident.resident_transaction.credential_request_id IS 'The cr -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- GRANT SELECT, INSERT, TRUNCATE, REFERENCES, UPDATE, DELETE ON resident.resident_transaction - TO residentuser; + TO :dbuname; -- This Table is used to save the user actions for the user actions table. @@ -231,4 +231,4 @@ COMMENT ON COLUMN resident.resident_user_actions.last_bell_notif_click_dtimes IS GRANT SELECT, INSERT, TRUNCATE, REFERENCES, UPDATE, DELETE ON resident.resident_user_actions - TO residentuser; + TO :dbuname; diff --git a/db_upgrade_scripts/mosip_resident/sql/1.2.0.1_to_1.2.1.0_rollback.sql b/db_upgrade_scripts/mosip_resident/sql/1.2.0.1_to_1.2.1.0_rollback.sql index cad54dbec00..715732f2ca2 100644 --- a/db_upgrade_scripts/mosip_resident/sql/1.2.0.1_to_1.2.1.0_rollback.sql +++ b/db_upgrade_scripts/mosip_resident/sql/1.2.0.1_to_1.2.1.0_rollback.sql @@ -1,12 +1,12 @@ -\c mosip_resident +\c :mosipdbname REVOKE SELECT, INSERT, REFERENCES, UPDATE, DELETE ON resident.otp_transaction -TO residentuser; +TO :dbuname; REVOKE SELECT, INSERT, REFERENCES, UPDATE, DELETE ON resident.resident_grievance_ticket -TO residentuser; +TO :dbuname; ALTER TABLE resident.resident_session alter column machine_type type varchar(30); @@ -14,4 +14,4 @@ DROP INDEX IF EXISTS idx_resident_user_actions_ida_token; REVOKE SELECT, INSERT, REFERENCES, UPDATE, DELETE ON resident.resident_user_actions - TO residentuser; \ No newline at end of file + TO :dbuname; \ No newline at end of file diff --git a/db_upgrade_scripts/mosip_resident/sql/1.2.0.1_to_1.2.1.0_upgrade.sql b/db_upgrade_scripts/mosip_resident/sql/1.2.0.1_to_1.2.1.0_upgrade.sql index 47735596ae3..073f93e5f5b 100644 --- a/db_upgrade_scripts/mosip_resident/sql/1.2.0.1_to_1.2.1.0_upgrade.sql +++ b/db_upgrade_scripts/mosip_resident/sql/1.2.0.1_to_1.2.1.0_upgrade.sql @@ -1,16 +1,16 @@ -\c mosip_resident +\c :mosipdbname GRANT SELECT, INSERT, REFERENCES, UPDATE, DELETE ON resident.otp_transaction -TO residentuser; +TO :dbuname; GRANT SELECT, INSERT, REFERENCES, UPDATE, DELETE ON resident.resident_grievance_ticket -TO residentuser; +TO :dbuname; ALTER TABLE resident.resident_session alter column machine_type type varchar(100); -- Adding index to ida_token column CREATE INDEX idx_resident_user_actions_ida_token ON resident.resident_user_actions (ida_token); GRANT SELECT, INSERT, REFERENCES, UPDATE, DELETE ON resident.resident_user_actions - TO residentuser; \ No newline at end of file + TO :dbuname; \ No newline at end of file diff --git a/db_upgrade_scripts/mosip_resident/sql/1.2.1.2_to_1.3.0_rollback.sql b/db_upgrade_scripts/mosip_resident/sql/1.2.1.2_to_1.3.0_rollback.sql index d08027e45dd..906dcef5d65 100644 --- a/db_upgrade_scripts/mosip_resident/sql/1.2.1.2_to_1.3.0_rollback.sql +++ b/db_upgrade_scripts/mosip_resident/sql/1.2.1.2_to_1.3.0_rollback.sql @@ -1,5 +1,5 @@ -- Below script is required to rollback from 1.3.0 to 1.3.0-beta.1 -\c mosip_resident +\c :mosipdbname DROP INDEX IF EXISTS resident.idx_resident_transaction_aid_crdtime_desc; \ No newline at end of file diff --git a/db_upgrade_scripts/mosip_resident/sql/1.2.1.2_to_1.3.0_upgrade.sql b/db_upgrade_scripts/mosip_resident/sql/1.2.1.2_to_1.3.0_upgrade.sql index f3df6f15c84..936ba66bf81 100644 --- a/db_upgrade_scripts/mosip_resident/sql/1.2.1.2_to_1.3.0_upgrade.sql +++ b/db_upgrade_scripts/mosip_resident/sql/1.2.1.2_to_1.3.0_upgrade.sql @@ -1,6 +1,6 @@ -- Below script is required to upgrade from 1.3.0-beta.1 to 1.3.0 -\c mosip_resident +\c :mosipdbname CREATE INDEX idx_resident_transaction_aid_crdtime_desc ON resident.resident_transaction (aid, cr_dtimes DESC); \ No newline at end of file diff --git a/db_upgrade_scripts/mosip_resident/upgrade.properties b/db_upgrade_scripts/mosip_resident/upgrade.properties index 0baa097cac5..6088869d55c 100644 --- a/db_upgrade_scripts/mosip_resident/upgrade.properties +++ b/db_upgrade_scripts/mosip_resident/upgrade.properties @@ -1,6 +1,7 @@ MOSIP_DB_NAME= ACTION=upgrade MOSIP_DB_NAME=mosip_resident +DB_UNAME=residentuser DB_SERVERIP= DB_PORT= SU_USER=postgres diff --git a/db_upgrade_scripts/mosip_resident/upgrade.sh b/db_upgrade_scripts/mosip_resident/upgrade.sh index a5787b40105..b0209b36d21 100644 --- a/db_upgrade_scripts/mosip_resident/upgrade.sh +++ b/db_upgrade_scripts/mosip_resident/upgrade.sh @@ -21,7 +21,7 @@ echo "Action: "$ACTION # Terminate existing connections echo "Terminating active connections" -CONN=$(PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -t -c "SELECT count(pg_terminate_backend(pg_stat_activity.pid)) FROM pg_stat_activity WHERE datname = '$MOSIP_DB_NAME' AND pid <> pg_backend_pid()";exit;) +CONN=$(PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 -v mosipdbname=$MOSIP_DB_NAME -v dbuname=$DB_UNAME --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -t -c "SELECT count(pg_terminate_backend(pg_stat_activity.pid)) FROM pg_stat_activity WHERE datname = '$MOSIP_DB_NAME' AND pid <> pg_backend_pid()";exit;) echo "Terminated connections" # Execute upgrade or rollback @@ -30,7 +30,7 @@ if [ "$ACTION" == "upgrade" ]; then UPGRADE_SCRIPT_FILE="sql/${CURRENT_VERSION}_to_${UPGRADE_VERSION}_upgrade.sql" if [ -f "$UPGRADE_SCRIPT_FILE" ]; then echo "Executing upgrade script $UPGRADE_SCRIPT_FILE" - PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f $UPGRADE_SCRIPT_FILE + PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 -v mosipdbname=$MOSIP_DB_NAME -v dbuname=$DB_UNAME --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f $UPGRADE_SCRIPT_FILE else echo "Upgrade script not found, exiting." exit 1 @@ -40,7 +40,7 @@ elif [ $ACTION == "rollback" ]; then REVOKE_SCRIPT_FILE="sql/${CURRENT_VERSION}_to_${UPGRADE_VERSION}_rollback.sql" if [ -f "$REVOKE_SCRIPT_FILE" ]; then echo "Executing rollback script $REVOKE_SCRIPT_FILE" - PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f $REVOKE_SCRIPT_FILE + PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 -v mosipdbname=$MOSIP_DB_NAME -v dbuname=$DB_UNAME --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f $REVOKE_SCRIPT_FILE else echo "rollback script not found, exiting." exit 1