A few more SQLite string fixes, refs #2783

Author: simonw

datasette/utils/__init__.py

@@ -1294,9 +1294,11 @@ class StartupError(Exception):
 _comments_and_strings_re = re.compile(
     r"""
     --[^\n]*            # single line comment
-    | /\*.*?\*/         # multi line comment
+    | /\*.*?(?:\*/|\Z)  # multi line comment, possibly to end-of-input
     | '(?:''|[^'])*'    # single quoted string ('' escapes a quote)
     | "(?:""|[^"])*"    # double quoted identifier ("" escapes a quote)
+    | \[(?:[^\]])*\]    # square-bracket quoted identifier
+    | `(?:``|[^`])*`    # backtick quoted identifier
     """,
     re.DOTALL | re.VERBOSE,
 )

tests/test_utils.py

@@ -764,6 +764,11 @@ def test_parse_metadata(content, expected):
         # Parameters that live inside a comment should be ignored
         ("select :x -- and :ignored", ["x"]),
         ("select :x /* and :ignored */ from t", ["x"]),
+        ("select :x /* and :ignored", ["x"]),
+        # Parameters inside quoted identifiers should be ignored
+        ("select [a:b] from t where id = :id", ["id"]),
+        ("select `a:b` from t where id = :id", ["id"]),
+        ("select `a``:b` from t where id = :id", ["id"]),
         # Parameters inside a string literal should be ignored
         ("select ':ignored' || :real", ["real"]),
     ),