Do not check timestamp when it is None

issue8779 review268321002
2019-11-05 10:33:25 +01:00
parent 34678d2be6
commit b8af68cf59
2 changed files with 6 additions and 0 deletions
@@ -539,6 +539,8 @@ class ModelSQL(ModelStorage):
                        '%s,%s' % (cls.__name__, id_))
                except KeyError:
                    continue
+                if timestamp is None:
+                    continue
                sql_type = fields.Char('timestamp').sql_type().base
                where.append((table.id == id_)
                    & (Extract('EPOCH',
@@ -305,6 +305,10 @@ class ModelSQLTestCase(unittest.TestCase):
        self.assertRaises(ConcurrencyException,
            ModelsqlTimestamp.delete, [record])

+        transaction.timestamp[str(record)] = None
+        ModelsqlTimestamp.write([record], {})
+        transaction.commit()
+
        transaction.timestamp.pop(str(record), None)
        ModelsqlTimestamp.write([record], {})
        transaction.commit()