Skip to content

Commit 8bedd7a

Browse files
ckm007ckm007
authored
Merge pull request #2354 from abhishek8shankar/MOSIP-37808
[MOSIP-37808] Updated DB attributes of MOSIP for registration
2 parents 80b4a9c + 3c2495f commit 8bedd7a

11 files changed

Lines changed: 69 additions & 72 deletions

File tree

‎db_scripts/mosip_regprc/db.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
CREATE DATABASE mosip_regprc
1+
CREATE DATABASE :mosipdbname
22
ENCODING = 'UTF8'
33
LC_COLLATE = 'en_US.UTF-8'
44
LC_CTYPE = 'en_US.UTF-8'
55
TABLESPACE = pg_default
66
OWNER = postgres
77
TEMPLATE = template0;
8-
COMMENT ON DATABASE mosip_regprc IS 'The data related to Registration process flows and transaction will be maintained in this database. This database also maintains data that is needed to perform deduplication.';
8+
COMMENT ON DATABASE :mosipdbname IS 'The data related to Registration process flows and transaction will be maintained in this database. This database also maintains data that is needed to perform deduplication.';
99

10-
\c mosip_regprc postgres
10+
\c :mosipdbname postgres
1111

1212
DROP SCHEMA IF EXISTS regprc CASCADE;
1313
CREATE SCHEMA regprc;
1414
ALTER SCHEMA regprc OWNER TO postgres;
15-
ALTER DATABASE mosip_regprc SET search_path TO regprc,pg_catalog,public;
15+
ALTER DATABASE :mosipdbname SET search_path TO regprc,pg_catalog,public;

‎db_scripts/mosip_regprc/ddl.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
\c mosip_regprc
1+
\c :mosipdbname
22

33
\ir ddl/regprc-individual_demographic_dedup.sql
44
\ir ddl/regprc-registration.sql

‎db_scripts/mosip_regprc/ddl/regprc-fk.sql‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
-- Foreign Key Constraints Same DB/Schema tables.
3-
-- FOREIGN KEY CONSTRAINTS : mosip_regprc database/schema.
3+
-- FOREIGN KEY CONSTRAINTS : :mosipdbname database/schema.
44

55
-- object: fk_regtrn_reg | type: CONSTRAINT --
66
-- ALTER TABLE regprc.registration_transaction DROP CONSTRAINT IF EXISTS fk_regtrn_reg CASCADE;
@@ -12,67 +12,66 @@
1212
-- object: fk_regtrn_trntyp | type: CONSTRAINT --
1313
-- ALTER TABLE regprc.registration_transaction DROP CONSTRAINT IF EXISTS fk_regtrn_trntyp CASCADE;
1414
ALTER TABLE regprc.registration_transaction ADD CONSTRAINT fk_regtrn_trntyp FOREIGN KEY (trn_type_code,lang_code)
15-
REFERENCES regprc.transaction_type (code,lang_code) MATCH SIMPLE
16-
ON DELETE NO ACTION ON UPDATE NO ACTION;
15+
REFERENCES regprc.transaction_type (code,lang_code) MATCH SIMPLE
16+
ON DELETE NO ACTION ON UPDATE NO ACTION;
1717
-- ddl-end --
1818

1919
-- object: fk_idemogd_reg | type: CONSTRAINT --
2020
-- ALTER TABLE regprc.individual_demographic_dedup DROP CONSTRAINT IF EXISTS fk_idemogd_reg CASCADE;
2121
ALTER TABLE regprc.individual_demographic_dedup ADD CONSTRAINT fk_idemogd_reg FOREIGN KEY (workflow_instance_id)
22-
REFERENCES regprc.registration (workflow_instance_id) MATCH SIMPLE
23-
ON DELETE NO ACTION ON UPDATE NO ACTION;
22+
REFERENCES regprc.registration (workflow_instance_id) MATCH SIMPLE
23+
ON DELETE NO ACTION ON UPDATE NO ACTION;
2424
-- ddl-end --
2525

2626
-- object: fk_rmnlver_reg | type: CONSTRAINT --
2727
-- ALTER TABLE regprc.reg_manual_verification DROP CONSTRAINT IF EXISTS fk_rmnlver_reg CASCADE;
2828
ALTER TABLE regprc.reg_manual_verification ADD CONSTRAINT fk_rmnlver_reg FOREIGN KEY (workflow_instance_id)
29-
REFERENCES regprc.registration (workflow_instance_id) MATCH SIMPLE
30-
ON DELETE NO ACTION ON UPDATE NO ACTION;
29+
REFERENCES regprc.registration (workflow_instance_id) MATCH SIMPLE
30+
ON DELETE NO ACTION ON UPDATE NO ACTION;
3131
-- ddl-end --
3232

