aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/models/categorization.rb
Commit message (Collapse)AuthorAgeFilesLines
* Un-deprecate using 'default_scope' as a macro, but if you are calling the ↵Jon Leighton2011-04-181-4/+1
| | | | macro multiple times that will give deprecation warnings, and in 3.2 we will simply overwrite the default scope when you call the macro multiple times.
* Deprecated support for passing hashes and relations to default_scope, in ↵Jon Leighton2011-04-121-1/+3
| | | | favour of defining a 'default_scope' class method in the model. See the CHANGELOG for more details.
* Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-041-0/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix creation of has_many through records with custom primary_key option on ↵Szymon Nowak2010-12-231-0/+1
| | | | | | | | belongs_to [#2990 state:resolved]
| * Fix various issues with the :primary_key option in :through associations ↵Jon Leighton2010-12-151-0/+3
| | | | | | | | [#2421 state:resolved]
| * Verify that creating a has_many through record where there is a ↵Jon Leighton2010-12-161-1/+10
| | | | | | | | default_scope on the join model works correctly (creates the join record with the default scope applied)
* | Fix naughty trailing whitespaceJon Leighton2010-10-311-1/+1
| |
* | Add test_has_many_through_belongs_to_with_has_many_through_source_reflection ↵Jon Leighton2010-10-141-1/+3
|/ | | | (which already passes)
* move assets and modelsJeremy Kemper2008-01-181-0/+5
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8657 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 08:15:09 +0000