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

Backport derive_named_parameters fix to 0.64.x

Browse source 
Refs #2354
This commit is contained in:
Simon Willison 2024-06-21 16:24:30 -07:00
commit 2e62282170
1 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

37
datasette/utils/__init__.py
View file

@ -402,9 +402,9 @@ def make_dockerfile(
apt_get_extras = apt_get_extras_ apt_get_extras = apt_get_extras_
if spatialite: if spatialite:
apt_get_extras.extend(["python3-dev", "gcc", "libsqlite3-mod-spatialite"]) apt_get_extras.extend(["python3-dev", "gcc", "libsqlite3-mod-spatialite"])
environment_variables[ environment_variables["SQLITE_EXTENSIONS"] = (
"SQLITE_EXTENSIONS" "/usr/lib/x86_64-linux-gnu/mod_spatialite.so"
] = "/usr/lib/x86_64-linux-gnu/mod_spatialite.so" )
return """ return """
FROM python:3.11.0-slim-bullseye FROM python:3.11.0-slim-bullseye
COPY . /app COPY . /app
@ -416,9 +416,11 @@ RUN datasette inspect {files} --inspect-file inspect-data.json
ENV PORT {port} ENV PORT {port}
EXPOSE {port} EXPOSE {port}
CMD {cmd}""".format( CMD {cmd}""".format(
apt_get_extras=APT_GET_DOCKERFILE_EXTRAS.format(" ".join(apt_get_extras)) apt_get_extras=(
if apt_get_extras APT_GET_DOCKERFILE_EXTRAS.format(" ".join(apt_get_extras))
else "", if apt_get_extras
else ""
),
environment_variables="\n".join( environment_variables="\n".join(
[ [
"ENV {} '{}'".format(key, value) "ENV {} '{}'".format(key, value)
@ -1114,17 +1116,24 @@ class StartupError(Exception):
pass pass
_re_named_parameter = re.compile(":([a-zA-Z0-9_]+)") _single_line_comment_re = re.compile(r"--.*")
_multi_line_comment_re = re.compile(r"/\*.*?\*/", re.DOTALL)
_single_quote_re = re.compile(r"'(?:''|[^'])*'")
_double_quote_re = re.compile(r'"(?:\"\"|[^"])*"')
_named_param_re = re.compile(r":(\w+)")
async def derive_named_parameters(db, sql): async def derive_named_parameters(db, sql):
explain = "explain {}".format(sql.strip().rstrip(";")) # Remove single-line comments
possible_params = _re_named_parameter.findall(sql) sql = _single_line_comment_re.sub("", sql)
try: # Remove multi-line comments
results = await db.execute(explain, {p: None for p in possible_params}) sql = _multi_line_comment_re.sub("", sql)
return [row["p4"].lstrip(":") for row in results if row["opcode"] == "Variable"] # Remove single-quoted strings
except (sqlite3.DatabaseError, AttributeError): sql = _single_quote_re.sub("", sql)
return possible_params # Remove double-quoted strings
sql = _double_quote_re.sub("", sql)
# Extract parameters from what is left
return _named_param_re.findall(sql)
def add_cors_headers(headers): def add_cors_headers(headers):