aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | 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-261-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix extracting `references` via `order_values` to respect quotingRyuta Kamizono2017-06-261-1/+1
| |/ / / / / / / /
* | | | | | | | | 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-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
* | | | | | | | | | Merge pull request #29519 from Edouard-chin/ec-structure-flags-orderRafael França2017-06-261-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | PR ReviewEdouard CHIN2017-06-211-2/+2
| * | | | | | | | | pass `structure_dump_flags` / `structure_load_flags` options before any other:Edouard CHIN2017-06-211-2/+2
* | | | | | | | | | 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-201-3/+3
|/ / / / / / / / /
* | | | | | | | | Fix ActiveRecord::Persistence#touch with lockingbogdanvlviv2017-06-211-1/+1
* | | | | | | | | Fix destroy with locking_column value nullbogdanvlviv2017-06-201-1/+1
* | | | | | | | | Merge pull request #29504 from kirs/fixtures-arel-bulkRafael França2017-06-204-9/+74
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use bulk INSERT to insert fixturesKir Shatrov2017-06-204-9/+74
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #28833 from bogdanvlviv/add-test-cases-for-optimistic-lockingRafael França2017-06-201-3/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Clean up 'Optimistic Locking' implementationbogdanvlviv2017-06-121-3/+4
* | | | | | | | | Merge pull request #29454 from kamipo/fix_exists_queries_with_cacheRafael França2017-06-192-51/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ensure query caching for `select_*` methods in connection adaptersRyuta Kamizono2017-06-153-52/+1
| * | | | | | | | | Fix `Relation#exists?` queries with query cacheRyuta Kamizono2017-06-151-1/+1
* | | | | | | | | | 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 #29455 from kirs/remove-column-with-fk-mysqlGuillermo Iguaran2017-06-161-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove FK together with column in MySQLKir Shatrov2017-06-161-0/+7
* | | | | | | | | | Merge pull request #29392 from alexcameron89/unpersisted_create_associationMatthew Draper2017-06-171-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Raise on create for singular association when parent is unpersistedAlex Kitchens2017-06-081-0/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #29431 from kamipo/fix_create_table_with_query_from_relationMatthew Draper2017-06-171-1/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix `create_table` with query from relationRyuta Kamizono2017-06-131-1/+6
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #29461 from dnl/unscope_where_orMatthew Draper2017-06-171-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Don't require 'unscope' to be the same for both sides of a 'or' relation.Dan Sherson2017-06-151-1/+1
* | | | | | | | | | Merge pull request #29464 from eugeneius/raw_write_attributeRafael França2017-06-151-15/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't map id to primary key in raw_write_attributeEugene Kenny2017-06-151-15/+6
| |/ / / / / / / / /
* | | | | | | | | | Fix `dump_schema_information` with empty versionsRyuta Kamizono2017-06-151-1/+1
* | | | | | | | | | Remove deprecated option from docs [ci skip] (#29459)Vipul A M2017-06-151-6/+6
|/ / / / / / / / /
* | | / / / / / / Prevent extra `sync_with_transaction_state`Ryuta Kamizono2017-06-151-5/+2
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #29378 from kamipo/avoid_overwriting_id_attribute_methodsRafael França2017-06-141-7/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Avoid overwriting the methods of `AttributeMethods::PrimaryKey`Ryuta Kamizono2017-06-071-7/+3
| |/ / / / / /