Skip to content

Commit 8091a83

Browse files
committed
Stop caching in-memory databases
1 parent dccd4a1 commit 8091a83

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

tiled/_tests/test_sync.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import asyncio
22
import contextlib
33
import tempfile
4-
import uuid
54

65
import awkward
76
import h5py
@@ -25,7 +24,6 @@
2524
def client_factory(readable_storage=None):
2625
with tempfile.TemporaryDirectory() as tempdir:
2726
catalog = in_memory(
28-
named_memory=str(uuid.uuid4())[:8],
2927
writable_storage=str(tempdir),
3028
readable_storage=readable_storage,
3129
)

tiled/_tests/test_validation.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
"""
22
This tests tiled's validation registry
33
"""
4-
import uuid
5-
64
import numpy as np
75
import pandas as pd
86
import pytest
@@ -108,7 +106,6 @@ def test_unknown_spec_strict(tmpdir):
108106
"path": "/",
109107
"args": {
110108
"writable_storage": str(tmpdir),
111-
"named_memory": str(uuid.uuid4())[:8],
112109
},
113110
},
114111
],

tiled/server/app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ def override_get_settings():
473473
# not set, use a SQLite database in memory. Horizontally scaled deployments
474474
# must specify a persistent database.
475475
settings.database_settings.uri = (
476-
settings.database_settings.uri or "sqlite://"
476+
settings.database_settings.uri or "sqlite:///file:authdb?mode=memory&cache=shared&uri=true"
477477
)
478478
if (
479479
authenticators

tiled/server/connection_pool.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ def open_database_connection_pool(database_settings: DatabaseSettings) -> AsyncE
7373
pool_pre_ping=database_settings.pool_pre_ping,
7474
)
7575

76-
# Cache the engine so we don't create more than one pool per database_settings.
77-
monitor_db_pool(engine.pool, sanitize_uri(database_settings.uri)[0])
78-
_connection_pools[database_settings] = engine
76+
# Cache the engine so we don't create more than one pool per database_settings.
77+
monitor_db_pool(engine.pool, sanitize_uri(database_settings.uri)[0])
78+
_connection_pools[database_settings] = engine
7979

8080
# For SQLite, ensure that foreign key constraints are enforced.
8181
if engine.dialect.name == "sqlite":

0 commit comments

Comments
 (0)