diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-10-05 19:46:48 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-10-05 19:46:48 +0100 |
| commit | 6090513cfb8acb5554a6653a6f2cb87648585d41 (patch) | |
| tree | 99bfd589a48153e33f19ae72baa6e98f5708a9b8 /activerecord/test/models | |
| parent | 01159a6431bbc2dc7d7d95ce294c8567c954f39e (diff) | |
| parent | 4df45d86097efbeabceecfe53d8ea2da9ccbb107 (diff) | |
| download | rails-6090513cfb8acb5554a6653a6f2cb87648585d41.tar.gz rails-6090513cfb8acb5554a6653a6f2cb87648585d41.tar.bz2 rails-6090513cfb8acb5554a6653a6f2cb87648585d41.zip | |
Merge commit 'mainstream/master'
Conflicts:
activerecord/lib/active_record/association_preload.rb
Diffstat (limited to 'activerecord/test/models')
| -rw-r--r-- | activerecord/test/models/post.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb index 3adbc0ce1f..6da37c31ff 100644 --- a/activerecord/test/models/post.rb +++ b/activerecord/test/models/post.rb @@ -22,6 +22,8 @@ class Post < ActiveRecord::Base end end + has_many :author_favorites, :through => :author + has_many :comments_with_interpolated_conditions, :class_name => 'Comment', :conditions => ['#{"#{aliased_table_name}." rescue ""}body = ?', 'Thank you for the welcome'] |