From 79cd9d518c777873fb254436eb8670a25e7b86d7 Mon Sep 17 00:00:00 2001
From: Murtuza Zabuawala <murtuza.zabuawala@enterprisedb.com>
Date: Wed, 3 Feb 2016 16:35:40 +0530
Subject: [PATCH] Modified the variable jinja2 macros to allow to set/reset
 multiple options in a single command, instead of multiple commands.

---
 .../servers/templates/macros/variable.macros         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/web/pgadmin/browser/server_groups/servers/templates/macros/variable.macros b/web/pgadmin/browser/server_groups/servers/templates/macros/variable.macros
index dac9fdbec..75ac5d507 100644
--- a/web/pgadmin/browser/server_groups/servers/templates/macros/variable.macros
+++ b/web/pgadmin/browser/server_groups/servers/templates/macros/variable.macros
@@ -12,11 +12,13 @@ ALTER {% if role %}ROLE {{ self.conn|qtIdent(role) }}{% if database %} IN DATABA
 {################################################}
 {# This will be generic macro for other objects #}
 {################################################}
-{% macro SET(conn, object_type, object_name, v_name, value) -%}
+{% macro SET(conn, object_type, object_name, options) -%}
 ALTER {{object_type}} {{ conn|qtIdent(object_name) }}
-    SET ({{ conn|qtIdent(v_name) }}={{ value|qtLiteral }});
+    SET ({% for opt in options %}{% if loop.index != 1 %}
+, {% endif %}{{ conn|qtIdent(opt.name) }}={{ opt.value|qtLiteral }}{% endfor %});
 {%- endmacro %}
-{% macro UNSET(conn, object_type, object_name, v_name) -%}
+{% macro UNSET(conn, object_type, object_name, options) -%}
 ALTER {{object_type}} {{ conn|qtIdent(object_name) }}
-    RESET ({{ conn|qtIdent(v_name) }});
-{%- endmacro %}
+    RESET ({% for opt in options %}{% if loop.index != 1 %}
+, {% endif %}{{ conn|qtIdent(opt.name) }}{% endfor %});
+{%- endmacro %}
\ No newline at end of file