server/migractions.py
changeset 9636 e35ae8617c03
parent 9635 aaf099172bb9
child 9686 9a04e48e780b
--- a/server/migractions.py	Mon Apr 07 17:02:04 2014 +0200
+++ b/server/migractions.py	Mon Apr 07 18:04:56 2014 +0200
@@ -607,21 +607,8 @@
             #       out of sync with newconstraints when multiple
             #       constraints of the same type are used
             for cstr in oldconstraints:
-                for newcstr in newconstraints:
-                    if newcstr.type() == cstr.type():
-                        break
-                else:
-                    newcstr = None
-                if newcstr is None:
-                    self.rqlexec('DELETE X constrained_by C WHERE C eid %(x)s',
-                                 {'x': cstr.eid}, ask_confirm=confirm)
-                else:
-                    newconstraints.remove(newcstr)
-                    value = unicode(newcstr.serialize())
-                    if value != unicode(cstr.serialize()):
-                        self.rqlexec('SET X value %(v)s WHERE X eid %(x)s',
-                                     {'x': cstr.eid, 'v': value},
-                                     ask_confirm=confirm)
+                self.rqlexec('DELETE CWConstraint C WHERE C eid %(x)s',
+                             {'x': cstr.eid}, ask_confirm=confirm)
             # 2. add new constraints
             cstrtype_map = self.cstrtype_mapping()
             self.rqlexecall(ss.constraints2rql(cstrtype_map, newconstraints,