github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove allow_concurrency and verification_timeout from ActiveRecord::Base (deprecated since 2.2).

Browse Source
This commit is contained in:
José Valim
2010-01-12 15:46:09 +01:00
parent c464271e03
commit 7f25ccf38d
2 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
View File

@@ -88,26 +88,6 @@ module ActiveRecord
end
class << self
# Deprecated and no longer has any effect.
def allow_concurrency
ActiveSupport::Deprecation.warn("ActiveRecord::Base.allow_concurrency has been deprecated and no longer has any effect. Please remove all references to allow_concurrency.")
end
# Deprecated and no longer has any effect.
def allow_concurrency=(flag)
ActiveSupport::Deprecation.warn("ActiveRecord::Base.allow_concurrency= has been deprecated and no longer has any effect. Please remove all references to allow_concurrency=.")
end
# Deprecated and no longer has any effect.
def verification_timeout
ActiveSupport::Deprecation.warn("ActiveRecord::Base.verification_timeout has been deprecated and no longer has any effect. Please remove all references to verification_timeout.")
end
# Deprecated and no longer has any effect.
def verification_timeout=(flag)
ActiveSupport::Deprecation.warn("ActiveRecord::Base.verification_timeout= has been deprecated and no longer has any effect. Please remove all references to verification_timeout=.")
end
# Returns the connection currently associated with the class. This can
# also be used to "borrow" the connection to do database work unrelated
# to any of the specific Active Records.

5
activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
View File

@@ -39,7 +39,6 @@ module ActiveRecord
def initialize(connection, logger = nil) #:nodoc:
@connection, @logger = connection, logger
@runtime = 0
@last_verification = 0
@query_cache_enabled = false
end
@@ -208,10 +207,6 @@ module ActiveRecord
end
result
rescue Exception => e
# Log message and raise exception.
# Set last_verification to 0, so that connection gets verified
# upon reentering the request loop
@last_verification = 0
message = "#{e.class.name}: #{e.message}: #{sql}"
log_info(message, name, 0)
raise translate_exception(e, message)