Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | removed deprecated methods, and related tests, from ActiveRecord | Josh Kalderimis | 2011-05-25 | 1 | -9/+0 |
| | |||||
* | Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scope | Jon Leighton | 2011-05-24 | 1 | -0/+6 |
|\ | | | | | Ignore :includes on through associations | ||||
| * | Ignore :includes on through associations | Andrew White | 2011-05-24 | 1 | -0/+6 |
| | | |||||
* | | Failing tests for #1233. | Andrew White | 2011-05-24 | 1 | -0/+40 |
| | | |||||
* | | add tests surrounding behavior of save and save! for associations that have ↵ | Aaron Patterson | 2011-05-24 | 1 | -0/+26 |
| | | | | | | | | validation errors | ||||
* | | adding a test for create! with invalid associations | Aaron Patterson | 2011-05-24 | 1 | -0/+9 |
| | | |||||
* | | do not bother with assert_nothing_raised, the test will fail and we get a ↵ | Aaron Patterson | 2011-05-24 | 1 | -3/+1 |
| | | | | | | | | better trace without it | ||||
* | | Add failing test case for issue 796 | Joey Butler | 2011-05-24 | 1 | -0/+9 |
|/ | |||||
* | Fix problem with loading polymorphic associations which have been defined in ↵ | Jon Leighton | 2011-05-22 | 1 | -0/+7 |
| | | | | an abstract superclass. Fixes #552. | ||||
* | Handle polymorphic_type NOT NULL-able columns as well. | thedarkone | 2011-05-21 | 1 | -0/+11 |
| | |||||
* | Refactoring test_has_many_with_pluralize_table_names_false test | Guillermo Iguaran | 2011-05-20 | 1 | -4/+1 |
| | |||||
* | Add block setting of attributes to singular associations | Andrew White | 2011-05-17 | 2 | -0/+42 |
| | |||||
* | Pass the attribute and option hashes to build_association | Andrew White | 2011-05-17 | 2 | -0/+29 |
| | | | | | | | The build_association method was added as an API for plugins to hook into in 1398db0. This commit restores this API and the ability to override class.new to return a subclass based on a virtual attribute in the attributes hash. | ||||
* | Fixed InnerJoinAssociationTest. Need to load essays fixture. | Arun Agrawal | 2011-05-17 | 1 | -1/+1 |
| | |||||
* | Adding missing require | Guillermo Iguaran | 2011-05-16 | 1 | -0/+1 |
| | |||||
* | Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_false | Jon Leighton | 2011-05-16 | 1 | -0/+11 |
|\ | | | | | Fixing has_many when ActiveRecord::Base.pluralize_table_names is false | ||||
| * | Fixing has_many association when ActiveRecord::Base.pluralize_table_names is ↵ | Guillermo Iguaran | 2011-05-15 | 1 | -0/+11 |
| | | | | | | | | false. fixes #557 | ||||
* | | CollectionAssociation#merge_target_lists should write to the underlying ↵ | Jon Leighton | 2011-05-14 | 1 | -0/+10 |
|/ | | | | attributes when copying, rather than using the assignment method | ||||
* | Don't use mass-assignment protection when setting foreign keys or ↵ | Jon Leighton | 2011-05-12 | 1 | -0/+33 |
| | | | | association conditions on singular associations. Fixes #481 (again). | ||||
* | Merge pull request #512 from pivotalneutron/fix_eager_load_with_calculations | Jon Leighton | 2011-05-11 | 1 | -1/+3 |
|\ | | | | | Bug fixes for calculations with includes | ||||
| * | Bug fixes: | Fadzril Muhamad & Joseph Palermo | 2011-05-12 | 1 | -1/+3 |
| | | | | | | | | | | | | - If doing a count on a relation that has an :include and a :join, it does a distinct even though it should not. - When doing a count on a relation that has an :include, it always falls back to a old style left join when performing the count. Looks like it was broken here: https://github.com/rails/rails/commit/b9599502c9e738a5a1513e75d08f8d40ed408265 | ||||
* | | Add missing requires | Santiago Pastorino | 2011-05-11 | 1 | -0/+1 |
| | | |||||
* | | Don't remove the target if it has already been destroyed | Andrew White | 2011-05-11 | 1 | -0/+9 |
|/ | |||||
* | Don't use select() values from the join model of a through association. ↵ | Jon Leighton | 2011-05-11 | 1 | -0/+4 |
| | | | | Fixes #508. | ||||
* | Bring back obj.association_loaded? as a deprecated method. Fixes #472. | Jon Leighton | 2011-05-11 | 1 | -0/+9 |
| | |||||
* | Add test to specify that attributes from an association's conditions should ↵ | Jon Leighton | 2011-05-10 | 1 | -4/+23 |
| | | | | be assigned without mass-assignment protection when a record is built on the association. | ||||
* | Don't use mass-assignment protection when applying the ↵ | Jon Leighton | 2011-05-10 | 1 | -0/+9 |
| | | | | scoped.scope_for_create. Fixes #481. | ||||
* | Add failing tests according to #479. | José Valim | 2011-05-10 | 1 | -0/+15 |
| | |||||
* | Add failing tests, according to #480. | José Valim | 2011-05-10 | 1 | -0/+14 |
| | |||||
* | Merge pull request #399 from ernie/join_conditions_on_join | Jon Leighton | 2011-05-05 | 1 | -0/+11 |
|\ | | | | | Add association join conditions to JOIN clause, not WHERE | ||||
| * | Add a test for outer joins with conditions where value IS NULL | Ernie Miller | 2011-05-05 | 1 | -0/+5 |
| | | |||||
| * | Add join conditions to JOIN clause, not WHERE | Ernie Miller | 2011-05-05 | 1 | -0/+6 |
| | | |||||
* | | Fix for lighthouse #6741 | Nick Howard | 2011-05-01 | 1 | -0/+24 |
|/ | | | | | | | - adds tests for find_or_create_by and find_or_initialize_by on has_many associations - changes the behavior of ActiveRecord::Associations::CollectionProxy#method_missing to differ to ActiveRecord::FinderMethods#find_or_instantiator_by_attributes for arg processing and saving so find_or_create_by's api on associations will be consistent w/ the api for model classes. | ||||
* | assert_difference can take a callable piece of code rather than just evaling ↵ | Aaron Patterson | 2011-05-01 | 1 | -4/+4 |
| | | | | a string | ||||
* | fixing more test warnings in 1.9.3 | Aaron Patterson | 2011-04-30 | 3 | -6/+6 |
| | |||||
* | Added test case and fix for proper eager loading associations | Pavel Forkert | 2011-04-22 | 1 | -0/+10 |
| | |||||
* | Fix test_associate_existing in has_many_through_associations_test on mysql ↵ | Jon Leighton | 2011-04-17 | 1 | -1/+1 |
| | | | | and postgresql | ||||
* | Refactor test to avoid hackery | Jon Leighton | 2011-04-15 | 1 | -4/+4 |
| | |||||
* | Deprecated support for passing hashes and relations to default_scope, in ↵ | Jon Leighton | 2011-04-12 | 2 | -14/+14 |
| | | | | favour of defining a 'default_scope' class method in the model. See the CHANGELOG for more details. | ||||
* | Using Object#in? and Object#either? in various places | Prem Sichanugrist | 2011-04-11 | 1 | -2/+3 |
| | | | | There're a lot of places in Rails source code which make a lot of sense to switching to Object#in? or Object#either? instead of using [].include?. | ||||
* | Added new #update_column method. | Sebastian Martinez | 2011-03-27 | 5 | -14/+14 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Revert "Removed #update_attribute method. New #update_column method." | Sebastian Martinez | 2011-03-27 | 5 | -14/+14 |
| | | | | | | This reverts commit 45c233ef819dc7b67e259dd73f24721fec28b8c8. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Removed #update_attribute method. New #update_column method. | Sebastian Martinez | 2011-03-26 | 5 | -14/+14 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | adding missing require | Aaron Patterson | 2011-03-22 | 1 | -0/+1 |
| | |||||
* | oracle, y u defy me | Jon Leighton | 2011-03-16 | 1 | -1/+1 |
| | |||||
* | Fix tests under postgres - we should always put conditions in the WHERE part ↵ | Jon Leighton | 2011-03-12 | 1 | -1/+1 |
| | | | | not in ON constraints because postgres requires that the table has been joined before the condition references it. | ||||
* | Add a test for STI on the through where the through is nested, and change ↵ | Jon Leighton | 2011-03-05 | 1 | -0/+9 |
| | | | | the code which support this | ||||
* | When preloading has_and_belongs_to_many associations, we should only ↵ | Jon Leighton | 2011-03-04 | 1 | -0/+16 |
| | | | | instantiate one AR object per actual record in the database. (Even when IM is off.) | ||||
* | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-04 | 16 | -504/+1182 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/class_methods/join_dependency.rb activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/lib/active_record/associations/has_one_association.rb activerecord/lib/active_record/associations/has_one_through_association.rb activerecord/lib/active_record/associations/through_association_scope.rb activerecord/lib/active_record/reflection.rb activerecord/test/cases/associations/has_many_through_associations_test.rb activerecord/test/cases/associations/has_one_through_associations_test.rb activerecord/test/cases/reflection_test.rb activerecord/test/cases/relations_test.rb activerecord/test/fixtures/memberships.yml activerecord/test/models/categorization.rb activerecord/test/models/category.rb activerecord/test/models/member.rb activerecord/test/models/reference.rb activerecord/test/models/tagging.rb | ||||
| * | Rewrote AssociationPreload. | Jon Leighton | 2011-02-28 | 2 | -16/+15 |
| | |