Update piwik to 2.16.1

[chef.git] / cookbooks / postgresql / providers / table.rb

diff --git a/cookbooks/postgresql/providers/table.rb b/cookbooks/postgresql/providers/table.rb
index b1dc85f7b43d760f2d509bb1a365527fab481003..495bf8b71e7d9368c25daeaa47cc255e53b1e890 100644 (file)
--- a/cookbooks/postgresql/providers/table.rb
+++ b/cookbooks/postgresql/providers/table.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+use_inline_resources
+

 def load_current_resource
   @pg = Chef::PostgreSQL.new(new_resource.cluster)
   @tables = @pg.tables(new_resource.database)
 def load_current_resource
   @pg = Chef::PostgreSQL.new(new_resource.cluster)
   @tables = @pg.tables(new_resource.database)


@@ -26,7 +28,7 @@ def load_current_resource
   @current_resource.cluster(new_resource.cluster)
   @current_resource.database(new_resource.database)
   @current_resource.schema(new_resource.schema)
   @current_resource.cluster(new_resource.cluster)
   @current_resource.database(new_resource.database)
   @current_resource.schema(new_resource.schema)

-  if pg_table = @tables[@name]
+  if (pg_table = @tables[@name])

     @current_resource.owner(pg_table[:owner])
     @current_resource.permissions(pg_table[:permissions])
   end
     @current_resource.owner(pg_table[:owner])
     @current_resource.permissions(pg_table[:permissions])
   end


@@ -67,12 +69,10 @@ action :create do
               @pg.execute(:command => "GRANT #{privilege.to_s.upcase} ON #{@name} TO \"#{user}\"", :database => new_resource.database)
             end
           end
               @pg.execute(:command => "GRANT #{privilege.to_s.upcase} ON #{@name} TO \"#{user}\"", :database => new_resource.database)
             end
           end

-        else
-          if current_privileges.include?(privilege)
-            converge_by("revoke #{privilege} for #{user} on #{new_resource}") do
-              Chef::Log.info("Revoking #{privilege} for #{user} on #{new_resource}")
-              @pg.execute(:command => "REVOKE #{privilege.to_s.upcase} ON #{@name} FROM \"#{user}\"", :database => new_resource.database)
-            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}")
+            @pg.execute(:command => "REVOKE #{privilege.to_s.upcase} ON #{@name} FROM \"#{user}\"", :database => new_resource.database)

           end
         end
       end
           end
         end
       end