Merge lp:~openerp-dev/openobject-server/7.0-unaccent-trans-search2-chs into lp:openobject-server/7.0

[Christophe Simonis (OpenERP)]

=== modified file 'openerp/osv/expression.py'
--- openerp/osv/expression.py	2014-02-03 12:05:25 +0000
+++ openerp/osv/expression.py	2014-03-31 12:31:12 +0000
@@ -1020,6 +1020,7 @@
                     push(create_substitution_leaf(leaf, (left, operator, right), working_model))
 
                 elif field.translate and right:
+                    field = left
                     need_wildcard = operator in ('like', 'ilike', 'not like', 'not ilike')
                     sql_operator = {'=like': 'like', '=ilike': 'ilike'}.get(operator, operator)
                     if need_wildcard:
@@ -1031,33 +1032,38 @@
                         sql_operator = sql_operator[4:] if sql_operator[:3] == 'not' else '='
                         inselect_operator = 'not inselect'
 
-                    subselect = '( SELECT res_id'          \
-                             '    FROM ir_translation'  \
-                             '   WHERE name = %s'       \
-                             '     AND lang = %s'       \
-                             '     AND type = %s'
-                    instr = ' %s'
-                    #Covering in,not in operators with operands (%s,%s) ,etc.
                     if sql_operator == 'in':
-                        instr = ','.join(['%s'] * len(right))
-                        subselect += '     AND value ' + sql_operator + ' ' + " (" + instr + ")"   \
-                             ') UNION ('                \
-                             '  SELECT id'              \
-                             '    FROM "' + working_model._table + '"'       \
-                             '   WHERE "' + left + '" ' + sql_operator + ' ' + " (" + instr + "))"
+                        right = tuple(right)
+
+                    if self.has_unaccent and sql_operator.endswith('like'):
+                        trans_left = 'unaccent(value)'
+                        left = 'unaccent("%s")' % (left,)
+                        instr = 'unaccent(%s)'
                     else:
-                        subselect += '     AND value ' + sql_operator + instr +   \
-                             ') UNION ('                \
-                             '  SELECT id'              \
-                             '    FROM "' + working_model._table + '"'       \
-                             '   WHERE "' + left + '" ' + sql_operator + instr + ")"
-
-                    params = [working_model._name + ',' + left,
+                        trans_left = 'value'
+                        left = '"%s"' % (left,)
+                        instr = '%s'
+
+                    subselect = """(SELECT res_id
+                                      FROM ir_translation
+                                     WHERE name = %s
+                                       AND lang = %s
+                                       AND type = %s
+                                       AND {trans_left} {operator} {right}
+                                   ) UNION (
+                                    SELECT id
+                                      FROM "{table}"
+                                     WHERE {left} {operator} {right}
+                                   )
+                                """.format(trans_left=trans_left, operator=sql_operator,
+                                           right=instr, table=working_model._table, left=left)
+
+                    params = [working_model._name + ',' + field,
                               context.get('lang', False) or 'en_US',
                               'model',
                               right,
                               right,
-                             ]
+                              ]
                     push(create_substitution_leaf(leaf, ('id', inselect_operator, (subselect, params)), working_model))
 
                 else:
@@ -1176,7 +1182,7 @@
 
             if left in model._columns:
                 format = need_wildcard and '%s' or model._columns[left]._symbol_set[0]
-                if self.has_unaccent and sql_operator in ('ilike', 'not ilike'):
+                if self.has_unaccent and sql_operator.endswith('like'):
                     query = '(unaccent(%s."%s") %s unaccent(%s))' % (table_alias, left, sql_operator, format)
                 else:
                     query = '(%s."%s" %s %s)' % (table_alias, left, sql_operator, format)