aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Don't passing `klass.connection` to `AssociationScope`Ryuta Kamizono2017-06-295-9/+8
| | | | | Passing `klass.connection` is redundant because `AssociationScope` is passed an association itself and an association has `klass`.
* Merge pull request #29600 from kamipo/show_query_cache_keysRafael França2017-06-281-1/+2
|\ | | | | Show query cache keys in `test_exceptional_middleware_clears_and_disables_cache_on_error`
| * Show query cache keys in ↵Ryuta Kamizono2017-06-281-1/+2
| | | | | | | | | | | | | | | | | | | | `test_exceptional_middleware_clears_and_disables_cache_on_error` `test_exceptional_middleware_clears_and_disables_cache_on_error` in postgresql adapter sometime fails recently. Show the query cache keys to investigte the cause. https://travis-ci.org/rails/rails/jobs/246467252#L490-L493
* | Merge pull request #29588 from greysteil/add-gemspec-linksRafael França2017-06-281-0/+5
|\ \ | | | | | | Add source code and changelog links to gemspecs
| * | Add source code and changelog links to gemspecsGrey Baker2017-06-281-0/+5
| | |
* | | Merge pull request #29593 from kratob/masterEileen M. Uchitelle2017-06-283-0/+23
|\ \ \ | |_|/ |/| | ActiveRecord: do not create "has many through" records that have been removed
| * | ActiveRecord: do not create "has many through" records that have been removedTobias Kraze2017-06-283-0/+23
| |/ | | | | | | | | If a record was built on a HasManyThroughAssociation, then removed, and then the record was saved, the removed record would be created anyways.
* | Merge pull request #29556 from kamipo/extract_ordered_relationRafael França2017-06-271-12/+11
|\ \ | | | | | | Extract `ordered_relation` in `FinderMethods`
| * | 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
|\ \ \ | | | | | | | | Refactor join dependency to move building constraints to `join_scope` in `Reflection`
| * | | 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
|/ / | | | | | | | | Simply we can skip instantiating `NullPreloader` if `assoc.klass` is nil.
* | 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 quoting
| * | 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
|\ \ | | | | | | Extract `build_scope` and `predicate_builder` in `Reflection`
| * | 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 tracker
| * | Ensure that using correct alias trackerRyuta Kamizono2017-06-252-1/+2
| | | | | | | | | | | | | | | | | | Covering #27994 in tests. Closes #27994.
| * | The AliasTracker#aliased_table_for needs the type caster for the joined ↵Ray Zane2017-06-253-14/+18
| |/ | | | | | | association, not the join root
* | Merge pull request #29511 from jhawthorn/clear_offsets_cache_on_collection_proxyRafael França2017-06-262-0/+36
|\ \ | | | | | | Rails 5.1.2.rc1 regression - Clear offset cache on CollectionProxy reset/reload
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `@offsets` cache is used by FinderMethods to cache records found by find_nth. This cache is cleared in AR::Relation#reset, but not in CollectionProxy#reset or CollectionProxy#reload. Because of this, since #29098, calling #first/#find_nth/etc after calling #reload or #reset on an association could return a stale record. This is an issue both when the full association target is loaded and when the item is loaded in #find_nth. This commit solves the problem by clearing the `@offsets` cache in CollectionProxy#reset and CollectionProxy#reload.
* | | Merge pull request #29519 from Edouard-chin/ec-structure-flags-orderRafael França2017-06-262-4/+4
|\ \ \ | |_|/ |/| | Pass `structure_dump_flags` / `structure_load_flags` options before any other:
| * | PR ReviewEdouard CHIN2017-06-211-2/+2
| | |
| * | pass `structure_dump_flags` / `structure_load_flags` options before any other:Edouard CHIN2017-06-212-4/+4
| | | | | | | | | | | | | | | | | | | | | - On Mysql, some command line options that affect option-file handling such as `--no-defaults` have to be passed before any other options - Modified rails to pass them right after the `mysql` command - Ref https://dev.mysql.com/doc/refman/5.7/en/option-file-options.html and https://bugs.mysql.com/bug.php?id=83386 - Ref #27437
* | | Remove unused variableyuuji.yaginuma2017-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This fixes the following warnings: ``` activerecord/test/cases/relation_test.rb:231: warning: assigned but unused variable - authors_with_commented_posts ```
* | | Merge pull request #29513 from kirs/fixture-yaml-fallbackRafael França2017-06-211-5/+4
|\ \ \ | | | | | | | | Avoid begin/rescue in fixture quoting
| * | | Avoid begin/rescue in fixture quotingKir Shatrov2017-06-201-5/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scalar values like arrays and hashes can't be inserted directly into table. Previously, the way to determine if the value is scalar was to try quoting it. If `quote` raised with an error than the value has to be converted to YAML. This flow is not very obvious. Ideally we could have a `quotable?` method in the connection, but I think that we can avoid begin/rescue block by simply checking if the value is Array or Hash. https://github.com/rails/rails/commit/aa31d21f5f4fc4d679e74a60f9df9706da7de373
* / | Keep INNER JOIN when merging relationsMaxime Lapointe2017-06-203-5/+40
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing `Author.joins(:posts).merge(Post.joins(:comments))` does this `SELECT ... INNER JOIN posts ON... LEFT OUTER JOIN comments ON...` instead of doing `SELECT ... INNER JOIN posts ON... INNER JOIN comments ON...`. This behavior is unexpected and makes little sense as, basically, doing `Post.joins(:comments)` means I want posts that have comments. Turning it to a LEFT JOIN means I want posts and join the comments data, if any. We can see this problem directly in the existing tests. The test_relation_merging_with_merged_joins_as_symbols only does joins from posts to comments to ratings while the ratings fixture isn't loaded, but the count is non-zero.
* | Fix ActiveRecord::Persistence#touch with lockingbogdanvlviv2017-06-214-3/+33
| | | | | | | | | | | | `ActiveRecord::Persistence#touch` does not work well when optimistic locking enabled and `locking_column`, without default value, is null in the database.
* | Fix destroy with locking_column value nullbogdanvlviv2017-06-203-1/+31
| | | | | | | | | | | | | | Fix destroying existing object does not work well when optimistic locking enabled and `locking column` is null in the database. Follow 22a822e5813ef7ea9ab6dbbb670a363899a083af, #28914
* | Merge pull request #29504 from kirs/fixtures-arel-bulkRafael França2017-06-208-10/+116
|\ \ | | | | | | Use bulk INSERT to insert fixtures
| * | Use bulk INSERT to insert fixturesKir Shatrov2017-06-208-10/+116
| | | | | | | | | | | | | | | | | | | | | | | | Improves the performance from O(n) to O(1). Previously it would require 50 queries to insert 50 fixtures. Now it takes only one query. Disabled on sqlite which doesn't support multiple inserts.
* | | Merge pull request #28833 from bogdanvlviv/add-test-cases-for-optimistic-lockingRafael França2017-06-202-3/+23
|\ \ \ | |/ / |/| | Add test cases for optimistic locking
| * | Clean up 'Optimistic Locking' implementationbogdanvlviv2017-06-121-3/+4
| | |
| * | Add test cases for optimistic lockingbogdanvlviv2017-06-121-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add test to ensure that locking_column cannot be updated explicitly. Add test to prevent regression on creating new object with explicit value locking_column. Related to #28318
* | | Merge pull request #29454 from kamipo/fix_exists_queries_with_cacheRafael França2017-06-193-51/+46
|\ \ \ | | | | | | | | Fix `Relation#exists?` queries with query cache
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a connection adapter overrides `select_*` methods, query caching will doesn't work. This patch changes `select_value` to `select_one` in `Relation#exists?` to ensure query caching. Fixes #29449.
* | | | Merge pull request #29494 from kamipo/prevent_extra_scope_constructionRafael França2017-06-193-3/+5
|\ \ \ \ | | | | | | | | | | Prevent extra `scope` construction in `find_target`
| * | | | Prevent extra `scope` construction in `find_target`Ryuta Kamizono2017-06-183-3/+5
| | | | | | | | | | | | | | | | | | | | Because constructing `scope` is a little expensive.
* | | | | Merge pull request #29486 from kirs/fixtures-arelRafael França2017-06-191-4/+11
|\ \ \ \ \ | | | | | | | | | | | | Refactor #insert_fixtures to use Arel
| * | | | | 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 #28754
| * | | | | Add a test case for #28754Ryuta Kamizono2017-06-181-0/+19
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A part for JSON was splitted from #28416 as #29273 and #29273 has already been merged. Closes #28754. Closes #27588. [Ryuta Kamizono & Bradley Priest]
* / | | | Remove debug printRyuta Kamizono2017-06-181-13/+0
|/ / / / | | | | | | | | | | | | | | | | This debug print was added in 87f5e5e for finding the regression caused by d314646 and the regression has already been fixed in 969339b.
* | | | Merge pull request #29415 from kamipo/remove_unused_defined_associationGuillermo Iguaran2017-06-162-2/+1
|\ \ \ \ | | | | | | | | | | Remove unused defined association
| * | | | Remove unused defined associationRyuta Kamizono2017-06-112-2/+1
| | |_|/ | |/| | | | | | | | | | | | | | `belongs_to :developer` on `Comment` model was added in 431f8e0 but it is unused.