From d4af50ed01f1cffdaacffcedf14bc0106b142255 Mon Sep 17 00:00:00 2001 From: abhishek8shankar Date: Sun, 5 Jul 2026 08:20:38 +0530 Subject: [PATCH 1/2] 1899 Updated db_upgrade scripts for admin-services 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 | 20 +++++++++---------- .../mosip_hotlist/upgrade.properties | 1 + db_upgrade_scripts/mosip_hotlist/upgrade.sh | 6 +++--- .../sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql | 2 +- .../sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql | 12 +++++------ .../sql/1.2.1.4_to_1.3.0_rollback.sql | 2 +- .../sql/1.2.1.4_to_1.3.0_upgrade.sql | 2 +- .../mosip_master/upgrade.properties | 1 + db_upgrade_scripts/mosip_master/upgrade.sh | 6 +++--- 10 files changed, 29 insertions(+), 27 deletions(-) diff --git a/db_upgrade_scripts/mosip_hotlist/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql b/db_upgrade_scripts/mosip_hotlist/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql index fbc9333caea..26fc6dba131 100644 --- a/db_upgrade_scripts/mosip_hotlist/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql +++ b/db_upgrade_scripts/mosip_hotlist/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql @@ -1,3 +1,3 @@ -DROP DATABASE IF EXISTS mosip_hotlist; +DROP DATABASE IF EXISTS :mosipdbname; -drop role if exists hotlistuser; +drop role if exists :dbuname; diff --git a/db_upgrade_scripts/mosip_hotlist/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql b/db_upgrade_scripts/mosip_hotlist/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql index b40dde02644..61f7f6d9256 100644 --- a/db_upgrade_scripts/mosip_hotlist/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql +++ b/db_upgrade_scripts/mosip_hotlist/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql @@ -1,4 +1,4 @@ -CREATE DATABASE mosip_hotlist +CREATE DATABASE :mosipdbname ENCODING = 'UTF8' LC_COLLATE = 'en_US.UTF-8' LC_CTYPE = 'en_US.UTF-8' @@ -6,27 +6,27 @@ CREATE DATABASE mosip_hotlist OWNER = postgres TEMPLATE = template0; -COMMENT ON DATABASE mosip_hotlist IS 'Hotlist data related logs and the data is stored in this database'; +COMMENT ON DATABASE :mosipdbname IS 'Hotlist data related logs and the data is stored in this database'; -\c mosip_hotlist +\c :mosipdbname DROP SCHEMA IF EXISTS hotlist CASCADE; CREATE SCHEMA hotlist; ALTER SCHEMA hotlist OWNER TO postgres; -ALTER DATABASE mosip_hotlist SET search_path TO hotlist,pg_catalog,public; +ALTER DATABASE :mosipdbname SET search_path TO hotlist,pg_catalog,public; -CREATE ROLE hotlistuser WITH +CREATE ROLE :dbuname WITH INHERIT LOGIN PASSWORD :dbuserpwd; GRANT CONNECT - ON DATABASE mosip_hotlist - TO hotlistuser; + ON DATABASE :mosipdbname + TO :dbuname; GRANT USAGE ON SCHEMA hotlist - TO hotlistuser; + TO :dbuname; -- DROP TABLE IF EXISTS hotlist.hotlist CASCADE; CREATE TABLE hotlist.hotlist ( @@ -91,7 +91,7 @@ COMMENT ON COLUMN hotlist.hotlist_h.start_timestamp IS E'startTimestamp: Timesta GRANT SELECT,INSERT,UPDATE,DELETE,TRUNCATE,REFERENCES ON ALL TABLES IN SCHEMA hotlist - TO hotlistuser; + TO :dbuname; ALTER DEFAULT PRIVILEGES IN SCHEMA hotlist - GRANT SELECT,INSERT,UPDATE,DELETE,REFERENCES ON TABLES TO hotlistuser; \ No newline at end of file + GRANT SELECT,INSERT,UPDATE,DELETE,REFERENCES ON TABLES TO :dbuname; \ No newline at end of file diff --git a/db_upgrade_scripts/mosip_hotlist/upgrade.properties b/db_upgrade_scripts/mosip_hotlist/upgrade.properties index 71dcb0bf412..04eadd0c012 100644 --- a/db_upgrade_scripts/mosip_hotlist/upgrade.properties +++ b/db_upgrade_scripts/mosip_hotlist/upgrade.properties @@ -1,4 +1,5 @@ MOSIP_DB_NAME= +DB_UNAME= DB_SERVERIP= DB_PORT= SU_USER=postgres diff --git a/db_upgrade_scripts/mosip_hotlist/upgrade.sh b/db_upgrade_scripts/mosip_hotlist/upgrade.sh index 323d04bf36b..6d865e59ca5 100644 --- a/db_upgrade_scripts/mosip_hotlist/upgrade.sh +++ b/db_upgrade_scripts/mosip_hotlist/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 -v dbuserpwd="'${DB_USER_PWD}'" --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -v primary_language_code=$PRIMARY_LANGUAGE_CODE -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 -v dbuserpwd="'${DB_USER_PWD}'" --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -v primary_language_code=$PRIMARY_LANGUAGE_CODE -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 -v primary_language_code=$PRIMARY_LANGUAGE_CODE -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 -v primary_language_code=$PRIMARY_LANGUAGE_CODE -a -b -f $REVOKE_SCRIPT_FILE else echo "rollback script not found, exiting." exit 1 diff --git a/db_upgrade_scripts/mosip_master/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql b/db_upgrade_scripts/mosip_master/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql index d152c50ee38..b0147e4d69b 100644 --- a/db_upgrade_scripts/mosip_master/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql +++ b/db_upgrade_scripts/mosip_master/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql @@ -1,4 +1,4 @@ -\c mosip_master +\c :mosipdbname REASSIGN OWNED BY postgres TO sysadmin; diff --git a/db_upgrade_scripts/mosip_master/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql b/db_upgrade_scripts/mosip_master/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql index 337a447cca0..bdad2502106 100644 --- a/db_upgrade_scripts/mosip_master/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql +++ b/db_upgrade_scripts/mosip_master/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql @@ -1,12 +1,12 @@ -\c mosip_master +\c :mosipdbname REASSIGN OWNED BY sysadmin TO postgres; -REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA master FROM masteruser; +REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA master FROM :dbuname; REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA master FROM sysadmin; -GRANT SELECT, INSERT, TRUNCATE, REFERENCES, UPDATE, DELETE ON ALL TABLES IN SCHEMA master TO masteruser; +GRANT SELECT, INSERT, TRUNCATE, REFERENCES, UPDATE, DELETE ON ALL TABLES IN SCHEMA master TO :dbuname; GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA master TO postgres; @@ -66,7 +66,7 @@ COMMENT ON COLUMN master.blocklisted_words.is_deleted IS 'IS_Deleted : Flag to m -- ddl-end -- COMMENT ON COLUMN master.blocklisted_words.del_dtimes IS 'Deleted DateTimestamp : Date and Timestamp when the record is soft deleted with is_deleted=TRUE'; -- ddl-end -- -GRANT SELECT,INSERT,UPDATE,DELETE,TRUNCATE,REFERENCES ON master.blocklisted_words TO masteruser; +GRANT SELECT,INSERT,UPDATE,DELETE,TRUNCATE,REFERENCES ON master.blocklisted_words TO :dbuname; ALTER TABLE master.blocklisted_words DROP CONSTRAINT IF EXISTS pk_blwrd_code CASCADE; ALTER TABLE master.blocklisted_words ALTER COLUMN lang_code DROP NOT NULL; @@ -106,7 +106,7 @@ COMMENT ON TABLE master.ui_spec IS E'UI Specifications : Stores UI Specificatio -- ddl-end -- COMMENT ON CONSTRAINT unq_dmn_type_vrsn_ischmid ON master.ui_spec IS E'Unique Constraint on domain,title,version,identity_schema_id'; -- ddl-end -- -GRANT SELECT,INSERT,UPDATE,DELETE,TRUNCATE,REFERENCES ON master.ui_spec TO masteruser; +GRANT SELECT,INSERT,UPDATE,DELETE,TRUNCATE,REFERENCES ON master.ui_spec TO :dbuname; TRUNCATE TABLE master.ui_spec cascade; INSERT into master.ui_spec (id,version,domain,title,description,type,json_spec,identity_schema_id,identity_schema_version,effective_from,status_code,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes,is_deleted,del_dtimes) SELECT id,id_version,'registration-client', title,description,'schema',id_attr_json,id,id_version,effective_from,status_code,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes,is_deleted,del_dtimes FROM master.identity_schema; @@ -270,7 +270,7 @@ CREATE TABLE master.permitted_local_config ( del_dtimes timestamp, CONSTRAINT permitted_local_config_pk PRIMARY KEY (code) ); -GRANT SELECT,INSERT,UPDATE,DELETE,TRUNCATE,REFERENCES ON master.permitted_local_config TO masteruser; +GRANT SELECT,INSERT,UPDATE,DELETE,TRUNCATE,REFERENCES ON master.permitted_local_config TO :dbuname; ------------------------------------------------------------------------------------------------------------------------------------------- SELECT * INTO master.loc_holiday_migr_bkp FROM master.loc_holiday; diff --git a/db_upgrade_scripts/mosip_master/sql/1.2.1.4_to_1.3.0_rollback.sql b/db_upgrade_scripts/mosip_master/sql/1.2.1.4_to_1.3.0_rollback.sql index 5b39bdf3eb0..611c650ec9c 100644 --- a/db_upgrade_scripts/mosip_master/sql/1.2.1.4_to_1.3.0_rollback.sql +++ b/db_upgrade_scripts/mosip_master/sql/1.2.1.4_to_1.3.0_rollback.sql @@ -1,4 +1,4 @@ -\c mosip_master +\c :mosipdbname -- Rollback script for master.app_detail ALTER TABLE master.app_detail ALTER COLUMN lang_code SET NOT NULL; diff --git a/db_upgrade_scripts/mosip_master/sql/1.2.1.4_to_1.3.0_upgrade.sql b/db_upgrade_scripts/mosip_master/sql/1.2.1.4_to_1.3.0_upgrade.sql index 281adfcd9ad..b0d59880f78 100644 --- a/db_upgrade_scripts/mosip_master/sql/1.2.1.4_to_1.3.0_upgrade.sql +++ b/db_upgrade_scripts/mosip_master/sql/1.2.1.4_to_1.3.0_upgrade.sql @@ -1,4 +1,4 @@ -\c mosip_master +\c :mosipdbname -- Upgrade script for master.app_detail SELECT * INTO master.app_detail_bkp FROM master.app_detail; diff --git a/db_upgrade_scripts/mosip_master/upgrade.properties b/db_upgrade_scripts/mosip_master/upgrade.properties index dfca3038d7f..0c42873dbbb 100644 --- a/db_upgrade_scripts/mosip_master/upgrade.properties +++ b/db_upgrade_scripts/mosip_master/upgrade.properties @@ -1,4 +1,5 @@ MOSIP_DB_NAME= +DB_UNAME= DB_SERVERIP= DB_PORT= SU_USER=postgres diff --git a/db_upgrade_scripts/mosip_master/upgrade.sh b/db_upgrade_scripts/mosip_master/upgrade.sh index fb6fcecfc4a..120afd43b06 100644 --- a/db_upgrade_scripts/mosip_master/upgrade.sh +++ b/db_upgrade_scripts/mosip_master/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 -v primary_language_code=$PRIMARY_LANGUAGE_CODE -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 -v primary_language_code=$PRIMARY_LANGUAGE_CODE -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 -v primary_language_code=$PRIMARY_LANGUAGE_CODE -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 -v primary_language_code=$PRIMARY_LANGUAGE_CODE -a -b -f $REVOKE_SCRIPT_FILE else echo "rollback script not found, exiting." exit 1 From ba066d9619d9c96c15ddd835a602f2a06199979d Mon Sep 17 00:00:00 2001 From: abhishek8shankar Date: Mon, 6 Jul 2026 02:52:59 +0530 Subject: [PATCH 2/2] 1899 Updated db_upgrade scripts for admin-services Signed-off-by: abhishek8shankar --- db_upgrade_scripts/mosip_hotlist/upgrade.properties | 4 ++-- db_upgrade_scripts/mosip_master/upgrade.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/db_upgrade_scripts/mosip_hotlist/upgrade.properties b/db_upgrade_scripts/mosip_hotlist/upgrade.properties index 04eadd0c012..be0b6dc7fb2 100644 --- a/db_upgrade_scripts/mosip_hotlist/upgrade.properties +++ b/db_upgrade_scripts/mosip_hotlist/upgrade.properties @@ -1,5 +1,5 @@ -MOSIP_DB_NAME= -DB_UNAME= +MOSIP_DB_NAME=mosip_hotlist +DB_UNAME=hotlistuser DB_SERVERIP= DB_PORT= SU_USER=postgres diff --git a/db_upgrade_scripts/mosip_master/upgrade.properties b/db_upgrade_scripts/mosip_master/upgrade.properties index 0c42873dbbb..3a7e0de366a 100644 --- a/db_upgrade_scripts/mosip_master/upgrade.properties +++ b/db_upgrade_scripts/mosip_master/upgrade.properties @@ -1,5 +1,5 @@ -MOSIP_DB_NAME= -DB_UNAME= +MOSIP_DB_NAME=mosip_master +DB_UNAME=masteruser DB_SERVERIP= DB_PORT= SU_USER=postgres