| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-11-08 | 1 | -1/+1 |
| |\ | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | ||||
| | * | Fixes queries using limits and punctuation in order, removes order("col1, ↵ | Santiago Pastorino | 2010-11-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | 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 | ||||
| * | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-31 | 1 | -0/+26 |
| |\| | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/through_association_scope.rb | ||||
| | * | Fix issues when including the same association multiple times and mixing ↵ | Ernie Miller | 2010-10-30 | 1 | -0/+26 |
| | | | | | | | | | joins/includes together. | ||||
| | * | Add some tests for functionality in JoinAssociation which already exists but ↵ | Jon Leighton | 2010-10-13 | 1 | -4/+4 |
| | | | | | | | | | was previously untested | ||||
| * | | Properly support conditions on any of the reflections involved in a nested ↵ | Jon Leighton | 2010-10-19 | 1 | -3/+3 |
| | | | | | | | | | through association | ||||
| * | | Refactoring JoinDependency and friends. This improves the code (IMO) ↵ | Jon Leighton | 2010-10-06 | 1 | -4/+4 |
| | | | | | | | | | 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. | ||||
| * | | Fix the tests (I have actually verified that these are also the 'right' ↵ | Jon Leighton | 2010-10-03 | 1 | -9/+9 |
| |/ | | | | fixes, rather than just making the tests pass again) | ||||
| * | removing unused models from tests | Subba Rao Pasupuleti | 2010-07-21 | 1 | -1/+0 |
| | | | | | | | [#5153 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | fixing typeo. thanks bamnet! | Aaron Patterson | 2010-07-16 | 1 | -1/+1 |
| | | |||||
| * | JoinDependency#graft does not properly set parent join [#5124 state:resolved] | David Genord II | 2010-07-16 | 1 | -0/+7 |
| | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Order is not guaranteed here, ordering by id of people table makes it work | Santiago Pastorino | 2010-06-25 | 1 | -2/+2 |
| | | |||||
| * | Make sure about which is the first element of the query, fixes a postgresql ↵ | Santiago Pastorino | 2010-06-09 | 1 | -2/+2 |
| | | | | | | | 8.4 failing test Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Fix multiple self-referencing eager loads failing to join multiple times | Ernie Miller | 2010-06-08 | 1 | -1/+9 |
| | | | | | | | [#4679 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Fix eager loading of associations causing table name collisions | Ernie Miller | 2010-04-28 | 1 | -0/+9 |
| | | | | | | | [#4463 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Added eager loading support to Relation and ActiveRecord#all. | Emilio Tagua | 2009-10-05 | 1 | -1/+1 |
| | | |||||
| * | Association preloading no longer stops if it hits a nil object [#1630 ↵ | Pivotal Labs | 2008-12-26 | 1 | -0/+8 |
| | | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> | ||||
| * | Fixed STI type condition for eager loading of associations | Tarmo Tänav | 2008-08-16 | 1 | -0/+12 |
| | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Added missing fixtures for tests which fail to run independently if run ↵ | Tarmo Tänav | 2008-08-04 | 1 | -1/+1 |
| | | | | | | | after schema reset Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Merge the has_finder gem, renamed as 'named_scope'. Closes #11404 [nkallen] | Rick Olson | 2008-03-24 | 1 | -4/+5 |
| | | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9084 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
| * | Merge branch 'ar-test-cleanup' of git://git.geeksomnia.com/rails | Jeremy Kemper | 2008-01-21 | 1 | -3/+3 |
| | | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8681 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
| * | Move tests to cases | Jeremy Kemper | 2008-01-18 | 1 | -0/+110 |
| git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8660 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |