From 2b237b5774b8d21039e7a5f87144c383e3c95038 Mon Sep 17 00:00:00 2001 From: Sergio Teruel Date: Thu, 9 Jan 2020 17:07:32 +0100 Subject: [PATCH] [MIG] base_external_dbsource_sqlite: Migration to v13.0 --- base_external_dbsource_sqlite/README.rst | 10 +++---- base_external_dbsource_sqlite/__manifest__.py | 30 +++++++------------ .../demo/base_external_dbsource.xml | 2 +- .../models/base_external_dbsource.py | 25 +++++++--------- .../readme/DESCRIPTION.rst | 1 - .../static/description/index.html | 6 ++-- .../tests/test_base_external_dbsource.py | 26 +++++++--------- .../odoo/addons/base_external_dbsource_sqlite | 1 + setup/base_external_dbsource_sqlite/setup.py | 6 ++++ 9 files changed, 47 insertions(+), 60 deletions(-) create mode 120000 setup/base_external_dbsource_sqlite/odoo/addons/base_external_dbsource_sqlite create mode 100644 setup/base_external_dbsource_sqlite/setup.py diff --git a/base_external_dbsource_sqlite/README.rst b/base_external_dbsource_sqlite/README.rst index 136863b1..643bf015 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/12.0/base_external_dbsource_sqlite + :target: https://github.com/OCA/server-backend/tree/13.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-12-0/server-backend-12-0-base_external_dbsource_sqlite + :target: https://translation.odoo-community.org/projects/server-backend-13-0/server-backend-13-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/12.0 + :target: https://runbot.odoo-community.org/runbot/253/13.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -73,7 +73,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. @@ -108,6 +108,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 f429c03a..e0d18e94 100644 --- a/base_external_dbsource_sqlite/__manifest__.py +++ b/base_external_dbsource_sqlite/__manifest__.py @@ -2,24 +2,14 @@ # Copyright 2016 LasLabs Inc. # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). { - 'name': 'External Database Source - SQLite', - 'version': '12.0.1.0.0', - 'category': 'Tools', - 'author': "Daniel Reis, " - "LasLabs, " - "Odoo Community Association (OCA)", - 'website': 'https://github.com/OCA/server-tools', - 'license': 'LGPL-3', - 'depends': [ - 'base_external_dbsource', - ], - 'external_dependencies': { - 'python': [ - 'sqlalchemy', - ], - }, - 'demo': [ - 'demo/base_external_dbsource.xml', - ], - 'installable': True, + "name": "External Database Source - SQLite", + "version": "13.0.1.0.0", + "category": "Tools", + "author": "Daniel Reis, LasLabs, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/server-tools", + "license": "LGPL-3", + "depends": ["base_external_dbsource"], + "external_dependencies": {"python": ["sqlalchemy"]}, + "demo": ["demo/base_external_dbsource.xml"], + "installable": True, } diff --git a/base_external_dbsource_sqlite/demo/base_external_dbsource.xml b/base_external_dbsource_sqlite/demo/base_external_dbsource.xml index 2c7b33a1..94764eaf 100644 --- a/base_external_dbsource_sqlite/demo/base_external_dbsource.xml +++ b/base_external_dbsource_sqlite/demo/base_external_dbsource.xml @@ -1,4 +1,4 @@ - + SQLite Demo diff --git a/base_external_dbsource_sqlite/models/base_external_dbsource.py b/base_external_dbsource_sqlite/models/base_external_dbsource.py index ca62ceef..406f6a59 100644 --- a/base_external_dbsource_sqlite/models/base_external_dbsource.py +++ b/base_external_dbsource_sqlite/models/base_external_dbsource.py @@ -4,23 +4,25 @@ import logging -from odoo import api, models +from odoo import 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 sqlalchemy - CONNECTORS.append(('sqlite', 'SQLite')) + + CONNECTORS.append(("sqlite", "SQLite")) except ImportError: - _logger.info('SQLAlchemy library not available. Please ' - 'install "sqlalchemy" python package.') + _logger.info( + "SQLAlchemy library not available. Please " + 'install "sqlalchemy" 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): @@ -28,25 +30,20 @@ class BaseExternalDbsource(models.Model): _inherit = "base.external.dbsource" - PWD_STRING_SQLITE = 'Password=%s;' + PWD_STRING_SQLITE = "Password=%s;" - @api.multi def connection_close_sqlite(self, connection): return connection.close() - @api.multi def connection_open_sqlite(self): return self._connection_open_sqlalchemy() - @api.multi def execute_sqlite(self, sqlquery, sqlparams, metadata): return self._execute_sqlalchemy(sqlquery, sqlparams, metadata) - @api.multi def _connection_open_sqlalchemy(self): return sqlalchemy.create_engine(self.conn_string_full).connect() - @api.multi def _execute_sqlalchemy(self, sqlquery, sqlparams, metadata): rows, cols = list(), list() for record in self: diff --git a/base_external_dbsource_sqlite/readme/DESCRIPTION.rst b/base_external_dbsource_sqlite/readme/DESCRIPTION.rst index 58eeb147..6b0b3576 100644 --- a/base_external_dbsource_sqlite/readme/DESCRIPTION.rst +++ b/base_external_dbsource_sqlite/readme/DESCRIPTION.rst @@ -1,3 +1,2 @@ This module extends ``base_external_dbsource``, allowing you to connect to foreign SQLite databases using SQLAlchemy. - diff --git a/base_external_dbsource_sqlite/static/description/index.html b/base_external_dbsource_sqlite/static/description/index.html index 7cfd8549..f1894233 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.

