X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/141871be7be50fe092cef6c84cfc84f2393c3545..b5b53aa76974af6ba50160fac6d093149bda6228:/cookbooks/postgresql/resources/table.rb?ds=sidebyside diff --git a/cookbooks/postgresql/resources/table.rb b/cookbooks/postgresql/resources/table.rb index ed2655932..5970f4e0a 100644 --- a/cookbooks/postgresql/resources/table.rb +++ b/cookbooks/postgresql/resources/table.rb @@ -17,6 +17,8 @@ # limitations under the License. # +unified_mode true + default_action :create property :table, :kind_of => String, :name_property => true @@ -40,7 +42,7 @@ action :create do converge_by("revoke all for #{user} on #{new_resource}") do Chef::Log.info("Revoking all for #{user} on #{new_resource}") - cluster.execute(:command => "REVOKE ALL ON #{qualified_name} FROM \"#{user}\"", :database => new_resource.database) + cluster.execute(:command => "REVOKE ALL ON TABLE #{qualified_name} FROM \"#{user}\"", :database => new_resource.database) end end @@ -57,13 +59,13 @@ action :create do unless current_privileges.include?(privilege) converge_by("grant #{privilege} for #{user} on #{new_resource}") do Chef::Log.info("Granting #{privilege} for #{user} on #{new_resource}") - cluster.execute(:command => "GRANT #{privilege.to_s.upcase} ON #{qualified_name} TO \"#{user}\"", :database => new_resource.database) + cluster.execute(:command => "GRANT #{privilege.to_s.upcase} ON TABLE #{qualified_name} TO \"#{user}\"", :database => new_resource.database) end end elsif current_privileges.include?(privilege) converge_by("revoke #{privilege} for #{user} on #{new_resource}") do Chef::Log.info("Revoking #{privilege} for #{user} on #{new_resource}") - cluster.execute(:command => "REVOKE #{privilege.to_s.upcase} ON #{qualified_name} FROM \"#{user}\"", :database => new_resource.database) + cluster.execute(:command => "REVOKE #{privilege.to_s.upcase} ON TABLE #{qualified_name} FROM \"#{user}\"", :database => new_resource.database) end end end