Skip to content

Commit a182849

Browse files
delcroipdelcroip
authored
Merge pull request #10 from openimis/develop
Develop
2 parents 9161fcd + 30cdf95 commit a182849

File tree

3 files changed

+57
-31
lines changed

3 files changed

+57
-31
lines changed

‎.github/workflows/docker.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: publish
2+
on:
3+
pull_request:
4+
workflow_dispatch:
5+
inputs:
6+
tag:
7+
default: latest
8+
description: build tag
9+
required: false
10+
jobs:
11+
publish-docker-image:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v2
15+
- name: Login to GitHub Container Registry
16+
uses: docker/login-action@v1
17+
with:
18+
registry: ghcr.io
19+
username: ${{ github.actor }}
20+
password: ${{ secrets.GITHUB_TOKEN }}
21+
- name: Build the pgsql Docker image
22+
run: |
23+
TAG_INPUT=${{ github.event.inputs.name }}
24+
docker build . --tag ghcr.io/openimis/openimis-pgsql:${TAG_INPUT:-"latest"}
25+
docker push ghcr.io/openimis/openimis-pgsql:${TAG_INPUT:-"latest"}

‎concatenate_files.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
22

33
mkdir output
4-
cat database\ scripts/*.sql > output/fullDemoDatabase.sql
4+
cd database\ scripts
5+
cat 00_dump.sql 0[2345]_*.sql demo_db.sql > ../output/fullDemoDatabase.sql

‎database scripts/02_aux_functions.sql‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,144 +1,144 @@
11
/* Functions for Year, Quarter, and Month */
22
--Year
3-
CREATE OR REPLACE FUNCTION YEAR(TIMESTAMP without TIME ZONE) RETURNS INTEGER
3+
CREATE OR REPLACE FUNCTION "public".YEAR(TIMESTAMP without TIME ZONE) RETURNS INTEGER
44
AS $$
55
SELECT EXTRACT(YEAR FROM $1)::INTEGER;
66
$$ LANGUAGE SQL IMMUTABLE;
7-
CREATE OR REPLACE FUNCTION YEAR(TIMESTAMP WITH TIME ZONE) RETURNS INTEGER
7+
CREATE OR REPLACE FUNCTION "public".YEAR(TIMESTAMP WITH TIME ZONE) RETURNS INTEGER
88
AS $$
99
SELECT EXTRACT(YEAR FROM $1)::INTEGER;
1010
$$ LANGUAGE SQL STABLE;
11-
CREATE OR REPLACE FUNCTION YEAR(DATE) RETURNS INTEGER
11+
CREATE OR REPLACE FUNCTION "public".YEAR(DATE) RETURNS INTEGER
1212
AS $$
1313
SELECT EXTRACT(YEAR FROM $1)::INTEGER;
1414
$$ LANGUAGE SQL IMMUTABLE;
1515

1616
--Quarter
17-
CREATE OR REPLACE FUNCTION QUARTER(TIMESTAMP without TIME ZONE) RETURNS INTEGER
17+
CREATE OR REPLACE FUNCTION "public".QUARTER(TIMESTAMP without TIME ZONE) RETURNS INTEGER
1818
AS $$
1919
SELECT EXTRACT(QUARTER FROM $1)::INTEGER;
2020
$$ LANGUAGE SQL IMMUTABLE;
21-
CREATE OR REPLACE FUNCTION QUARTER(TIMESTAMP WITH TIME ZONE) RETURNS INTEGER
21+
CREATE OR REPLACE FUNCTION "public".QUARTER(TIMESTAMP WITH TIME ZONE) RETURNS INTEGER
2222
AS $$
2323
SELECT EXTRACT(QUARTER FROM $1)::INTEGER;
2424
$$ LANGUAGE SQL STABLE;
25-
CREATE OR REPLACE FUNCTION QUARTER(DATE) RETURNS INTEGER
25+
CREATE OR REPLACE FUNCTION "public".QUARTER(DATE) RETURNS INTEGER
2626
AS $$
2727
SELECT EXTRACT(QUARTER FROM $1)::INTEGER;
2828
$$ LANGUAGE SQL IMMUTABLE;
2929

