diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/databases.rake | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 43c9b846b0..b0eceef489 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* PostgreSQL: db:test:purge closes open database connections first. #6236 [alex] + * Fixed test:uncommitted on Windows (backslash issue) #4999 [paul@paulbutcher.com] * Fixed migration creation to work with namespaced models, so script/generate model Gallery::Image will use create_table :gallery_images #6327 [BobSilva] diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake index cd91a94416..7bc9aa9473 100644 --- a/railties/lib/tasks/databases.rake +++ b/railties/lib/tasks/databases.rake @@ -123,6 +123,8 @@ namespace :db do 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"] + + ActiveRecord::Base.clear_active_connections! `dropdb -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}` `createdb #{enc_option} -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}` when "sqlite","sqlite3" |