If specified, pass PostgreSQL client character encoding to createdb. Closes #2703.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2843 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 4 insertions, 1 deletions

diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index eed9a4e4b1..ced871f3b1 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* If specified, pass PostgreSQL client character encoding to createdb.  #2703 [Kazuhiko <kazuhiko@fdiary.net>]
+
 * Catch CGI multipart parse errors.  Wrap dispatcher internals in a failsafe response handler.  [Jeremy Kemper]
 
 * The freeze_gems Rake task accepts the VERSION environment variable to decide which version of Rails to pull into vendor/rails.  [Chad Fowler, Jeremy Kemper]
diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake
index 97c07f97f9..c9a081502e 100644
--- a/railties/lib/tasks/databases.rake
+++ b/railties/lib/tasks/databases.rake
@@ -101,8 +101,9 @@ task :purge_test_database => :environment do
       ENV['PGHOST']     = abcs["test"]["host"] if abcs["test"]["host"]
       ENV['PGPORT']     = abcs["test"]["port"].to_s if abcs["test"]["port"]
       ENV['PGPASSWORD'] = abcs["test"]["password"].to_s if abcs["test"]["password"]
+      enc_option = "-E #{abcs["test"]["encoding"]}" if abcs["test"]["encoding"]
       `dropdb -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}`
-      `createdb -T template0 -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}`
+      `createdb #{enc_option} -T template0 -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}`
     when "sqlite","sqlite3"
       File.delete(abcs["test"]["dbfile"]) if File.exist?(abcs["test"]["dbfile"])
     when "sqlserver"