3030
--Month
31-
CREATE OR REPLACE FUNCTION MONTH(TIMESTAMP without TIME ZONE) RETURNS INTEGER
31+
CREATE OR REPLACE FUNCTION "public".MONTH(TIMESTAMP without TIME ZONE) RETURNS INTEGER
3232
AS $$
3333
SELECT EXTRACT(MONTH FROM $1)::INTEGER;
3434
$$ LANGUAGE SQL IMMUTABLE;
35-
CREATE OR REPLACE FUNCTION MONTH(TIMESTAMP WITH TIME ZONE) RETURNS INTEGER
35+
CREATE OR REPLACE FUNCTION "public".MONTH(TIMESTAMP WITH TIME ZONE) RETURNS INTEGER
3636
AS $$
3737
SELECT EXTRACT(MONTH FROM $1)::INTEGER;
3838
$$ LANGUAGE SQL STABLE;
39-
CREATE OR REPLACE FUNCTION MONTH(DATE) RETURNS INTEGER
39+
CREATE OR REPLACE FUNCTION "public".MONTH(DATE) RETURNS INTEGER
4040
AS $$
4141
SELECT EXTRACT(MONTH FROM $1)::INTEGER;
4242
$$ LANGUAGE SQL IMMUTABLE;
4343

4444

4545
/* DATEDIFF Functions for Year and Day */
4646
--Year
47-
CREATE OR REPLACE FUNCTION DATEDIFF_YEAR(TIMESTAMP without TIME ZONE, TIMESTAMP without TIME ZONE) RETURNS INTEGER
47+
CREATE OR REPLACE FUNCTION "public".DATEDIFF_YEAR(TIMESTAMP without TIME ZONE, TIMESTAMP without TIME ZONE) RETURNS INTEGER
4848
AS $$
4949
SELECT (DATE_PART('year', $2) - DATE_PART('year', $1))::INTEGER;
5050
$$ LANGUAGE SQL IMMUTABLE;
51-
CREATE OR REPLACE FUNCTION DATEDIFF_YEAR(TIMESTAMP WITH TIME ZONE, TIMESTAMP WITH TIME ZONE) RETURNS INTEGER
51+
CREATE OR REPLACE FUNCTION "public".DATEDIFF_YEAR(TIMESTAMP WITH TIME ZONE, TIMESTAMP WITH TIME ZONE) RETURNS INTEGER
5252
AS $$
5353
SELECT (DATE_PART('year', $2) - DATE_PART('year', $1))::INTEGER;
5454
$$ LANGUAGE SQL STABLE;
55-
CREATE OR REPLACE FUNCTION DATEDIFF_YEAR(DATE, DATE) RETURNS INTEGER
55+
CREATE OR REPLACE FUNCTION "public".DATEDIFF_YEAR(DATE, DATE) RETURNS INTEGER
5656
AS $$
5757
SELECT (DATE_PART('year', $2) - DATE_PART('year', $1))::INTEGER;
5858
$$ LANGUAGE SQL IMMUTABLE;
5959

6060
--Day
61-
CREATE OR REPLACE FUNCTION DATEDIFF_DAY(TIMESTAMP without TIME ZONE, TIMESTAMP without TIME ZONE) RETURNS INTEGER
61+
CREATE OR REPLACE FUNCTION "public".DATEDIFF_DAY(TIMESTAMP without TIME ZONE, TIMESTAMP without TIME ZONE) RETURNS INTEGER
6262
AS $$
6363
SELECT DATE_PART('day', $2 - $1)::INTEGER;
6464
$$ LANGUAGE SQL IMMUTABLE;
65-
CREATE OR REPLACE FUNCTION DATEDIFF_DAY(TIMESTAMP WITH TIME ZONE, TIMESTAMP WITH TIME ZONE) RETURNS INTEGER
65+
CREATE OR REPLACE FUNCTION "public".DATEDIFF_DAY(TIMESTAMP WITH TIME ZONE, TIMESTAMP WITH TIME ZONE) RETURNS INTEGER
6666
AS $$
6767
SELECT DATE_PART('day', $2 - $1)::INTEGER;
6868
$$ LANGUAGE SQL STABLE;
69-
CREATE OR REPLACE FUNCTION DATEDIFF_DAY(DATE, DATE) RETURNS INTEGER
69+
CREATE OR REPLACE FUNCTION "public".DATEDIFF_DAY(DATE, DATE) RETURNS INTEGER
7070
AS $$
7171
SELECT ($2::DATE - $1::DATE)::INTEGER;
7272
$$ LANGUAGE SQL IMMUTABLE;
7373

