Fixed code and updated tests for issue 320 (influxdata#321)

andyfeller · aviau · commit b9beaeb89df1 · 2016-05-13T09:32:05.000-04:00
Thanks @afelle1 !
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -502,7 +502,7 @@ def create_retention_policy(self, name, duration, replication,
         :type default: bool
         """
         query_string = \
-            "CREATE RETENTION POLICY %s ON %s " \
+            "CREATE RETENTION POLICY \"%s\" ON \"%s\" " \
             "DURATION %s REPLICATION %s" % \
             (name, database or self._database, duration, replication)
 
@@ -537,7 +537,7 @@ def alter_retention_policy(self, name, database=None,
             should be set. Otherwise the operation will fail.
         """
         query_string = (
-            "ALTER RETENTION POLICY {0} ON {1}"
+            "ALTER RETENTION POLICY \"{0}\" ON \"{1}\""
         ).format(name, database or self._database)
         if duration:
             query_string += " DURATION {0}".format(duration)
@@ -558,7 +558,7 @@ def drop_retention_policy(self, name, database=None):
         :type database: str
         """
         query_string = (
-            "DROP RETENTION POLICY {0} ON {1}"
+            "DROP RETENTION POLICY \"{0}\" ON \"{1}\""
         ).format(name, database or self._database)
         self.query(query_string)
 
@@ -583,7 +583,7 @@ def get_list_retention_policies(self, database=None):
               u'replicaN': 1}]
             """
         rsp = self.query(
-            "SHOW RETENTION POLICIES ON %s" % (database or self._database)
+            "SHOW RETENTION POLICIES ON \"%s\"" % (database or self._database)
         )
         return list(rsp.get_points())
 
diff --git a/influxdb/tests/client_test.py b/influxdb/tests/client_test.py
@@ -571,8 +571,8 @@ def test_create_retention_policy_default(self):
 
             self.assertEqual(
                 m.last_request.qs['q'][0],
-                'create retention policy somename on '
-                'db duration 1d replication 4 default'
+                'create retention policy "somename" on '
+                '"db" duration 1d replication 4 default'
             )
 
     def test_create_retention_policy(self):
@@ -590,8 +590,8 @@ def test_create_retention_policy(self):
 
             self.assertEqual(
                 m.last_request.qs['q'][0],
-                'create retention policy somename on '
-                'db duration 1d replication 4'
+                'create retention policy "somename" on '
+                '"db" duration 1d replication 4'
             )
 
     def test_alter_retention_policy(self):
@@ -608,22 +608,22 @@ def test_alter_retention_policy(self):
                                             duration='4d')
             self.assertEqual(
                 m.last_request.qs['q'][0],
-                'alter retention policy somename on db duration 4d'
+                'alter retention policy "somename" on "db" duration 4d'
             )
             # Test alter replication
             self.cli.alter_retention_policy('somename', 'db',
                                             replication=4)
             self.assertEqual(
                 m.last_request.qs['q'][0],
-                'alter retention policy somename on db replication 4'
+                'alter retention policy "somename" on "db" replication 4'
             )
 
             # Test alter default
             self.cli.alter_retention_policy('somename', 'db',
                                             default=True)
             self.assertEqual(
                 m.last_request.qs['q'][0],
-                'alter retention policy somename on db default'
+                'alter retention policy "somename" on "db" default'
             )
 
     @raises(Exception)
@@ -644,7 +644,7 @@ def test_drop_retention_policy(self):
             self.cli.drop_retention_policy('somename', 'db')
             self.assertEqual(
                 m.last_request.qs['q'][0],
-                'drop retention policy somename on db'
+                'drop retention policy "somename" on "db"'
             )
 
     @raises(Exception)
