Pārlūkot izejas kodu

bug fix with mysql

Steve Nyemba 1 gadu atpakaļ
vecāks
revīzija
324d81bd16
4 mainītis faili ar 10 papildinājumiem un 5 dzēšanām
  1. 0 1
      transport/__init__.py
  2. 8 2
      transport/mongo.py
  3. 1 1
      transport/providers.py
  4. 1 1
      transport/version.py

+ 0 - 1
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}

+ 8 - 2
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

+ 1 - 1
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'

+ 1 - 1
transport/version.py

@@ -1,2 +1,2 @@
 __author__ = 'The Phi Technology'
-__version__= '1.8.4'
+__version__= '1.8.6'