From fd0d740accef4d06310f8dcbcf15fbd6f3314295 Mon Sep 17 00:00:00 2001 From: Murtuza Zabuawala Date: Sat, 28 May 2016 19:45:10 +0530 Subject: [PATCH] Fixes #1143 - Update the comments in edit mode for the foreign data wrapper, and foreign table objects. --- .../templates/foreign_servers/sql/9.1_plus/update.sql | 2 +- .../templates/foreign_servers/sql/9.3_plus/update.sql | 2 +- .../templates/foreign_data_wrappers/sql/9.1_plus/update.sql | 2 +- .../templates/foreign_data_wrappers/sql/9.3_plus/update.sql | 2 +- .../templates/foreign_tables/sql/9.1_plus/update.sql | 2 +- .../templates/foreign_tables/sql/9.2_plus/update.sql | 2 +- .../templates/foreign_tables/sql/9.5_plus/update.sql | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/sql/9.1_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/sql/9.1_plus/update.sql index 2085bdb48..4c7590664 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/sql/9.1_plus/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/sql/9.1_plus/update.sql @@ -19,7 +19,7 @@ ALTER SERVER {{ conn|qtIdent(data.name) }} {% endif %} {# ============= Update foreign server comments ============= #} -{% if data.description and data.description != o_data.description %} +{% if data.description is defined and data.description != o_data.description %} COMMENT ON SERVER {{ conn|qtIdent(data.name) }} IS {{ data.description|qtLiteral }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/sql/9.3_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/sql/9.3_plus/update.sql index 2085bdb48..4c7590664 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/sql/9.3_plus/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/sql/9.3_plus/update.sql @@ -19,7 +19,7 @@ ALTER SERVER {{ conn|qtIdent(data.name) }} {% endif %} {# ============= Update foreign server comments ============= #} -{% if data.description and data.description != o_data.description %} +{% if data.description is defined and data.description != o_data.description %} COMMENT ON SERVER {{ conn|qtIdent(data.name) }} IS {{ data.description|qtLiteral }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/sql/9.1_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/sql/9.1_plus/update.sql index 990deb23d..3061c207a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/sql/9.1_plus/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/sql/9.1_plus/update.sql @@ -35,7 +35,7 @@ ALTER FOREIGN DATA WRAPPER {{ conn|qtIdent(data.name) }} {% endif %} {# ============= Update foreign data wrapper comments ============= #} -{% if data.description and data.description != o_data.description %} +{% if data.description is defined and data.description != o_data.description %} COMMENT ON FOREIGN DATA WRAPPER {{ conn|qtIdent(data.name) }} IS {{ data.description|qtLiteral }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/sql/9.3_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/sql/9.3_plus/update.sql index f97569ada..7a0163220 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/sql/9.3_plus/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/sql/9.3_plus/update.sql @@ -35,7 +35,7 @@ ALTER FOREIGN DATA WRAPPER {{ conn|qtIdent(data.name) }} {% endif %} {# ============= Update foreign data wrapper comments ============= #} -{% if data.description and data.description != o_data.description %} +{% if data.description is defined and data.description != o_data.description %} COMMENT ON FOREIGN DATA WRAPPER {{ conn|qtIdent(data.name) }} IS {{ data.description|qtLiteral }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.1_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.1_plus/update.sql index d34b2d0f8..3ea74f1ea 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.1_plus/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.1_plus/update.sql @@ -96,7 +96,7 @@ ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }} {{ SECLABLE.SET(conn, 'FOREIGN TABLE', name, r.provider, r.security_label, o_data.basensp) }} {% endfor %} {% endif -%} -{% if data.description %} +{% if data.description is defined and data.description != o_data.description%} COMMENT ON FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }} IS {{ data.description|qtLiteral }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.2_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.2_plus/update.sql index 44fb433af..52ce9269d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.2_plus/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.2_plus/update.sql @@ -135,7 +135,7 @@ ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }} {{ SECLABLE.SET(conn, 'FOREIGN TABLE', name, r.provider, r.security_label, o_data.basensp) }} {% endfor %} {% endif -%} -{% if data.description %} +{% if data.description is defined and data.description != o_data.description%} COMMENT ON FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }} IS {{ data.description|qtLiteral }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.5_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.5_plus/update.sql index 1aed70068..3afaf91fb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.5_plus/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.5_plus/update.sql @@ -147,7 +147,7 @@ ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }} {{ SECLABLE.SET(conn, 'FOREIGN TABLE', name, r.provider, r.security_label, o_data.basensp) }} {% endfor %} {% endif -%} -{% if data.description %} +{% if data.description is defined and data.description != o_data.description%} COMMENT ON FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }} IS {{ data.description|qtLiteral }};