diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2011-07-23 07:58:59 -0700 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-07-23 07:58:59 -0700 |
commit | 7dadb6aa0a65ff9ecd4b67d0686ab609fb9465ae (patch) | |
tree | 3c7d1f4a6586e4167fcca82b20424857def40d15 | |
parent | 25ec3c86e01b01da9577c8ed9a1cb4b33ba63f56 (diff) | |
parent | fbf4bee6ed3682b361d6fbeca8e185e665e26b81 (diff) | |
download | rails-7dadb6aa0a65ff9ecd4b67d0686ab609fb9465ae.tar.gz rails-7dadb6aa0a65ff9ecd4b67d0686ab609fb9465ae.tar.bz2 rails-7dadb6aa0a65ff9ecd4b67d0686ab609fb9465ae.zip |
Merge pull request #2171 from arunagw/database-rake-1.9.2
This conditions is required to work with database create task. 1.9.2 is h
-rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index 44e5520230..0ee7e20cf1 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -115,7 +115,8 @@ db_namespace = namespace :db do end end else - $stderr.puts "#{config['database']} already exists" + # Bug with 1.9.2 Calling return within begin still executes else + $stderr.puts "#{config['database']} already exists" unless config['adapter'] =~ /sqlite/ end end |