From 19faaa8222cb8fb18370ff355a940b989833fe7c Mon Sep 17 00:00:00 2001 From: "nch@tinyerp.com" <> Date: Tue, 24 Nov 2009 19:04:45 +0530 Subject: [PATCH] [IMP]:Membership module sql queries to parameterized query bzr revid: nch@tinyerp.com-20091124133445-f7odi503ktfbofsq --- addons/membership/membership.py | 10 ++++------ addons/membership/wizard/invoice_membership.py | 8 +++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/addons/membership/membership.py b/addons/membership/membership.py index bb0afe71845..c21385fdccd 100644 --- a/addons/membership/membership.py +++ b/addons/membership/membership.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -147,9 +147,7 @@ class membership_line(osv.osv): ) JOIN account_invoice ai ON ( ai.id = ail.invoice_id) - WHERE ml.id in (%s) - ''' % ','.join([str(id) for id in ids])) - + WHERE ml.id =ANY(%s)''',(ids,)) res = cr.fetchall() for r in res: if r[0] and r[0] < 0: @@ -401,7 +399,7 @@ class Partner(osv.osv): def _check_recursion(self, cr, uid, ids): level = 100 while len(ids): - cr.execute('select distinct associate_member from res_partner where id in ('+','.join(map(str, ids))+')') + cr.execute('select distinct associate_member from res_partner where id =ANY(%s)',(ids,)) ids = filter(None, map(lambda x:x[0], cr.fetchall())) if not level: return False diff --git a/addons/membership/wizard/invoice_membership.py b/addons/membership/wizard/invoice_membership.py index e1f8c80426f..3881c94ed22 100644 --- a/addons/membership/wizard/invoice_membership.py +++ b/addons/membership/wizard/invoice_membership.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -32,9 +32,7 @@ def _invoice_membership(self, cr, uid, data, context): cr.execute(''' SELECT partner_id, id, type FROM res_partner_address - WHERE partner_id IN (%s) - ''' % ','.join([str(id) for id in partner_ids]) - ) + WHERE partner_id =ANY(%s)''',(partner_ids,)) fetchal = cr.fetchall() if not fetchal: raise wizard.except_wizard(_('Error !'), _('No Address defined for this partner'))