aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #29593 from kratob/masterEileen M. Uchitelle2017-06-283-0/+23
|\
| * ActiveRecord: do not create "has many through" records that have been removedTobias Kraze2017-06-283-0/+23
* | Merge pull request #29556 from kamipo/extract_ordered_relationRafael França2017-06-271-12/+11
|\ \
| * | Extract `ordered_relation` in `FinderMethods`Ryuta Kamizono2017-06-241-12/+11
* | | Merge pull request #29589 from kamipo/refactor_join_scopeRafael França2017-06-273-54/+21
|\ \ \
| * | | Move building constraint to `join_scope` in `Reflection`Ryuta Kamizono2017-06-272-41/+14
| * | | Move constructing polymorphic type to `join_scope` in `Reflection`Ryuta Kamizono2017-06-273-16/+10
| | |/ | |/|
* / | Skip instantiating `NullPreloader` if `assoc.klass` is nilRyuta Kamizono2017-06-271-11/+3
|/ /
* | Merge pull request #29571 from kamipo/fix_extracting_references_via_order_valuesRafael França2017-06-262-1/+7
|\ \
| * | Fix extracting `references` via `order_values` to respect quotingRyuta Kamizono2017-06-262-1/+7
| |/
* | Merge pull request #29557 from kamipo/extract_build_scope_and_predicate_builderRafael França2017-06-263-20/+21
|\ \
| * | Move constructing join scope to `Reflection`Ryuta Kamizono2017-06-262-13/+12
| * | Extract `build_scope` and `predicate_builder` in `Reflection`Ryuta Kamizono2017-06-243-12/+14
| |/
* | Merge pull request #29568 from kamipo/ensure_using_correct_alias_trackerRafael França2017-06-265-15/+20
|\ \
| * | Ensure that using correct alias trackerRyuta Kamizono2017-06-252-1/+2
| * | 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-262-0/+36
|\ \
| * | Move clearing of @offsets cache to reset_scopeJohn Hawthorn2017-06-212-14/+22
| * | Clear offset cache on CollectionProxy reset/reloadJohn Hawthorn2017-06-202-0/+28
* | | Merge pull request #29519 from Edouard-chin/ec-structure-flags-orderRafael França2017-06-262-4/+4
|\ \ \ | |_|/ |/| |
| * | PR ReviewEdouard CHIN2017-06-211-2/+2
| * | pass `structure_dump_flags` / `structure_load_flags` options before any other:Edouard CHIN2017-06-212-4/+4
* | | Remove unused variableyuuji.yaginuma2017-06-221-1/+1
* | | Merge pull request #29513 from kirs/fixture-yaml-fallbackRafael França2017-06-211-5/+4
|\ \ \
| * | | Avoid begin/rescue in fixture quotingKir Shatrov2017-06-201-5/+4
| | |/ | |/|
* / | Keep INNER JOIN when merging relationsMaxime Lapointe2017-06-203-5/+40
|/ /
* | Fix ActiveRecord::Persistence#touch with lockingbogdanvlviv2017-06-214-3/+33
* | Fix destroy with locking_column value nullbogdanvlviv2017-06-203-1/+31
* | Merge pull request #29504 from kirs/fixtures-arel-bulkRafael França2017-06-208-10/+116
|\ \
| * | Use bulk INSERT to insert fixturesKir Shatrov2017-06-208-10/+116
* | | Merge pull request #28833 from bogdanvlviv/add-test-cases-for-optimistic-lockingRafael França2017-06-202-3/+23
|\ \ \ | |/ / |/| |
| * | Clean up 'Optimistic Locking' implementationbogdanvlviv2017-06-121-3/+4
| * | Add test cases for optimistic lockingbogdanvlviv2017-06-121-0/+19
* | | Merge pull request #29454 from kamipo/fix_exists_queries_with_cacheRafael França2017-06-193-51/+46
|\ \ \
| * | | Ensure query caching for `select_*` methods in connection adaptersRyuta Kamizono2017-06-154-52/+41
| * | | Fix `Relation#exists?` queries with query cacheRyuta Kamizono2017-06-152-1/+7
* | | | Merge pull request #29494 from kamipo/prevent_extra_scope_constructionRafael França2017-06-193-3/+5
|\ \ \ \
| * | | | Prevent extra `scope` construction in `find_target`Ryuta Kamizono2017-06-183-3/+5
* | | | | Merge pull request #29486 from kirs/fixtures-arelRafael França2017-06-191-4/+11
|\ \ \ \ \
| * | | | | Refactor #insert_fixtures to use ArelKir Shatrov2017-06-191-4/+11
| | |_|_|/ | |/| | |
* | | | | Merge pull request #29491 from kamipo/add_test_case_for_28754Matthew Draper2017-06-181-0/+19
|\ \ \ \ \
| * | | | | Add a test case for #28754Ryuta Kamizono2017-06-181-0/+19
| | |/ / / | |/| | |
* / | | | Remove debug printRyuta Kamizono2017-06-181-13/+0
|/ / / /
* | | | Merge pull request #29415 from kamipo/remove_unused_defined_associationGuillermo Iguaran2017-06-162-2/+1
|\ \ \ \
| * | | | Remove unused defined associationRyuta Kamizono2017-06-112-2/+1
| | |_|/ | |/| |
* | | | Merge pull request #29455 from kirs/remove-column-with-fk-mysqlGuillermo Iguaran2017-06-162-0/+17
|\ \ \ \
| * | | | Remove FK together with column in MySQLKir Shatrov2017-06-162-0/+17
* | | | | Merge pull request #29392 from alexcameron89/unpersisted_create_associationMatthew Draper2017-06-173-1/+14
|\ \ \ \ \
| * | | | | Raise on create for singular association when parent is unpersistedAlex Kitchens2017-06-083-1/+14
| |/ / / /
* | | | | Merge pull request #29431 from kamipo/fix_create_table_with_query_from_relationMatthew Draper2017-06-172-7/+10
|\ \ \ \ \