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

Show custom error message if SpatiaLite needed, closes #331

Browse source
This commit is contained in:
Simon Willison 2018-07-10 08:13:27 -07:00
commit 2db2ae4f21
No known key found for this signature in database
GPG key ID: 17E2DEA2588B7F52
1 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

32
datasette/app.py
View file

@ -1,4 +1,5 @@
import asyncio import asyncio
import click
import collections import collections
import hashlib import hashlib
import itertools import itertools
@ -261,17 +262,26 @@ class Datasette:
name = path.stem name = path.stem
if name in self._inspect: if name in self._inspect:
raise Exception("Multiple files with same stem %s" % name) raise Exception("Multiple files with same stem %s" % name)
try:
with sqlite3.connect( with sqlite3.connect(
"file:{}?immutable=1".format(path), uri=True "file:{}?immutable=1".format(path), uri=True
) as conn: ) as conn:
self.prepare_connection(conn) self.prepare_connection(conn)
self._inspect[name] = { self._inspect[name] = {
"hash": inspect_hash(path), "hash": inspect_hash(path),
"file": str(path), "file": str(path),
"views": inspect_views(conn), "views": inspect_views(conn),
"tables": inspect_tables(conn, self.metadata.get("databases", {}).get(name, {})) "tables": inspect_tables(conn, self.metadata.get("databases", {}).get(name, {}))
} }
except sqlite3.OperationalError as e:
if (e.args[0] == 'no such module: VirtualSpatialIndex'):
raise click.UsageError(
"It looks like you're trying to load a SpatiaLite"
" database without first loading the SpatiaLite module."
"\n\nRead more: https://datasette.readthedocs.io/en/latest/spatialite.html"
)
else:
raise
return self._inspect return self._inspect
def register_custom_units(self): def register_custom_units(self):