diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-07 03:55:24 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-07 03:55:24 +0000 |
| commit | b64004fda68f636cea93b591e3c48c1f096e279d (patch) | |
| tree | dbe21ed41b58eca981ed65015d1224e0c3fced03 /activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb | |
| parent | 98c02b96561ccb1c02158cba18990aa9d4d986fd (diff) | |
| download | rails-b64004fda68f636cea93b591e3c48c1f096e279d.tar.gz rails-b64004fda68f636cea93b591e3c48c1f096e279d.tar.bz2 rails-b64004fda68f636cea93b591e3c48c1f096e279d.zip | |
Fixed that conditions in has_many and has_and_belongs_to_many should be interpolated just like the finder_sql is
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@344 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb index 378fc79949..1152846df2 100644 --- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb +++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb @@ -14,7 +14,7 @@ module ActiveRecord "SELECT t.*, j.* FROM #{association_table_name} t, #{@join_table} j " + "WHERE t.#{@association_class.primary_key} = j.#{@association_foreign_key} AND " + "j.#{association_class_primary_key_name} = #{@owner.quoted_id} " + - (options[:conditions] ? " AND " + options[:conditions] : "") + " " + + (options[:conditions] ? " AND " + interpolate_sql(options[:conditions]) : "") + " " + "ORDER BY #{@order}" end |