Merge branch 'dbname_in_hostname'

buckle · Feb 2, 2012 · fa75781 · fa75781
2 parents 2981222 + 30b023c
commit fa75781
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/puppet/provider/database_user/mysql.rb b/lib/puppet/provider/database_user/mysql.rb
@@ -22,7 +22,8 @@ def create
 
   def destroy
     dbh = Puppet::Type.type(:database_user).provider(:mysql).connect
-    dbh.select_db('mysql').query("drop user '%s'" % @resource[:name].sub("@", "'@'"))
+    user = @resource[:name].sub(/^([^@]*)@([^\/]*)(\/(.*))?$/,'\1\'@\'\2')
+    dbh.select_db('mysql').query("drop user '%s'" % user)
     dbh.reload
     @property_hash[:ensure] = :absent
   end
@@ -37,7 +38,8 @@ def password_hash
 
   def password_hash=(string)
     dbh = Puppet::Type.type(:database_user).provider(:mysql).connect
-    dbh.select_db('mysql').query("SET PASSWORD FOR '%s' = '%s'" % [ @resource[:name].sub("@", "'@'"), string ])
+    user = @resource[:name].sub(/^([^@]*)@([^\/]*)(\/(.*))?$/,'\1\'@\'\2')
+    dbh.select_db('mysql').query("SET PASSWORD FOR '%s' = '%s'" % [ user, string ])
     dbh.reload
     @property_hash[:password_hash] = string
   end