Remove separate escape_string function.

geldata · Mar 15, 2024 · 714fd4d · 714fd4d
1 parent 251d3c9
commit 714fd4d
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 87 deletions.
diff --git a/edb/common/string.py b/edb/common/string.py
diff --git a/edb/edgeql/quote.py b/edb/edgeql/quote.py
@@ -21,7 +21,6 @@
 
 import re
 
-from edb.common.string import escape_string
 from .parser.grammar import keywords
 
 
@@ -37,6 +36,25 @@
 
 
 def quote_literal(string: str) -> str:
+
+    def escape_string(s: str) -> str:
+        # characters escaped according to
+        # https://www.edgedb.com/docs/reference/edgeql/lexical#strings
+        result = s
+
+        # escape backslash first
+        result = result.replace('\\', '\\\\')
+
+        result = result.replace('\'', '\\\'')
+        result = result.replace('\"', '\\\"')
+        result = result.replace('\b', '\\b')
+        result = result.replace('\f', '\\f')
+        result = result.replace('\n', '\\n')
+        result = result.replace('\r', '\\r')
+        result = result.replace('\t', '\\t')
+
+        return result
+
     return "'" + escape_string(string) + "'"
 
 

diff --git a/tests/common/test_string.py b/tests/common/test_string.py
diff --git a/tests/edgeql/test_quote.py b/tests/edgeql/test_quote.py
@@ -23,5 +23,24 @@
 class QuoteTests(unittest.TestCase):
 
     def test_quote_string(self):
+        self.assertEqual(qlquote.quote_literal(""), "''"),
         self.assertEqual(qlquote.quote_literal("abc"), "'abc'")
-        self.assertEqual(qlquote.quote_literal("abc\\\n"), "'abc\\\\\\n'")
+        self.assertEqual(qlquote.quote_literal("\b"), "'\\b'")
+        self.assertEqual(qlquote.quote_literal("\f"), "'\\f'")
+        self.assertEqual(qlquote.quote_literal("\n"), "'\\n'")
+        self.assertEqual(qlquote.quote_literal("\r"), "'\\r'")
+        self.assertEqual(qlquote.quote_literal("\t"), "'\\t'")
+        self.assertEqual(qlquote.quote_literal("\'"), "'\\\''")
+        self.assertEqual(qlquote.quote_literal("\""), "'\\\"'")
+        self.assertEqual(qlquote.quote_literal("\\"), "'\\\\'")
+        self.assertEqual(qlquote.quote_literal("\\b"), "'\\\\b'")
+        self.assertEqual(qlquote.quote_literal("\\f"), "'\\\\f'")
+        self.assertEqual(qlquote.quote_literal("\\n"), "'\\\\n'")
+        self.assertEqual(qlquote.quote_literal("\\r"), "'\\\\r'")
+        self.assertEqual(qlquote.quote_literal("\\t"), "'\\\\t'")
+        self.assertEqual(qlquote.quote_literal("\\\'"), "'\\\\\\\''")
+        self.assertEqual(qlquote.quote_literal("\\\""), "'\\\\\\\"'")
+        self.assertEqual(qlquote.quote_literal("\\\\"), "'\\\\\\\\'")
+        self.assertEqual(qlquote.quote_literal(
+            "abc\"efg\nhij\'klm\\nop"),
+            "'abc\\\"efg\\nhij\\\'klm\\\\nop'")