diff --git a/.oca/oca-port/blacklist/base_external_dbsource_mssql.json b/.oca/oca-port/blacklist/base_external_dbsource_mssql.json new file mode 100644 index 000000000..7d42daba3 --- /dev/null +++ b/.oca/oca-port/blacklist/base_external_dbsource_mssql.json @@ -0,0 +1,5 @@ +{ + "pull_requests": { + "200": "(auto) Nothing to port from PR #200" + } +} diff --git a/base_external_dbsource_mssql/README.rst b/base_external_dbsource_mssql/README.rst new file mode 100644 index 000000000..2184c2a74 --- /dev/null +++ b/base_external_dbsource_mssql/README.rst @@ -0,0 +1,118 @@ +================================ +External Database Source - MSSQL +================================ + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:1592492f9af044e7f851f717d7cad0f4844d7c5da4526a8ad39c0fa2eb8a4eb2 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-LGPL--3-blue.png + :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/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-15-0/server-backend-15-0-base_external_dbsource_mssql + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/server-backend&target_branch=15.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module extends ``base_external_dbsource``, allowing you to connect to +foreign MSSQL databases using SQLAlchemy. + +**Table of contents** + +.. contents:: + :local: + +Installation +============ + +To install this module, you need to: + +* Install & configure FreeTDS driver (tdsodbc package) +* Install ``sqlalchemy`` and ``pymssql`` python libraries +* Install ``base_external_dbsource_sqlite`` Odoo module + +Configuration +============= + +To configure this module, you need to: + +#. Database sources can be configured in Settings > Technical > + Database Structure > Database sources. + +Usage +===== + +To use this module: + +* Go to Settings > Technical > 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 + +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 to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Daniel Reis +* LasLabs + +Contributors +~~~~~~~~~~~~ + +* Daniel Reis +* Maxime Chambreuil +* Gervais Naoussi +* Dave Lasley +* `Tecnativa `_: + * Sergio Teruel + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/base_external_dbsource_mssql/__init__.py b/base_external_dbsource_mssql/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/base_external_dbsource_mssql/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/base_external_dbsource_mssql/__manifest__.py b/base_external_dbsource_mssql/__manifest__.py new file mode 100644 index 000000000..091564f96 --- /dev/null +++ b/base_external_dbsource_mssql/__manifest__.py @@ -0,0 +1,15 @@ +# Copyright <2011> +# Copyright 2016 LasLabs Inc. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). +{ + "name": "External Database Source - MSSQL", + "version": "14.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": ["pymssql<=2.2.5"]}, + "demo": ["demo/base_external_dbsource.xml"], + "installable": True, +} diff --git a/base_external_dbsource_mssql/demo/base_external_dbsource.xml b/base_external_dbsource_mssql/demo/base_external_dbsource.xml new file mode 100644 index 000000000..f008b838d --- /dev/null +++ b/base_external_dbsource_mssql/demo/base_external_dbsource.xml @@ -0,0 +1,11 @@ + + + + MSSQL Demo + Server=myServerAddress;Database=myDataBase;User Id=myUsername; + password + mssql + + diff --git a/base_external_dbsource_mssql/i18n/base_external_dbsource_mssql.pot b/base_external_dbsource_mssql/i18n/base_external_dbsource_mssql.pot new file mode 100644 index 000000000..26f7eb21f --- /dev/null +++ b/base_external_dbsource_mssql/i18n/base_external_dbsource_mssql.pot @@ -0,0 +1,19 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_external_dbsource_mssql +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 15.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_mssql +#: model:ir.model,name:base_external_dbsource_mssql.model_base_external_dbsource +msgid "External Database Sources" +msgstr "" diff --git a/base_external_dbsource_mssql/i18n/de.po b/base_external_dbsource_mssql/i18n/de.po new file mode 100644 index 000000000..600f91792 --- /dev/null +++ b/base_external_dbsource_mssql/i18n/de.po @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_external_dbsource_mssql +# +# 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_mssql +#: model:ir.model,name:base_external_dbsource_mssql.model_base_external_dbsource +msgid "External Database Sources" +msgstr "Externe Datenbankquellen" diff --git a/base_external_dbsource_mssql/i18n/es.po b/base_external_dbsource_mssql/i18n/es.po new file mode 100644 index 000000000..160c94d6d --- /dev/null +++ b/base_external_dbsource_mssql/i18n/es.po @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_external_dbsource_mssql +# +# 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_mssql +#: model:ir.model,name:base_external_dbsource_mssql.model_base_external_dbsource +msgid "External Database Sources" +msgstr "Fuentes externas de la base de datos" diff --git a/base_external_dbsource_mssql/i18n/hr.po b/base_external_dbsource_mssql/i18n/hr.po new file mode 100644 index 000000000..e18dbc9fd --- /dev/null +++ b/base_external_dbsource_mssql/i18n/hr.po @@ -0,0 +1,25 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_external_dbsource_mssql +# +# 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_mssql +#: model:ir.model,name:base_external_dbsource_mssql.model_base_external_dbsource +msgid "External Database Sources" +msgstr "Vanjske baze" diff --git a/base_external_dbsource_mssql/i18n/nl_NL.po b/base_external_dbsource_mssql/i18n/nl_NL.po new file mode 100644 index 000000000..1bd6b2a71 --- /dev/null +++ b/base_external_dbsource_mssql/i18n/nl_NL.po @@ -0,0 +1,25 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_external_dbsource_mssql +# +# 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_mssql +#: model:ir.model,name:base_external_dbsource_mssql.model_base_external_dbsource +msgid "External Database Sources" +msgstr "Externe databasebronnen" diff --git a/base_external_dbsource_mssql/i18n/pt_BR.po b/base_external_dbsource_mssql/i18n/pt_BR.po new file mode 100644 index 000000000..ace556135 --- /dev/null +++ b/base_external_dbsource_mssql/i18n/pt_BR.po @@ -0,0 +1,25 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_external_dbsource_mssql +# +# 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_mssql +#: model:ir.model,name:base_external_dbsource_mssql.model_base_external_dbsource +msgid "External Database Sources" +msgstr "Fontes Banco de Dados Externo" diff --git a/base_external_dbsource_mssql/i18n/sl.po b/base_external_dbsource_mssql/i18n/sl.po new file mode 100644 index 000000000..fda149985 --- /dev/null +++ b/base_external_dbsource_mssql/i18n/sl.po @@ -0,0 +1,25 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_external_dbsource_mssql +# +# 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_mssql +#: model:ir.model,name:base_external_dbsource_mssql.model_base_external_dbsource +msgid "External Database Sources" +msgstr "Viri zunanjih podatkovnih baz" diff --git a/base_external_dbsource_mssql/i18n/tr.po b/base_external_dbsource_mssql/i18n/tr.po new file mode 100644 index 000000000..d18bdfcce --- /dev/null +++ b/base_external_dbsource_mssql/i18n/tr.po @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_external_dbsource_mssql +# +# 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_mssql +#: model:ir.model,name:base_external_dbsource_mssql.model_base_external_dbsource +msgid "External Database Sources" +msgstr "Dış veritabanı kaynakları" diff --git a/base_external_dbsource_mssql/models/__init__.py b/base_external_dbsource_mssql/models/__init__.py new file mode 100644 index 000000000..91032fcb6 --- /dev/null +++ b/base_external_dbsource_mssql/models/__init__.py @@ -0,0 +1 @@ +from . import base_external_dbsource diff --git a/base_external_dbsource_mssql/models/base_external_dbsource.py b/base_external_dbsource_mssql/models/base_external_dbsource.py new file mode 100644 index 000000000..b79c066f0 --- /dev/null +++ b/base_external_dbsource_mssql/models/base_external_dbsource.py @@ -0,0 +1,31 @@ +# Copyright 2011 Daniel Reis +# Copyright 2016 LasLabs Inc. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +import pymssql + +from odoo import models + +from odoo.addons.base_external_dbsource.models import base_external_dbsource + +CONNECTORS = base_external_dbsource.BaseExternalDbsource.CONNECTORS +CONNECTORS.append(("mssql", "Microsoft SQL Server")) + +assert pymssql + + +class BaseExternalDbsource(models.Model): + """It provides logic for connection to a MSSQL data source.""" + + _inherit = "base.external.dbsource" + + PWD_STRING_MSSQL = "Password=%s;" + + def connection_close_mssql(self, connection): + return connection.close() + + def connection_open_mssql(self): + return self._connection_open_sqlalchemy() + + def execute_mssql(self, sqlquery, sqlparams, metadata): + return self._execute_sqlalchemy(sqlquery, sqlparams, metadata) diff --git a/base_external_dbsource_mssql/readme/CONFIGURE.rst b/base_external_dbsource_mssql/readme/CONFIGURE.rst new file mode 100644 index 000000000..f8fb7dd36 --- /dev/null +++ b/base_external_dbsource_mssql/readme/CONFIGURE.rst @@ -0,0 +1,4 @@ +To configure this module, you need to: + +#. Database sources can be configured in Settings > Technical > + Database Structure > Database sources. diff --git a/base_external_dbsource_mssql/readme/CONTRIBUTORS.rst b/base_external_dbsource_mssql/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..0d2405cf8 --- /dev/null +++ b/base_external_dbsource_mssql/readme/CONTRIBUTORS.rst @@ -0,0 +1,6 @@ +* Daniel Reis +* Maxime Chambreuil +* Gervais Naoussi +* Dave Lasley +* `Tecnativa `_: + * Sergio Teruel diff --git a/base_external_dbsource_mssql/readme/DESCRIPTION.rst b/base_external_dbsource_mssql/readme/DESCRIPTION.rst new file mode 100644 index 000000000..760ea45b4 --- /dev/null +++ b/base_external_dbsource_mssql/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module extends ``base_external_dbsource``, allowing you to connect to +foreign MSSQL databases using SQLAlchemy. diff --git a/base_external_dbsource_mssql/readme/INSTALL.rst b/base_external_dbsource_mssql/readme/INSTALL.rst new file mode 100644 index 000000000..d4fa27f64 --- /dev/null +++ b/base_external_dbsource_mssql/readme/INSTALL.rst @@ -0,0 +1,5 @@ +To install this module, you need to: + +* Install & configure FreeTDS driver (tdsodbc package) +* Install ``sqlalchemy`` and ``pymssql`` python libraries +* Install ``base_external_dbsource_sqlite`` Odoo module diff --git a/base_external_dbsource_mssql/readme/ROADMAP.rst b/base_external_dbsource_mssql/readme/ROADMAP.rst new file mode 100644 index 000000000..8b025883a --- /dev/null +++ b/base_external_dbsource_mssql/readme/ROADMAP.rst @@ -0,0 +1 @@ +* Add X.509 authentication diff --git a/base_external_dbsource_mssql/readme/USAGE.rst b/base_external_dbsource_mssql/readme/USAGE.rst new file mode 100644 index 000000000..d366e192a --- /dev/null +++ b/base_external_dbsource_mssql/readme/USAGE.rst @@ -0,0 +1,9 @@ +To use this module: + +* Go to Settings > Technical > 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 diff --git a/base_external_dbsource_mssql/static/description/icon.png b/base_external_dbsource_mssql/static/description/icon.png new file mode 100644 index 000000000..3a0328b51 Binary files /dev/null and b/base_external_dbsource_mssql/static/description/icon.png differ diff --git a/base_external_dbsource_mssql/static/description/index.html b/base_external_dbsource_mssql/static/description/index.html new file mode 100644 index 000000000..56a9d3e76 --- /dev/null +++ b/base_external_dbsource_mssql/static/description/index.html @@ -0,0 +1,473 @@ + + + + + + +External Database Source - MSSQL + + + +
+

