From 1d6bdbf37366bc0b00d7a27f5d502ba5cee6e10d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?= Date: Fri, 18 Nov 2022 08:17:06 +0100 Subject: [PATCH] [MIG] base_external_dbsource_sqlite: Migration to 15.0 TT38359 --- base_external_dbsource_sqlite/README.rst | 15 ++++++++----- base_external_dbsource_sqlite/__manifest__.py | 2 +- .../i18n/base_external_dbsource_sqlite.pot | 2 +- .../models/base_external_dbsource.py | 22 ++++--------------- .../readme/CONTRIBUTORS.rst | 5 ++++- .../static/description/index.html | 11 ++++++---- .../tests/test_base_external_dbsource.py | 12 ++++++---- 7 files changed, 34 insertions(+), 35 deletions(-) diff --git a/base_external_dbsource_sqlite/README.rst b/base_external_dbsource_sqlite/README.rst index 5b22e893..06fc7155 100644 --- a/base_external_dbsource_sqlite/README.rst +++ b/base_external_dbsource_sqlite/README.rst @@ -14,13 +14,13 @@ External Database Source - SQLite :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_sqlite + :target: https://github.com/OCA/server-backend/tree/15.0/base_external_dbsource_sqlite :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_sqlite + :target: https://translation.odoo-community.org/projects/server-backend-15-0/server-backend-15-0-base_external_dbsource_sqlite :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| @@ -72,7 +72,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. @@ -92,7 +92,10 @@ Contributors * Maxime Chambreuil * Gervais Naoussi * Dave Lasley -* Sergio Teruel (https://www.tecnativa.com) + +* `Tecnativa `_: + + * Sergio Teruel Maintainers ~~~~~~~~~~~ @@ -107,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_sqlite/__manifest__.py b/base_external_dbsource_sqlite/__manifest__.py index e9f11c09..6ceca6a2 100644 --- a/base_external_dbsource_sqlite/__manifest__.py +++ b/base_external_dbsource_sqlite/__manifest__.py @@ -3,7 +3,7 @@ # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). { "name": "External Database Source - SQLite", - "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", diff --git a/base_external_dbsource_sqlite/i18n/base_external_dbsource_sqlite.pot b/base_external_dbsource_sqlite/i18n/base_external_dbsource_sqlite.pot index 8990c9fe..4ecc28d4 100644 --- a/base_external_dbsource_sqlite/i18n/base_external_dbsource_sqlite.pot +++ b/base_external_dbsource_sqlite/i18n/base_external_dbsource_sqlite.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 13.0\n" +"Project-Id-Version: Odoo Server 15.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" diff --git a/base_external_dbsource_sqlite/models/base_external_dbsource.py b/base_external_dbsource_sqlite/models/base_external_dbsource.py index 22d6dff2..822e6072 100644 --- a/base_external_dbsource_sqlite/models/base_external_dbsource.py +++ b/base_external_dbsource_sqlite/models/base_external_dbsource.py @@ -1,28 +1,14 @@ # Copyright 2011 Daniel Reis # Copyright 2016 LasLabs Inc. # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). - -import logging +import sqlalchemy 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 - try: - import sqlalchemy - - CONNECTORS.append(("sqlite", "SQLite")) - except ImportError: - _logger.info( - "SQLAlchemy library not available. Please " - 'install "sqlalchemy" python package.' - ) -except ImportError: - _logger.info("base_external_dbsource Odoo module not found.") +CONNECTORS = base_external_dbsource.BaseExternalDbsource.CONNECTORS +CONNECTORS.append(("sqlite", "SQLite")) class BaseExternalDbsource(models.Model): diff --git a/base_external_dbsource_sqlite/readme/CONTRIBUTORS.rst b/base_external_dbsource_sqlite/readme/CONTRIBUTORS.rst index 6edf85ec..c750ea82 100644 --- a/base_external_dbsource_sqlite/readme/CONTRIBUTORS.rst +++ b/base_external_dbsource_sqlite/readme/CONTRIBUTORS.rst @@ -2,4 +2,7 @@ * Maxime Chambreuil * Gervais Naoussi * Dave Lasley -* Sergio Teruel (https://www.tecnativa.com) + +* `Tecnativa `_: + + * Sergio Teruel diff --git a/base_external_dbsource_sqlite/static/description/index.html b/base_external_dbsource_sqlite/static/description/index.html index f1894233..5a6ebbf1 100644 --- a/base_external_dbsource_sqlite/static/description/index.html +++ b/base_external_dbsource_sqlite/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: LGPL-3 OCA/server-backend Translate me on Weblate Try me on Runbot

+

Beta License: LGPL-3 OCA/server-backend Translate me on Weblate Try me on Runbot

This module extends base_external_dbsource, allowing you to connect to foreign SQLite databases using SQLAlchemy.

Table of contents

@@ -424,7 +424,7 @@ Data sources.

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.

@@ -443,7 +443,10 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
  • Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>
  • Gervais Naoussi <gervaisnaoussi@gmail.com>
  • Dave Lasley <dave@laslabs.com>
    • -
  • Sergio Teruel <sergio.teruel@tecnativa.com> (https://www.tecnativa.com)
    • +
  • Tecnativa:
      +
    • Sergio Teruel
      • +
    +
    • @@ -453,7 +456,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

    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_sqlite/tests/test_base_external_dbsource.py b/base_external_dbsource_sqlite/tests/test_base_external_dbsource.py index 7e24b40f..59d9f366 100644 --- a/base_external_dbsource_sqlite/tests/test_base_external_dbsource.py +++ b/base_external_dbsource_sqlite/tests/test_base_external_dbsource.py @@ -12,7 +12,7 @@ ADAPTER = ( class TestBaseExternalDbsource(common.TransactionCase): def setUp(self): - super(TestBaseExternalDbsource, self).setUp() + super().setUp() self.dbsource = self.env.ref("base_external_dbsource_sqlite.demo_sqlite") def test_connection_close_sqlite(self): @@ -24,7 +24,7 @@ class TestBaseExternalDbsource(common.TransactionCase): def test_connection_open_sqlite(self): """It should call SQLAlchemy open""" with mock.patch.object( - self.dbsource, "_connection_open_sqlalchemy" + type(self.dbsource), "_connection_open_sqlalchemy" ) as parent_method: self.dbsource.connection_open_sqlite() parent_method.assert_called_once_with() @@ -32,13 +32,17 @@ class TestBaseExternalDbsource(common.TransactionCase): def test_excecute_sqlite(self): """It should pass args to SQLAlchemy execute""" expect = "sqlquery", "sqlparams", "metadata" - with mock.patch.object(self.dbsource, "_execute_sqlalchemy") as parent_method: + with mock.patch.object( + type(self.dbsource), "_execute_sqlalchemy" + ) as parent_method: self.dbsource.execute_sqlite(*expect) parent_method.assert_called_once_with(*expect) def test_execute_sqlit_without_sqlparams(self): """It should pass args to SQLAlchemy execute""" expect = "sqlquery", None, "metadata" - with mock.patch.object(self.dbsource, "_execute_sqlalchemy") as parent_method: + with mock.patch.object( + type(self.dbsource), "_execute_sqlalchemy" + ) as parent_method: self.dbsource.execute_sqlite(*expect) parent_method.assert_called_once_with(*expect)