Merge lp:~james-page/charm-helpers/bug1675220 into lp:charm-helpers

[James Page]

Correctly quote database names to ensure that names generated from juju application names are acceptable.

For example 'neutron-api' contains a dash, which without quoting will cause a parsing failure.

[Chris MacNaughton (chris.macnaughton)]

Looks good to me

review: Approve

=== modified file 'charmhelpers/contrib/database/mysql.py'
--- charmhelpers/contrib/database/mysql.py	2017-03-03 11:09:33 +0000
+++ charmhelpers/contrib/database/mysql.py	2017-05-15 10:30:38 +0000
@@ -89,7 +89,7 @@
     def create_database(self, db_name):
         cursor = self.connection.cursor()
         try:
-            cursor.execute("CREATE DATABASE {} CHARACTER SET UTF8"
+            cursor.execute("CREATE DATABASE '{}' CHARACTER SET UTF8"
                            .format(db_name))
         finally:
             cursor.close()
@@ -114,7 +114,7 @@
         cursor = self.connection.cursor()
         try:
             # TODO: review for different grants
-            cursor.execute("GRANT ALL PRIVILEGES ON {}.* TO '{}'@'{}' "
+            cursor.execute("GRANT ALL PRIVILEGES ON '{}'.* TO '{}'@'{}' "
                            "IDENTIFIED BY '{}'".format(db_name,
                                                        db_user,
                                                        remote_ip,