Merge lp:~therp-nl/therp-backports/server-6.1-lp1062795-search_m2m_negative_gives_wrong_results into lp:therp-backports/server-6.1

[Stefan Rijnhart (Opener)]

Same as https://code.launchpad.net/~therp-nl/openobject-server/7.0-lp1062795-search_m2m_negative_gives_wrong_results/+merge/128351 but for the Therp maintenance branch of OpenERP server 6.1

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

I am rejecting this as not tested well enough, because of the promotion of our branches to the community backports

Unmerged revisions

4288. By Stefan Rijnhart (Opener) on 2012-10-15

[IMP] For completeness sake, fix o2m analogously to m2m
[RFR] Some small, obvious refactorings that the fixes in this branch exposed

4287. By Stefan Rijnhart (Opener) on 2012-10-08

[FIX] Preserve negative search operator's exclusivity in m2m dotted subqueries

4286. By Stefan Rijnhart (Opener) on 2012-10-06

[FIX] Search on many2many with negative operator gives wrong results

=== modified file 'openerp/osv/expression.py'
--- openerp/osv/expression.py	2012-01-24 12:42:52 +0000
+++ openerp/osv/expression.py	2012-10-15 11:22:23 +0000
@@ -152,6 +152,11 @@
 # below, this doesn't necessarily mean that any of those NEGATIVE_TERM_OPERATORS is
 # legal in the processed term.
 NEGATIVE_TERM_OPERATORS = ('!=', 'not like', 'not ilike', 'not in')
+REVERSE_NEGATIVE_OPERATOR = {'!=': '=', 'not like': 'like', 'not ilike': 'ilike', 'not in': 'in'}
+def get_ids_operator(operator):
+    if operator in NEGATIVE_TERM_OPERATORS:
+        return 'not in'
+    return 'in'
 
 TRUE_LEAF = (1, '=', 1)
 FALSE_LEAF = (0, '=', 1)
@@ -461,8 +466,10 @@
                     self.__exp[i] = (field_path[0], 'in', right)
                 # Making search easier when there is a left operand as field.o2m or field.m2m
                 if field._type in ['many2many', 'one2many']:
-                    right = field_obj.search(cr, uid, [(field_path[1], operator, right)], context=context)
-                    right1 = table.search(cr, uid, [(field_path[0],'in', right)], context=dict(context, active_test=False))
+                    local_operator = REVERSE_NEGATIVE_OPERATOR.get(operator, operator)
+                    right = field_obj.search(cr, uid, [(field_path[1], local_operator, right)], context=context)
+                    ids_operator = get_ids_operator(operator)
+                    right1 = table.search(cr, uid, [(field_path[0], ids_operator, right)], context=dict(context, active_test=False))
                     self.__exp[i] = ('id', 'in', right1)
 
                 if not isinstance(field, fields.property):
@@ -498,13 +505,11 @@
                     self.__exp = self.__exp[:i] + dom + self.__exp[i+1:]
 
                 else:
-                    call_null = True
-
                     if right is not False:
                         if isinstance(right, basestring):
-                            ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator, context=context, limit=None)]
-                            if ids2:
-                                operator = 'in'
+                            local_operator = REVERSE_NEGATIVE_OPERATOR.get(operator, operator)
+                            operator = get_ids_operator(operator)
+                            ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], local_operator, context=context, limit=None)]
                         else:
                             if not isinstance(right, list):
                                 ids2 = [right]
@@ -513,15 +518,13 @@
                         if not ids2:
                             if operator in ['like','ilike','in','=']:
                                 #no result found with given search criteria
-                                call_null = False
                                 self.__exp[i] = FALSE_LEAF
+                            else:
+                                self.__exp[i] = TRUE_LEAF
                         else:
-                            ids2 = select_from_where(cr, field._fields_id, field_obj._table, 'id', ids2, operator)
-                            if ids2:
-                                call_null = False
-                                self.__exp[i] = ('id', 'in', ids2)
-
-                    if call_null:
+                            ids2 = select_from_where(cr, field._fields_id, field_obj._table, 'id', ids2, "in")
+                            self.__exp[i] = ('id', operator, ids2)
+                    else:
                         o2m_op = 'in' if operator in NEGATIVE_TERM_OPERATORS else 'not in'
                         self.__exp[i] = ('id', o2m_op, select_distinct_from_where_not_null(cr, field._fields_id, field_obj._table))
 
@@ -539,12 +542,11 @@
                     ids2 = field_obj.search(cr, uid, dom, context=context)
                     self.__exp[i] = ('id', 'in', _rec_convert(ids2))
                 else:
-                    call_null_m2m = True
                     if right is not False:
                         if isinstance(right, basestring):
-                            res_ids = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator, context=context)]
-                            if res_ids:
-                                operator = 'in'
+                            local_operator = REVERSE_NEGATIVE_OPERATOR.get(operator, operator)
+                            operator = get_ids_operator(operator)
+                            res_ids = [x[0] for x in field_obj.name_search(cr, uid, right, [], local_operator, context=context)]
                         else:
                             if not isinstance(right, list):
                                 res_ids = [right]
@@ -553,16 +555,13 @@
                         if not res_ids:
                             if operator in ['like','ilike','in','=']:
                                 #no result found with given search criteria
-                                call_null_m2m = False
                                 self.__exp[i] = FALSE_LEAF
                             else:
-                                operator = 'in' # operator changed because ids are directly related to main object
+                                self.__exp[i] = TRUE_LEAF
                         else:
-                            call_null_m2m = False
-                            m2m_op = 'not in' if operator in NEGATIVE_TERM_OPERATORS else 'in'
-                            self.__exp[i] = ('id', m2m_op, select_from_where(cr, rel_id1, rel_table, rel_id2, res_ids, operator) or [0])
-
-                    if call_null_m2m:
+                            m2m_op = get_ids_operator(operator)
+                            self.__exp[i] = ('id', m2m_op, select_from_where(cr, rel_id1, rel_table, rel_id2, res_ids, "in") or [0])
+                    else:
                         m2m_op = 'in' if operator in NEGATIVE_TERM_OPERATORS else 'not in'
                         self.__exp[i] = ('id', m2m_op, select_distinct_from_where_not_null(cr, rel_id1, rel_table))