minor fixups, add backtick quoted identifiers

Author: nickzoic

countess/utils/expression_to_sql.py

@@ -89,7 +89,7 @@ def sql(self):
 
 
 class DoubleQuotedStringLiteral(SqlTemplatingSymbol):
-    regex = re.compile(r'"(?:\\.|[^"\n])*"')
+    regex = re.compile(r'"[^"\\]*(?:\\.[^"\\]*)*"')
 
     def sql(self):
         return duckdb_escape_literal(self.name[1:-1])
@@ -102,6 +102,13 @@ def sql(self):
         return duckdb_escape_identifier(self.name)
 
 
+class BacktickQuotedLabel(SqlTemplatingSymbol):
+    regex = re.compile(r"`(?:\\.|[^`\n])*`")
+
+    def sql(self):
+        return duckdb_escape_identifier(self.name[1:-1])
+
+
 class SqlTemplatingList(pypeg2.List):
     before = ""
     between = ""
@@ -122,7 +129,7 @@ class FunctionCall(pypeg2.Concat):
 
     def sql(self):
         func_name = str(self[0].name).upper()
-        func_params = ", ".join(s.sql() for s in self[1:])
+        func_params = ",".join(s.sql() for s in self[1:])
 
         if func_name in LIST_OPS:
             return f"LIST_{func_name}([{func_params}])"
@@ -136,6 +143,7 @@ class Value(pypeg2.Concat):
         BooleanLiteral,
         NullLiteral,
         Label,
+        BacktickQuotedLabel,
         DecimalLiteral,
         IntegerLiteral,
         SingleQuotedStringLiteral,

tests/plugins/test_expression.py

@@ -23,7 +23,7 @@
 
 code_2 = "__filter = bar + baz != 11"
 
-code_3 = "qux = foo + bar + baz\n\nfoo = None\n\nbar = None if qux else 0"
+code_3 = "qux = foo + bar + baz\n\nfoo = None\n\nbar = 1 if qux else 0"
 
 
 def test_expr_1():