aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib')
-rwxr-xr-xactiverecord/lib/active_record.rb1
-rw-r--r--activerecord/lib/active_record/query_cache.rb2
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