Escape string enum fix

mymarilyn · Mar 22, 2019 · f72814f · f72814f
1 parent 2beeac0
commit f72814f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/clickhouse_driver/util/escape.py b/clickhouse_driver/util/escape.py
@@ -39,7 +39,7 @@ def escape_param(item):
         return "(%s)" % ', '.join(text_type(escape_param(x)) for x in item)
 
     elif isinstance(item, Enum):
-        return item.value
+        return escape_param(item.value)
 
     elif isinstance(item, UUID):
         return "'%s'" % str(item)

diff --git a/tests/test_substitution.py b/tests/test_substitution.py
@@ -5,7 +5,7 @@
 from decimal import Decimal
 from uuid import UUID
 
-from enum import IntEnum
+from enum import IntEnum, Enum
 
 from tests.testcase import BaseTestCase
 
@@ -132,6 +132,17 @@ class A(IntEnum):
         rv = self.client.execute(self.double_tpl, params)
         self.assertEqual(rv, [(-1, 2)])
 
+        class A(Enum):
+            hello = 'hello'
+            world = 'world'
+
+        params = {'x': A.hello, 'y': A.world}
+
+        self.assert_subst(self.double_tpl, params, "SELECT 'hello', 'world'")
+
+        rv = self.client.execute(self.double_tpl, params)
+        self.assertEqual(rv, [('hello', 'world')])
+
     def test_float(self):
         params = {'x': 1e-12, 'y': 123.45}