Strip comments to ensure more stable parameter pre-binding (fixes #26)

database/macrostrat/database/utils.py

@@ -150,7 +150,7 @@ def _get_queries(sql, interpret_as_file=None):
     if isinstance(sql, Path):
         sql = sql.read_text()
 
-    return split(sql)
+    return split(format(sql, strip_comments=True))
 
 
 def _is_prebind_param(param):

database/test_database.py

@@ -278,6 +278,16 @@ def test_run_query_2(db):
     assert r1[0].name == "Test"
 
 
+def test_ambiguous_comment_bind(db):
+    sql = """
+    /* This is a comment {with_fake_param} */
+    SELECT name FROM sample WHERE name = {name}
+    """
+    res = db.run_query(sql, dict(name=Literal("Test")))
+    data = res.scalar()
+    assert data == "Test"
+
+
 def test_close_connection(conn):
     """
     Basic test demonstrating the underlying capability to kill a long-running query