[UPD] Update base_external_dbsource_mssql.pot

This commit is contained in:
oca-travis
2020-01-09 12:04:57 +00:00
committed by sergio-teruel
parent ea309ffce4
commit 5b93086045
5 changed files with 28 additions and 43 deletions

View File

@@ -2,25 +2,14 @@
# Copyright 2016 LasLabs Inc. # Copyright 2016 LasLabs Inc.
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl).
{ {
'name': 'External Database Source - MSSQL', "name": "External Database Source - MSSQL",
'version': '12.0.1.0.0', "version": "12.0.1.0.0",
'category': 'Tools', "category": "Tools",
'author': "Daniel Reis, " "author": "Daniel Reis, " "LasLabs, " "Odoo Community Association (OCA)",
"LasLabs, " "website": "https://github.com/OCA/server-backend",
"Odoo Community Association (OCA)", "license": "LGPL-3",
'website': 'https://github.com/OCA/server-backend', "depends": ["base_external_dbsource_sqlite"],
'license': 'LGPL-3', "external_dependencies": {"python": ["sqlalchemy", "pymssql"]},
'depends': [ "demo": ["demo/base_external_dbsource.xml"],
'base_external_dbsource_sqlite', "installable": True,
],
'external_dependencies': {
'python': [
'sqlalchemy',
'pymssql',
],
},
'demo': [
'demo/base_external_dbsource.xml',
],
'installable': True,
} }

View File

@@ -4,7 +4,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Odoo Server 11.0\n" "Project-Id-Version: Odoo Server 12.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"Last-Translator: <>\n" "Last-Translator: <>\n"
"Language-Team: \n" "Language-Team: \n"

View File

@@ -9,19 +9,20 @@ from odoo import api, models
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
try: try:
from odoo.addons.base_external_dbsource.models import ( from odoo.addons.base_external_dbsource.models import base_external_dbsource
base_external_dbsource,
)
CONNECTORS = base_external_dbsource.BaseExternalDbsource.CONNECTORS CONNECTORS = base_external_dbsource.BaseExternalDbsource.CONNECTORS
try: try:
import pymssql import pymssql
CONNECTORS.append(('mssql', 'Microsoft SQL Server'))
CONNECTORS.append(("mssql", "Microsoft SQL Server"))
assert pymssql assert pymssql
except (ImportError, AssertionError): except (ImportError, AssertionError):
_logger.info('MS SQL Server not available. Please install "pymssql" ' _logger.info(
'python package.') 'MS SQL Server not available. Please install "pymssql" ' "python package."
)
except ImportError: except ImportError:
_logger.info('base_external_dbsource Odoo module not found.') _logger.info("base_external_dbsource Odoo module not found.")
class BaseExternalDbsource(models.Model): class BaseExternalDbsource(models.Model):
@@ -29,7 +30,7 @@ class BaseExternalDbsource(models.Model):
_inherit = "base.external.dbsource" _inherit = "base.external.dbsource"
PWD_STRING_MSSQL = 'Password=%s;' PWD_STRING_MSSQL = "Password=%s;"
@api.multi @api.multi
def connection_close_mssql(self, connection): def connection_close_mssql(self, connection):

View File

@@ -4,18 +4,15 @@ import mock
from odoo.tests import common from odoo.tests import common
ADAPTER = (
ADAPTER = ('odoo.addons.base_external_dbsource_mssql.models' "odoo.addons.base_external_dbsource_mssql.models" ".base_external_dbsource.pymssql"
'.base_external_dbsource.pymssql') )
class TestBaseExternalDbsource(common.TransactionCase): class TestBaseExternalDbsource(common.TransactionCase):
def setUp(self): def setUp(self):
super(TestBaseExternalDbsource, self).setUp() super(TestBaseExternalDbsource, self).setUp()
self.dbsource = self.env.ref( self.dbsource = self.env.ref("base_external_dbsource_mssql.demo_mssql")
'base_external_dbsource_mssql.demo_mssql',
)
def test_connection_close_mssql(self): def test_connection_close_mssql(self):
""" It should close the connection """ """ It should close the connection """
@@ -26,16 +23,14 @@ class TestBaseExternalDbsource(common.TransactionCase):
def test_connection_open_mssql(self): def test_connection_open_mssql(self):
""" It should call SQLAlchemy open """ """ It should call SQLAlchemy open """
with mock.patch.object( with mock.patch.object(
self.dbsource, '_connection_open_sqlalchemy' self.dbsource, "_connection_open_sqlalchemy"
) as parent_method: ) as parent_method:
self.dbsource.connection_open_mssql() self.dbsource.connection_open_mssql()
parent_method.assert_called_once_with() parent_method.assert_called_once_with()
def test_excecute_mssql(self): def test_excecute_mssql(self):
""" It should pass args to SQLAlchemy execute """ """ It should pass args to SQLAlchemy execute """
expect = 'sqlquery', 'sqlparams', 'metadata' expect = "sqlquery", "sqlparams", "metadata"
with mock.patch.object( with mock.patch.object(self.dbsource, "_execute_sqlalchemy") as parent_method:
self.dbsource, '_execute_sqlalchemy'
) as parent_method:
self.dbsource.execute_mssql(*expect) self.dbsource.execute_mssql(*expect)
parent_method.assert_called_once_with(*expect) parent_method.assert_called_once_with(*expect)