Merge lp:~camptocamp/openupgrade-tools/7.0-add-database_cleanup-purge-model-attachment-error2 into lp:~therp-nl/openupgrade-tools/7.0-add-database_cleanup

[Guewen Baconnier @ Camptocamp]

Fix https://code.launchpad.net/~camptocamp/openupgrade-tools/7.0-add-database_cleanup-purge-model-attachment-error/+merge/204442

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks! My bad for merging the proposal blindly...

review: Approve

=== modified file 'database_cleanup/model/purge_models.py'
--- database_cleanup/model/purge_models.py	2014-02-05 16:23:57 +0000
+++ database_cleanup/model/purge_models.py	2014-02-06 11:09:29 +0000
@@ -66,14 +66,13 @@
             row = cr.fetchone()
             if row:
                 self.logger.info('Purging model %s', row[1])
-                cr.execute(
-                    "UPDATE ir_attachment SET res_model = FALSE "
-                    "WHERE id in %s",
-                    (tuple(attachment_ids), ))
+                attachment_ids = attachment_pool.search(
+                    cr, uid, [('res_model', '=', line.name)], context=context)
                 if attachment_ids:
-                    attachment_pool.write(
-                        cr, uid, attachment_ids, {'res_model': False},
-                        context=context)
+                    cr.execute(
+                        "UPDATE ir_attachment SET res_model = FALSE "
+                        "WHERE id in %s",
+                        (tuple(attachment_ids), ))
                 constraint_ids = constraint_pool.search(
                     cr, uid, [('model', '=', line.name)], context=context)
                 if constraint_ids: