diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-09-08 04:31:26 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-09-08 04:31:26 +0000 |
| commit | 2894887925a3613f1ea9f81bd72ec1f51c3e06da (patch) | |
| tree | 81e12dceaab6af0a2619e3486696ebaf155ed1c1 /activerecord/lib | |
| parent | f1b12b62f48257054a416269f3bf465fb4a8d6e7 (diff) | |
| download | rails-2894887925a3613f1ea9f81bd72ec1f51c3e06da.tar.gz rails-2894887925a3613f1ea9f81bd72ec1f51c3e06da.tar.bz2 rails-2894887925a3613f1ea9f81bd72ec1f51c3e06da.zip | |
Explicitly require active_record/query_cache before using it.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7419 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
| -rwxr-xr-x | activerecord/lib/active_record.rb | 1 | ||||
| -rw-r--r-- | activerecord/lib/active_record/query_cache.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 7dd89d86d0..9b391bf868 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -75,5 +75,4 @@ end require 'active_record/connection_adapters/abstract_adapter' -require 'active_record/query_cache' require 'active_record/schema_dumper' diff --git a/activerecord/lib/active_record/query_cache.rb b/activerecord/lib/active_record/query_cache.rb index e598de07e2..1b15f92284 100644 --- a/activerecord/lib/active_record/query_cache.rb +++ b/activerecord/lib/active_record/query_cache.rb @@ -62,7 +62,7 @@ module ActiveRecord case result when Array result.collect { |row| row.dup } - when Numeric, NilClass, FalseClass + when Fixnum, NilClass, FalseClass result else result.dup |