From b00e94e904d80fd058801a5574faa5731963798f Mon Sep 17 00:00:00 2001 From: Khushboo Vashi Date: Thu, 4 Aug 2016 15:24:03 +0100 Subject: [PATCH] Fix drop trigger function, function and procedures. Fixes #1467 --- .../servers/databases/schemas/functions/__init__.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py index 810bb49fe..ca69cac0b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py @@ -799,13 +799,11 @@ class FunctionView(PGChildNodeView, DataTypeReader): ) ) - name, func_args, nspname = res['rows'][0] - SQL = render_template("/".join([self.sql_template_path, 'delete.sql']), - name=name, - func_args=func_args, - nspname=nspname, + name=res['rows'][0]['name'], + func_args=res['rows'][0]['func_args'], + nspname=res['rows'][0]['nspname'], cascade=cascade) status, res = self.conn.execute_scalar(SQL) if not status: @@ -1327,7 +1325,8 @@ It may have been removed by another user or moved to another schema. if not status: return internal_server_error(errormsg=res) - func_def, name = res['rows'][0] + func_def = res['rows'][0]['func_def'] + name = res['rows'][0]['name'] # Fetch only arguments argString = name[name.rfind('('):].strip('(').strip(')')