Merge remote-tracking branch 'github/pull/510'

[chef.git] / cookbooks / postgresql / resources / database.rb

diff --git a/cookbooks/postgresql/resources/database.rb b/cookbooks/postgresql/resources/database.rb
index 9cc4f1e0e39b75270c7ff1ca905a9f75601700cb..cd2d4c7644f27f9bcac74ac326ab64dbcd2a8730 100644 (file)
--- a/cookbooks/postgresql/resources/database.rb
+++ b/cookbooks/postgresql/resources/database.rb
@@ -17,11 +17,13 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 default_action :create
 

-property :database, :kind_of => String, :name_attribute => true
+property :database, :kind_of => String, :name_property => true

 property :cluster, :kind_of => String, :required => true
 property :cluster, :kind_of => String, :required => true

-property :owner, :kind_of => String, :required => true
+property :owner, :kind_of => String, :required => [:create]

 property :encoding, :kind_of => String, :default => "UTF8"
 property :collation, :kind_of => String, :default => "en_GB.UTF8"
 property :ctype, :kind_of => String, :default => "en_GB.UTF8"
 property :encoding, :kind_of => String, :default => "UTF8"
 property :collation, :kind_of => String, :default => "en_GB.UTF8"
 property :ctype, :kind_of => String, :default => "en_GB.UTF8"


@@ -41,7 +43,11 @@ end
 action :drop do
   if cluster.databases.include?(new_resource.database)
     converge_by "drop database #{new_resource.database}" do
 action :drop do
   if cluster.databases.include?(new_resource.database)
     converge_by "drop database #{new_resource.database}" do

-      cluster.execute(:command => "DROP DATABASE \"#{new_resource.database}\"")
+      if cluster.version >= 13
+        cluster.execute(:command => "DROP DATABASE \"#{new_resource.database}\" WITH (FORCE)")
+      else
+        cluster.execute(:command => "DROP DATABASE \"#{new_resource.database}\"")
+      end

     end
   end
 end
     end
   end
 end