Merge lp:~openerp-dev/openobject-server/7.0-uninstall-module-constraint-mat into lp:openobject-server/7.0

[Martin Trigaux (OpenERP)]

When uninstalling a module, remove the ir.model.constraint after removing the non-model records and before fields and model definition

Unmerged revisions

5268. By Martin Trigaux (OpenERP) on 2014-03-28

[FIX] uninstall: when uninstalling a module, remove the ir.model.constraint after removing the non-model records and before fields and model definition

=== modified file 'openerp/addons/base/ir/ir_model.py'
--- openerp/addons/base/ir/ir_model.py	2014-02-24 16:19:18 +0000
+++ openerp/addons/base/ir/ir_model.py	2014-03-28 12:26:38 +0000
@@ -1085,13 +1085,20 @@
 
         # Remove non-model records first, then model fields, and finish with models
         unlink_if_refcount((model, res_id) for model, res_id in to_unlink
-                                if model not in ('ir.model','ir.model.fields'))
+                                if model not in ('ir.model','ir.model.fields','ir.model.constraint'))
+        unlink_if_refcount((model, res_id) for model, res_id in to_unlink
+                                if model == 'ir.model.constraint')
+
+        ir_module_module = self.pool['ir.module.module']
+        ir_model_constraint = self.pool['ir.model.constraint']
+        modules_to_remove_ids = ir_module_module.search(cr, uid, [('name', 'in', modules_to_remove)], context=context)
+        constraint_ids = ir_model_constraint.search(cr, uid, [('module', 'in', modules_to_remove_ids)], context=context)
+        ir_model_constraint._module_data_uninstall(cr, uid, constraint_ids, context)
+        
         unlink_if_refcount((model, res_id) for model, res_id in to_unlink
                                 if model == 'ir.model.fields')
 
         ir_model_relation = self.pool.get('ir.model.relation')
-        ir_module_module = self.pool.get('ir.module.module')
-        modules_to_remove_ids = ir_module_module.search(cr, uid, [('name', 'in', modules_to_remove)])
         relation_ids = ir_model_relation.search(cr, uid, [('module', 'in', modules_to_remove_ids)])
         ir_model_relation._module_data_uninstall(cr, uid, relation_ids, context)
 
 
=== modified file 'openerp/addons/base/module/module.py'
--- openerp/addons/base/module/module.py	2014-01-14 15:44:26 +0000
+++ openerp/addons/base/module/module.py	2014-03-28 12:26:38 +0000
@@ -432,11 +432,7 @@
         including the deletion of all database structures created by the module:
         tables, columns, constraints, etc."""
         ir_model_data = self.pool.get('ir.model.data')
-        ir_model_constraint = self.pool.get('ir.model.constraint')
         modules_to_remove = [m.name for m in self.browse(cr, uid, ids, context)]
-        modules_to_remove_ids = [m.id for m in self.browse(cr, uid, ids, context)]
-        constraint_ids = ir_model_constraint.search(cr, uid, [('module', 'in', modules_to_remove_ids)])
-        ir_model_constraint._module_data_uninstall(cr, uid, constraint_ids, context)
         ir_model_data._module_data_uninstall(cr, uid, modules_to_remove, context)
         self.write(cr, uid, ids, {'state': 'uninstalled'})
         return True