@@ -453,7 +453,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 ec4b1c7d..203a0210 100644 --- a/base_external_dbsource_sqlite/tests/test_base_external_dbsource.py +++ b/base_external_dbsource_sqlite/tests/test_base_external_dbsource.py @@ -4,18 +4,16 @@ import mock from odoo.tests import common - -ADAPTER = ('odoo.addons.base_external_dbsource_sqlite.models' - '.base_external_dbsource.sqlalchemy') +ADAPTER = ( + "odoo.addons.base_external_dbsource_sqlite.models" + ".base_external_dbsource.sqlalchemy" +) class TestBaseExternalDbsource(common.TransactionCase): - def setUp(self): super(TestBaseExternalDbsource, self).setUp() - self.dbsource = self.env.ref( - 'base_external_dbsource_sqlite.demo_sqlite', - ) + self.dbsource = self.env.ref("base_external_dbsource_sqlite.demo_sqlite") def test_connection_close_sqlite(self): """ It should close the connection """ @@ -26,25 +24,21 @@ class TestBaseExternalDbsource(common.TransactionCase): def test_connection_open_sqlite(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_sqlite() parent_method.assert_called_once_with() 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: + expect = "sqlquery", "sqlparams", "metadata" + with mock.patch.object(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: + expect = "sqlquery", None, "metadata" + with mock.patch.object(self.dbsource, "_execute_sqlalchemy") as parent_method: self.dbsource.execute_sqlite(*expect) parent_method.assert_called_once_with(*expect) diff --git a/setup/base_external_dbsource_sqlite/odoo/addons/base_external_dbsource_sqlite b/setup/base_external_dbsource_sqlite/odoo/addons/base_external_dbsource_sqlite new file mode 120000 index 00000000..058afab7 --- /dev/null +++ b/setup/base_external_dbsource_sqlite/odoo/addons/base_external_dbsource_sqlite @@ -0,0 +1 @@ +../../../../base_external_dbsource_sqlite \ No newline at end of file diff --git a/setup/base_external_dbsource_sqlite/setup.py b/setup/base_external_dbsource_sqlite/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/base_external_dbsource_sqlite/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)