From 5b93086045f43be86837ac5d7021c7d82803b275 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Thu, 9 Jan 2020 12:04:57 +0000 Subject: [PATCH] [UPD] Update base_external_dbsource_mssql.pot --- base_external_dbsource_mssql/__manifest__.py | 31 ++++++------------- .../i18n/base_external_dbsource_mssql.pot | 2 +- .../models/base_external_dbsource.py | 17 +++++----- .../readme/ROADMAP.rst | 2 +- .../tests/test_base_external_dbsource.py | 19 +++++------- 5 files changed, 28 insertions(+), 43 deletions(-) diff --git a/base_external_dbsource_mssql/__manifest__.py b/base_external_dbsource_mssql/__manifest__.py index 0d0d4014..1104d060 100644 --- a/base_external_dbsource_mssql/__manifest__.py +++ b/base_external_dbsource_mssql/__manifest__.py @@ -2,25 +2,14 @@ # Copyright 2016 LasLabs Inc. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). { - 'name': 'External Database Source - MSSQL', - 'version': '12.0.1.0.0', - 'category': 'Tools', - 'author': "Daniel Reis, " - "LasLabs, " - "Odoo Community Association (OCA)", - 'website': 'https://github.com/OCA/server-backend', - 'license': 'LGPL-3', - 'depends': [ - 'base_external_dbsource_sqlite', - ], - 'external_dependencies': { - 'python': [ - 'sqlalchemy', - 'pymssql', - ], - }, - 'demo': [ - 'demo/base_external_dbsource.xml', - ], - 'installable': True, + "name": "External Database Source - MSSQL", + "version": "12.0.1.0.0", + "category": "Tools", + "author": "Daniel Reis, " "LasLabs, " "Odoo Community Association (OCA)", + "website": "https://github.com/OCA/server-backend", + "license": "LGPL-3", + "depends": ["base_external_dbsource_sqlite"], + "external_dependencies": {"python": ["sqlalchemy", "pymssql"]}, + "demo": ["demo/base_external_dbsource.xml"], + "installable": True, } diff --git a/base_external_dbsource_mssql/i18n/base_external_dbsource_mssql.pot b/base_external_dbsource_mssql/i18n/base_external_dbsource_mssql.pot index e37bb794..9e07f689 100644 --- a/base_external_dbsource_mssql/i18n/base_external_dbsource_mssql.pot +++ b/base_external_dbsource_mssql/i18n/base_external_dbsource_mssql.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" diff --git a/base_external_dbsource_mssql/models/base_external_dbsource.py b/base_external_dbsource_mssql/models/base_external_dbsource.py index bb1b671a..180097f5 100644 --- a/base_external_dbsource_mssql/models/base_external_dbsource.py +++ b/base_external_dbsource_mssql/models/base_external_dbsource.py @@ -9,19 +9,20 @@ from odoo import api, models _logger = logging.getLogger(__name__) try: - from odoo.addons.base_external_dbsource.models import ( - base_external_dbsource, - ) + from odoo.addons.base_external_dbsource.models import base_external_dbsource + CONNECTORS = base_external_dbsource.BaseExternalDbsource.CONNECTORS try: import pymssql - CONNECTORS.append(('mssql', 'Microsoft SQL Server')) + + CONNECTORS.append(("mssql", "Microsoft SQL Server")) assert pymssql except (ImportError, AssertionError): - _logger.info('MS SQL Server not available. Please install "pymssql" ' - 'python package.') + _logger.info( + 'MS SQL Server not available. Please install "pymssql" ' "python package." + ) except ImportError: - _logger.info('base_external_dbsource Odoo module not found.') + _logger.info("base_external_dbsource Odoo module not found.") class BaseExternalDbsource(models.Model): @@ -29,7 +30,7 @@ class BaseExternalDbsource(models.Model): _inherit = "base.external.dbsource" - PWD_STRING_MSSQL = 'Password=%s;' + PWD_STRING_MSSQL = "Password=%s;" @api.multi def connection_close_mssql(self, connection): diff --git a/base_external_dbsource_mssql/readme/ROADMAP.rst b/base_external_dbsource_mssql/readme/ROADMAP.rst index fdddc735..8b025883 100644 --- a/base_external_dbsource_mssql/readme/ROADMAP.rst +++ b/base_external_dbsource_mssql/readme/ROADMAP.rst @@ -1 +1 @@ -* Add X.509 authentication \ No newline at end of file +* Add X.509 authentication diff --git a/base_external_dbsource_mssql/tests/test_base_external_dbsource.py b/base_external_dbsource_mssql/tests/test_base_external_dbsource.py index fcb6a3c6..240396d6 100644 --- a/base_external_dbsource_mssql/tests/test_base_external_dbsource.py +++ b/base_external_dbsource_mssql/tests/test_base_external_dbsource.py @@ -4,18 +4,15 @@ import mock from odoo.tests import common - -ADAPTER = ('odoo.addons.base_external_dbsource_mssql.models' - '.base_external_dbsource.pymssql') +ADAPTER = ( + "odoo.addons.base_external_dbsource_mssql.models" ".base_external_dbsource.pymssql" +) class TestBaseExternalDbsource(common.TransactionCase): - def setUp(self): super(TestBaseExternalDbsource, self).setUp() - self.dbsource = self.env.ref( - 'base_external_dbsource_mssql.demo_mssql', - ) + self.dbsource = self.env.ref("base_external_dbsource_mssql.demo_mssql") def test_connection_close_mssql(self): """ It should close the connection """ @@ -26,16 +23,14 @@ class TestBaseExternalDbsource(common.TransactionCase): def test_connection_open_mssql(self): """ It should call SQLAlchemy open """ with mock.patch.object( - self.dbsource, '_connection_open_sqlalchemy' + self.dbsource, "_connection_open_sqlalchemy" ) as parent_method: self.dbsource.connection_open_mssql() parent_method.assert_called_once_with() def test_excecute_mssql(self): """ It should pass args to SQLAlchemy execute """ - expect = 'sqlquery', 'sqlparams', 'metadata' - with mock.patch.object( - self.dbsource, '_execute_sqlalchemy' - ) as parent_method: + expect = "sqlquery", "sqlparams", "metadata" + with mock.patch.object(self.dbsource, "_execute_sqlalchemy") as parent_method: self.dbsource.execute_mssql(*expect) parent_method.assert_called_once_with(*expect)