[MOSIP-37808] Updated DB attributes of MOSIP esignet-44621branch

db_scripts/mosip_esignet/db.sql

@@ -1,17 +1,16 @@
-CREATE DATABASE mosip_esignet
-	ENCODING = 'UTF8' 
-	LC_COLLATE = 'en_US.UTF-8' 
-	LC_CTYPE = 'en_US.UTF-8' 
-	TABLESPACE = pg_default 
+CREATE DATABASE :mosipdbname
+	ENCODING = 'UTF8'
+	LC_COLLATE = 'en_US.UTF-8'
+	LC_CTYPE = 'en_US.UTF-8'
+	TABLESPACE = pg_default
 	OWNER = postgres
 	TEMPLATE  = template0;
 
-COMMENT ON DATABASE mosip_esignet IS 'e-Signet related data is stored in this database';
+COMMENT ON DATABASE :mosipdbname IS 'e-Signet related data is stored in this database';
 
-\c mosip_esignet postgres
+\c :mosipdbname postgres
 
 DROP SCHEMA IF EXISTS esignet CASCADE;
 CREATE SCHEMA esignet;
 ALTER SCHEMA esignet OWNER TO postgres;
-ALTER DATABASE mosip_esignet SET search_path TO esignet,pg_catalog,public;
-
+ALTER DATABASE :mosipdbname SET search_path TO esignet,pg_catalog,public;

db_scripts/mosip_esignet/ddl.sql

@@ -1,4 +1,4 @@
-\c mosip_esignet
+\c :mosipdbname
 
 \ir ddl/esignet-client_detail.sql
 \ir ddl/esignet-key_alias.sql
@@ -8,4 +8,4 @@
 \ir ddl/esignet-consent.sql
 \ir ddl/esignet-consent_history.sql
 \ir ddl/esignet-ca_cert_store.sql
-\ir ddl/esignet-server_profile.sql
+\ir ddl/esignet-server_profile.sql

db_scripts/mosip_esignet/deploy.properties

@@ -3,4 +3,5 @@ DB_PORT=5432
 SU_USER=postgres
 DEFAULT_DB_NAME=postgres
 MOSIP_DB_NAME=mosip_esignet
+DB_UNAME=esignetuser
 DML_FLAG=1

db_scripts/mosip_esignet/deploy.sh

@@ -31,23 +31,23 @@ CONN=$(PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --hos
 echo "Terminated connections"
 
 ## Drop db and role
-PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_db.sql
-PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_role.sql
+PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_db.sql -v mosipdbname=$MOSIP_DB_NAME
+PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_role.sql -v dbuname=$DB_UNAME
 
 ## Create users
 echo `date "+%m/%d/%Y %H:%M:%S"` ": Creating database users" | tee
-PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f role_dbuser.sql -v dbuserpwd=\'$DBUSER_PWD\'
+PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f role_dbuser.sql -v dbuserpwd=\'$DBUSER_PWD\' -v dbuname=$DB_UNAME
 
 ## Create DB
-PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f db.sql
-PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f ddl.sql
+PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f db.sql -v mosipdbname=$MOSIP_DB_NAME
+PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f ddl.sql -v mosipdbname=$MOSIP_DB_NAME -v dbuname=$DB_UNAME
 
 ## Grants
-PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f grants.sql
+PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f grants.sql -v mosipdbname=$MOSIP_DB_NAME -v dbuname=$DB_UNAME
 
 ## Populate tables
 if [ ${DML_FLAG} == 1 ]
 then
     echo `date "+%m/%d/%Y %H:%M:%S"` ": Deploying DML for ${MOSIP_DB_NAME} database"
-    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 dml.sql
-fi
+    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 dml.sql -v mosipdbname=$MOSIP_DB_NAME
+fi

db_scripts/mosip_esignet/dml.sql

@@ -1,4 +1,4 @@
-\c mosip_esignet
+\c :mosipdbname
 
 ----- TRUNCATE esignet.client_detail TABLE Data and It's reference Data and insert data from sql file -----
 TRUNCATE TABLE esignet.client_detail cascade ;

db_scripts/mosip_esignet/drop_db.sql

@@ -1,2 +1 @@
-DROP DATABASE IF EXISTS mosip_esignet;
-
+DROP DATABASE IF EXISTS :mosipdbname;

db_scripts/mosip_esignet/drop_role.sql

@@ -1 +1 @@
-drop role if exists esignetuser;
+drop role if exists :dbuname;

db_scripts/mosip_esignet/grants.sql

@@ -1,17 +1,16 @@
-\c mosip_esignet
+\c :mosipdbname
 
 GRANT CONNECT
-   ON DATABASE mosip_esignet
-   TO esignetuser;
+   ON DATABASE :mosipdbname
+   TO :dbuname;
 
 GRANT USAGE
    ON SCHEMA esignet
-   TO esignetuser;
+   TO :dbuname;
 
 GRANT SELECT,INSERT,UPDATE,DELETE,TRUNCATE,REFERENCES
-   ON ALL TABLES IN SCHEMA esignet
-   TO esignetuser;
+      ON ALL TABLES IN SCHEMA esignet
+          TO :dbuname;
 
 ALTER DEFAULT PRIVILEGES IN SCHEMA esignet
-	GRANT SELECT,INSERT,UPDATE,DELETE,REFERENCES ON TABLES TO esignetuser;
-
+	GRANT SELECT,INSERT,UPDATE,DELETE,REFERENCES ON TABLES TO :dbuname;

db_scripts/mosip_esignet/role_dbuser.sql

@@ -1,4 +1,4 @@
-CREATE ROLE esignetuser WITH
-	INHERIT
-	LOGIN
-	PASSWORD :dbuserpwd;
+CREATE ROLE :dbuname WITH
+    INHERIT
+    LOGIN
+    PASSWORD :dbuserpwd;