diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-12-14 22:32:54 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-12-14 22:32:54 +0000 |
| commit | f60e3aa1aedb1500be7d73dffba32bdb06710bd6 (patch) | |
| tree | fbe4cad191e0db09bcd4a3aa564573fdc74c37e0 | |
| parent | 519c5c754775ae99a4ea872cd77f50c70c6884a6 (diff) | |
| download | rails-f60e3aa1aedb1500be7d73dffba32bdb06710bd6.tar.gz rails-f60e3aa1aedb1500be7d73dffba32bdb06710bd6.tar.bz2 rails-f60e3aa1aedb1500be7d73dffba32bdb06710bd6.zip | |
Fixed that local database creation should consider 127.0.0.1 local (closes #9026) [parcelbrat]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8388 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/databases.rake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 164f60356e..06f56d3928 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that local database creation should consider 127.0.0.1 local #9026 [parcelbrat] + * Fixed that functional tests generated for scaffolds should use fixture calls instead of hard-coded IDs #10435 [boone] * Added db:migrate:redo and db:migrate:reset for rerunning existing migrations #10431, #10432 [matt] diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake index e8fb3bb1a1..2ecd09af2f 100644 --- a/railties/lib/tasks/databases.rake +++ b/railties/lib/tasks/databases.rake @@ -16,7 +16,7 @@ namespace :db do # <<: *defaults next unless config['database'] # Only connect to local databases - if config['host'] == 'localhost' || config['host'].blank? + if %w( 127.0.0.1 localhost ).include?(config['host']) || config['host'].blank? create_database(config) else p "This task only creates local databases. #{config['database']} is on a remote host." |