X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/05a0ff951fd8a83036b6b7d2e0e6762c7ba61d63..9bca5f05185dde08efcf2d5f1a2bf66c8cdc9f00:/cookbooks/postgresql/providers/database.rb diff --git a/cookbooks/postgresql/providers/database.rb b/cookbooks/postgresql/providers/database.rb index a63197afe..31704314b 100644 --- a/cookbooks/postgresql/providers/database.rb +++ b/cookbooks/postgresql/providers/database.rb @@ -23,7 +23,7 @@ def load_current_resource @current_resource = Chef::Resource::PostgresqlDatabase.new(new_resource.name) @current_resource.database(new_resource.database) @current_resource.cluster(new_resource.cluster) - if pg_database = @pg.databases[@current_resource.database] + if (pg_database = @pg.databases[@current_resource.database]) @current_resource.owner(pg_database[:owner]) @current_resource.encoding(pg_database[:encoding]) @current_resource.encoding(pg_database[:collate]) @@ -33,7 +33,7 @@ def load_current_resource end action :create do - unless @pg.databases.include?(new_resource.database) + if !@pg.databases.include?(new_resource.database) @pg.execute(:command => "CREATE DATABASE \"#{new_resource.database}\" OWNER \"#{new_resource.owner}\" TEMPLATE template0 ENCODING '#{new_resource.encoding}' LC_COLLATE '#{new_resource.collation}' LC_CTYPE '#{new_resource.ctype}'") new_resource.updated_by_last_action(true) else