7474
/* Datename functions for Quarter*/
7575
--Quarter
76-
CREATE OR REPLACE FUNCTION DATENAME_Q(TIMESTAMP without TIME ZONE) RETURNS TEXT
76+
CREATE OR REPLACE FUNCTION "public".DATENAME_Q(TIMESTAMP without TIME ZONE) RETURNS TEXT
7777
AS $$
7878
SELECT to_char($1, 'Q');
7979
$$ LANGUAGE SQL IMMUTABLE;
80-
CREATE OR REPLACE FUNCTION DATENAME_Q(TIMESTAMP WITH TIME ZONE) RETURNS TEXT
80+
CREATE OR REPLACE FUNCTION "public".DATENAME_Q(TIMESTAMP WITH TIME ZONE) RETURNS TEXT
8181
AS $$
8282
SELECT to_char($1, 'Q');
8383
$$ LANGUAGE SQL STABLE;
84-
CREATE OR REPLACE FUNCTION DATENAME_Q(DATE) RETURNS TEXT
84+
CREATE OR REPLACE FUNCTION "public".DATENAME_Q(DATE) RETURNS TEXT
8585
AS $$
8686
SELECT to_char($1, 'Q');
8787
$$ LANGUAGE SQL IMMUTABLE;
8888

8989
/* End of Month */
90-
CREATE OR REPLACE FUNCTION EOMONTH(TIMESTAMP without TIME ZONE) RETURNS TIMESTAMP without TIME ZONE
90+
CREATE OR REPLACE FUNCTION "public".EOMONTH(TIMESTAMP without TIME ZONE) RETURNS TIMESTAMP without TIME ZONE
9191
AS $$
9292
SELECT date_trunc('month', $1) + interval '1 month' - interval '1 day';
9393
$$ LANGUAGE SQL IMMUTABLE;
94-
CREATE OR REPLACE FUNCTION EOMONTH(TIMESTAMP WITH TIME ZONE) RETURNS TIMESTAMP with TIME ZONE
94+
CREATE OR REPLACE FUNCTION "public".EOMONTH(TIMESTAMP WITH TIME ZONE) RETURNS TIMESTAMP with TIME ZONE
9595
AS $$
9696
SELECT date_trunc('month', $1) + interval '1 month' - interval '1 day';
9797
$$ LANGUAGE SQL STABLE;
98-
CREATE OR REPLACE FUNCTION EOMONTH(DATE) RETURNS TIMESTAMP with TIME ZONE
98+
CREATE OR REPLACE FUNCTION "public".EOMONTH(DATE) RETURNS TIMESTAMP with TIME ZONE
9999
AS $$
100100
SELECT date_trunc('month', $1) + interval '1 month' - interval '1 day';
101101
$$ LANGUAGE SQL IMMUTABLE;
102102

