Permalink
Browse files

If specified, pass PostgreSQL client character encoding to createdb. C…

…loses #2703.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2843 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent ddf6910 commit f457ef46cfa5f7729ca95a2b2951c728d874fed4 @jeremy jeremy committed Nov 2, 2005
Showing with 4 additions and 1 deletion.
  1. +2 −0 railties/CHANGELOG
  2. +2 −1 railties/lib/tasks/databases.rake
View
@@ -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]
@@ -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"

0 comments on commit f457ef4

Please sign in to comment.