bug fix with mysql
This commit is contained in:
parent
0da32069e2
commit
324d81bd16
|
@ -242,7 +242,6 @@ def _get_alchemyEngine(**_args):
|
||||||
|
|
||||||
|
|
||||||
uri = ''.join([_provider,"://",_account,_fhost,'/',_database])
|
uri = ''.join([_provider,"://",_account,_fhost,'/',_database])
|
||||||
|
|
||||||
_engine = sqlalchemy.create_engine (uri,future=True)
|
_engine = sqlalchemy.create_engine (uri,future=True)
|
||||||
_out = {'sqlalchemy':_engine}
|
_out = {'sqlalchemy':_engine}
|
||||||
_pargs = {'host':_host,'port':_port,'username':_username,'password':_password}
|
_pargs = {'host':_host,'port':_port,'username':_username,'password':_password}
|
||||||
|
|
|
@ -95,10 +95,16 @@ class MongoReader(Mongo,Reader):
|
||||||
Mongo.__init__(self,**args)
|
Mongo.__init__(self,**args)
|
||||||
def read(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:
|
# @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 "aggregate" in cmd :
|
||||||
if "allowDiskUse" not in cmd :
|
if "allowDiskUse" not in cmd :
|
||||||
cmd["allowDiskUse"] = True
|
cmd["allowDiskUse"] = True
|
||||||
|
|
|
@ -27,7 +27,7 @@ SQLITE = 'sqlite'
|
||||||
SQLITE3= 'sqlite'
|
SQLITE3= 'sqlite'
|
||||||
REDSHIFT = 'redshift'
|
REDSHIFT = 'redshift'
|
||||||
NETEZZA = 'netezza'
|
NETEZZA = 'netezza'
|
||||||
MYSQL = 'mysql'
|
MYSQL = 'mysql+mysqlconnector'
|
||||||
RABBITMQ = 'rabbitmq'
|
RABBITMQ = 'rabbitmq'
|
||||||
MARIADB = 'mariadb'
|
MARIADB = 'mariadb'
|
||||||
COUCHDB = 'couch'
|
COUCHDB = 'couch'
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
__author__ = 'The Phi Technology'
|
__author__ = 'The Phi Technology'
|
||||||
__version__= '1.8.4'
|
__version__= '1.8.6'
|
||||||
|
|
Loading…
Reference in New Issue