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

Allow leading comments on SQL queries, refs #1860

Browse source
This commit is contained in:
Simon Willison 2022-10-26 14:34:33 -07:00
commit 55a709c480
2 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
datasette/utils/__init__.py
View file

@ -205,13 +205,28 @@ class InvalidSql(Exception):
pass
# Allow SQL to start with a /* */ or -- comment
comment_re = (
# Start of string, then any amount of whitespace
r"^(\s*"
+
# Comment that starts with -- and ends at a newline
r"(?:\-\-.*?\n\s*)"
+
# Comment that starts with /* and ends with */
r"|(?:/\*[\s\S]*?\*/)"
+
# Whitespace
r")*\s*"
)
allowed_sql_res = [
re.compile(r"^select\b"),
re.compile(r"^explain\s+select\b"),
re.compile(r"^explain\s+query\s+plan\s+select\b"),
re.compile(r"^with\b"),
re.compile(r"^explain\s+with\b"),
re.compile(r"^explain\s+query\s+plan\s+with\b"),
re.compile(comment_re + r"select\b"),
re.compile(comment_re + r"explain\s+select\b"),
re.compile(comment_re + r"explain\s+query\s+plan\s+select\b"),
re.compile(comment_re + r"with\b"),
re.compile(comment_re + r"explain\s+with\b"),
re.compile(comment_re + r"explain\s+query\s+plan\s+with\b"),
]
allowed_pragmas = (
"database_list",