Merge pull request #106 from opengisch/fix-non-ili

check table existance for source that is non-INTERLIS
opengisch · Oct 7, 2024 · e99347b · e99347b
2 parents 1b0934f + 453fac3
commit e99347b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -30,9 +30,9 @@ jobs:
         run: |
           sudo ./scripts/package_pip_packages.sh
       - name: Test on QGIS with PG 13
-        run: docker-compose -f .docker/docker-compose.gh.yml run -e "PGHOST=postgres13" qgis /usr/src/.docker/run-docker-tests.sh
+        run: docker compose -f .docker/docker-compose.gh.yml run -e "PGHOST=postgres13" qgis /usr/src/.docker/run-docker-tests.sh
       - name: Test on QGIS with PG 15
-        run: docker-compose -f .docker/docker-compose.gh.yml run -e "PGHOST=postgres15" qgis /usr/src/.docker/run-docker-tests.sh
+        run: docker compose -f .docker/docker-compose.gh.yml run -e "PGHOST=postgres15" qgis /usr/src/.docker/run-docker-tests.sh
 
   release:
     name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI

diff --git a/modelbaker/dbconnector/gpkg_connector.py b/modelbaker/dbconnector/gpkg_connector.py
@@ -653,6 +653,9 @@ def get_attrili_attrdb_mapping_by_owner(self, owners):
         return cursor
 
     def get_models(self):
+        if not self._table_exists("t_ili2db_trafo"):
+            return {}
+
         # Get MODELS
         cursor = self.conn.cursor()
 

diff --git a/modelbaker/dbconnector/mssql_connector.py b/modelbaker/dbconnector/mssql_connector.py
@@ -738,6 +738,9 @@ def get_iliname_dbname_mapping(self, sqlnames=list()):
         return result
 
     def get_models(self):
+        if not self._table_exists("t_ili2db_trafo"):
+            return {}
+
         # Get MODELS
         if self.schema:
             cur = self.conn.cursor()

diff --git a/modelbaker/dbconnector/pg_connector.py b/modelbaker/dbconnector/pg_connector.py
@@ -845,6 +845,9 @@ def get_attrili_attrdb_mapping_by_owner(self, owners):
         return {}
 
     def get_models(self):
+        if not self._table_exists("t_ili2db_trafo"):
+            return {}
+
         # Get MODELS
         if self.schema:
             cursor = self.conn.cursor(cursor_factory=psycopg2.extras.DictCursor)

diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
@@ -15,5 +15,5 @@ fi
 cd $(dirname $0)/..
 export GITHUB_WORKSPACE=$PWD # only for local execution
 
-docker-compose -f .docker/docker-compose.gh.yml run qgis /usr/src/.docker/run-docker-tests.sh $@
-docker-compose -f .docker/docker-compose.gh.yml rm -s -f
+docker compose -f .docker/docker-compose.gh.yml run qgis /usr/src/.docker/run-docker-tests.sh $@
+docker compose -f .docker/docker-compose.gh.yml rm -s -f