Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | 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 | |||||
| * | | | | | | | | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-14 | 8 | -40/+303 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb activerecord/test/cases/associations/cascaded_eager_loading_test.rb | |||||
| * | | | | | | | | | | 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 | 5 | -1/+51 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Refactoring JoinDependency and friends. This improves the code (IMO) ↵ | Jon Leighton | 2010-10-06 | 5 | -12/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 6 | -24/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| * | | | | | | | | | | | Started implementing nested :through associations by using the existing ↵ | Jon Leighton | 2010-10-01 | 1 | -13/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | structure of ThroughAssociationScope rather than layering a module over the top | |||||
| * | | | | | | | | | | | Merge branch 'master' into nested_has_many_through_2 | Jon Leighton | 2010-09-30 | 12 | -56/+209 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Initial nested_has_many_through support [#1152] | Bodaniel Jeanes | 2010-09-26 | 2 | -8/+43 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Change behavior of count(:limit => x, :offset => y) to limit/offset before ↵ | John Mileham | 2011-03-03 | 2 | -11/+54 | |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | counting. | |||||
* | | | | | | | | | | | | Rewrote AssociationPreload. | Jon Leighton | 2011-02-28 | 3 | -17/+16 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | skip this on oracle | Aaron Patterson | 2011-02-28 | 1 | -0/+2 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | use an attribute rather than a SQL literal | Aaron Patterson | 2011-02-26 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | removing limits and offsets from COUNT queries unless both are specified. ↵ | Aaron Patterson | 2011-02-25 | 1 | -0/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#6268 state:resolved] | |||||
* | | | | | | | | | | | | fixes: ActiveRecord::Base.scopes includes all scopes defined in all subclasses | Eric Allam | 2011-02-24 | 1 | -0/+4 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | observers leak across tests, so rather than modify the object, we should ↵ | Aaron Patterson | 2011-02-23 | 1 | -6/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | just count the number of times the observer was called | |||||
* | | | | | | | | | | | | Fix observer callbacks firing multiple times on descendant instances | Kamal Fariz Mahyuddin | 2011-02-22 | 1 | -0/+14 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | expectations change when using IM. Change oracle tests to reflect that | Aaron Patterson | 2011-02-22 | 1 | -2/+6 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | adding a test case for custom locking | Aaron Patterson | 2011-02-21 | 1 | -0/+17 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Use proper objects to do the work to build the associations (adding methods, ↵ | Jon Leighton | 2011-02-21 | 2 | -12/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | callbacks etc) rather than calling a whole bunch of methods with rather long names. | |||||
* | | | | | | | | | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Tpyo: fixing several cases of the the | Nicholas Rowe | 2011-02-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | oops, no need for puts! | Aaron Patterson | 2011-02-18 | 1 | -1/+0 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | AR::AttributeMethods does not need to be included in an AR::Base class. | Aaron Patterson | 2011-02-18 | 1 | -0/+62 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | fixes a merge conflict | Xavier Noria | 2011-02-19 | 1 | -10/+0 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | merges docrails | Xavier Noria | 2011-02-18 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix Typos: remove several occurences of the the | Nicholas Rowe | 2011-02-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 1 | -8/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Remove test which was broken on 1.8. This test is now irrelevant since ↵ | Jon Leighton | 2011-02-18 | 1 | -8/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | singular associations no longer return a proxy object. | |||||
* | | | | | | | | | | | | | | Don't use skip, just don't run anything, we don't have skip in Ruby 1.8 | Emilio Tagua | 2011-02-18 | 2 | -8/+4 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Should use "=" instead "replace" after this commit: ↵ | Emilio Tagua | 2011-02-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1644663ba7f678d178deab2bf1629dc05626f85b | |||||
* | | | | | | | | | | | | | | No need to test agaisnt target. | Emilio Tagua | 2011-02-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Use to_a instead :load in test, since :load changed. | Emilio Tagua | 2011-02-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | No need to test against target anymore. | Emilio Tagua | 2011-02-18 | 1 | -8/+8 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 13 | -161/+99 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb | |||||
| * | | | | | | | | | | | | | Split AssociationProxy into an Association class (and subclasses) which ↵ | Jon Leighton | 2011-02-18 | 10 | -152/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more. |