Jon Leighton
|
735844db71
|
Merge branch 'master' into nested_has_many_through
Conflicts:
activerecord/CHANGELOG
activerecord/lib/active_record/association_preload.rb
activerecord/lib/active_record/associations.rb
activerecord/lib/active_record/associations/class_methods/join_dependency.rb
activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
activerecord/lib/active_record/associations/has_many_association.rb
activerecord/lib/active_record/associations/has_many_through_association.rb
activerecord/lib/active_record/associations/has_one_association.rb
activerecord/lib/active_record/associations/has_one_through_association.rb
activerecord/lib/active_record/associations/through_association_scope.rb
activerecord/lib/active_record/reflection.rb
activerecord/test/cases/associations/has_many_through_associations_test.rb
activerecord/test/cases/associations/has_one_through_associations_test.rb
activerecord/test/cases/reflection_test.rb
activerecord/test/cases/relations_test.rb
activerecord/test/fixtures/memberships.yml
activerecord/test/models/categorization.rb
activerecord/test/models/category.rb
activerecord/test/models/member.rb
activerecord/test/models/reference.rb
activerecord/test/models/tagging.rb
|
2011-03-04 09:30:27 +00:00 |
|
Jon Leighton
|
52f09eac5b
|
Correctly update counter caches on deletion for has_many :through [#2824 state:resolved]. Also fixed a bunch of other counter cache bugs in the process, as once I fixed this one others started appearing like nobody's business.
|
2011-02-07 23:35:05 +00:00 |
|
Jon Leighton
|
9ec0734874
|
Properly support conditions on any of the reflections involved in a nested through association
|
2010-10-19 00:27:40 +01:00 |
|
Jon Leighton
|
a34391c3b4
|
Add support for table aliasing, with a test that needs aliasing in order to work correctly. This test incidentally provides a more complicated test case (4 inner joins, 2 using polymorphism).
|
2010-10-02 21:45:46 +01:00 |
|
Gabe da Silveira
|
7e3364ac46
|
Fix that counter_cache breaks with has_many :dependent => :nullify.
[#1196 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
|
2009-08-09 21:18:16 -07:00 |
|
Michael Koziarski
|
c48f744400
|
Make sure that belongs_to counter decrements when assigning nil Closes #10804 [jeanmartin]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8735 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
|
2008-01-26 06:23:03 +00:00 |
|
Jamis Buck
|
2a35baa0bb
|
Wrap :conditions in parentheses to prevent problems with OR's #1871
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2324 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
|
2005-09-24 23:58:13 +00:00 |
|
David Heinemeier Hansson
|
d9d22c7596
|
Fixed that single-table inheritance sub-classes couldn't be used to limit the result set with eager loading #1215 [Chris McGrath]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1619 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
|
2005-07-03 08:21:22 +00:00 |
|
David Heinemeier Hansson
|
1a6954af01
|
Changed habtm eager loading to also use joins
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1201 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
|
2005-04-18 05:55:20 +00:00 |
|
David Heinemeier Hansson
|
76690111d5
|
Fixes for postgresql testing #1129, #1130, #1131
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1199 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
|
2005-04-18 05:03:56 +00:00 |
|
David Heinemeier Hansson
|
75b8ac80d9
|
Dont initialize the association proxy for nil records
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1165 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
|
2005-04-14 07:49:13 +00:00 |
|
David Heinemeier Hansson
|
fdd268138a
|
Made eager loading work with inheritance hierarchies #1065 [Ryan Carver]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1131 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
|
2005-04-10 15:49:49 +00:00 |
|
David Heinemeier Hansson
|
f8783abf0c
|
Made eager loading work even more
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1083 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
|
2005-04-03 17:50:11 +00:00 |
|
David Heinemeier Hansson
|
abc895b828
|
Added new Base.find API and deprecated find_all, find_first. Added preliminary support for eager loading of associations
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1077 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
|
2005-04-03 10:52:05 +00:00 |
|