merge stable
authorAurelien Campeas <aurelien.campeas@logilab.fr>
Thu, 04 Mar 2010 17:51:27 +0100
branchstable
changeset 4803 f531742e85f4
parent 4801 d3ea940e2b0c (diff)
parent 4802 fa2297d6542a (current diff)
child 4809 1e983e926cca
child 5204 d175ce5c2e85
merge
--- a/server/schemaserial.py	Thu Mar 04 17:50:17 2010 +0100
+++ b/server/schemaserial.py	Thu Mar 04 17:51:27 2010 +0100
@@ -223,8 +223,9 @@
         pb = ProgressBar(pb_size, title=_title)
     else:
         pb = None
-    # serialize all entity types, assuring CWEType is serialized first
-    groupmap = group_mapping(cursor)
+    groupmap = group_mapping(cursor, interactive=False)
+    # serialize all entity types, assuring CWEType is serialized first for proper
+    # is / is_instance_of insertion
     eschemas.remove(schema.eschema('CWEType'))
     eschemas.insert(0, schema.eschema('CWEType'))
     for eschema in eschemas:
@@ -245,7 +246,7 @@
             if pb is not None:
                 pb.update()
             continue
-        for rql, kwargs in rschema2rql(rschema, groupmap):
+        for rql, kwargs in rschema2rql(rschema, groupmap=groupmap):
             execute(rql, kwargs, build_descr=False)
         if pb is not None:
             pb.update()