diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-30 20:47:26 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-30 20:47:26 +0200 |
| commit | c63cf7bf0db708fe46a929cf57649ab5a92034af (patch) | |
| tree | 8f0974852b51597652e6ae73da26f3eb80fe878b /activerecord/lib/active_record/relation/predicate_builder.rb | |
| parent | 52c56f9f7ec46ee39f1a6319ff4017e2492683ed (diff) | |
| parent | b07e6fdaa0aa07016d1425ada5b7f966142d0212 (diff) | |
| download | rails-c63cf7bf0db708fe46a929cf57649ab5a92034af.tar.gz rails-c63cf7bf0db708fe46a929cf57649ab5a92034af.tar.bz2 rails-c63cf7bf0db708fe46a929cf57649ab5a92034af.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'activerecord/lib/active_record/relation/predicate_builder.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/predicate_builder.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb index d853fd63d1..5cea2328e8 100644 --- a/activerecord/lib/active_record/relation/predicate_builder.rb +++ b/activerecord/lib/active_record/relation/predicate_builder.rb @@ -20,9 +20,7 @@ module ActiveRecord table = Arel::Table.new(table_name, :engine => @engine) end - unless attribute = table[column] - raise StatementInvalid, "No attribute named `#{column}` exists for table `#{table.name}`" - end + attribute = table[column] || Arel::Attribute.new(table, column) case value when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::Relation |