From 17bd379cb6767e68f88ada15743b544d64f498ef Mon Sep 17 00:00:00 2001 From: Surinder Kumar Date: Fri, 14 Oct 2016 12:23:10 -0700 Subject: [PATCH] Properly quote names when renaming FTS dictionaries and templates. Fixes #1857 --- .../templates/fts_dictionary/sql/9.1_plus/update.sql | 4 ++-- .../templates/fts_template/sql/9.1_plus/update.sql | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/sql/9.1_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/sql/9.1_plus/update.sql index 51ba1793a..8b17c68a8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/sql/9.1_plus/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/sql/9.1_plus/update.sql @@ -5,7 +5,7 @@ {% if data.name and data.name != o_data.name %} {% set name = data.name %} ALTER TEXT SEARCH DICTIONARY {{conn|qtIdent(o_data.schema)}}.{{conn|qtIdent(o_data.name)}} - RENAME TO {{data.name}}; + RENAME TO {{ conn|qtIdent(data.name) }}; {% endif %} {% if 'options' in data %} @@ -46,4 +46,4 @@ ALTER TEXT SEARCH DICTIONARY {{conn|qtIdent(o_data.schema)}}.{{conn|qtIdent(name COMMENT ON TEXT SEARCH DICTIONARY {{conn|qtIdent(schema)}}.{{conn|qtIdent(name)}} IS {{ data.description|qtLiteral }}; {% endif %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/9.1_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/9.1_plus/update.sql index 4c7362fc3..d6754f0f2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/9.1_plus/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/9.1_plus/update.sql @@ -2,7 +2,7 @@ {% if data %} {% if data.name and data.name != o_data.name %} ALTER TEXT SEARCH TEMPLATE {{conn|qtIdent(o_data.schema)}}.{{conn|qtIdent(o_data.name)}} - RENAME TO {{data.name}}; + RENAME TO {{ conn|qtIdent(data.name) }}; {% endif %} {#in case of rename, use new fts template name #}