Techsystech
/
server-tools
mirror of https://github.com/OCA/server-tools.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[FIX] mogrify doesn't allow dicts

pull/1783/head
mreficent 2018-06-25 16:14:50 +02:00 committed by Lois Rilo
parent e1b95da998
commit 1e34d7c36c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql_request_abstract/__manifest__.py
View File

@ -5,7 +5,7 @@
{ {
'name': 'SQL Request Abstract', 'name': 'SQL Request Abstract',
'version': '10.0.1.0.0', 'version': '10.0.1.0.1',
'author': 'GRAP,Akretion,Odoo Community Association (OCA)', 'author': 'GRAP,Akretion,Odoo Community Association (OCA)',
'website': 'https://www.odoo-community.org', 'website': 'https://www.odoo-community.org',
'license': 'AGPL-3', 'license': 'AGPL-3',

8
sql_request_abstract/models/sql_request_mixin.py
View File

@ -144,8 +144,10 @@ class SQLRequestMixin(models.AbstractModel):
if mode in ('view', 'materialized_view'): if mode in ('view', 'materialized_view'):
rollback = False rollback = False
params = params and params or {} params = params or {}
query = self.env.cr.mogrify(self.query, params).decode('utf-8') # pylint: disable=sql-injection
query = self.query % params
query = query.decode('utf-8')
if mode in ('fetchone', 'fetchall'): if mode in ('fetchone', 'fetchall'):
pass pass
@ -184,12 +186,14 @@ class SQLRequestMixin(models.AbstractModel):
def _create_savepoint(self): def _create_savepoint(self):
rollback_name = '%s_%s' % ( rollback_name = '%s_%s' % (
self._name.replace('.', '_'), uuid.uuid1().hex) self._name.replace('.', '_'), uuid.uuid1().hex)
# pylint: disable=sql-injection
req = "SAVEPOINT %s" % (rollback_name) req = "SAVEPOINT %s" % (rollback_name)
self.env.cr.execute(req) self.env.cr.execute(req)
return rollback_name return rollback_name
@api.model @api.model
def _rollback_savepoint(self, rollback_name): def _rollback_savepoint(self, rollback_name):
# pylint: disable=sql-injection
req = "ROLLBACK TO SAVEPOINT %s" % (rollback_name) req = "ROLLBACK TO SAVEPOINT %s" % (rollback_name)
self.env.cr.execute(req) self.env.cr.execute(req)