Skip to content

Commit 245b5f7

Browse files
committed
Revert "Add option to not used cached databases"
This reverts commit 9339ab4.
1 parent 9339ab4 commit 245b5f7

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

tiled/_tests/test_sync.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
def client_factory(readable_storage=None):
2525
with tempfile.TemporaryDirectory() as tempdir:
2626
catalog = in_memory(
27-
writable_storage=str(tempdir), readable_storage=readable_storage, use_cached_database=False
27+
writable_storage=str(tempdir), readable_storage=readable_storage
2828
)
2929
app = build_app(catalog)
3030
with Context.from_app(app) as context:

tiled/catalog/adapter.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,8 @@ def __init__(
171171
key_maker=lambda: str(uuid.uuid4()),
172172
storage_pool_size=5,
173173
storage_max_overflow=10,
174-
use_cached_database=True,
175174
):
176-
self.engine = get_database_engine(database_settings, use_cached_database=use_cached_database)
175+
self.engine = get_database_engine(database_settings)
177176
self.database_settings = database_settings
178177
self.writable_storage = {}
179178
self.readable_storage = {}
@@ -1677,7 +1676,6 @@ def in_memory(
16771676
adapters_by_mimetype=None,
16781677
top_level_access_blob=None,
16791678
cache_settings=None,
1680-
use_cached_database=True
16811679
):
16821680
if not named_memory:
16831681
uri = "sqlite:///:memory:"
@@ -1695,7 +1693,6 @@ def in_memory(
16951693
adapters_by_mimetype=adapters_by_mimetype,
16961694
top_level_access_blob=top_level_access_blob,
16971695
cache_settings=cache_settings,
1698-
use_cached_database=use_cached_database
16991696
)
17001697

17011698

@@ -1715,7 +1712,6 @@ def from_uri(
17151712
storage_pool_size=5,
17161713
catalog_max_overflow=10,
17171714
storage_max_overflow=10,
1718-
use_cached_database=True
17191715
):
17201716
uri = ensure_specified_sql_driver(uri)
17211717
if init_if_not_exists:
@@ -1751,7 +1747,6 @@ def from_uri(
17511747
cache_settings,
17521748
storage_pool_size=storage_pool_size,
17531749
storage_max_overflow=storage_max_overflow,
1754-
use_cached_database=use_cached_database,
17551750
)
17561751
node = RootNode(metadata, specs, top_level_access_blob)
17571752
mount_path = (

tiled/server/connection_pool.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,14 @@ async def close_database_connection_pool(database_settings: DatabaseSettings):
9898

9999
def get_database_engine(
100100
settings: Union[Settings, DatabaseSettings] = Depends(get_settings),
101-
use_cached_database = True,
102101
) -> AsyncEngine:
103102
database_settings = (
104103
settings.database_settings if isinstance(settings, Settings) else settings
105104
)
106105
# Special case for single-user mode
107106
if database_settings.uri is None:
108107
return None
109-
if database_settings in _connection_pools and use_cached_database:
108+
if database_settings in _connection_pools:
110109
return _connection_pools[database_settings]
111110
else:
112111
return open_database_connection_pool(database_settings)

0 commit comments

Comments
 (0)