Filter SQL connection options

Prevent passing dict to SQL connection which throws an error because it cannot be cached

Author: webb-ben

pygeoapi/provider/mvt_postgresql.py

@@ -33,7 +33,6 @@
 #
 # =================================================================
 
-from copy import deepcopy
 import logging
 
 from sqlalchemy.sql import func, select
@@ -64,11 +63,7 @@ def __init__(self, provider_def):
 
         :returns: pygeoapi.provider.MVT.MVTPostgreSQLProvider
         """
-        pg_def = deepcopy(provider_def)
-        # delete the zoom option before initializing the PostgreSQL provider
-        # that provider breaks otherwise
-        del pg_def['options']['zoom']
-        PostgreSQLProvider.__init__(self, pg_def)
+        PostgreSQLProvider.__init__(self, provider_def)
         BaseMVTProvider.__init__(self, provider_def)
 
     def get_fields(self):

pygeoapi/provider/sql.py

@@ -107,7 +107,7 @@ def __init__(
         self,
         provider_def: dict,
         driver_name: str,
-        extra_conn_args: Optional[dict]
+        extra_conn_args: Optional[dict] = {}
     ):
         """
         GenericSQLProvider Class constructor
@@ -143,9 +143,7 @@ def __init__(
         LOGGER.debug(f'Configured Storage CRS: {self.storage_crs}')
 
         # Read table information from database
-        options = None
-        if provider_def.get('options'):
-            options = provider_def['options']
+        options = provider_def.get('options', {})
         self._store_db_parameters(provider_def['data'], options)
         self._engine = get_engine(
             driver_name,
@@ -154,7 +152,7 @@ def __init__(
             self.db_name,
             self.db_user,
             self._db_password,
-            **(self.db_options or {}) | (extra_conn_args or {})
+            **self.db_options | extra_conn_args
         )
         self.table_model = get_table_model(
             self.table, self.id_field, self.db_search_path, self._engine
@@ -443,7 +441,11 @@ def _store_db_parameters(self, parameters, options):
         # reflecting the table definition from the DB
         self.db_search_path = tuple(parameters.get('search_path', ['public']))
         self._db_password = parameters.get('password')
-        self.db_options = options
+        self.db_options = {
+            k: v
+            for k, v in options.items()
+            if not isinstance(v, dict)
+        }
 
     def _sqlalchemy_to_feature(self, item, crs_transform_out=None):
         feature = {'type': 'Feature'}
@@ -608,7 +610,7 @@ def get_engine(
     database: str,
     user: str,
     password: str,
-    **connection_options
+    **connect_args
 ):
     """Create SQL Alchemy engine."""
     conn_str = URL.create(
@@ -619,11 +621,8 @@ def get_engine(
         port=int(port),
         database=database
     )
-    conn_args = {
-        **connection_options
-    }
     engine = create_engine(
-        conn_str, connect_args=conn_args, pool_pre_ping=True
+        conn_str, connect_args=connect_args, pool_pre_ping=True
     )
     return engine