103103
/* Dateadd functions for the other OpenIMIS functions*/
104104
--Year
105-
CREATE OR REPLACE FUNCTION DATEADD_YEAR(INTEGER, TIMESTAMP without TIME ZONE) RETURNS TIMESTAMP without TIME ZONE
105+
CREATE OR REPLACE FUNCTION "public".DATEADD_YEAR(INTEGER, TIMESTAMP without TIME ZONE) RETURNS TIMESTAMP without TIME ZONE
106106
AS $$
107107
SELECT $2 + ($1 * INTERVAL '1 year');
108108
$$ LANGUAGE SQL IMMUTABLE;
109-
CREATE OR REPLACE FUNCTION DATEADD_YEAR(INTEGER, TIMESTAMP WITH TIME ZONE) RETURNS TIMESTAMP with TIME ZONE
109+
CREATE OR REPLACE FUNCTION "public".DATEADD_YEAR(INTEGER, TIMESTAMP WITH TIME ZONE) RETURNS TIMESTAMP with TIME ZONE
110110
AS $$
111111
SELECT $2 + ($1 * INTERVAL '1 year');
112112
$$ LANGUAGE SQL STABLE;
113-
CREATE OR REPLACE FUNCTION DATEADD_YEAR(INTEGER, DATE) RETURNS TIMESTAMP without TIME ZONE
113+
CREATE OR REPLACE FUNCTION "public".DATEADD_YEAR(INTEGER, DATE) RETURNS TIMESTAMP without TIME ZONE
114114
AS $$
115115
SELECT $2 + ($1 * INTERVAL '1 year');
116116
$$ LANGUAGE SQL IMMUTABLE;
117117

118118
--Month
119-
CREATE OR REPLACE FUNCTION DATEADD_MONTH(INTEGER, TIMESTAMP without TIME ZONE) RETURNS TIMESTAMP without TIME ZONE
119+
CREATE OR REPLACE FUNCTION "public".DATEADD_MONTH(INTEGER, TIMESTAMP without TIME ZONE) RETURNS TIMESTAMP without TIME ZONE
120120
AS $$
121121
SELECT $2 + ($1 * INTERVAL '1 month');
122122
$$ LANGUAGE SQL IMMUTABLE;
123-
CREATE OR REPLACE FUNCTION DATEADD_MONTH(INTEGER, TIMESTAMP WITH TIME ZONE) RETURNS TIMESTAMP with TIME ZONE
123+
CREATE OR REPLACE FUNCTION "public".DATEADD_MONTH(INTEGER, TIMESTAMP WITH TIME ZONE) RETURNS TIMESTAMP with TIME ZONE
124124
AS $$
125125
SELECT $2 + ($1 * INTERVAL '1 month');
126126
$$ LANGUAGE SQL STABLE;
127-
CREATE OR REPLACE FUNCTION DATEADD_MONTH(INTEGER, DATE) RETURNS TIMESTAMP without TIME ZONE
127+
CREATE OR REPLACE FUNCTION "public".DATEADD_MONTH(INTEGER, DATE) RETURNS TIMESTAMP without TIME ZONE
128128
AS $$
129129
SELECT $2 + ($1 * INTERVAL '1 month');
130130
$$ LANGUAGE SQL IMMUTABLE;
131131

132132
--DAY
133-
CREATE OR REPLACE FUNCTION DATEADD_DAY(INTEGER, TIMESTAMP without TIME ZONE) RETURNS TIMESTAMP without TIME ZONE
133+
CREATE OR REPLACE FUNCTION "public".DATEADD_DAY(INTEGER, TIMESTAMP without TIME ZONE) RETURNS TIMESTAMP without TIME ZONE
134134
AS $$
135135
SELECT $2 + $1 * INTERVAL '1 day';
136136
$$ LANGUAGE SQL IMMUTABLE;
137-
CREATE OR REPLACE FUNCTION DATEADD_DAY(INTEGER, TIMESTAMP WITH TIME ZONE) RETURNS TIMESTAMP with TIME ZONE
137+
CREATE OR REPLACE FUNCTION "public".DATEADD_DAY(INTEGER, TIMESTAMP WITH TIME ZONE) RETURNS TIMESTAMP with TIME ZONE
138138
AS $$
139139
SELECT $2 + $1 * INTERVAL '1 day';
140140
$$ LANGUAGE SQL STABLE;
141-
CREATE OR REPLACE FUNCTION DATEADD_DAY(INTEGER, DATE) RETURNS TIMESTAMP without TIME ZONE
141+
CREATE OR REPLACE FUNCTION "public".DATEADD_DAY(INTEGER, DATE) RETURNS TIMESTAMP without TIME ZONE
142142
AS $$
143143
SELECT $2 + $1 * INTERVAL '1 day';
144144
$$ LANGUAGE SQL IMMUTABLE;

0 commit comments

Comments
 (0)