3333
-- object: fk_rmnlver_trntyp | type: CONSTRAINT --
3434
-- ALTER TABLE regprc.reg_manual_verification DROP CONSTRAINT IF EXISTS fk_rmnlver_trntyp CASCADE;
3535
ALTER TABLE regprc.reg_manual_verification ADD CONSTRAINT fk_rmnlver_trntyp FOREIGN KEY (trntyp_code,lang_code)
36-
REFERENCES regprc.transaction_type (code,lang_code) MATCH SIMPLE
37-
ON DELETE NO ACTION ON UPDATE NO ACTION;
36+
REFERENCES regprc.transaction_type (code,lang_code) MATCH SIMPLE
37+
ON DELETE NO ACTION ON UPDATE NO ACTION;
3838
-- ddl-end --
3939

4040

4141
-- object: fk_regded_regtrn | type: CONSTRAINT --
4242
-- ALTER TABLE regprc.reg_demo_dedupe_list DROP CONSTRAINT IF EXISTS fk_regded_regtrn CASCADE;
4343
ALTER TABLE regprc.reg_demo_dedupe_list ADD CONSTRAINT fk_regded_regtrn FOREIGN KEY (regtrn_id)
44-
REFERENCES regprc.registration_transaction (id) MATCH FULL
45-
ON DELETE NO ACTION ON UPDATE NO ACTION;
44+
REFERENCES regprc.registration_transaction (id) MATCH FULL
45+
ON DELETE NO ACTION ON UPDATE NO ACTION;
4646
-- ddl-end --
4747

4848

4949
-- object: fk_regref_reg | type: CONSTRAINT --
5050
-- ALTER TABLE regprc.reg_bio_ref DROP CONSTRAINT IF EXISTS fk_regref_reg CASCADE;
5151
ALTER TABLE regprc.reg_bio_ref ADD CONSTRAINT fk_regbrf_reg FOREIGN KEY (workflow_instance_id)
52-
REFERENCES regprc.registration (workflow_instance_id) MATCH SIMPLE
53-
ON DELETE NO ACTION ON UPDATE NO ACTION;
52+
REFERENCES regprc.registration (workflow_instance_id) MATCH SIMPLE
53+
ON DELETE NO ACTION ON UPDATE NO ACTION;
5454
-- ddl-end --
5555

5656

5757
-- object: fk_abisresp_abisreq | type: CONSTRAINT --
5858
-- ALTER TABLE regprc.abis_response DROP CONSTRAINT IF EXISTS fk_abisresp_abisreq CASCADE;
5959
ALTER TABLE regprc.abis_response ADD CONSTRAINT fk_abisresp_abisreq FOREIGN KEY (abis_req_id)
60-
REFERENCES regprc.abis_request (id) MATCH FULL
61-
ON DELETE NO ACTION ON UPDATE NO ACTION;
60+
REFERENCES regprc.abis_request (id) MATCH FULL
61+
ON DELETE NO ACTION ON UPDATE NO ACTION;
6262
-- ddl-end --
6363

6464

6565
-- object: fk_abisresp_resp_id | type: CONSTRAINT --
6666
-- ALTER TABLE regprc.abis_response_det DROP CONSTRAINT IF EXISTS fk_abisresp_resp_id CASCADE;
6767
ALTER TABLE regprc.abis_response_det ADD CONSTRAINT fk_abisresp_resp_id FOREIGN KEY (abis_resp_id)
68-
REFERENCES regprc.abis_response (id) MATCH FULL
69-
ON DELETE NO ACTION ON UPDATE NO ACTION;
68+
REFERENCES regprc.abis_response (id) MATCH FULL
69+
ON DELETE NO ACTION ON UPDATE NO ACTION;
7070
-- ddl-end --
7171

7272

7373
-- object: fk_rlostd_reg | type: CONSTRAINT --
7474
-- ALTER TABLE regprc.reg_lost_uin_det DROP CONSTRAINT IF EXISTS fk_rlostd_reg CASCADE;
7575
ALTER TABLE regprc.reg_lost_uin_det ADD CONSTRAINT fk_rlostd_reg FOREIGN KEY (workflow_instance_id)
76-
REFERENCES regprc.registration (workflow_instance_id) MATCH SIMPLE
77-
ON DELETE NO ACTION ON UPDATE NO ACTION;
78-
76+
REFERENCES regprc.registration (workflow_instance_id) MATCH SIMPLE
77+
ON DELETE NO ACTION ON UPDATE NO ACTION;

