Merge pull request influxdata#271 from slomek/master

aviau · aviau · commit f4469303292a · 2015-11-27T13:05:22.000-05:00
Fix create/drop numeric-named databases (Thanks @slomek !)
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -460,15 +460,15 @@ def create_database(self, dbname):
         :param dbname: the name of the database to create
         :type dbname: str
         """
-        self.query("CREATE DATABASE %s" % dbname)
+        self.query("CREATE DATABASE \"%s\"" % dbname)
 
     def drop_database(self, dbname):
         """Drop a database from InfluxDB.
 
         :param dbname: the name of the database to drop
         :type dbname: str
         """
-        self.query("DROP DATABASE %s" % dbname)
+        self.query("DROP DATABASE \"%s\"" % dbname)
 
     def create_retention_policy(self, name, duration, replication,
                                 database=None, default=False):
diff --git a/influxdb/tests/client_test.py b/influxdb/tests/client_test.py
@@ -407,7 +407,20 @@ def test_create_database(self):
             self.cli.create_database('new_db')
             self.assertEqual(
                 m.last_request.qs['q'][0],
-                'create database new_db'
+                'create database "new_db"'
+            )
+
+    def test_create_numeric_named_database(self):
+        with requests_mock.Mocker() as m:
+            m.register_uri(
+                requests_mock.GET,
+                "http://localhost:8086/query",
+                text='{"results":[{}]}'
+            )
+            self.cli.create_database('123')
+            self.assertEqual(
+                m.last_request.qs['q'][0],
+                'create database "123"'
             )
 
     @raises(Exception)
@@ -425,7 +438,20 @@ def test_drop_database(self):
             self.cli.drop_database('new_db')
             self.assertEqual(
                 m.last_request.qs['q'][0],
-                'drop database new_db'
+                'drop database "new_db"'
+            )
+
+    def test_drop_numeric_named_database(self):
+        with requests_mock.Mocker() as m:
+            m.register_uri(
+                requests_mock.GET,
+                "http://localhost:8086/query",
+                text='{"results":[{}]}'
+            )
+            self.cli.drop_database('123')
+            self.assertEqual(
+                m.last_request.qs['q'][0],
+                'drop database "123"'
             )
 
     @raises(Exception)
