aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation.rb
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2012-04-13 16:17:28 +0100
committerJon Leighton <j@jonathanleighton.com>2012-04-13 16:17:52 +0100
commit60ac540053d5b5d32d7b349bae03f4d874a9826e (patch)
tree79cd22e0090a29077ec72b109c57053e2580232a /activerecord/lib/active_record/relation.rb
parent6311975fb3c02f50730fd1e11b8dba8dd9c05306 (diff)
downloadrails-60ac540053d5b5d32d7b349bae03f4d874a9826e.tar.gz
rails-60ac540053d5b5d32d7b349bae03f4d874a9826e.tar.bz2
rails-60ac540053d5b5d32d7b349bae03f4d874a9826e.zip
now we can just manipulate the values hash in #only and #except
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
-rw-r--r--activerecord/lib/active_record/relation.rb12
1 files changed, 8 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 7918d08cf0..8d6ed4c6d1 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -23,13 +23,13 @@ module ActiveRecord
alias :loaded? :loaded
alias :default_scoped? :default_scoped
- def initialize(klass, table)
- @klass, @table = klass, table
-
+ def initialize(klass, table, values = {})
+ @klass = klass
+ @table = table
+ @values = values
@implicit_readonly = nil
@loaded = false
@default_scoped = false
- @values = {}
end
def insert(values)
@@ -522,6 +522,10 @@ module ActiveRecord
to_a.blank?
end
+ def values
+ @values.dup
+ end
+
private
def references_eager_loaded_tables?