aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22518 from RochesterinNYC/better-error-message-for-includ...Arthur Nogueira Neves2016-03-181-1/+1
|\
| * Improve clarity of error message for missing includes and eager_loadJames Wen2016-01-281-1/+1
* | start hiding the `scope_chain` data structureAaron Patterson2016-03-041-1/+1
* | don't treat all associations with extensions as instance dependent.Yves Senn2016-03-031-1/+5
* | Merge pull request #18766 from yasyf/issue_17864Sean Griffin2016-02-291-8/+15
|\ \
| * | Honour the order of the joining model in a `has_many :through`Yasyf Mohamedali2015-03-022-9/+16
* | | Merge pull request #23794 from matthewd/mutation-safe-to_aMatthew Draper2016-02-212-1/+5
|\ \ \
| * | | Mutating the result of Relation#to_a should not affect the relationMatthew Draper2016-02-212-1/+5
* | | | eliminate warnings about multiple primary keys on habtm join tablesAaron Patterson2016-02-191-0/+3
|/ / /
* | | Merge pull request #18109 from k0kubun/unscoped-joinsSean Griffin2016-02-111-6/+12
|\ \ \
| * | | Allow `joins` to be unscopedTakashi Kokubun2016-01-311-6/+12
| | |/ | |/|
* | | rename to 'second_to_last' and 'third_to_last'Brian Christian2016-02-102-8/+8
* | | allow Array.penultimate and Array.antepenultiate access methodsBrian Christian2016-02-092-0/+18
* | | Merge pull request #23457 from matthewd/arel-attributeMatthew Draper2016-02-042-2/+2
|\ \ \
| * | | Defer Arel attribute lookup to the model classMatthew Draper2016-02-042-2/+2
| |/ /
* | | Merge pull request #20997 from himesh-r/issue-20995Arthur Neves2016-02-021-1/+4
|\ \ \ | |/ / |/| |
| * | Changed id-writer to save join table records based on association primary key...Himesh2016-02-021-1/+4
* | | Add missing source_type if provided on hmt which belongs to an sti recordVipul A M2016-01-241-0/+5
* | | Define `:foreign_type` as a valid option in `SingularAssociation`yui-knk2016-01-193-3/+3
* | | `substitute_at` is no longer usedRyuta Kamizono2016-01-141-2/+1
* | | Revert "Merge pull request #22486 from methyl/fix-includes-for-groupped-assoc...Yves Senn2015-12-211-5/+1
* | | Merge pull request #22486 from methyl/fix-includes-for-groupped-associationYves Senn2015-12-211-1/+5
|\ \ \
| * | | Pass SQL group by values when including scoped associationLucjan Suski2015-12-151-1/+5
* | | | Merge pull request #19423 from yuroyoro/fix_performance_regression_of_preload...Aaron Patterson2015-12-181-2/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Read already loaded association records from association.targetTomohito Ozaki2015-04-171-2/+7
* | | | Make sure we touch all the parents when touch_later.Arthur Neves2015-12-061-2/+1
* | | | Bugfix collection association #create method …Bogdan Gusiev2015-11-231-4/+8
* | | | Except keys of `build_record`'s argument from `create_scope` in initialize_at...yui-knk2015-11-161-3/+6
* | | | Update belongs_to.rbEhsan Yousefi2015-11-081-2/+1
* | | | docs, `ActiveRecord::JoinDependency` is not part of the public API.Yves Senn2015-11-071-1/+1
* | | | Merge pull request #12071 from Crunch09/outer_joinsSean Griffin2015-10-301-2/+15
|\ \ \ \
| * | | | added ActiveRecord::Relation#left_outer_joinsFlorian Thomas2015-05-191-2/+15
* | | | | Ensure `has_and_belongs_to_many` works with `belongs_to_required_by_default`Sean Griffin2015-10-291-2/+2
* | | | | Never pass `nil` to `order`Sean Griffin2015-10-294-16/+7
* | | | | Revert "Revert "Merge pull request #22026 from akihiro17/fix-preload-associat...Yves Senn2015-10-291-0/+4
* | | | | Revert "Merge pull request #22026 from akihiro17/fix-preload-association"Sean Griffin2015-10-291-4/+0
* | | | | Set `scope.reordering_value` to `true` if :reordering values are specifiedakihiro172015-10-301-0/+4
* | | | | Merge pull request #18383 from scambra/habtm-with-where-includes-16032-for-ma...Rafael Mendonça França2015-10-271-1/+2
|\ \ \ \ \
| * | | | | Includes HABTM returns correct size now. It's caused by the join dependencySergio Cambra2015-01-071-2/+3
* | | | | | [ci skip] Add doc for preloader_forschneems2015-10-261-0/+4
* | | | | | [ci skip] Clarify doc for preloaders_for_oneschneems2015-10-261-0/+5
* | | | | | [ci skip] Add doc to preloaders_onschneems2015-10-261-0/+1
* | | | | | Merge pull request #19686 from tsun1215/index_errorsSean Griffin2015-10-261-1/+1
|\ \ \ \ \ \
| * | | | | | Errors can be indexed with nested attributesMichael Probber2015-04-171-1/+1
* | | | | | | [ci skip] Fix method documentation locationschneems2015-10-261-3/+2
* | | | | | | Merge pull request #21918 from bogdan/refactor-preloaderSean Griffin2015-10-221-42/+30
|\ \ \ \ \ \ \
| * | | | | | | Refactored association preloader for performanceBogdan Gusiev2015-10-221-42/+30
* | | | | | | | Fix merge conflicts for #19938Sean Griffin2015-10-201-6/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix for activerecord join dependency instantiate bugMehmet Emin İNAÇ2015-05-041-6/+5
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Changed the order of Association constraints from where->order->unscope to un...kal2015-10-201-1/+1