Skip to content

Commit

Permalink
Fix pg_service 2nd try
Browse files Browse the repository at this point in the history
Fix pg_service 2nd try
  • Loading branch information
ponceta committed Oct 23, 2024
1 parent bcee926 commit 629cc1c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions datamodel/test/test_schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

from .utils import DEFAULT_PG_SERVICE, DbTestBase

TWW_SCHEMAS = ("tdh_sys", "tdh_vl", "tdh_od", "tdh_cfg", "tdh_app")
TDH_SCHEMAS = ("tdh_sys", "tdh_vl", "tdh_od", "tdh_cfg", "tdh_app")
PG_SCHEMAS = ("pg_toast", "information_schema", "pg_catalog", "public")


Expand All @@ -23,7 +23,7 @@ def setUpClass(cls):
cls.conn = psycopg.connect(f"service={pgservice}")

def test_list_schemas(self):
schemas = ", ".join([f"'{schema}'" for schema in TWW_SCHEMAS + PG_SCHEMAS])
schemas = ", ".join([f"'{schema}'" for schema in TDH_SCHEMAS + PG_SCHEMAS])
list_schemas = f"SELECT schema_name FROM information_schema.schemata WHERE schema_name NOT IN ({schemas});"
self.check_empty(list_schemas)

Expand All @@ -32,7 +32,7 @@ def test_app_schema(self):
self.check_empty(list_tables)

def test_data_schemas(self):
pg_schemas = ", ".join([f"'{schema}'" for schema in TWW_SCHEMAS + PG_SCHEMAS])
pg_schemas = ", ".join([f"'{schema}'" for schema in TDH_SCHEMAS + PG_SCHEMAS])
list_views = (
"SELECT * FROM information_schema.tables WHERE table_type = 'VIEW' "
f"AND table_schema NOT IN ('tdh_app', {pg_schemas})"
Expand Down
2 changes: 1 addition & 1 deletion plugin/.docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN apt-get update && \
&& rm -rf /var/lib/apt/lists/*

RUN printf '[postgres]\nhost=db\ndbname=postgres\nuser=postgres\n' >> /etc/postgresql-common/pg_service.conf
RUN printf '[pg_tdh]\nhost=db\ndbname=tww\nuser=postgres\npassword=postgres\n' >> /etc/postgresql-common/pg_service.conf
RUN printf '[pg_tdh]\nhost=db\ndbname=tdh\nuser=postgres\npassword=postgres\n' >> /etc/postgresql-common/pg_service.conf

# Some defaults
ENV POSTGRES_PASSWORD=postgres
Expand Down
2 changes: 1 addition & 1 deletion project/district_heating.qgs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<qgis projectname="TEKSI District Heating" saveDateTime="2024-08-20T14:38:20" saveUser="pulpoar" saveUserFull="Poncet-Montanges, Arnaud" version="3.34.8-Prizren">
<qgis projectname="TEKSI : District Heating" saveDateTime="2024-08-20T14:38:20" saveUser="pulpoar" saveUserFull="Poncet-Montanges, Arnaud" version="3.34.8-Prizren">
<homePath path=""></homePath>
<title>TEKSI District Heating</title>
<transaction mode="Disabled"></transaction>
Expand Down

0 comments on commit 629cc1c

Please sign in to comment.