github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

De-duplicate 'datasette db.db db.db', closes #1632

Browse source 
Refs https://github.com/simonw/datasette-publish-fly/pull/12
This commit is contained in:
Simon Willison 2022-02-07 15:28:46 -08:00
commit 0cd982fc6a
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
datasette/cli.py
View file

@ -549,6 +549,9 @@ def serve(
)
)
# De-duplicate files so 'datasette db.db db.db' only attaches one /db
files = list(dict.fromkeys(files))
try:
ds = Datasette(files, **kwargs)
except SpatialiteNotFound:

12
tests/test_cli.py
View file

@ -257,6 +257,7 @@ def test_serve_create(ensure_eventloop, tmpdir):
def test_serve_duplicate_database_names(ensure_eventloop, tmpdir):
"'datasette db.db nested/db.db' should attach two databases, /db and /db_2"
runner = CliRunner()
db_1_path = str(tmpdir / "db.db")
nested = tmpdir / "nested"
@ -270,6 +271,17 @@ def test_serve_duplicate_database_names(ensure_eventloop, tmpdir):
assert {db["name"] for db in databases} == {"db", "db_2"}
def test_serve_deduplicate_same_database_path(ensure_eventloop, tmpdir):
"'datasette db.db db.db' should only attach one database, /db"
runner = CliRunner()
db_path = str(tmpdir / "db.db")
sqlite3.connect(db_path).execute("vacuum")
result = runner.invoke(cli, [db_path, db_path, "--get", "/-/databases.json"])
assert result.exit_code == 0, result.output
databases = json.loads(result.output)
assert {db["name"] for db in databases} == {"db"}
@pytest.mark.parametrize(
"filename", ["test-database (1).sqlite", "database (1).sqlite"]
)