aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-07-26 19:14:24 +0200
committerJosé Valim <jose.valim@gmail.com>2010-07-26 19:14:56 +0200
commitdd61a817dea85990f13664d74bca15bc5796b76e (patch)
tree6ba9c03834a6aed9e2a691208a9c2ce6472aa92d /activerecord/lib/active_record/connection_adapters
parent32844cbc025b394ecd0b9fe2fd755b4e5b6cd4e7 (diff)
downloadrails-dd61a817dea85990f13664d74bca15bc5796b76e.tar.gz
rails-dd61a817dea85990f13664d74bca15bc5796b76e.tar.bz2
rails-dd61a817dea85990f13664d74bca15bc5796b76e.zip
Move runtime back to the Thread.current
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_adapter.rb7
1 files changed, 0 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 69a963c3d3..d8c92d0ad3 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -34,13 +34,11 @@ module ActiveRecord
include QueryCache
include ActiveSupport::Callbacks
- attr_accessor :runtime
define_callbacks :checkout, :checkin
def initialize(connection, logger = nil) #:nodoc:
@active = nil
@connection, @logger = connection, logger
- @runtime = 0
@query_cache_enabled = false
@query_cache = {}
@instrumenter = ActiveSupport::Notifications.instrumenter
@@ -92,11 +90,6 @@ module ActiveRecord
false
end
- def reset_runtime #:nodoc:
- rt, @runtime = @runtime, 0
- rt
- end
-
# QUOTING ==================================================
# Override to return the quoted table name. Defaults to column quoting.