aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Expand)AuthorAgeFilesLines
* Assigning `values` is only necessary when `reflection_scope.where_clause` is ...Ryuta Kamizono2017-09-051-1/+1
* Don't merge `reflection_scope` if `reflection.scope` isn't givenRyuta Kamizono2017-09-051-1/+1
* Scope in associations should treat nil as `all`Ryuta Kamizono2017-09-044-5/+7
* Fix preloading through association with custom scopeRyuta Kamizono2017-09-021-1/+6
* `values[:includes]` in `reflection_scope` is not compatible with `through_scope`Ryuta Kamizono2017-09-021-1/+6
* Don't call `scope.eager_loading?` when `reflection_scope.where_clause` is emptyRyuta Kamizono2017-09-021-10/+10
* Merge pull request #30403 from yhirano55/fix_broken_doc_for_active_recordRyuta Kamizono2017-08-267-7/+7
|\
| * Fix broken doc for Active Record [ci skip]Yoshiyuki Hirano2017-08-257-7/+7
* | Should work inverse association when eager loadingRyuta Kamizono2017-08-251-3/+3
|/
* Through scope should not be affected by scopingRyuta Kamizono2017-08-152-12/+2
* Merge pull request #27609 from kamipo/fix_association_primary_keyRafael França2017-08-141-4/+7
|\
| * Fix `reflection.association_primary_key` for `has_many` associationsRyuta Kamizono2017-08-131-4/+7
* | Delegate to `Enumerable#find` for `CollectionProxy`Ryuta Kamizono2017-08-132-17/+14
|/
* Merge pull request #29720 from gaurish/ar_find_error_message_improvementRafael França2017-08-111-1/+3
|\
| * Return Not found Ids in ActiveRecord::NotFoundGaurish Sharma2017-07-291-1/+3
* | Specify `table.name` only when `scope.table` and `table` are different (#29058)Ryuta Kamizono2017-08-111-4/+12
* | Passing `klass` to `StatementCache.new`Ryuta Kamizono2017-08-042-12/+8
|/
* Remove single element array preprocessRyuta Kamizono2017-07-261-1/+1
* Remove useless `JoinInformation`Ryuta Kamizono2017-07-252-5/+3
* Merge pull request #29765 from lugray/fix_counter_cacheRafael França2017-07-241-3/+1
|\
| * Add test for fixed `counter_cache` double incrementLisa Ugray2017-07-191-3/+1
* | Refactor Active Record to let Arel manage bind paramsSean Griffin2017-07-242-5/+3
* | Merge pull request #29855 from lugray/has_one_destroyed_by_associationRafael França2017-07-211-0/+2
|\ \
| * | Match destroyed_by_association for has_one to has_manyLisa Ugray2017-07-211-0/+2
* | | Use frozen-string-literal in ActiveRecordKir Shatrov2017-07-1935-0/+70
|/ /
* | Merge pull request #29033 from kamipo/make_preload_query_to_prepared_statementsSean Griffin2017-07-181-1/+1
|\ \ | |/ |/|
| * Make preload query to preparableRyuta Kamizono2017-07-071-1/+1
* | Fix unscoping `default_scope` for `Preloader`Ryuta Kamizono2017-07-191-1/+11
* | Fix `JoinDependency` with using a custom tableRyuta Kamizono2017-07-182-6/+9
* | Don't cache `scope_for_create`Ryuta Kamizono2017-07-162-2/+2
* | Fix `create_with` using both string and symbolRyuta Kamizono2017-07-163-9/+7
* | Remove useless `aliased_table_name` in `JoinDependency`Ryuta Kamizono2017-07-154-18/+1
|/
* Fix eager loading association with scope including joinsRyuta Kamizono2017-07-041-4/+10
* Fix preloading association with scope including joinsRyuta Kamizono2017-07-043-49/+25
* Remove unused `association_key` and `table` methods in `Preloader::Association`Ryuta Kamizono2017-07-041-10/+0
* Merge branch 'master' into require_relative_2017Xavier Noria2017-07-022-4/+12
|\
| * Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-0235-35/+0
| * Merge pull request #29540 from kirs/rubocop-frozen-stringMatthew Draper2017-07-0235-0/+35
| |\
| | * Enforce frozen string in RubocopKir Shatrov2017-07-0135-0/+35
| * | Merge pull request #29506 from pat/frozen-string-literalsMatthew Draper2017-07-021-2/+1
| |\ \
| | * | Make ActiveRecord frozen string literal friendly.Pat Allan2017-06-201-2/+1
| * | | Merge pull request #29631 from kamipo/should_be_clear_association_idsMatthew Draper2017-07-011-2/+11
| |\ \ \
| | * | | Should be clear `@association_ids` when joined newly associated recordRyuta Kamizono2017-06-301-2/+11
| | | |/ | | |/|
* | / | [Active Record] require => require_relativeAkira Matsuda2017-07-013-3/+3
|/ / /
* / / Delete stale comment for `AR::Associations::Builder::CollectionAssociation`fatkodima2017-07-011-2/+0
|/ /
* | Merge pull request #29616 from kamipo/remove_unused_aliased_table_nameRafael França2017-06-291-8/+0
|\ \
| * | Remove unused `aliased_table_name` in `Association`Ryuta Kamizono2017-06-291-8/+0
* | | Merge pull request #29129 from kamipo/prevent_extra_through_scopeRafael França2017-06-281-2/+4
|\ \ \ | |/ / |/| |
| * | Prevent extra `through_scope`Ryuta Kamizono2017-05-181-2/+4
* | | Merge pull request #29610 from kamipo/dont_passing_klass_connection_to_associ...Rafael França2017-06-284-7/+7
|\ \ \