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

.resolve_db_name() and .execute() work without inspect

Browse source 
Refs #420
This commit is contained in:
Simon Willison 2019-03-31 16:51:52 -07:00
commit 7d0f668556
4 changed files with 68 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
datasette/views/base.py
View file

@ -156,14 +156,13 @@ class BaseView(RenderMixin):
return r
async def resolve_db_name(self, request, db_name, **kwargs):
databases = self.ds.inspect()
hash = None
name = None
if "-" in db_name:
# Might be name-and-hash, or might just be
# a name with a hyphen in it
name, hash = db_name.rsplit("-", 1)
if name not in databases:
if name not in self.ds.databases:
# Try the whole name
name = db_name
hash = None
@ -171,11 +170,13 @@ class BaseView(RenderMixin):
name = db_name
# Verify the hash
try:
info = databases[name]
db = self.ds.databases[name]
except KeyError:
raise NotFound("Database not found: {}".format(name))
expected = info["hash"][:HASH_LENGTH]
expected = "000"
if db.hash is not None:
expected = db.hash[:HASH_LENGTH]
correct_hash_provided = (expected == hash)
if not correct_hash_provided: