Merge lp:~borjals/openobject-server/5.0-bugfix-581137 into lp:openobject-server/5.0

[Borja López Soilán (NeoPolus)]

Fix the parent_store computation

Fix the parent_store computation when parent_id is changed from NULL to anything else, or from any parent_id back to NULL.

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2010-05-18 13:57:53 +0000
+++ bin/osv/orm.py	2010-05-18 17:39:29 +0000
@@ -2555,14 +2555,15 @@
             # The parent_left/right computation may take up to
             # 5 seconds. No need to recompute the values if the
             # parent is the same. Get the current value of the parent
-            base_query = 'SELECT id FROM %s WHERE id IN %%s AND %s' % \
-                            (self._table, self._parent_name)
-            params = (tuple(ids),)
             parent_val = vals[self._parent_name]
             if parent_val:
-                cr.execute(base_query + " != %s", params + (parent_val,))
+                query = "SELECT id FROM %s WHERE id IN %%s AND (%s != %%s OR %s IS NULL)" % \
+                                (self._table, self._parent_name, self._parent_name)
+                cr.execute(query, (tuple(ids), parent_val))
             else:
-                cr.execute(base_query + " IS NULL", params)
+                query = "SELECT id FROM %s WHERE id IN %%s AND (%s IS NOT NULL)" % \
+                                (self._table, self._parent_name)
+                cr.execute(query, (tuple(ids),))
             parents_changed = map(operator.itemgetter(0), cr.fetchall())
 
         upd0 = []