|
@@ -52,7 +52,7 @@ def create_session(request):
|
|
|
if any(old_session) and 'properties' in old_session[0]:
|
|
if any(old_session) and 'properties' in old_session[0]:
|
|
|
properties = old_session[0]['properties']
|
|
properties = old_session[0]['properties']
|
|
|
|
|
|
|
|
- response['session'] = get_api(request.user, session, request.fs, request.jt).create_session(lang=session['type'], properties=properties)
|
|
|
|
|
|
|
+ response['session'] = get_api(request, session).create_session(lang=session['type'], properties=properties)
|
|
|
response['status'] = 0
|
|
response['status'] = 0
|
|
|
|
|
|
|
|
return JsonResponse(response)
|
|
return JsonResponse(response)
|
|
@@ -66,7 +66,7 @@ def close_session(request):
|
|
|
|
|
|
|
|
session = json.loads(request.POST.get('session', '{}'))
|
|
session = json.loads(request.POST.get('session', '{}'))
|
|
|
|
|
|
|
|
- response['session'] = get_api(request.user, {'type': session['type']}, request.fs, request.jt).close_session(session=session)
|
|
|
|
|
|
|
+ response['session'] = get_api(request, {'type': session['type']}).close_session(session=session)
|
|
|
response['status'] = 0
|
|
response['status'] = 0
|
|
|
|
|
|
|
|
return JsonResponse(response)
|
|
return JsonResponse(response)
|
|
@@ -81,7 +81,7 @@ def execute(request):
|
|
|
notebook = json.loads(request.POST.get('notebook', '{}'))
|
|
notebook = json.loads(request.POST.get('notebook', '{}'))
|
|
|
snippet = json.loads(request.POST.get('snippet', '{}'))
|
|
snippet = json.loads(request.POST.get('snippet', '{}'))
|
|
|
|
|
|
|
|
- response['handle'] = get_api(request.user, snippet, request.fs, request.jt).execute(notebook, snippet)
|
|
|
|
|
|
|
+ response['handle'] = get_api(request, snippet).execute(notebook, snippet)
|
|
|
|
|
|
|
|
# Materialize and HTML escape results
|
|
# Materialize and HTML escape results
|
|
|
if response['handle'].get('sync') and response['handle']['result'].get('data'):
|
|
if response['handle'].get('sync') and response['handle']['result'].get('data'):
|
|
@@ -101,7 +101,7 @@ def check_status(request):
|
|
|
notebook = json.loads(request.POST.get('notebook', '{}'))
|
|
notebook = json.loads(request.POST.get('notebook', '{}'))
|
|
|
snippet = json.loads(request.POST.get('snippet', '{}'))
|
|
snippet = json.loads(request.POST.get('snippet', '{}'))
|
|
|
|
|
|
|
|
- response['query_status'] = get_api(request.user, snippet, request.fs, request.jt).check_status(notebook, snippet)
|
|
|
|
|
|
|
+ response['query_status'] = get_api(request, snippet).check_status(notebook, snippet)
|
|
|
response['status'] = 0
|
|
response['status'] = 0
|
|
|
|
|
|
|
|
return JsonResponse(response)
|
|
return JsonResponse(response)
|
|
@@ -118,7 +118,7 @@ def fetch_result_data(request):
|
|
|
rows = json.loads(request.POST.get('rows', 100))
|
|
rows = json.loads(request.POST.get('rows', 100))
|
|
|
start_over = json.loads(request.POST.get('startOver', False))
|
|
start_over = json.loads(request.POST.get('startOver', False))
|
|
|
|
|
|
|
|
- response['result'] = get_api(request.user, snippet, request.fs, request.jt).fetch_result(notebook, snippet, rows, start_over)
|
|
|
|
|
|
|
+ response['result'] = get_api(request, snippet).fetch_result(notebook, snippet, rows, start_over)
|
|
|
|
|
|
|
|
# Materialize and HTML escape results
|
|
# Materialize and HTML escape results
|
|
|
if response['result'].get('data') and response['result'].get('type') == 'table':
|
|
if response['result'].get('data') and response['result'].get('type') == 'table':
|
|
@@ -138,7 +138,7 @@ def fetch_result_metadata(request):
|
|
|
notebook = json.loads(request.POST.get('notebook', '{}'))
|
|
notebook = json.loads(request.POST.get('notebook', '{}'))
|
|
|
snippet = json.loads(request.POST.get('snippet', '{}'))
|
|
snippet = json.loads(request.POST.get('snippet', '{}'))
|
|
|
|
|
|
|
|
- response['result'] = get_api(request.user, snippet, request.fs, request.jt).fetch_result_metadata(notebook, snippet)
|
|
|
|
|
|
|
+ response['result'] = get_api(request, snippet).fetch_result_metadata(notebook, snippet)
|
|
|
response['status'] = 0
|
|
response['status'] = 0
|
|
|
|
|
|
|
|
return JsonResponse(response)
|
|
return JsonResponse(response)
|
|
@@ -153,7 +153,7 @@ def cancel_statement(request):
|
|
|
notebook = json.loads(request.POST.get('notebook', '{}'))
|
|
notebook = json.loads(request.POST.get('notebook', '{}'))
|
|
|
snippet = json.loads(request.POST.get('snippet', '{}'))
|
|
snippet = json.loads(request.POST.get('snippet', '{}'))
|
|
|
|
|
|
|
|
- response['result'] = get_api(request.user, snippet, request.fs, request.jt).cancel(notebook, snippet)
|
|
|
|
|
|
|
+ response['result'] = get_api(request, snippet).cancel(notebook, snippet)
|
|
|
response['status'] = 0
|
|
response['status'] = 0
|
|
|
|
|
|
|
|
return JsonResponse(response)
|
|
return JsonResponse(response)
|
|
@@ -174,7 +174,7 @@ def get_logs(request):
|
|
|
size = request.POST.get('size')
|
|
size = request.POST.get('size')
|
|
|
size = int(size) if size else None
|
|
size = int(size) if size else None
|
|
|
|
|
|
|
|
- db = get_api(request.user, snippet, request.fs, request.jt)
|
|
|
|
|
|
|
+ db = get_api(request, snippet)
|
|
|
|
|
|
|
|
logs = db.get_log(notebook, snippet, startFrom=startFrom, size=size)
|
|
logs = db.get_log(notebook, snippet, startFrom=startFrom, size=size)
|
|
|
|
|
|
|
@@ -314,7 +314,7 @@ def close_notebook(request):
|
|
|
|
|
|
|
|
for session in notebook['sessions']:
|
|
for session in notebook['sessions']:
|
|
|
try:
|
|
try:
|
|
|
- response['result'].append(get_api(request.user, session, request.fs, request.jt).close_session(session))
|
|
|
|
|
|
|
+ response['result'].append(get_api(request, session).close_session(session))
|
|
|
except QueryExpired:
|
|
except QueryExpired:
|
|
|
pass
|
|
pass
|
|
|
except Exception, e:
|
|
except Exception, e:
|
|
@@ -336,7 +336,7 @@ def close_statement(request):
|
|
|
snippet = json.loads(request.POST.get('snippet', '{}'))
|
|
snippet = json.loads(request.POST.get('snippet', '{}'))
|
|
|
|
|
|
|
|
try:
|
|
try:
|
|
|
- response['result'] = get_api(request.user, snippet, request.fs, request.jt).close_statement(snippet)
|
|
|
|
|
|
|
+ response['result'] = get_api(request, snippet).close_statement(snippet)
|
|
|
except QueryExpired:
|
|
except QueryExpired:
|
|
|
pass
|
|
pass
|
|
|
|
|
|
|
@@ -357,7 +357,7 @@ def autocomplete(request, server=None, database=None, table=None, column=None, n
|
|
|
snippet = json.loads(request.POST.get('snippet', '{}'))
|
|
snippet = json.loads(request.POST.get('snippet', '{}'))
|
|
|
|
|
|
|
|
try:
|
|
try:
|
|
|
- autocomplete_data = get_api(request.user, snippet, request.fs, request.jt).autocomplete(snippet, database, table, column, nested)
|
|
|
|
|
|
|
+ autocomplete_data = get_api(request, snippet).autocomplete(snippet, database, table, column, nested)
|
|
|
response.update(autocomplete_data)
|
|
response.update(autocomplete_data)
|
|
|
except QueryExpired:
|
|
except QueryExpired:
|
|
|
pass
|
|
pass
|