Remove db.PG_CONN

src/db/__init__.py

@@ -47,14 +47,4 @@ def password(self):
         return self._db_uri.password if self._db_uri else None
 
 
-# It's expected to be set from another module
-# Example:
-# PG_CONN = {
-#     'host': LAYMAN_PG_HOST,
-#     'port': LAYMAN_PG_PORT,
-#     'dbname': LAYMAN_PG_DBNAME,
-#     'user': LAYMAN_PG_USER,
-#     'password': LAYMAN_PG_PASSWORD,
-# }
-PG_CONN = {}
 PG_URI_STR = str()

src/db/util.py

@@ -4,7 +4,7 @@
 from flask import g
 
 import crs as crs_def
-from . import PG_CONN, PG_URI_STR
+from . import PG_URI_STR
 from .error import Error
 
 logger = logging.getLogger(__name__)
@@ -13,8 +13,9 @@
 
 
 def create_connection_cursor(db_uri_str=None, encapsulate_exception=True):
+    db_uri_str = db_uri_str or PG_URI_STR
     try:
-        connection = psycopg2.connect(db_uri_str) if db_uri_str else psycopg2.connect(**PG_CONN)
+        connection = psycopg2.connect(db_uri_str)
         connection.set_session(autocommit=True)
     except BaseException as exc:
         if encapsulate_exception:

src/layman/layer/db/__init__.py

@@ -7,7 +7,7 @@
 from psycopg2 import sql
 from psycopg2.errors import InsufficientPrivilege
 
-from db import util as db_util, PG_CONN
+from db import util as db_util
 from layman.common.language import get_languages_iso639_2
 from layman.http import LaymanError
 from layman import settings
@@ -120,7 +120,7 @@ def import_layer_vector_file_to_internal_table(workspace, layername, main_filepa
 
 
 def create_ogr2ogr_args(*, schema, table_name, main_filepath, crs_id, output):
-    pg_conn = ' '.join([f"{k}='{v}'" for k, v in PG_CONN.items()])
+    pg_conn = ' '.join([f"{k}='{v}'" for k, v in settings.PG_CONN.items()])
     ogr2ogr_args = [
         'ogr2ogr',
         '-nln', table_name,

src/layman_settings.py

@@ -87,7 +87,6 @@ class EnumOriginalDataSource(Enum):
     'user': LAYMAN_PG_USER,
     'password': LAYMAN_PG_PASSWORD,
 }
-db.PG_CONN = PG_CONN
 PG_URI_STR = f"postgresql://{LAYMAN_PG_USER}:{LAYMAN_PG_PASSWORD}@{LAYMAN_PG_HOST}:{LAYMAN_PG_PORT}/{LAYMAN_PG_DBNAME}"
 db.PG_URI_STR = PG_URI_STR