From e9497687d0b172fe452e0d3d682d14afc4b9749d Mon Sep 17 00:00:00 2001
From: Murtuza Zabuawala <murtuza.zabuawala@enterprisedb.com>
Date: Tue, 2 Feb 2016 19:39:35 +0530
Subject: [PATCH] Adding the macros to set variable options for objects other
 than Role.

---
 .../servers/templates/macros/variable.macros  | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 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 bc36dff11..dac9fdbec 100644
--- a/web/pgadmin/browser/server_groups/servers/templates/macros/variable.macros
+++ b/web/pgadmin/browser/server_groups/servers/templates/macros/variable.macros
@@ -1,6 +1,22 @@
+{####################################################}
+{# This will be specific macro for Role objects     #}
+{####################################################}
 {% macro APPLY(conn, database, role, param, value) -%}
-ALTER {% if role %}ROLE {{ self.conn|qtIdent(role) }}{% if database %} IN DATABASE {{ conn|qtIdent(database) }}{% endif %}{% else %}DATABASE {{ conn|qtIdent(database) }}{% endif %} SET {{ conn|qtIdent(param) }} TO {{ value|qtLiteral }};
+ALTER {% if role %}ROLE {{ self.conn|qtIdent(role) }}{% if database %} IN DATABASE {{ conn|qtIdent(database) }}{% endif %}{% else %}DATABASE {{ conn|qtIdent(database) }}{% endif %}
+    SET {{ conn|qtIdent(param) }} TO {{ value|qtLiteral }};
 {%- endmacro %}
 {% macro RESET(conn, database, role, param) -%}
-ALTER {% if role %}ROLE {{ self.conn|qtIdent(role) }}{% if database %} IN DATABASE {{ conn|qtIdent(database) }}{% endif %}{% else %}DATABASE {{ conn|qtIdent(database) }}{% endif %} RESET {{ conn|qtIdent(param) }};
+ALTER {% if role %}ROLE {{ self.conn|qtIdent(role) }}{% if database %} IN DATABASE {{ conn|qtIdent(database) }}{% endif %}{% else %}DATABASE {{ conn|qtIdent(database) }}{% endif %}
+    RESET {{ conn|qtIdent(param) }};
+{%- endmacro %}
+{################################################}
+{# This will be generic macro for other objects #}
+{################################################}
+{% macro SET(conn, object_type, object_name, v_name, value) -%}
+ALTER {{object_type}} {{ conn|qtIdent(object_name) }}
+    SET ({{ conn|qtIdent(v_name) }}={{ value|qtLiteral }});
+{%- endmacro %}
+{% macro UNSET(conn, object_type, object_name, v_name) -%}
+ALTER {{object_type}} {{ conn|qtIdent(object_name) }}
+    RESET ({{ conn|qtIdent(v_name) }});
 {%- endmacro %}