diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-13 01:10:37 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-13 12:00:15 -0700 |
commit | e8550ee0329586b32de425e905c7af7e65bc78a8 (patch) | |
tree | 0cdfe0f9f0d3fb010280ff0453fc553ab6ff2d92 /activerecord/lib/active_record/connection_adapters/abstract | |
parent | fa5da8ad54d68ea0484825845eb6f6a8e8bca361 (diff) | |
download | rails-e8550ee0329586b32de425e905c7af7e65bc78a8.tar.gz rails-e8550ee0329586b32de425e905c7af7e65bc78a8.tar.bz2 rails-e8550ee0329586b32de425e905c7af7e65bc78a8.zip |
Cherry-pick core extensions
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 1 | ||||
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/quoting.rb | 2 |
2 files changed, 3 insertions, 0 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 e8e736bf38..500dafdc2e 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -1,5 +1,6 @@ require 'monitor' require 'set' +require 'active_support/core_ext/module/synchronization' module ActiveRecord # Raised when a connection could not be obtained within the connection diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb index 3a7bf35248..720fba29e9 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/big_decimal/conversions' + module ActiveRecord module ConnectionAdapters # :nodoc: module Quoting |