| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | 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 | |
| |/ | ||||||
| * | expanding the test to include both type of order declaration | Neeraj Singh | 2010-09-18 | 2 | -2/+10 | |
| | | | | | | | | | | while declaring default_scope Also added test for unscoped using block style with four different combinations Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | fixed Subject model after_initialize callback for test_oracle_synonym test | Raimonds Simanovskis | 2010-09-09 | 1 | -3/+7 | |
| | | ||||||
| * | failing test for reorder overriding default_scope | Nick Ragaz | 2010-09-05 | 1 | -1/+1 | |
| | | | | | | | [5528] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | order should always be concatenated. | Neeraj Singh | 2010-09-05 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | order that is declared first has highest priority in all cases. Here are some examples. Car.order('name desc').find(:first, :order => 'id').name Car.named_scope_with_order.named_scope_with_another_order Car.order('id DESC').scoping do Car.find(:first, :order => 'id asc') end No special treatment to with_scope or scoping. Also note that if default_scope declares an order then the order declared in default_scope has the highest priority unless with_exclusive_scope is used. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | Change relation merging to always append select, group and order values | Pratik Naik | 2010-08-31 | 1 | -1/+1 | |
| | | ||||||
| * | While creating a new record using has_many create method default scope of ↵ | Neeraj Singh | 2010-08-19 | 2 | -0/+8 | |
| | | | | | | | | | | | | 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> | |||||
| * | Add missing model | Santiago Pastorino | 2010-08-14 | 1 | -0/+2 | |
| | | ||||||
| * | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 5 | -6/+6 | |
| | | | | | 's/[ \t]*$//' -i {} \;) | |||||
| * | Ensure we can nest include calls [#5285 state:resolved] | Neeraj Singh | 2010-08-12 | 3 | -0/+11 | |
| | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Eager loading an association should not change the count of children | Neeraj Singh | 2010-08-02 | 3 | -0/+12 | |
| | | | | | | | [#4971 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | test and fix collection_singular_ids= with string primary keys [#5125 ↵ | Robert Pankowecki | 2010-08-02 | 1 | -0/+3 | |
| | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Object#returning removed | Santiago Pastorino | 2010-07-25 | 1 | -1/+1 | |
| | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Ensure default_scope can be overwriten by association conditions. | José Valim | 2010-07-21 | 1 | -0/+1 | |
| | | ||||||
| * | eagerly loaded association records should respect default_scope [#2931 ↵ | Subba Rao Pasupuleti | 2010-07-21 | 2 | -0/+6 | |
| | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | update_attribute should not update readonly attributes | Neeraj Singh | 2010-07-21 | 1 | -1/+4 | |
| | | | | | | | [#5106 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Ensure that primary_keys of HABTM records is not double quoted | Neeraj Singh | 2010-07-20 | 2 | -0/+14 | |
| | | | | | [#5152 state:reslved] | |||||
| * | update_attributes and update_attributes! are now wrapped in a transaction | Neeraj Singh | 2010-07-13 | 1 | -0/+2 | |
| | | | | | | | [#922 state:resovled] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Added reorder delegation for ActiveRecord::Base(to be able to overwrite the ↵ | Vitalii Khustochka | 2010-07-13 | 1 | -0/+1 | |
| | | | | | | | default_scope ordering in the named scope [#5093 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | string IDs are now quoted correctly [#5064 state:resolved] | Will St. Clair + Neeraj Singh | 2010-07-13 | 3 | -0/+13 | |
| | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | reset_counter should work with non-traditional belongs_to and polymorphic ↵ | Neeraj Singh | 2010-07-08 | 3 | -0/+10 | |
| | | | | | | | | | belongs_to [#4984 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Eager loading :through associations will join the :source model if there are ↵ | Grant Ammons | 2010-07-08 | 1 | -0/+1 | |
| | | | | | | | :conditions. [#2362 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | mass_assignment_security moved from AR to AMo, and minor test cleanup | Josh Kalderimis | 2010-07-08 | 1 | -9/+1 | |
| | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | minor changes to mass assignment security patch to bring it in line with ↵ | Josh Kalderimis | 2010-07-08 | 1 | -0/+32 | |
| | | | | | | | rails standards Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |