From 45887735c6d9cbf403d87622a5afcdefa9d33139 Mon Sep 17 00:00:00 2001
From: Jon Nelson <jdnelson@dyn.com>
Date: Tue, 12 Jul 2016 09:48:21 -0500
Subject: [PATCH] properly quote identifiers with double quotes. This is rarely
 necessary.

---
 _modules/postgres_ext.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/_modules/postgres_ext.py b/_modules/postgres_ext.py
index 54b338e..8712028 100644
--- a/_modules/postgres_ext.py
+++ b/_modules/postgres_ext.py
@@ -185,9 +185,9 @@ def tablespace_create(name, location, owner=None, user=None, host=None, port=Non
 
         salt '*' postgres_ext.tablespace_create tablespacename '/path/datadir'
     '''
-    query = 'CREATE TABLESPACE {0} LOCATION \'{1}\''.format(name, location)
+    query = 'CREATE TABLESPACE "{0}" LOCATION \'{1}\''.format(name, location)
     if owner is not None:
-        query += ' OWNER \'{1}\''.format(owner)
+        query += ' OWNER "{1}"'.format(owner)
 
     # Execute the command
     ret = _psql_prepare_and_run(['-c', query],
@@ -214,16 +214,16 @@ def tablespace_alter(name, user=None, host=None, port=None, maintenance_db=None,
     queries = []
 
     if new_name:
-        queries.append('ALTER TABLESPACE {} RENAME TO {}'.format(
+        queries.append('ALTER TABLESPACE "{}" RENAME TO "{}"'.format(
                        name, new_name))
     if new_owner:
-        queries.append('ALTER TABLESPACE {} OWNER TO {}'.format(
+        queries.append('ALTER TABLESPACE "{}" OWNER TO "{}"'.format(
                        name, new_owner))
     if set_option:
-        queries.append('ALTER TABLESPACE {} SET ({} = {})'.format(
+        queries.append('ALTER TABLESPACE "{}" SET ({} = {})'.format(
                        name, set_option[0], set_option[1]))
     if reset_option:
-        queries.append('ALTER TABLESPACE {} RESET ({})'.format(
+        queries.append('ALTER TABLESPACE "{}" RESET ({})'.format(
                        name, reset_option))
 
     for query in queries:
@@ -245,7 +245,7 @@ def tablespace_remove(name, user=None, host=None, port=None,
     .. code-block:: bash
         salt '*' postgres_ext.tablespace_remove tsname
     '''
-    query = 'DROP TABLESPACE {}'.format(name)
+    query = 'DROP TABLESPACE "{}"'.format(name)
     ret = _psql_prepare_and_run(['-c', query],
                                 user=user,
                                 host=host,