Merge lp:~pedro.baeza/openupgrade-addons/6.1-fetchmail into lp:openupgrade-addons/6.1

[Pedro Manuel Baeza]

[ADD] Migration script for module 'fetchmail'.

[ADD] Migration script for module 'fetchmail'.

[Paulius Sladkevičius @ hbee (komsas)]

I found that selection field 'state' on the 6.0 - draft, waiting, done, but 6.1 have 2 only draft, done, I suggest to map 'waiting' to 'draft'.

review: Needs Fixing

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

Hi Pedro,

this proposal is set to 'Work in progress', which is why it did not get reviewed earlier on. Does it need any more work as far as you are concerned?

From my part, please use the @migrate decorator to replace the try/catch block, the logging part and the version check. And Paulius' suggestion looks good to me too.

review: Needs Fixing

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Stefan and Paulius,

Thanks for your reviews. I was very newbie when I made this MP, so please excuse me if I did something wrong in the MP status.

I have made the changes you have proposed. Please check them.

Regards.

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

Thank you Pedro! To finish it off, you can remove the now unsed imports of os, logging and osv from the file. l.31 is now unused too, and I would appreciate if you could break up lines 9 and 48 to respect PEP max. line length.

review: Needs Fixing

[Pedro Manuel Baeza (pedro.baeza)]

Hi again, Stefan,

Thank you very much for your appreciations. I'm a little unaware of this details, but I will try to take in care for future apports.

Regards.

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

Thanks for the changes!

review: Approve

[Paulius Sladkevičius @ hbee (komsas)]

review: Approve

=== added file 'fetchmail/migrations/6.1.1.0/pre-migration.py'
--- fetchmail/migrations/6.1.1.0/pre-migration.py	1970-01-01 00:00:00 +0000
+++ fetchmail/migrations/6.1.1.0/pre-migration.py	2013-07-18 10:21:25 +0000
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2013 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com)
+#                       Pedro M. Baeza <[e-mail]> 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.openupgrade import openupgrade
+
+me = __file__
+
+column_renames = {
+    'mail_message': [
+        ('server_id', 'fetchmail_server_id'),
+        ],
+    }
+
+table_renames = [
+    ('email_server', 'fetchmail_server'),
+    ]
+
+model_renames = [
+    ('email.server', 'fetchmail.server'),
+    ]
+
+def _change_waiting_state(cr):
+    openupgrade.logged_query(cr, "UPDATE fetchmail_server \
+        SET state='draft' \
+        WHERE state='waiting'")
+
[e-mail]()
+def migrate(cr, version):
+    if openupgrade.table_exists(cr, 'email_server'):
+        openupgrade.rename_tables(cr, table_renames)
+        openupgrade.rename_columns(cr, column_renames)
+        openupgrade.rename_models(cr, model_renames)
+    _change_waiting_state(cr)