Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Make sure Model#touch doesn't try to update non existing columns | Pratik Naik | 2010-12-30 | 1 | -1/+3 | |
| | | ||||||
| * | Make serialized fixtures work again | Pratik Naik | 2010-12-29 | 1 | -0/+3 | |
| | | ||||||
| * | Raise an error for associations which try to go :through a polymorphic ↵ | Jon Leighton | 2010-12-23 | 1 | -1/+2 | |
| | | | | | | | | association [#6212 state:resolved] | |||||
| * | Test to verify that #2189 (count with has_many :through and a named_scope) ↵ | Jon Leighton | 2010-12-23 | 1 | -0/+2 | |
| | | | | | | | | is fixed | |||||
| * | Fix creation of has_many through records with custom primary_key option on ↵ | Szymon Nowak | 2010-12-23 | 2 | -0/+2 | |
| | | | | | | | | belongs_to [#2990 state:resolved] | |||||
| * | Verify that has_one :through preload respects the :conditions [#2976 ↵ | Will Bryant | 2010-12-23 | 1 | -0/+1 | |
| | | | | | | | | state:resolved] | |||||
| * | Don't allow a has_one association to go :through a collection association ↵ | Jon Leighton | 2010-12-23 | 2 | -4/+9 | |
| | | | | | | | | [#2976 state:resolved] | |||||
| * | removing SQL interpolation, please use scoping and attribute conditionals as ↵ | Aaron Patterson | 2010-12-22 | 1 | -3/+0 | |
| | | | | | | | | a replacement | |||||
| * | has_many associations with :dependent => :delete_all should update the ↵ | Jon Leighton | 2010-12-20 | 1 | -0/+2 | |
| | | | | | | | | counter cache when deleting records | |||||
| * | Fix problem where wrong keys are used in JoinAssociation when an association ↵ | Jon Leighton | 2010-12-20 | 1 | -0/+1 | |
| | | | | | | | | goes :through a belongs_to [#2801 state:resolved] | |||||
| * | Fix various issues with the :primary_key option in :through associations ↵ | Jon Leighton | 2010-12-15 | 2 | -0/+13 | |
| | | | | | | | | [#2421 state:resolved] | |||||
| * | Verify that creating a has_many through record where there is a ↵ | Jon Leighton | 2010-12-16 | 2 | -1/+14 | |
| | | | | | | | | default_scope on the join model works correctly (creates the join record with the default scope applied) | |||||
| * | Respect the default_scope on a join model when reading a through association | Jon Leighton | 2010-12-16 | 3 | -1/+12 | |
| | | ||||||
| * | Fix hm:t to self table aliasing in construct_scope | Ernie Miller | 2010-12-16 | 1 | -0/+1 | |
| | | ||||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-12-12 | 1 | -1/+5 | |
|\| | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG 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_through_association.rb | |||||
| * | fix warnings, stop using global variables | Aaron Patterson | 2010-11-30 | 1 | -1/+5 | |
| | | ||||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-11-27 | 1 | -0/+8 | |
|\| | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/associations.rb | |||||
| * | If a nested_attribute is being marked for destruction and at the same time ↵ | Neeraj Singh | 2010-11-24 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | an attr_accessor value is being assigned then the value being assigned is being ignored. This patch is a fix for that issue. [#5939 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-11-17 | 4 | -4/+4 | |
|\| | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/test/cases/associations/has_many_through_associations_test.rb | |||||
| * | use persisted? instead of new_record? wherever possible | David Chelimsky | 2010-11-09 | 4 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | - persisted? is the API defined in ActiveModel - makes it easier for extension libraries to conform to ActiveModel APIs without concern for whether the extended object is specifically ActiveRecord [#5927 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | | Fix naughty trailing whitespace | Jon Leighton | 2010-10-31 | 10 | -16/+16 | |
| | | ||||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-31 | 1 | -0/+1 | |
|\| | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/through_association_scope.rb | |||||
| * | Convert :primary_key in association to a string before comparing to column ↵ | Denis Odorcic | 2010-10-30 | 1 | -0/+1 | |
| | | | | | | | | names, so that for example :primary_key => :another_pk works as well [#5605 state:resolved] | |||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-28 | 3 | -0/+50 | |
|\| | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/test/schema/schema.rb | |||||
| * | has_one maintains the association with separate after_create/after_update | Xavier Noria | 2010-10-22 | 1 | -0/+37 | |
| | | | | | | | | | | This way parent models can get their own after_create and after_update callbacks fired after has_one has done its job. | |||||
| * | scopes can take an object that responds to `call` | Aaron Patterson | 2010-10-19 | 1 | -0/+7 | |
| | | ||||||
| * | Allow default_scope to accept a Proc. | Tim Morgan | 2010-10-19 | 1 | -0/+6 | |
| | | ||||||
* | | Add explicit tests for the nested through association changes in reflection.rb | Jon Leighton | 2010-10-19 | 3 | -0/+3 | |
| | | ||||||
* | | Support the :primary_key option on a through reflection in a nested through ↵ | Jon Leighton | 2010-10-19 | 2 | -1/+10 | |
| | | | | | | | | association | |||||
* | | Support for :primary_key option on the source reflection of a through ↵ | Jon Leighton | 2010-10-19 | 2 | -1/+4 | |
| | | | | | | | | association, where the source is a has_one or has_many | |||||
* | | Respect the :primary_key option on the through_reflection of (non-nested) ↵ | Jon Leighton | 2010-10-19 | 2 | -1/+12 | |
| | | | | | | | | through associations | |||||
* | | Properly support conditions on any of the reflections involved in a nested ↵ | Jon Leighton | 2010-10-19 | 3 | -2/+13 | |
| | | | | | | | | through association | |||||
* | | Add test_has_one_through_has_one_through_with_belongs_to_source_reflection | Jon Leighton | 2010-10-14 | 2 | -1/+4 | |
| | | ||||||
* | | Add test_has_many_through_belongs_to_with_has_many_through_source_reflection ↵ | Jon Leighton | 2010-10-14 | 1 | -1/+3 | |
| | | | | | | | | (which already passes) | |||||
* | | Add test_has_many_through_has_many_through_with_belongs_to_source_reflection ↵ | Jon Leighton | 2010-10-14 | 1 | -0/+1 | |
| | | | | | | | | (which already works) | |||||
* | | Added ↵ | Jon Leighton | 2010-10-14 | 1 | -0/+1 | |
| | | | | | | | | test_has_many_through_has_many_with_has_many_through_habtm_source_reflection and make it pass | |||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-14 | 1 | -1/+0 | |
|\| | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb activerecord/test/cases/associations/cascaded_eager_loading_test.rb | |||||
| * | Add some tests for functionality in JoinAssociation which already exists but ↵ | Jon Leighton | 2010-10-13 | 1 | -0/+3 | |
| | | | | | | | | was previously untested | |||||
| * | reorder removed in favor of except(:order).order | Santiago Pastorino | 2010-10-11 | 1 | -1/+0 | |
| | | ||||||
* | | Add ↵ | Jon Leighton | 2010-10-13 | 1 | -0/+2 | |
| | | | | | | | | test_has_many_through_has_and_belongs_to_many_with_has_many_source_reflection and make it work | |||||
* | | Add a commented, failing test for using a habtm in a has many through ↵ | Jon Leighton | 2010-10-12 | 1 | -3/+5 | |
| | | | | | | | | association. I want to refactor how aliasing works first. | |||||
* | | Add test_has_many_through_has_one_through_with_has_many_source_reflection | Jon Leighton | 2010-10-12 | 1 | -0/+1 | |
| | | ||||||
* | | Adding test_has_many_through_has_one_with_has_many_through_source_reflection ↵ | Jon Leighton | 2010-10-12 | 2 | -0/+4 | |
| | | | | | | | | and modifying ThroughAssociationScope to make it work correctly. | |||||
* | | Add test_has_many_through_has_one_through | Jon Leighton | 2010-10-12 | 1 | -0/+3 | |
| | | ||||||
* | | Support has_one through assocs as the source association | Jon Leighton | 2010-10-12 | 1 | -1/+4 | |
| | | ||||||
* | | Add support for nested through associations in JoinAssociation. Hence ↵ | Jon Leighton | 2010-10-09 | 6 | -0/+13 | |
| | | | | | | | | Foo.joins(:bar) will work for through associations. There is some duplicated code now, which will be refactored. | |||||
* | | Refactoring JoinDependency and friends. This improves the code (IMO) ↵ | Jon Leighton | 2010-10-06 | 1 | -0/+3 | |
| | | | | | | | | 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. | |||||
* | | Add support for table aliasing, with a test that needs aliasing in order to ↵ | Jon Leighton | 2010-10-02 | 1 | -1/+2 | |
| | | | | | | | | work correctly. This test incidentally provides a more complicated test case (4 inner joins, 2 using polymorphism). | |||||
* | | Prevent ↵ | Jon Leighton | 2010-09-30 | 1 | -2/+2 | |
| | | | | | | | | test_has_many_through_a_has_many_through_association_on_through_reflection failing for me due to ordering of the results | |||||
* | | Initial nested_has_many_through support [#1152] | Bodaniel Jeanes | 2010-09-26 | 2 | -4/+12 | |
|/ |