From 5ce0720b7526c335bd277eb71c7cdb4d369e7fd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 9 Aug 2012 16:42:03 +0200 Subject: [PATCH 1/3] [IMP] fields: many2many: extracted query generation, to ease overrides. bzr revid: tde@openerp.com-20120809144203-sm93gsl2db608z85 --- openerp/osv/fields.py | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py index 4ff23956050..c173a8ba8c4 100644 --- a/openerp/osv/fields.py +++ b/openerp/osv/fields.py @@ -648,6 +648,20 @@ class many2many(_column): col2 = '%s_id' % dest_model._table return (tbl, col1, col2) + def _get_query_and_where_params(self, cr, model, ids, values, where_params): + """ Extracted from ``get`` to facilitate fine-tuning of the generated + query. """ + query = 'SELECT %(rel)s.%(id2)s, %(rel)s.%(id1)s \ + FROM %(rel)s, %(from_c)s \ + WHERE %(rel)s.%(id1)s IN %%s \ + AND %(rel)s.%(id2)s = %(tbl)s.id \ + %(where_c)s \ + %(order_by)s \ + %(limit)s \ + OFFSET %(offset)d' \ + % values + return (query, where_params) + def get(self, cr, model, ids, name, user=None, offset=0, context=None, values=None): if not context: context = {} @@ -685,15 +699,7 @@ class many2many(_column): if self._limit is not None: limit_str = ' LIMIT %d' % self._limit - query = 'SELECT %(rel)s.%(id2)s, %(rel)s.%(id1)s \ - FROM %(rel)s, %(from_c)s \ - WHERE %(rel)s.%(id1)s IN %%s \ - AND %(rel)s.%(id2)s = %(tbl)s.id \ - %(where_c)s \ - %(order_by)s \ - %(limit)s \ - OFFSET %(offset)d' \ - % {'rel': rel, + query, where_params = self._get_query_and_where_params(cr, model, ids, {'rel': rel, 'from_c': from_c, 'tbl': obj._table, 'id1': id1, @@ -702,7 +708,8 @@ class many2many(_column): 'limit': limit_str, 'order_by': order_by, 'offset': offset, - } + }, where_params) + cr.execute(query, [tuple(ids),] + where_params) for r in cr.fetchall(): res[r[1]].append(r[0]) From a82ae8d83e0d69a5e271a6fdb4d73be6387085a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 9 Aug 2012 16:45:26 +0200 Subject: [PATCH 2/3] [CLEAN] Removed unnecessary \(. bzr revid: tde@openerp.com-20120809144526-8mhbrr56mfjodygq --- openerp/osv/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py index c173a8ba8c4..72779dbd4f8 100644 --- a/openerp/osv/fields.py +++ b/openerp/osv/fields.py @@ -660,7 +660,7 @@ class many2many(_column): %(limit)s \ OFFSET %(offset)d' \ % values - return (query, where_params) + return query, where_params def get(self, cr, model, ids, name, user=None, offset=0, context=None, values=None): if not context: From cc84d7d1689cc5bf213b976e1b070bf9701fb023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 13 Aug 2012 17:24:13 +0200 Subject: [PATCH 3/3] [FIX] res_partner: do not write on the partner if the dict of update_address is void; this could cause a loop with subscribers. bzr revid: tde@openerp.com-20120813152413-j62vvzxp3ijpfc4n --- openerp/addons/base/res/res_partner.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index d275c0c7b4e..7bae191a943 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -318,7 +318,8 @@ class res_partner(osv.osv): def update_address(self, cr, uid, ids, vals, context=None): addr_vals = dict((key, vals[key]) for key in POSTAL_ADDRESS_FIELDS if vals.get(key)) - return super(res_partner, self).write(cr, uid, ids, addr_vals, context) + if addr_vals: + return super(res_partner, self).write(cr, uid, ids, addr_vals, context) def name_get(self, cr, uid, ids, context=None): if context is None: