Jon Leighton
|
256b363eee
|
Revert "Deprecate defining scopes with a callable (lambda, proc, etc) via the scope class method. Just define a class method yourself instead."
This reverts commit f0e198bfa1.
Conflicts:
activerecord/test/models/post.rb
|
2011-04-17 20:47:52 +01:00 |
|
Jon Leighton
|
f0e198bfa1
|
Deprecate defining scopes with a callable (lambda, proc, etc) via the scope class method. Just define a class method yourself instead.
|
2011-04-12 19:46:05 -07:00 |
|
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 |
|
Glenn Vanderburg
|
6bd9fac1e3
|
Propagate association extensions to scopes called on the association.
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
2011-02-01 12:38:58 -02:00 |
|
Jon Leighton
|
3103296a61
|
Let AssociationCollection#find use #scoped to do its finding. Note that I am removing test_polymorphic_has_many_going_through_join_model_with_disabled_include, since this specifies different behaviour for an association than for a regular scope. It seems reasonable to expect scopes and association proxies to behave in roughly the same way rather than having subtle differences.
|
2011-01-03 16:24:31 -08:00 |
|
Jon Leighton
|
076b75bf98
|
Add some tests for functionality in JoinAssociation which already exists but was previously untested
|
2010-10-13 08:24:19 -07:00 |
|
Jon Leighton
|
ab5a933502
|
Add support for nested through associations in JoinAssociation. Hence Foo.joins(:bar) will work for through associations. There is some duplicated code now, which will be refactored.
|
2010-10-09 22:00:33 +01:00 |
|
Jon Leighton
|
f2b41914d6
|
Refactoring JoinDependency and friends. This improves the code (IMO) including adding some explanatory comments, but more importantly structures it in such a way as to allow a JoinAssociation to produce an arbitrary number of actual joins, which will be necessary for nested has many through support. Also added 3 tests covering functionality which existed but was not previously covered.
|
2010-10-06 12:06:51 +01:00 |
|
Pratik Naik
|
517f709b51
|
Properly cache association_collection#scopes calls having arguments
|
2010-06-04 00:53:45 +01:00 |
|
Pratik Naik
|
d60bb0a9e4
|
Rename named_scope to scope
|
2010-01-18 04:38:19 +05:30 |
|
Tristan Dunn
|
0472839d68
|
Prevent overwriting of table name in merging SQL conditions [#2949 state:resolved]
|
2009-08-10 00:41:36 +01:00 |
|
Rick Olson
|
081ddb6f24
|
Merge the has_finder gem, renamed as 'named_scope'. Closes #11404 [nkallen]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9084 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
|
2008-03-24 02:50:02 +00: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 |
|
Jeremy Kemper
|
43b81d01d0
|
move assets and models
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8657 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
|
2008-01-18 07:27:03 +00:00 |
|