X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/dde08aa5cf12c06dfe7e1298a5367b1a20686aea..b4b7207702e937ea24d18db199df9951aa71bd18:/cookbooks/postgresql/libraries/postgresql.rb

diff --git a/cookbooks/postgresql/libraries/postgresql.rb b/cookbooks/postgresql/libraries/postgresql.rb
index 2f672960c..feaa508b9 100644
--- a/cookbooks/postgresql/libraries/postgresql.rb
+++ b/cookbooks/postgresql/libraries/postgresql.rb
@@ -1,12 +1,12 @@
-require 'chef/mixin/command'
+require "chef/mixin/shell_out"
 
-class Chef
+module OpenStreetMap
   class PostgreSQL
-    include Chef::Mixin::Command
+    include Chef::Mixin::ShellOut
 
     TABLE_PRIVILEGES = [
       :select, :insert, :update, :delete, :truncate, :references, :trigger
-    ]
+    ].freeze
 
     def initialize(cluster)
       @cluster = cluster
@@ -16,37 +16,42 @@ class Chef
       # Create argument array
       args = []
 
-      # Build the arguments
-      args.push("--command=\"#{options[:command].gsub('"', '\\"')}\"") if options[:command]
-      args.push("--file=#{options[:file]}") if options[:file]
+      # Add the cluster
+      args.push("--cluster")
+      args.push(@cluster)
 
-      # Get the database to use
-      database = options[:database] || "template1"
+      # Set output format
+      args.push("--no-align") unless options.fetch(:align, true)
 
-      # Build the command to run
-      command = "/usr/bin/psql --cluster #{@cluster} #{args.join(' ')} #{database}"
+      # Add any SQL command to execute
+      if options[:command]
+        args.push("--command")
+        args.push(options[:command])
+      end
+
+      # Add any file to execute SQL commands from
+      if options[:file]
+        args.push("--file")
+        args.push(options[:file])
+      end
+
+      # Add the database name
+      args.push(options[:database] || "template1")
 
       # Get the user and group to run as
       user = options[:user] || "postgres"
       group = options[:group] || "postgres"
 
       # Run the command
-      run_command(:command => command, :user => user, :group => group)
+      shell_out!("/usr/bin/psql", *args, :user => user, :group => group)
     end
 
     def query(sql, options = {})
-      # Get the database to use
-      database = options[:database] || "template1"
-
-      # Construct the command string
-      command = "/usr/bin/psql --cluster #{@cluster} --no-align --command='#{sql}' #{database}"
-
       # Run the query
-      status, stdout, stderr = output_of_command(command, :user => "postgres", :group => "postgres")
-      handle_command_failures(status, "STDOUT: #{stdout}\nSTDERR: #{stderr}", :output_on_failure => true)
+      result = execute(options.merge(:command => sql, :align => false))
 
       # Split the output into lines
-      lines = stdout.split("\n")
+      lines = result.stdout.split("\n")
 
       # Remove the "(N rows)" line from the end
       lines.pop
@@ -57,64 +62,67 @@ class Chef
       # Extract the record data
       lines.collect do |line|
         record = {}
-        fields.zip(line.split("|")) { |name,value| record[name.to_sym] = value }
+        fields.zip(line.split("|")) { |name, value| record[name.to_sym] = value }
         record
       end
     end
 
     def users
-      @users ||= query("SELECT * FROM pg_user").inject({}) do |users,user|
+      @users ||= query("SELECT * FROM pg_user").each_with_object({}) do |user, users|
         users[user[:usename]] = {
           :superuser => user[:usesuper] == "t",
           :createdb => user[:usercreatedb] == "t",
           :createrole => user[:usecatupd] == "t",
           :replication => user[:userepl] == "t"
         }
-        users
       end
     end
 
     def databases
-      @databases ||= query("SELECT d.datname, u.usename, d.encoding, d.datcollate, d.datctype FROM pg_database AS d INNER JOIN pg_user AS u ON d.datdba = u.usesysid").inject({}) do |databases,database|
+      @databases ||= query("SELECT d.datname, u.usename, d.encoding, d.datcollate, d.datctype FROM pg_database AS d INNER JOIN pg_user AS u ON d.datdba = u.usesysid").each_with_object({}) do |database, databases|
         databases[database[:datname]] = {
           :owner => database[:usename],
           :encoding => database[:encoding],
           :collate => database[:datcollate],
           :ctype => database[:datctype]
         }
-        databases
       end
     end
 
     def extensions(database)
       @extensions ||= {}
-      @extensions[database] ||= query("SELECT extname, extversion FROM pg_extension", :database => database).inject({}) do |extensions,extension|
+      @extensions[database] ||= query("SELECT extname, extversion FROM pg_extension", :database => database).each_with_object({}) do |extension, extensions|
         extensions[extension[:extname]] = {
           :version => extension[:extversion]
         }
-        databases
+      end
+    end
+
+    def tablespaces
+      @tablespaces ||= query("SELECT spcname, usename FROM pg_tablespace AS t INNER JOIN pg_user AS u ON t.spcowner = u.usesysid").each_with_object({}) do |tablespace, tablespaces|
+        tablespaces[tablespace[:spcname]] = {
+          :owner => tablespace[:usename]
+        }
       end
     end
 
     def tables(database)
       @tables ||= {}
-      @tables[database] ||= query("SELECT n.nspname, c.relname, u.usename, c.relacl FROM pg_class AS c INNER JOIN pg_user AS u ON c.relowner = u.usesysid INNER JOIN pg_namespace AS n ON c.relnamespace = n.oid", :database => database).inject({}) do |tables,table|
+      @tables[database] ||= query("SELECT n.nspname, c.relname, u.usename, c.relacl FROM pg_class AS c INNER JOIN pg_user AS u ON c.relowner = u.usesysid INNER JOIN pg_namespace AS n ON c.relnamespace = n.oid", :database => database).each_with_object({}) do |table, tables|
         name = "#{table[:nspname]}.#{table[:relname]}"
 
         tables[name] = {
           :owner => table[:usename],
           :permissions => parse_acl(table[:relacl] || "{}")
         }
-
-        tables
       end
     end
 
-  private
+    private
 
     def parse_acl(acl)
-      acl.sub(/^\{(.*)\}$/, "\\1").split(",").inject({}) do |permissions, entry|
-        entry = entry.sub(/^"(.*)"$/) { $1.gsub(/\\"/, '"') }.sub(/\/.*$/, "")
+      acl.sub(/^\{(.*)\}$/, "\\1").split(",").each_with_object({}) do |entry, permissions|
+        entry = entry.sub(/^"(.*)"$/) { Regexp.last_match[1].gsub(/\\"/, '"') }.sub(%r{/.*$}, "")
         user, privileges = entry.split("=")
 
         user = user.sub(/^"(.*)"$/, "\\1")
@@ -123,9 +131,7 @@ class Chef
         permissions[user] = {
           "a" => :insert, "r" => :select, "w" => :update, "d" => :delete,
           "D" => :truncate, "x" => :references, "t" => :trigger
-        }.values_at(*(privileges.chars)).compact
-
-        permissions
+        }.values_at(*privileges.chars).compact
       end
     end
   end