Merge pull request #505 from dimitri-yatsenko/master

Fix #376 and #488

Author: eywalker

datajoint/connection.py

@@ -95,7 +95,7 @@ def connect(self):
             self._conn = client.connect(
                 init_command=self.init_fun,
                 sql_mode="NO_ZERO_DATE,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,"
-                         "STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION",
+                         "STRICT_ALL_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION",
                 charset=config['connection.charset'],
                 **self.conn_info)
 

datajoint/query.py

@@ -117,6 +117,9 @@ def _make_condition(self, arg):
         :param arg: any valid restriction object.
         :return: an SQL condition string.  It may also be a boolean that is intended to be treated as a string.
         """
+        def prep_value(v):
+            return str(v) if isinstance(v, (datetime.date, datetime.datetime, datetime.time, decimal.Decimal)) else v
+
         negate = False
         while isinstance(arg, Not):
             negate = not negate
@@ -125,7 +128,7 @@ def _make_condition(self, arg):
 
         # restrict by string
         if isinstance(arg, str):
-            return template % arg.strip()
+            return template % arg.strip().replace("%", "%%")  # escape % in strings, see issue #376
 
         # restrict by AndList
         if isinstance(arg, AndList):
@@ -148,15 +151,12 @@ def _make_condition(self, arg):
         # restrict by a mapping such as a dict -- convert to an AndList of string equality conditions
         if isinstance(arg, collections.abc.Mapping):
             return template % self._make_condition(
-                AndList('`%s`=%r' % (k, (v if not isinstance(v, (
-                    datetime.date, datetime.datetime, datetime.time, decimal.Decimal)) else str(v)))
-                        for k, v in arg.items() if k in self.heading))
+                AndList('`%s`=%r' % (k, prep_value(v)) for k, v in arg.items() if k in self.heading))
 
         # restrict by a numpy record -- convert to an AndList of string equality conditions
         if isinstance(arg, np.void):
             return template % self._make_condition(
-                AndList(('`%s`='+('%s' if self.heading[k].numeric else '"%s"')) % (k, arg[k])
-                        for k in arg.dtype.fields if k in self.heading))
+                AndList(('`%s`=%r' % (k, prep_value(arg[k])) for k in arg.dtype.fields if k in self.heading)))
 
         # restrict by a Relation class -- triggers instantiation
         if inspect.isclass(arg) and issubclass(arg, Query):

tests/schema.py

@@ -29,7 +29,13 @@ class Test2(dj.Manual):
     value   :   int     # value
     """
 
-
+@schema
+class Test3(dj.Manual):
+    definition = """
+    key : int 
+    ---
+    value : varchar(300)
+    """
 
 @schema
 class TestExtra(dj.Manual):

tests/test_relational_operand.py

@@ -6,7 +6,7 @@
 
 import datajoint as dj
 from .schema_simple import A, B, D, E, L, DataA, DataB, TestUpdate, IJ, JI, ReservedWord
-from .schema import Experiment
+from .schema import Experiment, Test3
 
 
 def setup():
@@ -129,6 +129,21 @@ def test_join():
         y = (A & 'cond_in_a=1').proj(a2='id_a')
         assert_equal(len(rel), len(x * y))
 
+
+    @staticmethod
+    def test_issue_376():
+        tab = Test3()
+        tab.delete_quick()
+        tab.insert((
+            (1, '%%%'),
+            (2, 'one%'),
+            (3, 'one')
+        ))
+        assert_equal(len(tab & 'value="%%%"'), 1)
+        assert_equal(len(tab & {'value': "%%%"}), 1)
+        assert_equal(len(tab & 'value like "o%"'), 2)
+        assert_equal(len(tab & 'value like "o%%"'), 2)
+
     @staticmethod
     def test_issue_463():
         assert_equal(((A & B) * B).fetch().size, len(A * B))