aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorArun Agrawal <arunagw@gmail.com>2011-12-27 15:55:45 +0530
committerArun Agrawal <arunagw@gmail.com>2011-12-27 15:55:45 +0530
commit29b5e5f66591b41e0297aec29ad8e70c6afaa9c9 (patch)
treeff51f49db8184c708ccb8f33b0dcafbb567cccdc /activerecord
parent3e4d0daedfdf1e041fcf13e896a273556e426b64 (diff)
downloadrails-29b5e5f66591b41e0297aec29ad8e70c6afaa9c9.tar.gz
rails-29b5e5f66591b41e0297aec29ad8e70c6afaa9c9.tar.bz2
rails-29b5e5f66591b41e0297aec29ad8e70c6afaa9c9.zip
Revert "This conditions is required to work with database create task. 1.9.2 is having a bug with "Calling return within begin still executes else". "
No need to worry about 1.9.2 with master This reverts commit fbf4bee6ed3682b361d6fbeca8e185e665e26b81.
Diffstat (limited to 'activerecord')
-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