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

Ensure trigger function names are schema qualified in trigger RE-SQL. Fixes #1949

pull/3/head
Murtuza Zabuawala 2016-11-11 13:46:06 +00:00 committed by Dave Page
parent d5361a62cb
commit f405cdf383
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py
View File

@ -517,25 +517,7 @@ class TriggerView(PGChildNodeView):
# Making copy of output for future use # Making copy of output for future use
data = dict(res['rows'][0]) data = dict(res['rows'][0])
data = self.get_trigger_function_schema(data)
# If language is 'edbspl' then trigger function should be 'Inline EDB-SPL'
# else we will find the trigger function with schema name.
if data['lanname'] == 'edbspl':
data['tfunction'] = 'Inline EDB-SPL'
else:
SQL = render_template("/".join([self.template_path,
'get_triggerfunctions.sql']),
tgfoid=data['tgfoid'],
show_system_objects=self.blueprint.show_system_objects)
status, result = self.conn.execute_dict(SQL)
if not status:
return internal_server_error(errormsg=res)
# 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]:
data['tfunction'] = result['rows'][0]['tfunctions']
if len(data['custom_tgargs']) > 1: if len(data['custom_tgargs']) > 1:
# We know that trigger has more than 1 argument, let's join them # We know that trigger has more than 1 argument, let's join them
@ -760,6 +742,30 @@ class TriggerView(PGChildNodeView):
except Exception as e: except Exception as e:
return internal_server_error(errormsg=str(e)) return internal_server_error(errormsg=str(e))
def get_trigger_function_schema(self, data):
"""
This function will return trigger function with schema name
"""
# If language is 'edbspl' then trigger function should be 'Inline EDB-SPL'
# else we will find the trigger function with schema name.
if data['lanname'] == 'edbspl':
data['tfunction'] = 'Inline EDB-SPL'
else:
SQL = render_template("/".join([self.template_path,
'get_triggerfunctions.sql']),
tgfoid=data['tgfoid'],
show_system_objects=self.blueprint.show_system_objects)
status, result = self.conn.execute_dict(SQL)
if not status:
return internal_server_error(errormsg=res)
# 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]:
data['tfunction'] = result['rows'][0]['tfunctions']
return data
def get_sql(self, scid, tid, trid, data): def get_sql(self, scid, tid, trid, data):
""" """
This function will genrate sql from model data This function will genrate sql from model data
@ -784,6 +790,8 @@ class TriggerView(PGChildNodeView):
self.trigger_name = data['name'] self.trigger_name = data['name']
self.lanname = old_data['lanname'] self.lanname = old_data['lanname']
old_data = self.get_trigger_function_schema(old_data)
if len(old_data['custom_tgargs']) > 1: if len(old_data['custom_tgargs']) > 1:
# We know that trigger has more than 1 argument, let's join them # We know that trigger has more than 1 argument, let's join them
old_data['tgargs'] = self._format_args(old_data['custom_tgargs']) old_data['tgargs'] = self._format_args(old_data['custom_tgargs'])
@ -841,6 +849,8 @@ class TriggerView(PGChildNodeView):
data['schema'] = self.schema data['schema'] = self.schema
data['table'] = self.table data['table'] = self.table
data = self.get_trigger_function_schema(data)
if len(data['custom_tgargs']) > 1: if len(data['custom_tgargs']) > 1:
# We know that trigger has more than 1 argument, let's join them # We know that trigger has more than 1 argument, let's join them
data['tgargs'] = self._format_args(data['custom_tgargs']) data['tgargs'] = self._format_args(data['custom_tgargs'])