Skip to content

Commit

Permalink
bugfix: correctly detect json1 in versions.json (#2327)
Browse files Browse the repository at this point in the history
Fixes #2326
  • Loading branch information
sebbacon authored Aug 15, 2024
1 parent 6d91d08 commit 9cb5700
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions datasette/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
async_call_with_supported_arguments,
await_me_maybe,
call_with_supported_arguments,
detect_json1,
display_actor,
escape_css_string,
escape_sqlite,
Expand Down Expand Up @@ -1172,9 +1173,8 @@ def _versions(self):
conn = sqlite3.connect(":memory:")
self._prepare_connection(conn, "_memory")
sqlite_version = conn.execute("select sqlite_version()").fetchone()[0]
sqlite_extensions = {}
sqlite_extensions = {"json1": detect_json1(conn)}
for extension, testsql, hasversion in (
("json1", "SELECT json('{}')", False),
("spatialite", "SELECT spatialite_version()", True),
):
try:
Expand Down
4 changes: 4 additions & 0 deletions tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,10 @@ async def test_versions_json(ds_client):
assert "version" in data["sqlite"]
assert "fts_versions" in data["sqlite"]
assert "compile_options" in data["sqlite"]
# By default, the json1 extension is enabled in the SQLite
# provided by the `ubuntu-latest` github actions runner, and
# all versions of SQLite from 3.38.0 onwards
assert data["sqlite"]["extensions"]["json1"]


@pytest.mark.asyncio
Expand Down

0 comments on commit 9cb5700

Please sign in to comment.