From 1bd37d1f76f23982ffb9f009863ccccf7600f2a9 Mon Sep 17 00:00:00 2001 From: Murtuza Zabuawala Date: Fri, 3 Jun 2016 14:34:50 +0530 Subject: [PATCH] Fixes #1275 Issue with Query tool for PPAS - not showing the correct output --- web/pgadmin/tools/sqleditor/__init__.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/web/pgadmin/tools/sqleditor/__init__.py b/web/pgadmin/tools/sqleditor/__init__.py index 3f4392ae0..74c37a4af 100644 --- a/web/pgadmin/tools/sqleditor/__init__.py +++ b/web/pgadmin/tools/sqleditor/__init__.py @@ -432,6 +432,16 @@ def poll(trans_id): else: if result is None: 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() return make_json_response(data={'status': status, 'result': result,