External Database Source - MSSQL

+ + +

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

+

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

+

Table of contents

+ +
+

Installation

+

To install this module, you need to:

+
    +
  • Install & configure FreeTDS driver (tdsodbc package)
    • +
  • Install sqlalchemy and pymssql python libraries
    • +
  • Install base_external_dbsource_sqlite Odoo module
    • +
+
+
+

Configuration

+

To configure this module, you need to:

+
    +
  1. Database sources can be configured in Settings > Technical > +Database Structure > Database sources.
    2. +
+
+
+

Usage

+

To use this module:

+
    +
  • Go to Settings > Technical > 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
    • +
+
+
+

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 to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Daniel Reis
    • +
  • LasLabs
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/base_external_dbsource_mssql/tests/__init__.py b/base_external_dbsource_mssql/tests/__init__.py new file mode 100644 index 000000000..87aa84b3e --- /dev/null +++ b/base_external_dbsource_mssql/tests/__init__.py @@ -0,0 +1 @@ +from . import test_base_external_dbsource diff --git a/base_external_dbsource_mssql/tests/test_base_external_dbsource.py b/base_external_dbsource_mssql/tests/test_base_external_dbsource.py new file mode 100644 index 000000000..884b84d16 --- /dev/null +++ b/base_external_dbsource_mssql/tests/test_base_external_dbsource.py @@ -0,0 +1,38 @@ +# Copyright 2016 LasLabs Inc. + +import mock + +from odoo.tests import common + +ADAPTER = ( + "odoo.addons.base_external_dbsource_mssql.models" ".base_external_dbsource.pymssql" +) + + +class TestBaseExternalDbsource(common.TransactionCase): + def setUp(self): + super().setUp() + self.dbsource = self.env.ref("base_external_dbsource_mssql.demo_mssql") + + def test_connection_close_mssql(self): + """It should close the connection""" + connection = mock.MagicMock() + res = self.dbsource.connection_close_mssql(connection) + self.assertEqual(res, connection.close()) + + def test_connection_open_mssql(self): + """It should call SQLAlchemy open""" + with mock.patch.object( + type(self.dbsource), "_connection_open_sqlalchemy" + ) as parent_method: + self.dbsource.connection_open_mssql() + parent_method.assert_called_once_with() + + def test_excecute_mssql(self): + """It should pass args to SQLAlchemy execute""" + expect = "sqlquery", "sqlparams", "metadata" + with mock.patch.object( + type(self.dbsource), "_execute_sqlalchemy" + ) as parent_method: + self.dbsource.execute_mssql(*expect) + parent_method.assert_called_once_with(*expect) diff --git a/base_external_dbsource_sqlite/models/base_external_dbsource.py b/base_external_dbsource_sqlite/models/base_external_dbsource.py index 822e6072e..5cbaa96a4 100644 --- a/base_external_dbsource_sqlite/models/base_external_dbsource.py +++ b/base_external_dbsource_sqlite/models/base_external_dbsource.py @@ -38,6 +38,8 @@ def _execute_sqlalchemy(self, sqlquery, sqlparams, metadata): cur = connection.execute(sqlquery) else: cur = connection.execute(sqlquery, sqlparams) + if self.env.context.get("no_return", False): + return rows, cols if metadata: cols = list(cur.keys()) rows = [r for r in cur] diff --git a/requirements.txt b/requirements.txt index 867daed4a..719227169 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ # generated from manifests external_dependencies sqlalchemy +pymssql<=2.2.5 diff --git a/setup/base_external_dbsource_mssql/odoo/addons/base_external_dbsource_mssql b/setup/base_external_dbsource_mssql/odoo/addons/base_external_dbsource_mssql new file mode 120000 index 000000000..9a9b864e2 --- /dev/null +++ b/setup/base_external_dbsource_mssql/odoo/addons/base_external_dbsource_mssql @@ -0,0 +1 @@ +../../../../base_external_dbsource_mssql \ No newline at end of file diff --git a/setup/base_external_dbsource_mssql/setup.py b/setup/base_external_dbsource_mssql/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/base_external_dbsource_mssql/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/test-requirements.txt b/test-requirements.txt new file mode 100644 index 000000000..810bb405e --- /dev/null +++ b/test-requirements.txt @@ -0,0 +1 @@ +odoo14-addon-base_external_dbsource_sqlite@git+https://github.com/OCA/server-backend@refs/pull/239/head#subdirectory=setup/base_external_dbsource_sqlite