IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-24 09:40:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix the RE-SQL for for views to properly qualify trigger function names. Fixes #2381

Browse Source
This commit is contained in:
Khushboo Vashi 2017-06-07 13:40:11 +01:00 committed by Dave Page
parent ae80976689
commit b134ae2cb4
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py
View File

@ -896,15 +896,26 @@ class ViewNode(PGChildNodeView, VacuumSettings):
trigger['oid'], columns)
res_rows = trigger_definition(res_rows)
res_rows['schema'] = res_rows['nspname']
# It should be relname and not table, but in create.sql
# (which is referred from many places) we have used
# data.table and not data.relname so compatibility add new key as
# table in res_rows.
res_rows['table'] = res_rows['relname']
res_rows['tfunction'] = self.qtIdent(self.conn, res_rows['schema'], res_rows['tfunction'])
# Get trigger function with its schema name
SQL = render_template("/".join([self.trigger_temp_path,
'sql/#{0}#/get_triggerfunctions.sql'.format(self.manager.version)]),
tgfoid=res_rows['tgfoid'],
show_system_objects=self.blueprint.show_system_objects)
status, result = self.conn.execute_dict(SQL)
if not status:
return internal_server_error(errormsg=result)
# Update the trigger function which we have fetched with schema name
if 'rows' in result and len(result['rows']) > 0 and \
'tfunctions' in result['rows'][0]:
res_rows['tfunction'] = result['rows'][0]['tfunctions']
# Format arguments
if len(res_rows['custom_tgargs']) > 1: