aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/connection_adapters
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2012-08-31 11:53:50 +0100
committerJon Leighton <j@jonathanleighton.com>2012-08-31 15:56:27 +0100
commit221571beb6b4bb7437989bdefaf421f993ab6002 (patch)
treec546a8b970c4ec8927dfbd287f36eec83d08477e /activerecord/test/cases/connection_adapters
parentae79c7a201f3aeea8919790eca1faa3fb552f88a (diff)
downloadrails-221571beb6b4bb7437989bdefaf421f993ab6002.tar.gz
rails-221571beb6b4bb7437989bdefaf421f993ab6002.tar.bz2
rails-221571beb6b4bb7437989bdefaf421f993ab6002.zip
Make connection pool retrieval faster
* Loop rather than recurse in retrieve_connection_pool * Key the hash by class rather than class name. This avoids creating unnecessary strings.
Diffstat (limited to 'activerecord/test/cases/connection_adapters')
-rw-r--r--activerecord/test/cases/connection_adapters/connection_handler_test.rb13
1 files changed, 4 insertions, 9 deletions
diff --git a/activerecord/test/cases/connection_adapters/connection_handler_test.rb b/activerecord/test/cases/connection_adapters/connection_handler_test.rb
index 17cb447105..2286ef1391 100644
--- a/activerecord/test/cases/connection_adapters/connection_handler_test.rb
+++ b/activerecord/test/cases/connection_adapters/connection_handler_test.rb
@@ -4,16 +4,11 @@ module ActiveRecord
module ConnectionAdapters
class ConnectionHandlerTest < ActiveRecord::TestCase
def setup
+ @klass = Class.new { include Model::Tag }
+ @subklass = Class.new(@klass) { include Model::Tag }
+
@handler = ConnectionHandler.new
- @handler.establish_connection 'america', Base.connection_pool.spec
- @klass = Class.new do
- include Model::Tag
- def self.name; 'america'; end
- end
- @subklass = Class.new(@klass) do
- include Model::Tag
- def self.name; 'north america'; end
- end
+ @handler.establish_connection @klass, Base.connection_pool.spec
end
def test_retrieve_connection