aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-08-19 10:46:01 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2010-08-19 10:46:10 -0700
commita4458f5d21da65c4291aa339ac91c332867752f7 (patch)
tree403122d57272f906e2dbc3cbba02bcfb18883b27
parenta70248c3d8eaf70422c1bcf1b571e937de95baee (diff)
downloadrails-a4458f5d21da65c4291aa339ac91c332867752f7.tar.gz
rails-a4458f5d21da65c4291aa339ac91c332867752f7.tar.bz2
rails-a4458f5d21da65c4291aa339ac91c332867752f7.zip
removing useless ternary
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb2
-rw-r--r--activerecord/test/cases/pooled_connections_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index 857af1baf7..37e584a629 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -322,7 +322,7 @@ module ActiveRecord
# already been opened.
def connected?(klass)
conn = retrieve_connection_pool(klass)
- conn ? conn.connected? : false
+ conn && conn.connected?
end
# Remove the connection for this class. This will close the active
diff --git a/activerecord/test/cases/pooled_connections_test.rb b/activerecord/test/cases/pooled_connections_test.rb
index e61960059e..de5fa140ba 100644
--- a/activerecord/test/cases/pooled_connections_test.rb
+++ b/activerecord/test/cases/pooled_connections_test.rb
@@ -89,7 +89,7 @@ class PooledConnectionsTest < ActiveRecord::TestCase
def test_undefined_connection_returns_false
old_handler = ActiveRecord::Base.connection_handler
ActiveRecord::Base.connection_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
- assert_equal false, ActiveRecord::Base.connected?
+ assert ! ActiveRecord::Base.connected?
ensure
ActiveRecord::Base.connection_handler = old_handler
end