pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #1275 Issue with Query tool for PPAS - not showing the correct output

pull/3/head
Murtuza Zabuawala 2016-06-03 14:34:50 +05:30 committed by Akshay Joshi
parent a989840460
commit 1bd37d1f76
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/pgadmin/tools/sqleditor/__init__.py
View File

@ -432,6 +432,16 @@ def poll(trans_id):
else: else:
if result is None: if result is None:
result = conn.status_message() result = conn.status_message()
additional_result = conn.messages()
"""
'Procedure/Function output may comes in the form of Notices from the
database server, so we need to append those outputs with the original
result.
"""
if isinstance(additional_result, list) \
and len(additional_result) > 0:
result = str(additional_result[-1]) + result
rows_affected = conn.rows_affected() rows_affected = conn.rows_affected()
return make_json_response(data={'status': status, 'result': result, return make_json_response(data={'status': status, 'result': result,