Allow configuring qwc config schema in service config

Author: manisandro

requirements.txt

@@ -5,4 +5,4 @@ flask-restx==1.3.0
 requests==2.32.0
 psycopg2==2.9.9
 SQLAlchemy==2.0.29
-qwc-services-core==1.3.29
+qwc-services-core==1.3.30

schemas/qwc-map-viewer.json

@@ -24,6 +24,10 @@
           "description": "DB connection URL (for user_info_fields). Can be set to an empty string if running without DB.",
           "type": "string"
         },
+        "qwc_config_schema": {
+          "description": "The name of the DB schema which stores the qwc config. Default: qwc_config",
+          "type": "string"
+        },
         "qwc2_path": {
           "description": "Path to QWC2 files",
           "type": "string"

src/qwc2_viewer.py

@@ -14,8 +14,6 @@
 from qwc_services_core.runtime_config import RuntimeConfig
 
 
-qwc_config_schema = os.getenv("QWC_CONFIG_SCHEMA", "qwc_config")
-
 db_engine = DatabaseEngine()
 
 
@@ -95,6 +93,7 @@ def __init__(self, tenant, tenant_handler, logger):
             config.get('internal_permalink_service_url', default_url))
 
         self.db_url = config.get('db_url', 'postgresql:///?service=qwc_configdb')
+        self.qwc_config_schema = config.get('qwc_config_schema', 'qwc_config')
 
         self.show_restricted_themes = config.get('show_restricted_themes', False)
         self.show_restricted_themes_whitelist = config.get('show_restricted_themes_whitelist', "")
@@ -140,7 +139,7 @@ def qwc2_index(self, identity, params, request_url):
                     FROM {schema}.user_infos ui
                     JOIN {schema}.users u ON u.id=ui.user_id
                     WHERE u.name=:user;
-                """.format(schema=qwc_config_schema))
+                """.format(schema=self.qwc_config_schema))
                 result = conn.execute(sql, {"user": identity.get("username")})
 
                 row = result.first()
@@ -270,7 +269,7 @@ def qwc2_config(self, identity, params):
                             FROM {schema}.user_infos ui
                             JOIN {schema}.users u ON u.id=ui.user_id
                             WHERE u.name=:user;
-                        """.format(schema=qwc_config_schema))
+                        """.format(schema=self.qwc_config_schema))
                         result = conn.execute(sql, {"user": identity.get("username")})
 
                         row = result.first()
@@ -385,7 +384,7 @@ def set_user_info(self, params, identity):
             """.format(
                 columns = ",".join(columns),
                 values_sql = ",".join(values_sql),
-                schema=qwc_config_schema
+                schema=self.qwc_config_schema
             ))
             result = conn.execute(sql, values)
             row = result.one_or_none()