aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/models
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-283-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_updateXavier Noria2010-10-221-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 Patterson2010-10-191-0/+7
| |
| * Allow default_scope to accept a Proc.Tim Morgan2010-10-191-0/+6
| |
* | Add explicit tests for the nested through association changes in reflection.rbJon Leighton2010-10-193-0/+3
| |
* | Support the :primary_key option on a through reflection in a nested through ↵Jon Leighton2010-10-192-1/+10
| | | | | | | | association
* | Support for :primary_key option on the source reflection of a through ↵Jon Leighton2010-10-192-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 Leighton2010-10-192-1/+12
| | | | | | | | through associations
* | Properly support conditions on any of the reflections involved in a nested ↵Jon Leighton2010-10-193-2/+13
| | | | | | | | through association
* | Add test_has_one_through_has_one_through_with_belongs_to_source_reflectionJon Leighton2010-10-142-1/+4
| |
* | Add test_has_many_through_belongs_to_with_has_many_through_source_reflection ↵Jon Leighton2010-10-141-1/+3
| | | | | | | | (which already passes)
* | Add test_has_many_through_has_many_through_with_belongs_to_source_reflection ↵Jon Leighton2010-10-141-0/+1
| | | | | | | | (which already works)
* | Added ↵Jon Leighton2010-10-141-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_throughJon Leighton2010-10-141-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 Leighton2010-10-131-0/+3
| | | | | | | | was previously untested
| * reorder removed in favor of except(:order).orderSantiago Pastorino2010-10-111-1/+0
| |
* | Add ↵Jon Leighton2010-10-131-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 Leighton2010-10-121-3/+5
| | | | | | | | association. I want to refactor how aliasing works first.
* | Add test_has_many_through_has_one_through_with_has_many_source_reflectionJon Leighton2010-10-121-0/+1
| |
* | Adding test_has_many_through_has_one_with_has_many_through_source_reflection ↵Jon Leighton2010-10-122-0/+4
| | | | | | | | and modifying ThroughAssociationScope to make it work correctly.
* | Add test_has_many_through_has_one_throughJon Leighton2010-10-121-0/+3
| |
* | Support has_one through assocs as the source associationJon Leighton2010-10-121-1/+4
| |
* | Add support for nested through associations in JoinAssociation. Hence ↵Jon Leighton2010-10-096-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 Leighton2010-10-061-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 Leighton2010-10-021-1/+2
| | | | | | | | work correctly. This test incidentally provides a more complicated test case (4 inner joins, 2 using polymorphism).
* | Prevent ↵Jon Leighton2010-09-301-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 Jeanes2010-09-262-4/+12
|/
* expanding the test to include both type of order declarationNeeraj Singh2010-09-182-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 testRaimonds Simanovskis2010-09-091-3/+7
|
* failing test for reorder overriding default_scopeNick Ragaz2010-09-051-1/+1
| | | | | | [5528] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* order should always be concatenated.Neeraj Singh2010-09-051-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 valuesPratik Naik2010-08-311-1/+1
|
* While creating a new record using has_many create method default scope of ↵Neeraj Singh2010-08-192-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 modelSantiago Pastorino2010-08-141-0/+2
|
* Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵Santiago Pastorino2010-08-145-6/+6
| | | | 's/[ \t]*$//' -i {} \;)
* Ensure we can nest include calls [#5285 state:resolved]Neeraj Singh2010-08-123-0/+11
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Eager loading an association should not change the count of childrenNeeraj Singh2010-08-023-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 Pankowecki2010-08-021-0/+3
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Object#returning removedSantiago Pastorino2010-07-251-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Ensure default_scope can be overwriten by association conditions.José Valim2010-07-211-0/+1
|
* eagerly loaded association records should respect default_scope [#2931 ↵Subba Rao Pasupuleti2010-07-212-0/+6
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* update_attribute should not update readonly attributesNeeraj Singh2010-07-211-1/+4
| | | | | | [#5106 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Ensure that primary_keys of HABTM records is not double quotedNeeraj Singh2010-07-202-0/+14
| | | | [#5152 state:reslved]
* update_attributes and update_attributes! are now wrapped in a transactionNeeraj Singh2010-07-131-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 Khustochka2010-07-131-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 Singh2010-07-133-0/+13
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* reset_counter should work with non-traditional belongs_to and polymorphic ↵Neeraj Singh2010-07-083-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 Ammons2010-07-081-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 cleanupJosh Kalderimis2010-07-081-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 Kalderimis2010-07-081-0/+32
| | | | | | rails standards Signed-off-by: José Valim <jose.valim@gmail.com>