cubicweb/server/migractions.py
branch3.24
changeset 11904 e760c54490b1
parent 11767 432f87a63057
child 11905 2f36115d38b1
--- a/cubicweb/server/migractions.py	Thu Jan 19 09:53:31 2017 +0100
+++ b/cubicweb/server/migractions.py	Wed Jan 18 15:04:27 2017 +0100
@@ -1,4 +1,4 @@
-# copyright 2003-2016 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# copyright 2003-2017 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #
 # This file is part of CubicWeb.
@@ -814,12 +814,12 @@
             if attrschema.type not in instschema:
                 self.cmd_add_entity_type(attrschema.type, False, False)
             if rschema.type not in instschema:
-                # need to add the relation type and to commit to get it
-                # actually in the schema
-                self.cmd_add_relation_type(rschema.type, False, commit=True)
+                # need to add the relation type
+                self.cmd_add_relation_type(rschema.type, False, commit=False)
             # register relation definition
             rdef = self._get_rdef(rschema, eschema, eschema.destination(rschema))
             ss.execschemarql(execute, rdef, ss.rdef2rql(rdef, cstrtypemap, groupmap),)
+        self.commit()
         # take care to newly introduced base class
         # XXX some part of this should probably be under the "if auto" block
         for spschema in eschema.specialized_by(recursive=False):