[MIG] base_external_dbsource_mssql: Migration to v12.0

[UPD] Update base_external_dbsource_mssql.pot
This commit is contained in:
Sergio Teruel
2020-01-08 10:40:38 +01:00
committed by Andrea Cattalani
parent 6b79b77216
commit 08dcfc3710
8 changed files with 46 additions and 55 deletions

View File

@@ -14,13 +14,13 @@ External Database Source - MSSQL
:target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
:alt: License: LGPL-3 :alt: License: LGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github
:target: https://github.com/OCA/server-backend/tree/11.0/base_external_dbsource_mssql :target: https://github.com/OCA/server-backend/tree/12.0/base_external_dbsource_mssql
:alt: OCA/server-backend :alt: OCA/server-backend
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/server-backend-11-0/server-backend-11-0-base_external_dbsource_mssql :target: https://translation.odoo-community.org/projects/server-backend-12-0/server-backend-12-0-base_external_dbsource_mssql
:alt: Translate me on Weblate :alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
:target: https://runbot.odoo-community.org/runbot/253/11.0 :target: https://runbot.odoo-community.org/runbot/253/12.0
:alt: Try me on Runbot :alt: Try me on Runbot
|badge1| |badge2| |badge3| |badge4| |badge5| |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -74,7 +74,7 @@ Bug Tracker
Bugs are tracked on `GitHub Issues <https://github.com/OCA/server-backend/issues>`_. Bugs are tracked on `GitHub Issues <https://github.com/OCA/server-backend/issues>`_.
In case of trouble, please check there if your issue has already been reported. In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed If you spotted it first, help us smashing it by providing a detailed and welcomed
`feedback <https://github.com/OCA/server-backend/issues/new?body=module:%20base_external_dbsource_mssql%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_. `feedback <https://github.com/OCA/server-backend/issues/new?body=module:%20base_external_dbsource_mssql%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
Do not contact contributors directly about support or help with technical issues. Do not contact contributors directly about support or help with technical issues.
@@ -95,7 +95,7 @@ Contributors
* Gervais Naoussi <gervaisnaoussi@gmail.com> * Gervais Naoussi <gervaisnaoussi@gmail.com>
* Dave Lasley <dave@laslabs.com> * Dave Lasley <dave@laslabs.com>
* `Tecnativa <https://www.tecnativa.com>`_: * `Tecnativa <https://www.tecnativa.com>`_:
* Sergio Teruel * Sergio Teruel
Maintainers Maintainers
~~~~~~~~~~~ ~~~~~~~~~~~
@@ -110,6 +110,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and mission is to support the collaborative development of Odoo features and
promote its widespread use. promote its widespread use.
This module is part of the `OCA/server-backend <https://github.com/OCA/server-backend/tree/11.0/base_external_dbsource_mssql>`_ project on GitHub. This module is part of the `OCA/server-backend <https://github.com/OCA/server-backend/tree/12.0/base_external_dbsource_mssql>`_ project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

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': '11.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

@@ -3,4 +3,4 @@
* Gervais Naoussi <gervaisnaoussi@gmail.com> * Gervais Naoussi <gervaisnaoussi@gmail.com>
* Dave Lasley <dave@laslabs.com> * Dave Lasley <dave@laslabs.com>
* `Tecnativa <https://www.tecnativa.com>`_: * `Tecnativa <https://www.tecnativa.com>`_:
* Sergio Teruel * Sergio Teruel

View File

@@ -367,7 +367,7 @@ ul.auto-toc {
!! This file is generated by oca-gen-addon-readme !! !! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !! !! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/server-backend/tree/11.0/base_external_dbsource_mssql"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/server-backend-11-0/server-backend-11-0-base_external_dbsource_mssql"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/253/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p> <p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/server-backend/tree/12.0/base_external_dbsource_mssql"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/server-backend-12-0/server-backend-12-0-base_external_dbsource_mssql"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/253/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p>This module extends <tt class="docutils literal">base_external_dbsource</tt>, allowing you to connect to <p>This module extends <tt class="docutils literal">base_external_dbsource</tt>, allowing you to connect to
foreign MSSQL databases using SQLAlchemy.</p> foreign MSSQL databases using SQLAlchemy.</p>
<p><strong>Table of contents</strong></p> <p><strong>Table of contents</strong></p>
@@ -426,7 +426,7 @@ Database Structure &gt; Database sources.</li>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/server-backend/issues">GitHub Issues</a>. <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/server-backend/issues">GitHub Issues</a>.
In case of trouble, please check there if your issue has already been reported. In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed If you spotted it first, help us smashing it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/server-backend/issues/new?body=module:%20base_external_dbsource_mssql%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p> <a class="reference external" href="https://github.com/OCA/server-backend/issues/new?body=module:%20base_external_dbsource_mssql%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p> <p>Do not contact contributors directly about support or help with technical issues.</p>
</div> </div>
<div class="section" id="credits"> <div class="section" id="credits">
@@ -445,8 +445,14 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
<li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:maxime.chambreuil&#64;savoirfairelinux.com">maxime.chambreuil&#64;savoirfairelinux.com</a>&gt;</li> <li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:maxime.chambreuil&#64;savoirfairelinux.com">maxime.chambreuil&#64;savoirfairelinux.com</a>&gt;</li>
<li>Gervais Naoussi &lt;<a class="reference external" href="mailto:gervaisnaoussi&#64;gmail.com">gervaisnaoussi&#64;gmail.com</a>&gt;</li> <li>Gervais Naoussi &lt;<a class="reference external" href="mailto:gervaisnaoussi&#64;gmail.com">gervaisnaoussi&#64;gmail.com</a>&gt;</li>
<li>Dave Lasley &lt;<a class="reference external" href="mailto:dave&#64;laslabs.com">dave&#64;laslabs.com</a>&gt;</li> <li>Dave Lasley &lt;<a class="reference external" href="mailto:dave&#64;laslabs.com">dave&#64;laslabs.com</a>&gt;</li>
<li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>: <li><dl class="first docutils">
* Sergio Teruel</li> <dt><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:</dt>
<dd><ul class="first last">
<li>Sergio Teruel</li>
</ul>
</dd>
</dl>
</li>
</ul> </ul>
</div> </div>
<div class="section" id="maintainers"> <div class="section" id="maintainers">
@@ -456,7 +462,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and mission is to support the collaborative development of Odoo features and
promote its widespread use.</p> promote its widespread use.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/server-backend/tree/11.0/base_external_dbsource_mssql">OCA/server-backend</a> project on GitHub.</p> <p>This module is part of the <a class="reference external" href="https://github.com/OCA/server-backend/tree/12.0/base_external_dbsource_mssql">OCA/server-backend</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p> <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div> </div>
</div> </div>

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)