aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | Don't passing `klass.connection` to `AssociationScope`Ryuta Kamizono2017-06-294-7/+7
* | | | Merge pull request #29604 from kamipo/fix_ids_reader_to_respect_case_sensitiv...Rafael França2017-06-281-4/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix `ids_reader` to respect case sensitive primary keyRyuta Kamizono2017-06-281-4/+1
* | | | Merge pull request #29593 from kratob/masterEileen M. Uchitelle2017-06-281-0/+5
|\ \ \ \ | |/ / / |/| | |
| * | | ActiveRecord: do not create "has many through" records that have been removedTobias Kraze2017-06-281-0/+5
* | | | Merge pull request #29589 from kamipo/refactor_join_scopeRafael França2017-06-271-47/+3
|\ \ \ \
| * | | | Move building constraint to `join_scope` in `Reflection`Ryuta Kamizono2017-06-271-39/+3
| * | | | Move constructing polymorphic type to `join_scope` in `Reflection`Ryuta Kamizono2017-06-271-10/+2
| |/ / /
* / / / Skip instantiating `NullPreloader` if `assoc.klass` is nilRyuta Kamizono2017-06-271-11/+3
|/ / /
* | | Merge pull request #29557 from kamipo/extract_build_scope_and_predicate_builderRafael França2017-06-262-13/+4
|\ \ \
| * | | Move constructing join scope to `Reflection`Ryuta Kamizono2017-06-261-9/+1
| * | | Extract `build_scope` and `predicate_builder` in `Reflection`Ryuta Kamizono2017-06-242-5/+4
* | | | Merge pull request #29568 from kamipo/ensure_using_correct_alias_trackerRafael França2017-06-263-14/+18
|\ \ \ \
| * | | | The AliasTracker#aliased_table_for needs the type caster for the joined assoc...Ray Zane2017-06-253-14/+18
| |/ / /
* | | | Merge pull request #29511 from jhawthorn/clear_offsets_cache_on_collection_proxyRafael França2017-06-261-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Move clearing of @offsets cache to reset_scopeJohn Hawthorn2017-06-211-2/+1
| * | | Clear offset cache on CollectionProxy reset/reloadJohn Hawthorn2017-06-201-0/+2
* | | | Keep INNER JOIN when merging relationsMaxime Lapointe2017-06-201-3/+3
|/ / /
* | / Prevent extra `scope` construction in `find_target`Ryuta Kamizono2017-06-183-3/+5
| |/ |/|
* | Raise on create for singular association when parent is unpersistedAlex Kitchens2017-06-081-0/+4
* | Don't expose methods and attrs for internal usageRyuta Kamizono2017-05-304-8/+10
* | Merge pull request #29098 from kamipo/fix_association_with_extension_issuesMatthew Draper2017-05-304-26/+22
|\ \
| * | Extract `default_extensions` to avoid `klass.all`Ryuta Kamizono2017-05-301-1/+1
| * | Cache the association proxy objectRyuta Kamizono2017-05-282-4/+8
| * | Fix association with extension issuesRyuta Kamizono2017-05-283-22/+14
* | | Remove unused `Association#interpolate`Ryuta Kamizono2017-05-281-8/+0
|/ /
* | Merge pull request #29174 from kamipo/remove_unused_join_part_nameMatthew Draper2017-05-241-4/+0
|\ \
| * | Remove unused `JoinPart#name`Ryuta Kamizono2017-05-221-4/+0
| |/
* / Refactor making join constraintsRyuta Kamizono2017-05-231-23/+6
|/
* Remove useless `target_records_from_association`Ryuta Kamizono2017-05-041-11/+3
* Evaluate belongs_to :default option against the owner, not the associationGeorge Claghorn2017-04-271-1/+1
* Mixin `CollectionProxy::DelegateExtending` after `ClassSpecificRelation`Ryuta Kamizono2017-04-221-10/+18