aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-12-27 04:41:18 -0800
committerSantiago Pastorino <santiago@wyeworks.com>2011-12-27 04:41:18 -0800
commit1a7701522d2308df801ba1f375cb0626386928a5 (patch)
tree8fb5a879db4e03c9bed7912e4485c4b4a1c9d991
parent01cde1da6c7a59a38e7a7aa949a3615b890d7414 (diff)
parent29b5e5f66591b41e0297aec29ad8e70c6afaa9c9 (diff)
downloadrails-1a7701522d2308df801ba1f375cb0626386928a5.tar.gz
rails-1a7701522d2308df801ba1f375cb0626386928a5.tar.bz2
rails-1a7701522d2308df801ba1f375cb0626386928a5.zip
Merge pull request #4201 from arunagw/no_worry_about_1.9.2
Revert "This conditions is required to work with database create task.
-rw-r--r--activerecord/lib/active_record/railties/databases.rake3
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index de299dbe91..180424641a 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -112,8 +112,7 @@ db_namespace = namespace :db do
end
end
else
- # Bug with 1.9.2 Calling return within begin still executes else
- $stderr.puts "#{config['database']} already exists" unless config['adapter'] =~ /sqlite/
+ $stderr.puts "#{config['database']} already exists"
end
end