Merge lp:~camptocamp/openerp-product-attributes/7.0-fix-1259975-migration-lep into lp:~product-core-editors/openerp-product-attributes/7.0

[Leonardo Pistone]

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM

review: Approve (code review, no test)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM
Thanks

review: Approve (code review)

=== modified file 'product_custom_attributes/migrations/7.0.0.2/post-migration.py'
--- product_custom_attributes/migrations/7.0.0.2/post-migration.py	2013-09-30 11:21:33 +0000
+++ product_custom_attributes/migrations/7.0.0.2/post-migration.py	2013-12-11 15:53:04 +0000
@@ -25,11 +25,12 @@
 
 
 def migrate(cr, version):
-    logger.info("Migrating product_custom_attributes from version %s", version)
-    cr.execute("UPDATE product_template pt "
-               "SET attribute_set_id = (SELECT pp.attribute_set_id "
-               "                        FROM product_product pp WHERE "
-               "                        pp.product_tmpl_id = pt.id "
-               "                        LIMIT 1)"
-               "WHERE pt.attribute_set_id IS NULL")
-    cr.execute('ALTER TABLE product_product DROP COLUMN attribute_set_id')
+    if version:  # do not run on a fresh DB, see lp:1259975
+        logger.info("Migrating product_custom_attributes from version %s", version)
+        cr.execute("UPDATE product_template pt "
+                   "SET attribute_set_id = (SELECT pp.attribute_set_id "
+                   "                        FROM product_product pp WHERE "
+                   "                        pp.product_tmpl_id = pt.id "
+                   "                        LIMIT 1)"
+                   "WHERE pt.attribute_set_id IS NULL")
+        cr.execute('ALTER TABLE product_product DROP COLUMN attribute_set_id')