|
@@ -80,8 +80,10 @@ from notebook.models import escape_rows
|
|
|
if sys.version_info[0] > 2:
|
|
if sys.version_info[0] > 2:
|
|
|
from urllib.parse import quote_plus as urllib_quote_plus
|
|
from urllib.parse import quote_plus as urllib_quote_plus
|
|
|
from past.builtins import long
|
|
from past.builtins import long
|
|
|
|
|
+ from io import StringIO
|
|
|
else:
|
|
else:
|
|
|
from urllib import quote_plus as urllib_quote_plus
|
|
from urllib import quote_plus as urllib_quote_plus
|
|
|
|
|
+ from cStringIO import StringIO
|
|
|
|
|
|
|
|
|
|
|
|
|
ENGINES = {}
|
|
ENGINES = {}
|
|
@@ -177,6 +179,11 @@ class SqlAlchemyApi(Api):
|
|
|
'username': self.user.username
|
|
'username': self.user.username
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
|
|
+ if self.options.get('credentials_json'):
|
|
|
|
|
+ self.options['credentials_info'] = json.loads(
|
|
|
|
|
+ self.options.pop('credentials_json')
|
|
|
|
|
+ )
|
|
|
|
|
+
|
|
|
options = self.options.copy()
|
|
options = self.options.copy()
|
|
|
options.pop('session', None)
|
|
options.pop('session', None)
|
|
|
options.pop('url', None)
|
|
options.pop('url', None)
|