Created
January 21, 2014 12:28
-
-
Save gravitystorm/8539124 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| From b61c1c20dad213eb57d039b0d12a031a5906a2a5 Mon Sep 17 00:00:00 2001 | |
| From: Andy Allan <andy@gravitystorm.co.uk> | |
| Date: Tue, 21 Jan 2014 12:26:26 +0000 | |
| Subject: [PATCH] Quote the database and user strings when altering databases. | |
| --- | |
| cookbooks/postgresql/providers/database.rb | 6 +++--- | |
| 1 file changed, 3 insertions(+), 3 deletions(-) | |
| diff --git a/cookbooks/postgresql/providers/database.rb b/cookbooks/postgresql/providers/database.rb | |
| index 9cf9dd4..a63197a 100644 | |
| --- a/cookbooks/postgresql/providers/database.rb | |
| +++ b/cookbooks/postgresql/providers/database.rb | |
| @@ -34,11 +34,11 @@ end | |
| action :create do | |
| unless @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}'") | |
| + @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 | |
| if new_resource.owner != @current_resource.owner | |
| - @pg.execute(:command => "ALTER DATABASE #{new_resource.database} OWNER TO #{new_resource.owner}") | |
| + @pg.execute(:command => "ALTER DATABASE \"#{new_resource.database}\" OWNER TO \"#{new_resource.owner}\"") | |
| new_resource.updated_by_last_action(true) | |
| end | |
| end | |
| @@ -46,7 +46,7 @@ end | |
| action :drop do | |
| if @pg.databases.include?(new_resource.database) | |
| - @pg.execute(:command => "DROP DATABASE #{new_resource.database}") | |
| + @pg.execute(:command => "DROP DATABASE \"#{new_resource.database}\"") | |
| new_resource.updated_by_last_action(true) | |
| end | |
| end | |
| -- | |
| 1.7.9.5 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment