Merge lp:~yann-papouin/ocb-server/7.0-bug-1049653-translatable-unaccent into lp:ocb-server

[Yann Papouin]

Automatically derived from https://code.launchpad.net/~yann-papouin/openobject-server/7.0-bug-1049653-translatable-unaccent for https://code.launchpad.net/~openerp/openobject-server/7.0.

[Holger Brunn (Therp) (hbrunn)]

mutatis mutandis the same as ocb-6.1

review: Approve (code review)

[Pedro Manuel Baeza (pedro.baeza)]

Thanks for the patch.

Regards.

review: Approve (code review)

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

Hello,

somebody to compare with existing MP from Cloves Almeida and take the best one?
https://code.launchpad.net/~cmsa/openobject-server/openobject-server-7.0-fix-unaccent/+merge/197810

review: Needs Information

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

I mean Carlos Almeida sorry.

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Raphaël,

As far as I can see, Carlos Almeida patch is incomplete, because it doesn't take in account certain values that can be unaccented too.

Indeed, this solution applies unaccent indiscriminately (even to the left part of the comparison), but I think it's done in this way to follow official patch.

Regards.

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

Setting to 'rejected' because an alternative fix was merged here: http://bazaar.launchpad.net/~openerp/openobject-server/7.0/revision/5268. Nevertheless, thanks for the proposal!

Unmerged revisions

5284. By Damián Soriano (damiansoriano) on 2014-03-09

[FIX] --unaccent parameter does not work

=== modified file 'openerp/osv/expression.py'
--- openerp/osv/expression.py	2014-02-06 08:47:08 +0000
+++ openerp/osv/expression.py	2014-03-10 10:02:31 +0000
@@ -1046,11 +1046,18 @@
                              '    FROM "' + working_model._table + '"'       \
                              '   WHERE "' + left + '" ' + sql_operator + ' ' + " (" + instr + "))"
                     else:
-                        subselect += '     AND value ' + sql_operator + instr +   \
-                             ') UNION ('                \
-                             '  SELECT id'              \
-                             '    FROM "' + working_model._table + '"'       \
-                             '   WHERE "' + left + '" ' + sql_operator + instr + ")"
+                        if self.has_unaccent and sql_operator in ('ilike', 'not ilike'):
+                            subselect += '     AND unaccent(value) ' + sql_operator + ' unaccent(' + instr +   \
+                                 ')) UNION ('                \
+                                 '  SELECT id'              \
+                                 '    FROM "' + working_model._table + '"'       \
+                                 '   WHERE unaccent("' + left + '") ' + sql_operator + ' unaccent(' + instr + '))'
+                        else:
+                            subselect += '     AND value ' + sql_operator + instr +   \
+                                 ') UNION ('                \
+                                 '  SELECT id'              \
+                                 '    FROM "' + working_model._table + '"'       \
+                                 '   WHERE "' + left + '" ' + sql_operator + instr + ")"
 
                     params = [working_model._name + ',' + left,
                               context.get('lang', False) or 'en_US',