Add option to not used cached databases

Author: dan-fernandes

tiled/_tests/test_sync.py

@@ -24,7 +24,7 @@
 def client_factory(readable_storage=None):
     with tempfile.TemporaryDirectory() as tempdir:
         catalog = in_memory(
-            writable_storage=str(tempdir), readable_storage=readable_storage
+            writable_storage=str(tempdir), readable_storage=readable_storage, use_cached_database=False
         )
         app = build_app(catalog)
         with Context.from_app(app) as context:

tiled/catalog/adapter.py

@@ -171,8 +171,9 @@ def __init__(
         key_maker=lambda: str(uuid.uuid4()),
         storage_pool_size=5,
         storage_max_overflow=10,
+        use_cached_database=True,
     ):
-        self.engine = get_database_engine(database_settings)
+        self.engine = get_database_engine(database_settings, use_cached_database=use_cached_database)
         self.database_settings = database_settings
         self.writable_storage = {}
         self.readable_storage = {}
@@ -1676,6 +1677,7 @@ def in_memory(
     adapters_by_mimetype=None,
     top_level_access_blob=None,
     cache_settings=None,
+    use_cached_database=True
 ):
     if not named_memory:
         uri = "sqlite:///:memory:"
@@ -1693,6 +1695,7 @@ def in_memory(
         adapters_by_mimetype=adapters_by_mimetype,
         top_level_access_blob=top_level_access_blob,
         cache_settings=cache_settings,
+        use_cached_database=use_cached_database
     )
 
 
@@ -1712,6 +1715,7 @@ def from_uri(
     storage_pool_size=5,
     catalog_max_overflow=10,
     storage_max_overflow=10,
+    use_cached_database=True
 ):
     uri = ensure_specified_sql_driver(uri)
     if init_if_not_exists:
@@ -1747,6 +1751,7 @@ def from_uri(
         cache_settings,
         storage_pool_size=storage_pool_size,
         storage_max_overflow=storage_max_overflow,
+        use_cached_database=use_cached_database,
     )
     node = RootNode(metadata, specs, top_level_access_blob)
     mount_path = (

tiled/server/connection_pool.py

@@ -98,14 +98,15 @@ async def close_database_connection_pool(database_settings: DatabaseSettings):
 
 def get_database_engine(
     settings: Union[Settings, DatabaseSettings] = Depends(get_settings),
+    use_cached_database = True,
 ) -> AsyncEngine:
     database_settings = (
         settings.database_settings if isinstance(settings, Settings) else settings
     )
     # Special case for single-user mode
     if database_settings.uri is None:
         return None
-    if database_settings in _connection_pools:
+    if database_settings in _connection_pools and use_cached_database:
         return _connection_pools[database_settings]
     else:
         return open_database_connection_pool(database_settings)