From 3743e2d8a68daa5d707b6731649642044117101a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?= Date: Fri, 18 Nov 2022 08:10:32 +0100 Subject: [PATCH] [MIG] base_external_dbsource_mssql: Migration to 15.0 TT38357 --- base_external_dbsource_mssql/README.rst | 10 ++++----- base_external_dbsource_mssql/__manifest__.py | 4 ++-- .../models/base_external_dbsource.py | 21 +++++-------------- .../static/description/index.html | 8 +++---- .../tests/test_base_external_dbsource.py | 8 ++++--- 5 files changed, 21 insertions(+), 30 deletions(-) diff --git a/base_external_dbsource_mssql/README.rst b/base_external_dbsource_mssql/README.rst index b633360d..d857e394 100644 --- a/base_external_dbsource_mssql/README.rst +++ b/base_external_dbsource_mssql/README.rst @@ -14,13 +14,13 @@ External Database Source - MSSQL :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html :alt: License: LGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github - :target: https://github.com/OCA/server-backend/tree/13.0/base_external_dbsource_mssql + :target: https://github.com/OCA/server-backend/tree/15.0/base_external_dbsource_mssql :alt: OCA/server-backend .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/server-backend-13-0/server-backend-13-0-base_external_dbsource_mssql + :target: https://translation.odoo-community.org/projects/server-backend-15-0/server-backend-15-0-base_external_dbsource_mssql :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/253/13.0 + :target: https://runbot.odoo-community.org/runbot/253/15.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -74,7 +74,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. 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 -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -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 promote its widespread use. -This module is part of the `OCA/server-backend `_ project on GitHub. +This module is part of the `OCA/server-backend `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/base_external_dbsource_mssql/__manifest__.py b/base_external_dbsource_mssql/__manifest__.py index 2e18a3e0..83b2e5ef 100644 --- a/base_external_dbsource_mssql/__manifest__.py +++ b/base_external_dbsource_mssql/__manifest__.py @@ -3,13 +3,13 @@ # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). { "name": "External Database Source - MSSQL", - "version": "13.0.1.0.0", + "version": "15.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<=2.2.5"]}, + "external_dependencies": {"python": ["pymssql<=2.2.5"]}, "demo": ["demo/base_external_dbsource.xml"], "installable": True, } diff --git a/base_external_dbsource_mssql/models/base_external_dbsource.py b/base_external_dbsource_mssql/models/base_external_dbsource.py index 9a538cc8..b79c066f 100644 --- a/base_external_dbsource_mssql/models/base_external_dbsource.py +++ b/base_external_dbsource_mssql/models/base_external_dbsource.py @@ -2,27 +2,16 @@ # Copyright 2016 LasLabs Inc. # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). -import logging +import pymssql from odoo import models -_logger = logging.getLogger(__name__) +from odoo.addons.base_external_dbsource.models import base_external_dbsource -try: - from odoo.addons.base_external_dbsource.models import base_external_dbsource +CONNECTORS = base_external_dbsource.BaseExternalDbsource.CONNECTORS +CONNECTORS.append(("mssql", "Microsoft SQL Server")) - CONNECTORS = base_external_dbsource.BaseExternalDbsource.CONNECTORS - try: - import pymssql - - CONNECTORS.append(("mssql", "Microsoft SQL Server")) - assert pymssql - except (ImportError, AssertionError): - _logger.info( - 'MS SQL Server not available. Please install "pymssql" ' "python package." - ) -except ImportError: - _logger.info("base_external_dbsource Odoo module not found.") +assert pymssql class BaseExternalDbsource(models.Model): diff --git a/base_external_dbsource_mssql/static/description/index.html b/base_external_dbsource_mssql/static/description/index.html index 14b017db..e93c009e 100644 --- a/base_external_dbsource_mssql/static/description/index.html +++ b/base_external_dbsource_mssql/static/description/index.html @@ -3,7 +3,7 @@ - + External Database Source - MSSQL