Fix default values and SQL formatting for event triggers. Fixes #1229
parent
4c2004d479
commit
e6aa3e1494
|
@ -548,6 +548,7 @@ class EventTriggerView(PGChildNodeView):
|
||||||
if not isinstance(sql, (str, unicode)):
|
if not isinstance(sql, (str, unicode)):
|
||||||
return sql
|
return sql
|
||||||
sql = sql.strip('\n').strip(' ')
|
sql = sql.strip('\n').strip(' ')
|
||||||
|
sql = re.sub('\n{2,}', '\n\n', sql)
|
||||||
if sql == '':
|
if sql == '':
|
||||||
sql = "--modified SQL"
|
sql = "--modified SQL"
|
||||||
return make_json_response(
|
return make_json_response(
|
||||||
|
@ -661,6 +662,7 @@ class EventTriggerView(PGChildNodeView):
|
||||||
sql_header += "\n"
|
sql_header += "\n"
|
||||||
|
|
||||||
sql = sql_header + sql
|
sql = sql_header + sql
|
||||||
|
sql = re.sub('\n{2,}', '\n\n', sql)
|
||||||
|
|
||||||
return ajax_response(response=sql)
|
return ajax_response(response=sql)
|
||||||
|
|
||||||
|
|
|
@ -58,10 +58,10 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
|
||||||
name: undefined,
|
name: undefined,
|
||||||
eventowner: undefined,
|
eventowner: undefined,
|
||||||
comment: undefined,
|
comment: undefined,
|
||||||
enabled: undefined,
|
enabled: "O",
|
||||||
eventfuncoid: undefined,
|
eventfuncoid: undefined,
|
||||||
eventfunname: undefined,
|
eventfunname: undefined,
|
||||||
eventname: undefined,
|
eventname: "DDL_COMMAND_START",
|
||||||
when: undefined,
|
when: undefined,
|
||||||
xmin: undefined,
|
xmin: undefined,
|
||||||
source: undefined,
|
source: undefined,
|
||||||
|
|
Loading…
Reference in New Issue