‎db_scripts/mosip_regprc/ddl/regprc-reg_verification.sql‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- -------------------------------------------------------------------------------------------------
2-
-- Database Name: mosip_regprc
2+
-- Database Name: :mosipdbname
33
-- Table Name : regprc.reg_manual_verification
44
-- Purpose : Verification: Records marked for verification will be present in this table.
55
-- Create By : Monobikash
@@ -12,22 +12,22 @@
1212
-- object: regprc.reg_verification | type: TABLE --
1313
-- DROP TABLE IF EXISTS regprc.reg_verification CASCADE;
1414
CREATE TABLE regprc.reg_verification(
15-
workflow_instance_id character varying(36) NOT NULL,
16-
reg_id character varying(39) NOT NULL,
17-
verification_req_id character varying(39) NOT NULL,
18-
matched_type character varying(36),
19-
verification_usr_id character varying(256),
20-
response_text character varying(512),
21-
status_code character varying(36),
22-
reason_code character varying(36),
23-
status_comment character varying(256),
24-
is_active boolean NOT NULL,
25-
cr_by character varying(256) NOT NULL,
26-
cr_dtimes timestamp NOT NULL,
27-
upd_by character varying(256),
28-
upd_dtimes timestamp,
29-
is_deleted boolean,
30-
del_dtimes timestamp,
31-
CONSTRAINT pk_reg_ver_id PRIMARY KEY (workflow_instance_id)
15+
workflow_instance_id character varying(36) NOT NULL,
16+
reg_id character varying(39) NOT NULL,
17+
verification_req_id character varying(39) NOT NULL,
18+
matched_type character varying(36),
19+
verification_usr_id character varying(256),
20+
response_text character varying(512),
21+
status_code character varying(36),
22+
reason_code character varying(36),
23+
status_comment character varying(256),
24+
is_active boolean NOT NULL,
25+
cr_by character varying(256) NOT NULL,
26+
cr_dtimes timestamp NOT NULL,
27+
upd_by character varying(256),
28+
upd_dtimes timestamp,
29+
is_deleted boolean,
30+
del_dtimes timestamp,
31+
CONSTRAINT pk_reg_ver_id PRIMARY KEY (workflow_instance_id)
3232
);
33-
-- ddl-end --
33+
-- ddl-end --

‎db_scripts/mosip_regprc/deploy.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ DB_PORT=5432
33
SU_USER=postgres
44
DEFAULT_DB_NAME=postgres
55
MOSIP_DB_NAME=mosip_regprc
6+
DB_UNAME=regprcuser
67
DML_FLAG=1

‎db_scripts/mosip_regprc/deploy.sh‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,31 @@ else
1616
fi
1717

1818
## Terminate existing connections
19-
echo "Terminating active connections"
19+
echo "Terminating active connections"
2020
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;)
2121
echo "Terminated connections"
2222

2323
## Drop db and role
2424
echo "Dropping DB"
25-
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
25+
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
2626
echo "Dropping user"
27-
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
27+
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
2828

2929
## Create users
30-
echo `date "+%m/%d/%Y %H:%M:%S"` ": Creating database users"
31-
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\'
30+
echo `date "+%m/%d/%Y %H:%M:%S"` ": Creating database users"
31+
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
3232

3333
## Create DB
3434
echo "Creating DB"
35-
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
36-
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
35+
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
36+
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
3737

3838
## Grants
39-
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
39+
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
4040

4141
## Populate tables
4242
if [ ${DML_FLAG} == 1 ]
4343
then
44-
echo `date "+%m/%d/%Y %H:%M:%S"` ": Deploying DML for ${MOSIP_DB_NAME} database"
45-
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
44+
echo `date "+%m/%d/%Y %H:%M:%S"` ": Deploying DML for ${MOSIP_DB_NAME} database"
45+
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
4646
fi
47-

‎db_scripts/mosip_regprc/dml.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
\c mosip_regprc
1+
\c :mosipdbname
22
TRUNCATE TABLE regprc.transaction_type cascade ;
33
\COPY regprc.transaction_type (code,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/regprc-transaction_type.csv' delimiter ',' HEADER csv;

‎db_scripts/mosip_regprc/drop_db.sql‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
DROP DATABASE IF EXISTS mosip_regprc;
2-
1+
DROP DATABASE IF EXISTS :mosipdbname;

‎db_scripts/mosip_regprc/drop_role.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
drop role if exists regprcuser;
1+
drop role if exists :dbuname;

‎db_scripts/mosip_regprc/grants.sql‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
\c mosip_regprc
1+
\c :mosipdbname
22

33
GRANT CONNECT
4-
ON DATABASE mosip_regprc
5-
TO regprcuser;
4+
ON DATABASE :mosipdbname
5+
TO :dbuname;
66

77
GRANT USAGE
88
ON SCHEMA regprc
9-
TO regprcuser;
9+
TO :dbuname;
1010

1111
GRANT SELECT,INSERT,UPDATE,DELETE,TRUNCATE,REFERENCES
12-
ON ALL TABLES IN SCHEMA regprc
13-
TO regprcuser;
14-
15-
ALTER DEFAULT PRIVILEGES IN SCHEMA regprc
16-
GRANT SELECT,INSERT,UPDATE,DELETE,REFERENCES ON TABLES TO regprcuser;
12+
ON ALL TABLES IN SCHEMA regprc
13+
TO :dbuname;
1714

15+
ALTER DEFAULT PRIVILEGES IN SCHEMA regprc
16+
GRANT SELECT,INSERT,UPDATE,DELETE,REFERENCES ON TABLES TO :dbuname;

0 commit comments

Comments
 (0)