From 324d81bd167d89c299834f454ff60412dda56af6 Mon Sep 17 00:00:00 2001 From: Steve Nyemba Date: Mon, 18 Sep 2023 20:00:40 -0500 Subject: [PATCH] bug fix with mysql --- transport/__init__.py | 1 - transport/mongo.py | 10 ++++++++-- transport/providers.py | 2 +- transport/version.py | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/transport/__init__.py b/transport/__init__.py index 4c2270c..bbb2e50 100644 --- a/transport/__init__.py +++ b/transport/__init__.py @@ -242,7 +242,6 @@ def _get_alchemyEngine(**_args): uri = ''.join([_provider,"://",_account,_fhost,'/',_database]) - _engine = sqlalchemy.create_engine (uri,future=True) _out = {'sqlalchemy':_engine} _pargs = {'host':_host,'port':_port,'username':_username,'password':_password} diff --git a/transport/mongo.py b/transport/mongo.py index 96c9075..c24b4b8 100644 --- a/transport/mongo.py +++ b/transport/mongo.py @@ -95,10 +95,16 @@ class MongoReader(Mongo,Reader): Mongo.__init__(self,**args) def read(self,**args): - if 'mongo' in args or 'cmd' in args: + if 'mongo' in args or 'cmd' in args or 'pipeline' in args: # # @TODO: - cmd = args['mongo'] if 'mongo' in args else args['cmd'] + cmd = {} + if 'pipeline' in args : + cmd['pipeline']= args['pipeline'] + if 'aggregate' not in cmd : + cmd['aggregate'] = self.collection + if 'pipeline' not in args or 'aggregate' not in cmd : + cmd = args['mongo'] if 'mongo' in args else args['cmd'] if "aggregate" in cmd : if "allowDiskUse" not in cmd : cmd["allowDiskUse"] = True diff --git a/transport/providers.py b/transport/providers.py index a638a89..c1c4bae 100644 --- a/transport/providers.py +++ b/transport/providers.py @@ -27,7 +27,7 @@ SQLITE = 'sqlite' SQLITE3= 'sqlite' REDSHIFT = 'redshift' NETEZZA = 'netezza' -MYSQL = 'mysql' +MYSQL = 'mysql+mysqlconnector' RABBITMQ = 'rabbitmq' MARIADB = 'mariadb' COUCHDB = 'couch' diff --git a/transport/version.py b/transport/version.py index 6d0f952..ec087c4 100644 --- a/transport/version.py +++ b/transport/version.py @@ -1,2 +1,2 @@ __author__ = 'The Phi Technology' -__version__= '1.8.4' +__version__= '1.8.6'