Skip to content

Commit 7063280

Browse files
authored
Merge pull request #9 from openimis/feature/OP-1360
Feature/op 1360
2 parents 788e909 + c6b961f commit 7063280

File tree

4 files changed

+33
-24
lines changed

4 files changed

+33
-24
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FROM postgres:13-alpine
22

3-
3+
# Script to detect whether the database has finished initializing
4+
COPY ["true_isready.sh", "/usr/local/bin/"]
45
COPY ["database scripts/00_dump.sql", "database scripts/0[2345]_*.sql", "database scripts/demo_db.sql", "/docker-entrypoint-initdb.d/"]

database scripts/00_dump.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4048,6 +4048,7 @@ CREATE TABLE "public"."tblPremium" (
40484048
"AuditUserID" integer NOT NULL,
40494049
"PayerID" integer,
40504050
"PolicyID" integer NOT NULL,
4051+
"CreatedDate" date DEFAULT CURRENT_DATE NOT NULL,
40514052
"RowID" "text"
40524053
);
40534054

database scripts/01_modular_base.sql

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -187,24 +187,24 @@ CREATE TABLE "public"."core_User" (
187187

188188
--
189189
-- TOC entry 214 (class 1259 OID 20299)
190-
-- Name: core_User_groups; Type: TABLE; Schema: public; Owner: postgres
190+
-- Name: Core_User_groups; Type: TABLE; Schema: public; Owner: postgres
191191
--
192192

193-
CREATE TABLE "public"."core_User_groups" (
193+
CREATE TABLE "public"."Core_User_groups" (
194194
"id" integer NOT NULL,
195195
"user_id" "uuid" NOT NULL,
196196
"group_id" integer NOT NULL
197197
);
198198

199199

200-
-- ALTER TABLE "public"."core_User_groups" OWNER TO "postgres";
200+
-- ALTER TABLE "public"."Core_User_groups" OWNER TO "postgres";
201201

202202
--
203203
-- TOC entry 213 (class 1259 OID 20297)
204-
-- Name: core_User_groups_id_seq; Type: SEQUENCE; Schema: public; Owner: postgres
204+
-- Name: Core_User_groups_id_seq; Type: SEQUENCE; Schema: public; Owner: postgres
205205
--
206206

207-
CREATE SEQUENCE "public"."core_User_groups_id_seq"
207+
CREATE SEQUENCE "public"."Core_User_groups_id_seq"
208208
AS integer
209209
START WITH 1
210210
INCREMENT BY 1
@@ -213,15 +213,15 @@ CREATE SEQUENCE "public"."core_User_groups_id_seq"
213213
CACHE 1;
214214

215215

216-
-- ALTER TABLE "public"."core_User_groups_id_seq" OWNER TO "postgres";
216+
-- ALTER TABLE "public"."Core_User_groups_id_seq" OWNER TO "postgres";
217217

218218
--
219219
-- TOC entry 3994 (class 0 OID 0)
220220
-- Dependencies: 213
221-
-- Name: core_User_groups_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: postgres
221+
-- Name: Core_User_groups_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: postgres
222222
--
223223

224-
ALTER SEQUENCE "public"."core_User_groups_id_seq" OWNED BY "public"."core_User_groups"."id";
224+
ALTER SEQUENCE "public"."Core_User_groups_id_seq" OWNED BY "public"."Core_User_groups"."id";
225225

226226

227227
--
@@ -397,20 +397,20 @@ ALTER TABLE ONLY "public"."core_TechnicalUser"
397397

398398
--
399399
-- TOC entry 3402 (class 2606 OID 20304)
400-
-- Name: core_User_groups core_User_groups_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres
400+
-- Name: Core_User_groups Core_User_groups_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres
401401
--
402402

403-
ALTER TABLE ONLY "public"."core_User_groups"
404-
ADD CONSTRAINT "core_User_groups_pkey" PRIMARY KEY ("id");
403+
ALTER TABLE ONLY "public"."Core_User_groups"
404+
ADD CONSTRAINT "Core_User_groups_pkey" PRIMARY KEY ("id");
405405

406406

407407
--
408408
-- TOC entry 3405 (class 2606 OID 20410)
409-
-- Name: core_User_groups core_User_groups_user_id_group_id_8ec5911a_uniq; Type: CONSTRAINT; Schema: public; Owner: postgres
409+
-- Name: Core_User_groups Core_User_groups_user_id_group_id_8ec5911a_uniq; Type: CONSTRAINT; Schema: public; Owner: postgres
410410
--
411411

412-
ALTER TABLE ONLY "public"."core_User_groups"
413-
ADD CONSTRAINT "core_User_groups_user_id_group_id_8ec5911a_uniq" UNIQUE ("user_id", "group_id");
412+
ALTER TABLE ONLY "public"."Core_User_groups"
413+
ADD CONSTRAINT "Core_User_groups_user_id_group_id_8ec5911a_uniq" UNIQUE ("user_id", "group_id");
414414

415415

416416
--
@@ -484,18 +484,18 @@ CREATE INDEX "core_TechnicalUser_username_6f41c923_like" ON "public"."core_Techn
484484

485485
--
486486
-- TOC entry 3400 (class 1259 OID 20412)
487-
-- Name: core_User_groups_group_id_197830ae; Type: INDEX; Schema: public; Owner: postgres
487+
-- Name: Core_User_groups_group_id_197830ae; Type: INDEX; Schema: public; Owner: postgres
488488
--
489489

490-
CREATE INDEX "core_User_groups_group_id_197830ae" ON "public"."core_User_groups" USING "btree" ("group_id");
490+
CREATE INDEX "Core_User_groups_group_id_197830ae" ON "public"."Core_User_groups" USING "btree" ("group_id");
491491

492492

493493
--
494494
-- TOC entry 3403 (class 1259 OID 20411)
495-
-- Name: core_User_groups_user_id_06a128ce; Type: INDEX; Schema: public; Owner: postgres
495+
-- Name: Core_User_groups_user_id_06a128ce; Type: INDEX; Schema: public; Owner: postgres
496496
--
497497

498-
CREATE INDEX "core_User_groups_user_id_06a128ce" ON "public"."core_User_groups" USING "btree" ("user_id");
498+
CREATE INDEX "Core_User_groups_user_id_06a128ce" ON "public"."Core_User_groups" USING "btree" ("user_id");
499499

500500

501501
--
@@ -589,11 +589,11 @@ ALTER TABLE ONLY "public"."core_Mutation_Log"
589589

590590
--
591591
-- TOC entry 3727 (class 2606 OID 20399)
592-
-- Name: core_User_groups core_User_groups_user_id_06a128ce_fk_core_User_id; Type: FK CONSTRAINT; Schema: public; Owner: postgres
592+
-- Name: Core_User_groups Core_User_groups_user_id_06a128ce_fk_core_User_id; Type: FK CONSTRAINT; Schema: public; Owner: postgres
593593
--
594594

595-
ALTER TABLE ONLY "public"."core_User_groups"
596-
ADD CONSTRAINT "core_User_groups_user_id_06a128ce_fk_core_User_id" FOREIGN KEY ("user_id") REFERENCES "public"."core_User"("id") DEFERRABLE INITIALLY DEFERRED;
595+
ALTER TABLE ONLY "public"."Core_User_groups"
596+
ADD CONSTRAINT "Core_User_groups_user_id_06a128ce_fk_core_User_id" FOREIGN KEY ("user_id") REFERENCES "public"."core_User"("id") DEFERRABLE INITIALLY DEFERRED;
597597

598598

599599
--
@@ -699,10 +699,10 @@ ALTER TABLE ONLY "public"."insuree_InsureeMutation"
699699

700700
--
701701
-- TOC entry 3329 (class 2604 OID 20302)
702-
-- Name: core_User_groups id; Type: DEFAULT; Schema: public; Owner: postgres
702+
-- Name: Core_User_groups id; Type: DEFAULT; Schema: public; Owner: postgres
703703
--
704704

705-
ALTER TABLE ONLY "public"."core_User_groups" ALTER COLUMN "id" SET DEFAULT "nextval"('"public"."core_User_groups_id_seq"'::"regclass");
705+
ALTER TABLE ONLY "public"."Core_User_groups" ALTER COLUMN "id" SET DEFAULT "nextval"('"public"."Core_User_groups_id_seq"'::"regclass");
706706

707707

708708
--

true_isready.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env bash
2+
if [[ $(pgrep -f docker-entrypoint-initdb.d) == "" ]]
3+
then
4+
exit 0
5+
else
6+
exit 1
7+
fi

0 commit comments

Comments
 (0)