Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-11-17 | 9 | -57/+92 |
|\ | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/test/cases/associations/has_many_through_associations_test.rb | ||||
| * | removing many unused variables | Aaron Patterson | 2010-11-16 | 1 | -2/+2 |
| | | |||||
| * | reloading an association will properly set attributes of instantiated ↵ | Aaron Patterson | 2010-11-16 | 1 | -0/+21 |
| | | | | | | | | objects. Thanks Brian Palmer [#5802 state:resolved] | ||||
| * | if association is already loaded and if a find operation is performed on the ↵ | Neeraj Singh | 2010-11-15 | 1 | -0/+11 |
| | | | | | | | | | | | | already loaded association list with an empty hash then do not perform another sql [#5972 state:resolved] | ||||
| * | fisting a bunch of unused variable warnings | Aaron Patterson | 2010-11-15 | 4 | -20/+16 |
| | | |||||
| * | Fix bug where size of through association is not correct after adding a ↵ | Jason Cheow | 2010-11-14 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | has_many association (occurs only before main object has been reloaded). [#5968 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | use persisted? instead of new_record? wherever possible | David Chelimsky | 2010-11-09 | 5 | -35/+35 |
| | | | | | | | | | | | | | | | | | | | | | | - 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> | ||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-11-08 | 2 | -3/+3 |
|\| | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | ||||
| * | Fixes queries using limits and punctuation in order, removes order("col1, ↵ | Santiago Pastorino | 2010-11-05 | 2 | -3/+3 |
| | | | | | | | | | | | | col2") usage in favor of order(["col1", "col2"}) [#4597 state:committed] | ||||
* | | Update new tests in cascaded_eager_loading_test.rb to work with the modified ↵ | Jon Leighton | 2010-10-31 | 1 | -6/+6 |
| | | | | | | | | fixtures in this branch | ||||
* | | Fix bug with 0bb85ed9ffa9808926b46e8f7e59cab5b85ac19f which missed out a ↵ | Jon Leighton | 2010-10-31 | 1 | -1/+2 |
| | | | | | | | | fixtures declaration in cascaded_eager_loading_test.rb | ||||
* | | Fix naughty trailing whitespace | Jon Leighton | 2010-10-31 | 3 | -101/+101 |
| | | |||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-31 | 2 | -0/+33 |
|\| | | | | | | | | | | | 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/+7 |
| | | | | | | | | names, so that for example :primary_key => :another_pk works as well [#5605 state:resolved] | ||||
| * | Fix issues when including the same association multiple times and mixing ↵ | Ernie Miller | 2010-10-30 | 1 | -0/+26 |
| | | | | | | | | joins/includes together. | ||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-28 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/test/schema/schema.rb | ||||
| * | removing unused variables | Aaron Patterson | 2010-10-20 | 1 | -2/+2 |
| | | |||||
| * | Add some tests for functionality in JoinAssociation which already exists but ↵ | Jon Leighton | 2010-10-13 | 4 | -11/+33 |
| | | | | | | | | was previously untested | ||||
* | | Rename nested_has_many_through_associations_test.rb because it does not only ↵ | Jon Leighton | 2010-10-19 | 1 | -1/+1 |
| | | | | | | | | concern has_many associations | ||||
* | | Add explicit ordering to nested_has_many_through_associations_test.rb as ↵ | Jon Leighton | 2010-10-19 | 1 | -32/+37 |
| | | | | | | | | this was causing failures under postgres | ||||
* | | Remove various comments and code which were just being used during the ↵ | Jon Leighton | 2010-10-19 | 1 | -5/+0 |
| | | | | | | | | development of nested through association support (OMFGZ, I might just have nearly finished this\! | ||||
* | | Support the :primary_key option on a through reflection in a nested through ↵ | Jon Leighton | 2010-10-19 | 1 | -1/+16 |
| | | | | | | | | association | ||||
* | | Support for :primary_key option on the source reflection of a through ↵ | Jon Leighton | 2010-10-19 | 2 | -6/+18 |
| | | | | | | | | 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 | -2/+37 |
| | | | | | | | | through associations | ||||
* | | Properly support conditions on any of the reflections involved in a nested ↵ | Jon Leighton | 2010-10-19 | 3 | -8/+42 |
| | | | | | | | | through association | ||||
* | | Make sure nested through associations are read only | Jon Leighton | 2010-10-15 | 1 | -0/+42 |
| | | |||||
* | | Add assertions for nested through associations loaded by includes with ↵ | Jon Leighton | 2010-10-15 | 1 | -81/+75 |
| | | | | | | | | conditions (uses the single-query strategy). Currently one failure to fix. | ||||
* | | Support preloading nested through associations (using the default ↵ | Jon Leighton | 2010-10-15 | 1 | -61/+140 |
| | | | | | | | | multi-query strategy) | ||||
* | | Remove unnecessary requires from nested_has_many_through_associations_test.rb | Jon Leighton | 2010-10-14 | 1 | -6/+0 |
| | | |||||
* | | Add test_has_one_through_has_one_through_with_belongs_to_source_reflection | Jon Leighton | 2010-10-14 | 1 | -2/+13 |
| | | |||||
* | | Add test_has_many_through_belongs_to_with_has_many_through_source_reflection ↵ | Jon Leighton | 2010-10-14 | 1 | -1/+12 |
| | | | | | | | | (which already passes) | ||||
* | | Add test_has_many_through_has_many_through_with_belongs_to_source_reflection ↵ | Jon Leighton | 2010-10-14 | 1 | -1/+12 |
| | | | | | | | | (which already works) | ||||
* | | Added ↵ | Jon Leighton | 2010-10-14 | 2 | -2/+17 |
| | | | | | | | | test_has_many_through_has_many_with_has_many_through_habtm_source_reflection and make it pass | ||||
* | | Add ↵ | Jon Leighton | 2010-10-13 | 1 | -1/+11 |
| | | | | | | | | test_has_many_through_has_and_belongs_to_many_with_has_many_source_reflection and make it work | ||||
* | | First bit of support for habtm in through assocs - ↵ | Jon Leighton | 2010-10-13 | 2 | -5/+10 |
| | | | | | | | | test_has_many_through_has_many_with_has_and_belongs_to_many_source_reflection now passes | ||||
* | | Add a commented, failing test for using a habtm in a has many through ↵ | Jon Leighton | 2010-10-12 | 2 | -6/+11 |
| | | | | | | | | 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 | -1/+18 |
| | | |||||
* | | Adding test_has_many_through_has_one_with_has_many_through_source_reflection ↵ | Jon Leighton | 2010-10-12 | 1 | -2/+19 |
| | | | | | | | | and modifying ThroughAssociationScope to make it work correctly. | ||||
* | | Rename some tests for consistency | Jon Leighton | 2010-10-12 | 1 | -3/+3 |
| | | |||||
* | | Add test_has_many_through_has_one_through | Jon Leighton | 2010-10-12 | 1 | -2/+14 |
| | | |||||
* | | Support has_one through assocs as the source association | Jon Leighton | 2010-10-12 | 1 | -3/+32 |
| | | |||||
* | | A load of tests that need to be written | Jon Leighton | 2010-10-12 | 1 | -0/+63 |
| | | |||||
* | | Add support for nested through associations in JoinAssociation. Hence ↵ | Jon Leighton | 2010-10-09 | 1 | -5/+54 |
| | | | | | | | | Foo.joins(:bar) will work for through associations. There is some duplicated code now, which will be refactored. | ||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-06 | 3 | -0/+26 |
|\| | |||||
| * | AssociationCollection#include? working properly for objects added with build ↵ | Marcelo Giorgi | 2010-09-30 | 3 | -0/+26 |
| | | | | | | | | method [#3472 state:resolved] | ||||
* | | Refactoring JoinDependency and friends. This improves the code (IMO) ↵ | Jon Leighton | 2010-10-06 | 4 | -11/+33 |
| | | | | | | | | 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. | ||||
* | | A failing test for a nested has many through association loaded via ↵ | Jon Leighton | 2010-10-05 | 1 | -0/+6 |
| | | | | | | | | Foo.joins(:bar) | ||||
* | | Fix the tests (I have actually verified that these are also the 'right' ↵ | Jon Leighton | 2010-10-03 | 2 | -11/+11 |
| | | | | | | | | fixes, rather than just making the tests pass again) | ||||
* | | Add support for table aliasing, with a test that needs aliasing in order to ↵ | Jon Leighton | 2010-10-02 | 1 | -0/+5 |
| | | | | | | | | work correctly. This test incidentally provides a more complicated test case (4 inner joins, 2 using polymorphism). | ||||
* | | Integrate nested support into ThroughAssociationScope, using my concept of ↵ | Jon Leighton | 2010-10-02 | 1 | -12/+12 |
| | | | | | | | | generating a 'chain' of reflections to be joined. It seems to work at the moment, all existing tests are passing. There may be further complications as we add more test cases for nested associations, though. |