| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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. | ||||
| * | | 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 | 5 | -0/+46 |
| |\| | |||||
| | * | Revert "porting 515917f5d8678af6c57842ca5dfd7c18e67ff1fe to master" | Aaron Patterson | 2010-09-28 | 1 | -6/+0 |
| | | | | | | | | | This reverts commit bee447a5b9fe1d683c6cc69aefb7fc22c2a9d9af. | ||||
| | * | Set attributes properly for model built from association with conditions ↵ | Marcelo Giorgi | 2010-09-28 | 5 | -0/+46 |
| | | | | | | | | | | | | | [#5562 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| | * | porting 515917f5d8678af6c57842ca5dfd7c18e67ff1fe to master | Aaron Patterson | 2010-09-28 | 1 | -0/+6 |
| | | | |||||
| * | | Initial nested_has_many_through support [#1152] | Bodaniel Jeanes | 2010-09-26 | 2 | -8/+43 |
| |/ | |||||
| * | remove join table rows before removing owner row for habtm associations, ↵ | Hemant Kumar | 2010-09-21 | 1 | -1/+1 |
| | | | | | fixes#5674 | ||||
| * | providing arel with column information when possible [#5392 state:resolved] | Aaron Patterson | 2010-09-21 | 1 | -0/+10 |
| | | |||||
| * | Change relation merging to always append select, group and order values | Pratik Naik | 2010-08-31 | 2 | -41/+10 |
| | | |||||
| * | removing unused code | Aaron Patterson | 2010-08-22 | 1 | -2/+2 |
| | | |||||
| * | updated test_should_record_timestamp_for_join_table for Oracle | Raimonds Simanovskis | 2010-08-22 | 1 | -1/+1 |
| | | |||||
| * | While creating a new record using has_many create method default scope of ↵ | Neeraj Singh | 2010-08-19 | 1 | -0/+19 |
| | | | | | | | | | | | | child should be respected. author.posts.create should take into account default_scope defined on post. [#3939: state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | avoids warnings about mismatched indentations in Ruby 1.9.2 | Xavier Noria | 2010-08-19 | 1 | -8/+5 |
| | | |||||
| * | code gardening: we have assert_(nil|blank|present), more concise, with ↵ | Xavier Noria | 2010-08-17 | 4 | -6/+6 |
| | | | | | better default failure messages - let's use them | ||||
| * | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 3 | -14/+14 |
| | | | | | 's/[ \t]*$//' -i {} \;) | ||||
| * | fixed indentation in test cases | Mark Turner | 2010-08-11 | 1 | -2/+1 |
| | | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
| * | Merge branch 'master' into mysql2 | Brian Lopez | 2010-08-02 | 1 | -1/+39 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Bring returning back to ease migration. Remove duplicated logic. Eager loading an association should not change the count of children fix loading of different elements in array then int and string [#5036 state:resolved] Tidy up previous commit. test and fix collection_singular_ids= with string primary keys [#5125 state:resolved] Handle edge cases in the previous patch. Improved how AppGenerator generates the application name. It now detects the current app name whenever possible. This means that renaming the residing directory will not effect the app name generated by AppGenerator. ActiveModel::Errors json serialization to work as Rails 3b4 [#5254 state:resolved] Add missing require in ActiveSupport::HashWithIndifferentAccess [#5189 state:resolved] Add an internal (private API) after_touch callback. [#5271 state:resolved] added failing touch propagation test Makes rails destroy scaffold don't duplicate routes.draw do |map| |map| when using the deprecated syntax Failing test to check for route file corruption if legacy map parameter is used. [#5263 state:open] Corrected the rake test:units and test:functionals description [#5251 state:committed] Use AS::OrderedHash when trusting in the order of the hash Fix label form helper to use I18n and html options, without the need of 'nil' text param: | ||||
| | * | Tidy up previous commit. | José Valim | 2010-08-02 | 1 | -1/+1 |
| | | | |||||
| | * | test and fix collection_singular_ids= with string primary keys [#5125 ↵ | Robert Pankowecki | 2010-08-02 | 1 | -1/+39 |
| | | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | update tests for mysql2 support | Brian Lopez | 2010-08-02 | 2 | -3/+8 |
| |/ | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |