summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-01-16 15:48:31 -0500
committerMicah Anderson <micah@riseup.net>2012-01-16 15:48:31 -0500
commitf2dd063f82eb0c32d02a5e0cb4777f96915ee431 (patch)
tree12f175a819c315e1c37540371208f49b3901ae15
parent2fc384981886eeb33b262c443c05bb0c7dff0528 (diff)
fix missing end
-rw-r--r--lib/puppet/provider/mysql_grant/mysql.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/puppet/provider/mysql_grant/mysql.rb b/lib/puppet/provider/mysql_grant/mysql.rb
index e1bdc07..5652cf4 100644
--- a/lib/puppet/provider/mysql_grant/mysql.rb
+++ b/lib/puppet/provider/mysql_grant/mysql.rb
@@ -108,6 +108,7 @@ Puppet::Type.type(:mysql_grant).provide(:mysql) do
end
if name[:type] == :column
fields << :column
+ end
not mysql( "mysql", "-NBe", 'SELECT "1" FROM %s WHERE %s' % [ name[:type], fields.map do |f| "%s = '%s'" % [f, name[f]] end.join(' AND ')]).empty?
end
@@ -200,8 +201,8 @@ Puppet::Type.type(:mysql_grant).provide(:mysql) do
all_privs = MYSQL_TABLE_PRIVS
when :column
stmt = 'update columns_priv set '
- where = ' where user="%s" and host="%s" and Db="%s" and Table="%s"' % [ name[:user], name[:host], name[:db], name[:table] ]
- all_privs = MYSQL_DB_PRIVS
+ where = ' where user="%s" and host="%s" and Db="%s" and Table_name="%s"' % [ name[:user], name[:host], name[:db], name[:table_name] ]
+ all_privs = MYSQL_COLUMN_PRIVS
end
if privs[0] == :all
@@ -220,6 +221,7 @@ Puppet::Type.type(:mysql_grant).provide(:mysql) do
#puts "set:", set
stmt = stmt << set << where
+ #puts "stmt:", stmt
if !set.empty?
mysql "mysql", "-Be", stmt