public inbox for [email protected]
help / color / mirror / Atom feed[pgAdmin4][PATCH] To fix the spacing issue in SQL for Event trigger
2+ messages / 2 participants
[nested] [flat]
* [pgAdmin4][PATCH] To fix the spacing issue in SQL for Event trigger
@ 2017-06-02 05:13 Murtuza Zabuawala <[email protected]>
2017-06-06 10:20 ` Re: [pgAdmin4][PATCH] To fix the spacing issue in SQL for Event trigger Dave Page <[email protected]>
0 siblings, 1 reply; 2+ messages in thread
From: Murtuza Zabuawala @ 2017-06-02 05:13 UTC (permalink / raw)
To: pgadmin-hackers
Hi,
PFA minor patch to fix the issue of extra spacing in generated SQL in Event
trigger.
RM#1229
--
Regards,
Murtuza Zabuawala
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py
index 671b6f4..e574d7a 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py
@@ -548,6 +548,7 @@ class EventTriggerView(PGChildNodeView):
if not isinstance(sql, (str, unicode)):
return sql
sql = sql.strip('\n').strip(' ')
+ sql = re.sub('\n{2,}', '\n\n', sql)
if sql == '':
sql = "--modified SQL"
return make_json_response(
@@ -661,6 +662,7 @@ class EventTriggerView(PGChildNodeView):
sql_header += "\n"
sql = sql_header + sql
+ sql = re.sub('\n{2,}', '\n\n', sql)
return ajax_response(response=sql)
diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js
index 1291cfb..a5e5d21 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js
@@ -58,10 +58,10 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
name: undefined,
eventowner: undefined,
comment: undefined,
- enabled: undefined,
+ enabled: "O",
eventfuncoid: undefined,
eventfunname: undefined,
- eventname: undefined,
+ eventname: "DDL_COMMAND_START",
when: undefined,
xmin: undefined,
source: undefined,
--
Sent via pgadmin-hackers mailing list ([email protected])
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers
Attachments:
[text/plain] RM_1229.diff (1.8K, 3-RM_1229.diff)
download | inline diff:
diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py
index 671b6f4..e574d7a 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py
@@ -548,6 +548,7 @@ class EventTriggerView(PGChildNodeView):
if not isinstance(sql, (str, unicode)):
return sql
sql = sql.strip('\n').strip(' ')
+ sql = re.sub('\n{2,}', '\n\n', sql)
if sql == '':
sql = "--modified SQL"
return make_json_response(
@@ -661,6 +662,7 @@ class EventTriggerView(PGChildNodeView):
sql_header += "\n"
sql = sql_header + sql
+ sql = re.sub('\n{2,}', '\n\n', sql)
return ajax_response(response=sql)
diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js
index 1291cfb..a5e5d21 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js
@@ -58,10 +58,10 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
name: undefined,
eventowner: undefined,
comment: undefined,
- enabled: undefined,
+ enabled: "O",
eventfuncoid: undefined,
eventfunname: undefined,
- eventname: undefined,
+ eventname: "DDL_COMMAND_START",
when: undefined,
xmin: undefined,
source: undefined,
^ permalink raw reply [nested|flat] 2+ messages in thread
* Re: [pgAdmin4][PATCH] To fix the spacing issue in SQL for Event trigger
2017-06-02 05:13 [pgAdmin4][PATCH] To fix the spacing issue in SQL for Event trigger Murtuza Zabuawala <[email protected]>
@ 2017-06-06 10:20 ` Dave Page <[email protected]>
0 siblings, 0 replies; 2+ messages in thread
From: Dave Page @ 2017-06-06 10:20 UTC (permalink / raw)
To: Murtuza Zabuawala <[email protected]>; +Cc: pgadmin-hackers
Thanks, applied.
On Fri, Jun 2, 2017 at 6:13 AM, Murtuza Zabuawala
<[email protected]> wrote:
> Hi,
>
> PFA minor patch to fix the issue of extra spacing in generated SQL in Event
> trigger.
> RM#1229
>
> --
> Regards,
> Murtuza Zabuawala
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
>
> --
> Sent via pgadmin-hackers mailing list ([email protected])
> To make changes to your subscription:
> http://www.postgresql.org/mailpref/pgadmin-hackers
>
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
--
Sent via pgadmin-hackers mailing list ([email protected])
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers
^ permalink raw reply [nested|flat] 2+ messages in thread
end of thread, other threads:[~2017-06-06 10:20 UTC | newest]
Thread overview: 2+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2017-06-02 05:13 [pgAdmin4][PATCH] To fix the spacing issue in SQL for Event trigger Murtuza Zabuawala <[email protected]>
2017-06-06 10:20 ` Dave Page <[email protected]>
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox