aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorSteve Bourne <stevebourne@gmail.com>2011-10-12 10:46:08 -0700
committerSteve Bourne <stevebourne@gmail.com>2011-10-12 10:46:08 -0700
commite552fe16d43d89c37b85cf3d5e8c8e5afe150529 (patch)
tree113fa592bba33f06c3a046ff14819cd3e65ab409 /activerecord/lib/active_record
parent532e6d59b50b241d51d2a423bab5962d9cf7b0d4 (diff)
downloadrails-e552fe16d43d89c37b85cf3d5e8c8e5afe150529.tar.gz
rails-e552fe16d43d89c37b85cf3d5e8c8e5afe150529.tar.bz2
rails-e552fe16d43d89c37b85cf3d5e8c8e5afe150529.zip
change activerecord query conditions example to avoid 'type' as column name
'Type' is a reserved column for STI. Changed conditions example to avoid using that column name as an example. The example isn't STI-related (and mentioning STI here is needless clutter), so changing to avoid accidentally encouraging users to use 'type' as a column name for other purposes.
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 78159d13d4..7a9654ffd8 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -115,8 +115,8 @@ module ActiveRecord #:nodoc:
# When joining tables, nested hashes or keys written in the form 'table_name.column_name'
# can be used to qualify the table name of a particular condition. For instance:
#
- # Student.joins(:schools).where(:schools => { :type => 'public' })
- # Student.joins(:schools).where('schools.type' => 'public' )
+ # Student.joins(:schools).where(:schools => { :category => 'public' })
+ # Student.joins(:schools).where('schools.category' => 'public' )
#
# == Overwriting default accessors
#