Fixed issue with build_where_clause and build_choose_clause.

ej2 · ej2 · commit 33d69e531b73 · 2016-11-16T22:49:08.000-06:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,9 @@
 Changelog
 ========
 
+* 0.5.3 (October 14th, 2016)
+    * Fixed issue in build_choose_clause and build_where_clause that caused single quotes to not be escaped.
+
 * 0.5.2 (October 14th, 2016)
     * Fixed issue on UpdateMixin.
     * Fixed issue with CashBackInfo.
diff --git a/quickbooks/utils.py b/quickbooks/utils.py
@@ -9,7 +9,7 @@ def build_where_clause(**kwargs):
 
         for key, value in kwargs.items():
             if isinstance(value, six.string_types):
-                where.append("{0} = '{1}'".format(key, value.replace("'", "\'")))
+                where.append("{0} = '{1}'".format(key, value.replace(r"'", r"\'")))
             else:
                 where.append("{0} = {1}".format(key, value))
 
@@ -26,7 +26,7 @@ def build_choose_clause(choices, field):
 
         for choice in choices:
             if isinstance(choice, six.string_types):
-                where.append("'{0}'".format(choice.replace("'", "\'")))
+                where.append("'{0}'".format(choice.replace(r"'", r"\'")))
             else:
                 where.append("{0}".format(choice))
 
diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@ def read(*parts):
         return fp.read()
 
 
-VERSION = (0, 5, 2)
+VERSION = (0, 5, 3)
 version = '.'.join(map(str, VERSION))
 
 setup(
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
@@ -3,20 +3,21 @@
 
 
 class UtilsTests(unittest.TestCase):
-    def setup(self):
-        pass
-
     def test_build_where_clause(self):
-        where_clause = utils.build_where_clause(field1=1, field2="value2")
-
-        self.assertTrue(where_clause, "WHERE field1 = 1 AND field2 = 'value2")
+        where_clause = utils.build_where_clause(field1=1, field2="Someone's Company")
+        self.assertEqual(where_clause, "field2 = 'Someone\\\'s Company' AND field1 = 1")
 
     def test_build_where_clause_integers(self):
         where_clause = utils.build_choose_clause(choices=[1, 2], field="field1")
 
-        self.assertTrue(where_clause, "WHERE field1 in (1, 2)")
+        self.assertEqual(where_clause, "field1 in (1, 2)")
 
     def test_build_where_clause_strings(self):
         where_clause = utils.build_choose_clause(choices=["val1", "val2"], field="field1")
 
-        self.assertTrue(where_clause, "WHERE field1 in ('val1', 'val2')")
+        self.assertEqual(where_clause, "field1 in ('val1', 'val2')")
+
+    def test_build_where_clause_quoted_value(self):
+        where_clause = utils.build_choose_clause(choices=["val1", "Someone's Company"], field="field1")
+
+        self.assertEqual(where_clause, "field1 in ('val1', 'Someone\\\'s Company')")
