aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | Delete needless `require 'active_support/deprecation'`yui-knk2015-10-202-4/+0
* | | | | applies new doc guidelines to Active Record.Yves Senn2015-10-141-9/+9
* | | | | fix broken RDoc markup. Use `<tt>` instead of `+`. [ci skip]Yves Senn2015-10-141-3/+3
* | | | | docs, add missing `:nodoc: for `Associations::Builder`. [ci skip]Yves Senn2015-10-137-9/+9
* | | | | nodoc `ActiveRecord::ForeignAssociation`. [ci skip]Yves Senn2015-10-131-1/+1
* | | | | Merge pull request #11410 from bogdan/increment-concurencyJeremy Daer2015-10-102-35/+21
|\ \ \ \ \
| * | | | | Make #increment! and #decrement! methods concurency safeBogdan Gusiev2015-10-052-35/+21
* | | | | | Merge pull request #21033 from dgynn/preloader_build_scope_tuningArthur Nogueira Neves2015-10-041-1/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | skip _select! call unless :select values are specifiedDave Gynn2015-07-261-1/+3
* | | | | | no more class methods for JoinDependency [ci skip]Gaurav Sharma2015-09-291-2/+1
* | | | | | Fix `ActiveRecord::RecordNotFound` error message with custom primary key [ci ...amitkumarsuroliya2015-09-261-7/+7
| |/ / / / |/| | | |
* | | | | Clean up the implementation of AR::DirtySean Griffin2015-09-241-1/+1
* | | | | Merge pull request #21550 from didacte/unscope-associationsSean Griffin2015-09-241-1/+1
|\ \ \ \ \
| * | | | | Include association's `unscope` when preloadingJimmy Bourassa2015-09-091-1/+1
* | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-09-181-1/+1
|\ \ \ \ \ \
| * | | | | | [ci skip] Fix module name of documentyui-knk2015-09-171-1/+1
| |/ / / / /
* | | | | | `restrict_with_error` message will now respect owner’s human name in any lo...Ronak Jangir2015-09-122-2/+2
* | | | | | Merge pull request #21486 from bogdan/refactor-has-many-counter-cacheEileen M. Uchitelle2015-09-092-61/+10
|\ \ \ \ \ \
| * | | | | | HasManyAssociation: moved half of counter cache code to reflectionBogdan Gusiev2015-09-032-61/+10
| |/ / / / /
* / / / / / Added nodoc for `arel` method which returns object of private api. [ci skip]Ronak Jangir2015-09-091-1/+1
|/ / / / /
* | | | | Only nullify persisted has_one target associationsAgis-2015-08-241-1/+1
* | | | | Added docs for CollectionProxy#take [ci skip]Ronak Jangir2015-08-231-0/+25
* | | | | Correct error message in Standard American english and add a test case for th...prakash2015-08-181-1/+1
* | | | | Merge pull request #19683 from tristang/require-option-for-counter-cacheRafael Mendonça França2015-08-131-1/+8
|\ \ \ \ \
| * | | | | Require explicit counter_cache option for has_manyTristan Gamilis2015-04-071-1/+8
* | | | | | Skip statement cache on through association readerRafael Mendonça França2015-08-123-12/+10
* | | | | | use correct DB connection for generated HABTM tableMatt Hanlon2015-08-071-3/+7
* | | | | | Use memoization for collection associations ids readerMehmet Emin İNAÇ2015-08-031-2/+4
* | | | | | Fix misleading errors for has_one through relationsMehmet Emin İNAÇ2015-07-221-2/+10
| |/ / / / |/| | | |
* | | | | Deprecate and rename the keys for association restrict_dependent_destroyRoque Pinel2015-07-202-2/+16