Techsystech
/
OCA_Reporting_engine_17.0
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIG] sql_request_abstract: Migration to 11.0

pull/669/head
hveficent 2018-07-25 15:54:32 +02:00 committed by Sylvain LE GAL
parent b800c27354
commit 543a544cb2
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql_request_abstract/README.rst
View File

@ -1,4 +1,4 @@
.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3 :alt: License: AGPL-3
@ -6,7 +6,7 @@
Abstract Model to manage SQL Requests Abstract Model to manage SQL Requests
===================================== =====================================
This module provide an abstract model to manage SQL Select request on database. This module provides an abstract model to manage SQL Select requests on database.
It is not usefull for itself. You can see an exemple of implementation in the It is not usefull for itself. You can see an exemple of implementation in the
'sql_export' module. (same repository). 'sql_export' module. (same repository).
@ -45,7 +45,7 @@ Inherit the model:
.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
:alt: Try me on Runbot :alt: Try me on Runbot
:target: https://runbot.odoo-community.org/runbot/149/10.0 :target: https://runbot.odoo-community.org/runbot/149/11.0
Bug Tracker Bug Tracker
=========== ===========

1
sql_request_abstract/__init__.py
View File

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from . import models from . import models

3
sql_request_abstract/__manifest__.py
View File

@ -1,11 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (C) 2017 - Today: GRAP (http://www.grap.coop) # Copyright (C) 2017 - Today: GRAP (http://www.grap.coop)
# @author: Sylvain LE GAL (https://twitter.com/legalsylvain) # @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
{ {
'name': 'SQL Request Abstract', 'name': 'SQL Request Abstract',
'version': '10.0.1.0.1', 'version': '11.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',

1
sql_request_abstract/models/__init__.py
View File

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from . import sql_request_mixin from . import sql_request_mixin

11
sql_request_abstract/models/sql_request_mixin.py
View File

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright (C) 2015 Akretion (<http://www.akretion.com>) # Copyright (C) 2015 Akretion (<http://www.akretion.com>)
# Copyright (C) 2017 - Today: GRAP (http://www.grap.coop) # Copyright (C) 2017 - Today: GRAP (http://www.grap.coop)
# @author: Sylvain LE GAL (https://twitter.com/legalsylvain) # @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
@ -6,7 +5,7 @@
import re import re
import uuid import uuid
import StringIO from io import StringIO
import base64 import base64
from psycopg2 import ProgrammingError from psycopg2 import ProgrammingError
@ -144,10 +143,12 @@ class SQLRequestMixin(models.AbstractModel):
if mode in ('view', 'materialized_view'): if mode in ('view', 'materialized_view'):
rollback = False rollback = False
params = params or {}
# pylint: disable=sql-injection # pylint: disable=sql-injection
if params:
query = self.query % params query = self.query % params
query = query.decode('utf-8') else:
query = self.query
query = query
if mode in ('fetchone', 'fetchall'): if mode in ('fetchone', 'fetchall'):
pass pass
@ -242,7 +243,7 @@ class SQLRequestMixin(models.AbstractModel):
res = self._hook_executed_request() res = self._hook_executed_request()
except ProgrammingError as e: except ProgrammingError as e:
raise UserError( raise UserError(
_("The SQL query is not valid:\n\n %s") % e.message) _("The SQL query is not valid:\n\n %s") % e)
finally: finally:
self._rollback_savepoint(rollback_name) self._rollback_savepoint(rollback_name)
return res return res