From 4b49e4f7a206ad9fbddbefa1b86377c19983bf08 Mon Sep 17 00:00:00 2001 From: Dave Lasley Date: Wed, 7 Dec 2016 18:28:41 -0800 Subject: [PATCH] [IMP] base_external_dbsource: Refactor & Split by source * Heavily refactor code for reusability * Split all sources into independent modules * Add more test coverage * Add CRUD methods * Add iterator execute return to roadmap [UPD] Update base_external_dbsource_mysql.pot --- base_external_dbsource_mysql/README.rst | 80 +++++++++++++++++++ base_external_dbsource_mysql/__init__.py | 2 + base_external_dbsource_mysql/__manifest__.py | 29 +++++++ .../demo/base_external_dbsource.xml | 9 +++ .../i18n/base_external_dbsource_mysql.pot | 20 +++++ base_external_dbsource_mysql/i18n/de.po | 24 ++++++ base_external_dbsource_mysql/i18n/es.po | 24 ++++++ base_external_dbsource_mysql/i18n/hr.po | 25 ++++++ base_external_dbsource_mysql/i18n/nl_NL.po | 25 ++++++ base_external_dbsource_mysql/i18n/pt_BR.po | 25 ++++++ base_external_dbsource_mysql/i18n/sl.po | 25 ++++++ base_external_dbsource_mysql/i18n/tr.po | 24 ++++++ .../models/__init__.py | 3 + .../models/base_external_dbsource.py | 43 ++++++++++ .../tests/__init__.py | 3 + .../tests/test_base_external_dbsource.py | 42 ++++++++++ 16 files changed, 403 insertions(+) create mode 100644 base_external_dbsource_mysql/README.rst create mode 100644 base_external_dbsource_mysql/__init__.py create mode 100644 base_external_dbsource_mysql/__manifest__.py create mode 100644 base_external_dbsource_mysql/demo/base_external_dbsource.xml create mode 100644 base_external_dbsource_mysql/i18n/base_external_dbsource_mysql.pot create mode 100644 base_external_dbsource_mysql/i18n/de.po create mode 100644 base_external_dbsource_mysql/i18n/es.po create mode 100644 base_external_dbsource_mysql/i18n/hr.po create mode 100644 base_external_dbsource_mysql/i18n/nl_NL.po create mode 100644 base_external_dbsource_mysql/i18n/pt_BR.po create mode 100644 base_external_dbsource_mysql/i18n/sl.po create mode 100644 base_external_dbsource_mysql/i18n/tr.po create mode 100644 base_external_dbsource_mysql/models/__init__.py create mode 100644 base_external_dbsource_mysql/models/base_external_dbsource.py create mode 100644 base_external_dbsource_mysql/tests/__init__.py create mode 100644 base_external_dbsource_mysql/tests/test_base_external_dbsource.py diff --git a/base_external_dbsource_mysql/README.rst b/base_external_dbsource_mysql/README.rst new file mode 100644 index 00000000..0bdc60a7 --- /dev/null +++ b/base_external_dbsource_mysql/README.rst @@ -0,0 +1,80 @@ +.. image:: https://img.shields.io/badge/licence-LGPL--3-blue.svg + :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-3 + +================================ +External Database Source - MySQL +================================ + +This module extends ``base_external_dbsource``, allowing you to connect to +foreign MySQL databases using SQLAlchemy. + + + +Installation +============ + +* Install ``sqlalchemy`` and ``MySQLdb`` python libraries +* Install ``base_external_dbsource_sqlite`` Odoo module + +Configuration +============= + +Database sources can be configured in Settings > Configuration -> Data sources. + + +Usage +===== + +To use this module: + +* Go to Settings > Database Structure > Database Sources +* Click on Create to enter the following information: + +* Datasource name?? +* Pasword +* Connector: Choose the database to which you want to connect +* Connection string: Specify how to connect to database + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/149/10.0 for server-tools + +Known issues / Roadmap +====================== + + +* Add X.509 authentication + +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. + +Credits +======= + +Contributors +------------ + +* Daniel Reis +* Maxime Chambreuil +* Gervais Naoussi +* Dave Lasley + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +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. + +To contribute to this module, please visit http://odoo-community.org. diff --git a/base_external_dbsource_mysql/__init__.py b/base_external_dbsource_mysql/__init__.py new file mode 100644 index 00000000..a0fdc10f --- /dev/null +++ b/base_external_dbsource_mysql/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import models diff --git a/base_external_dbsource_mysql/__manifest__.py b/base_external_dbsource_mysql/__manifest__.py new file mode 100644 index 00000000..1762124b --- /dev/null +++ b/base_external_dbsource_mysql/__manifest__.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Copyright <2011> +# Copyright 2016 LasLabs Inc. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). +{ + 'name': 'External Database Source - MySQL', + 'version': '10.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_sqlite', + ], + # Uncomment this for v11 + # 'external_dependencies': [ + # 'python': [ + # 'sqlalchemy', + # 'MySQLdb', + # ] + # ], + 'demo': [ + 'demo/base_external_dbsource.xml', + ], + 'installable': True, + 'auto_install': True, # Remove this key for v11 +} diff --git a/base_external_dbsource_mysql/demo/base_external_dbsource.xml b/base_external_dbsource_mysql/demo/base_external_dbsource.xml new file mode 100644 index 00000000..89ebe0f0 --- /dev/null +++ b/base_external_dbsource_mysql/demo/base_external_dbsource.xml @@ -0,0 +1,9 @@ + + + + MySQL Demo + Server=myServerAddress;Database=myDataBase;Uid=myUsername; + password + mysql + + diff --git a/base_external_dbsource_mysql/i18n/base_external_dbsource_mysql.pot b/base_external_dbsource_mysql/i18n/base_external_dbsource_mysql.pot new file mode 100644 index 00000000..8001d98a --- /dev/null +++ b/base_external_dbsource_mysql/i18n/base_external_dbsource_mysql.pot @@ -0,0 +1,20 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_external_dbsource_mysql +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: base_external_dbsource_mysql +#: model:ir.model,name:base_external_dbsource_mysql.model_base_external_dbsource +msgid "External Database Sources" +msgstr "" + diff --git a/base_external_dbsource_mysql/i18n/de.po b/base_external_dbsource_mysql/i18n/de.po new file mode 100644 index 00000000..6011570f --- /dev/null +++ b/base_external_dbsource_mysql/i18n/de.po @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_external_dbsource_mysql +# +# Translators: +# Rudolf Schnapka , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-10 00:47+0000\n" +"PO-Revision-Date: 2017-05-10 00:47+0000\n" +"Last-Translator: Rudolf Schnapka , 2017\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: base_external_dbsource_mysql +#: model:ir.model,name:base_external_dbsource_mysql.model_base_external_dbsource +msgid "External Database Sources" +msgstr "Externe Datenbankquellen" diff --git a/base_external_dbsource_mysql/i18n/es.po b/base_external_dbsource_mysql/i18n/es.po new file mode 100644 index 00000000..e7b7e07f --- /dev/null +++ b/base_external_dbsource_mysql/i18n/es.po @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_external_dbsource_mysql +# +# Translators: +# Fernando Lara , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-22 00:54+0000\n" +"PO-Revision-Date: 2017-02-22 00:54+0000\n" +"Last-Translator: Fernando Lara , 2017\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: base_external_dbsource_mysql +#: model:ir.model,name:base_external_dbsource_mysql.model_base_external_dbsource +msgid "External Database Sources" +msgstr "Fuentes externas de la base de datos" diff --git a/base_external_dbsource_mysql/i18n/hr.po b/base_external_dbsource_mysql/i18n/hr.po new file mode 100644 index 00000000..69af6d9f --- /dev/null +++ b/base_external_dbsource_mysql/i18n/hr.po @@ -0,0 +1,25 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_external_dbsource_mysql +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-10 00:47+0000\n" +"PO-Revision-Date: 2017-05-10 00:47+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"Language: hr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: base_external_dbsource_mysql +#: model:ir.model,name:base_external_dbsource_mysql.model_base_external_dbsource +msgid "External Database Sources" +msgstr "Vanjske baze" diff --git a/base_external_dbsource_mysql/i18n/nl_NL.po b/base_external_dbsource_mysql/i18n/nl_NL.po new file mode 100644 index 00000000..7063bdd6 --- /dev/null +++ b/base_external_dbsource_mysql/i18n/nl_NL.po @@ -0,0 +1,25 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_external_dbsource_mysql +# +# Translators: +# Peter Hageman , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-22 01:11+0000\n" +"PO-Revision-Date: 2017-06-22 01:11+0000\n" +"Last-Translator: Peter Hageman , 2017\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/" +"teams/23907/nl_NL/)\n" +"Language: nl_NL\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: base_external_dbsource_mysql +#: model:ir.model,name:base_external_dbsource_mysql.model_base_external_dbsource +msgid "External Database Sources" +msgstr "Externe databasebronnen" diff --git a/base_external_dbsource_mysql/i18n/pt_BR.po b/base_external_dbsource_mysql/i18n/pt_BR.po new file mode 100644 index 00000000..1b108bb2 --- /dev/null +++ b/base_external_dbsource_mysql/i18n/pt_BR.po @@ -0,0 +1,25 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_external_dbsource_mysql +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-21 04:22+0000\n" +"PO-Revision-Date: 2017-01-21 04:22+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" +"teams/23907/pt_BR/)\n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: base_external_dbsource_mysql +#: model:ir.model,name:base_external_dbsource_mysql.model_base_external_dbsource +msgid "External Database Sources" +msgstr "Fontes Banco de Dados Externo" diff --git a/base_external_dbsource_mysql/i18n/sl.po b/base_external_dbsource_mysql/i18n/sl.po new file mode 100644 index 00000000..6cf9c825 --- /dev/null +++ b/base_external_dbsource_mysql/i18n/sl.po @@ -0,0 +1,25 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_external_dbsource_mysql +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-21 04:22+0000\n" +"PO-Revision-Date: 2017-01-21 04:22+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"Language: sl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" + +#. module: base_external_dbsource_mysql +#: model:ir.model,name:base_external_dbsource_mysql.model_base_external_dbsource +msgid "External Database Sources" +msgstr "Viri zunanjih podatkovnih baz" diff --git a/base_external_dbsource_mysql/i18n/tr.po b/base_external_dbsource_mysql/i18n/tr.po new file mode 100644 index 00000000..01db2f81 --- /dev/null +++ b/base_external_dbsource_mysql/i18n/tr.po @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_external_dbsource_mysql +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-21 04:22+0000\n" +"PO-Revision-Date: 2017-01-21 04:22+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n" +"Language: tr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: base_external_dbsource_mysql +#: model:ir.model,name:base_external_dbsource_mysql.model_base_external_dbsource +msgid "External Database Sources" +msgstr "D???? veritaban?? kaynaklar??" diff --git a/base_external_dbsource_mysql/models/__init__.py b/base_external_dbsource_mysql/models/__init__.py new file mode 100644 index 00000000..44b7269b --- /dev/null +++ b/base_external_dbsource_mysql/models/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +from . import base_external_dbsource diff --git a/base_external_dbsource_mysql/models/base_external_dbsource.py b/base_external_dbsource_mysql/models/base_external_dbsource.py new file mode 100644 index 00000000..660b0130 --- /dev/null +++ b/base_external_dbsource_mysql/models/base_external_dbsource.py @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- +# Copyright 2011 Daniel Reis +# Copyright 2016 LasLabs Inc. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +import logging + +from odoo import api, models + +_logger = logging.getLogger(__name__) + +try: + from odoo.addons.base_external_dbsource.models import ( + base_external_dbsource, + ) + CONNECTORS = base_external_dbsource.BaseExternalDbsource.CONNECTORS + try: + import MySQLdb + CONNECTORS.append(('mysql', 'MySQL')) + assert MySQLdb + except (ImportError, AssertionError): + _logger.info('MySQL not available. Please install "mysqldb" ' + 'python package.') +except ImportError: + _logger.info('base_external_dbsource Odoo module not found.') + + +class BaseExternalDbsource(models.Model): + """ It provides logic for connection to a MySQL data source. """ + + _inherit = "base.external.dbsource" + + @api.multi + def connection_close_mysql(self, connection): + return connection.close() + + @api.multi + def connection_open_mysql(self): + return self._connection_open_sqlalchemy() + + @api.multi + def execute_mysql(self, sqlquery, sqlparams, metadata): + return self._execute_sqlalchemy(sqlquery, sqlparams, metadata) diff --git a/base_external_dbsource_mysql/tests/__init__.py b/base_external_dbsource_mysql/tests/__init__.py new file mode 100644 index 00000000..768d7990 --- /dev/null +++ b/base_external_dbsource_mysql/tests/__init__.py @@ -0,0 +1,3 @@ +# -*- encoding: utf-8 -*- + +from . import test_base_external_dbsource diff --git a/base_external_dbsource_mysql/tests/test_base_external_dbsource.py b/base_external_dbsource_mysql/tests/test_base_external_dbsource.py new file mode 100644 index 00000000..998a89ed --- /dev/null +++ b/base_external_dbsource_mysql/tests/test_base_external_dbsource.py @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 LasLabs Inc. + +import mock + +from odoo.tests import common + + +ADAPTER = ('odoo.addons.base_external_dbsource_mysql.models' + '.base_external_dbsource.MySQLdb') + + +class TestBaseExternalDbsource(common.TransactionCase): + + def setUp(self): + super(TestBaseExternalDbsource, self).setUp() + self.dbsource = self.env.ref( + 'base_external_dbsource_mysql.demo_mysql', + ) + + def test_connection_close_mysql(self): + """ It should close the connection """ + connection = mock.MagicMock() + res = self.dbsource.connection_close_mysql(connection) + self.assertEqual(res, connection.close()) + + def test_connection_open_mysql(self): + """ It should call SQLAlchemy open """ + with mock.patch.object( + self.dbsource, '_connection_open_sqlalchemy' + ) as parent_method: + self.dbsource.connection_open_mysql() + parent_method.assert_called_once_with() + + def test_excecute_mysql(self): + """ It should pass args to SQLAlchemy execute """ + expect = 'sqlquery', 'sqlparams', 'metadata' + with mock.patch.object( + self.dbsource, '_execute_sqlalchemy' + ) as parent_method: + self.dbsource.execute_mysql(*expect) + parent_method.assert_called_once_with(*expect)