aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't error on an empty CONTENT_TYPEJon Moss2016-11-102-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit prevents a possible issue wherein an empty CONTENT_TYPE header is sent in a request to a Rails application, and then `request.content_mime_type` would return `nil`. This is because the `has_content_type?` guard method was not properly checking the validity of a request's content type; it was only checking to see whether or not the header existed, not whether it had a value stored inside. Relatedly, after an internal discussion, it was determined that the `has_content_type?` method is not meant to be part of the public API, and is therefore changed to a `:nodoc:` method in this commit. The test for this behavior is a little bit ugly, for two reasons. One is that it was difficult to determine where to place the test... I figured the best place would be with the rest of the ParamsWrapper stuff, since that's where the original issue was. Also, we have to do some fancy footwork in calling `dispatch` on the test's controller manually... this is because `ActionController::TestCase` will throw an error if you try and pass in a nil content type, which is exactly what we are trying to test here... Because of that, we have to manually call in to the controller, and bypass the `post` request helper. Fixes #26912. This is a regression in behavior between Rails versions 4.2.x and 5.0.x, which was introduced via [this commit](https://github.com/rails/rails/commit/a9f28600e901b11a9222e34bfae8642bfb753186).
* Mysql2::Client::FOUND_ROWS should be defined in all currently supported ↵Akira Matsuda2016-11-101-6/+4
| | | | versions of mysql2
* Merge pull request #26988 from Paxa/connection_pool_statRafael França2016-11-083-0/+47
|\ | | | | Add ActiveRecord::Base.connection_pool.stat
| * Add ActiveRecord::Base.connection_pool.statPavel2016-11-093-0/+47
| |
* | [ci skip] Expand context on `:cache_hits`.Kasper Timm Hansen2016-11-081-5/+7
| | | | | | | | Need to explain the key is only there in certain cases.
* | Merge pull request #26993 from yui-knk/render_collection.action_viewKasper Timm Hansen2016-11-081-0/+16
|\ \ | | | | | | [ci skip] Add `render_collection.action_view` entry to AS instrumenta…
| * | [ci skip] Add `render_collection.action_view` entry to AS instrumentationyui-knk2016-11-081-0/+16
|/ /
* | Merge pull request #26990 from kirs/upgrade-jrubyRafael França2016-11-071-2/+2
|\ \ | |/ |/| Upgrade JRuby to satisfy gemfile
| * Upgrade JRuby to satisfy gemfileKir Shatrov2016-11-071-2/+2
|/
* Merge pull request #26982 from bogdanvlviv/started_guideKasper Timm Hansen2016-11-071-2/+2
|\ | | | | Fix 'Getting Started with Rails' [ci skip]
| * Fix 'Getting Started with Rails' [ci skip]bogdanvlviv2016-11-061-2/+2
| | | | | | | | | | | | | | | | | | `bin/rails generate controller Comments` creates files app/assets/javascripts/comments.coffee app/assets/stylesheets/comments.scss not app/assets/javascripts/comment.coffee app/assets/stylesheets/comment.scss
* | Merge pull request #26986 from bogdanvlviv/docs_migrationsEileen M. Uchitelle2016-11-061-2/+2
|\ \ | |/ |/| Add missing spaces [ci skip]
| * Add missing spaces [ci skip]bogdanvlviv2016-11-071-2/+2
|/
* Merge pull request #26909 from matthewd/query-cache-connectionMatthew Draper2016-11-064-40/+75
|\ | | | | Clear query cache during checkin, instead of an execution callback
| * Clear query cache during checkin, instead of an execution callbackMatthew Draper2016-10-274-40/+75
| | | | | | | | | | | | | | It doesn't make sense for the query cache to persist while a connection moves through the pool and is assigned to a new thread. [Samuel Cochran & Matthew Draper]
* | Merge pull request #26972 from ↵Rafael França2016-11-052-8/+17
|\ \ | | | | | | | | | | | | kamipo/avoid_unscope_order_when_limit_value_present Avoid `unscope(:order)` when `limit_value` is presented for `count`
| * | Avoid `unscope(:order)` when `limit_value` is presented for `count`Ryuta Kamizono2016-11-062-8/+17
| | | | | | | | | | | | | | | If `limit_value` is presented, records fetching order is very important for performance. Should not unscope the order in the case.
* | | Erubis is not actually used in ARAkira Matsuda2016-11-061-2/+2
|/ /
* | Merge pull request #26969 from y-yagi/remove_unused_requiresRafael França2016-11-051-3/+0
|\ \ | | | | | | remove unused require
| * | remove unused requireyuuji.yaginuma2016-11-051-3/+0
| | | | | | | | | | | | YAML and ERB were removed at 971d510
* | | Merge pull request #26971 from damireh/patch-1Jon Moss2016-11-051-1/+1
|\ \ \ | | | | | | | | Use local variable instead of instance variable [ci skip]
| * | | Use local variable instead of instance variable [ci skip]Daniel Amireh2016-11-051-1/+1
|/ / / | | | | | | Update render yield docs to use `search` local variable instead of `@q` instance variable
* | | Tweaking some test data due to sprintf behavior change in 2.4Akira Matsuda2016-11-051-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | 2.3: sprintf('%0.1f', 5.55) #=> "5.5" 2.4: sprintf('%0.1f', 5.55) #=> "5.6" see: https://github.com/ruby/ruby/commit/6ed8c79ddb11ccfb580bb0a22b22cc1362250255 and https://github.com/ruby/ruby/commit/295f60b94d5ff6551fab7c55e18d1ffa6a4cf7e3
* | | Show what was the error when assertion has failedAkira Matsuda2016-11-051-1/+1
| | | | | | | | | | | | this test case fails with ruby 2.4, so we want to see what's actually happening
* | | Less method invocationAkira Matsuda2016-11-051-1/+1
| | |
* | | Merge pull request #26967 from headius/bad_threading_testAaron Patterson2016-11-041-5/+5
|\ \ \ | | | | | | | | Use different name for main and thread connection variable.
| * | | Use different name for main and thread connection variable.Charles Oliver Nutter2016-11-041-5/+5
| |/ / | | | | | | | | | | | | | | | Under JRuby, the updates of the one shared variable interleaved, causing threads to pick up each others' connections. I'm amazed this worked on MRI.
* | | Merge pull request #26965 from rothhound/update_sqlite3Guillermo Iguaran2016-11-041-3/+3
|\ \ \ | | | | | | | | Update sqlite3
| * | | Update sqlite3Gianfranco Montoya2016-11-041-3/+3
|/ / /
* | | Merge pull request #26536 from ↵Arthur Nogueira Neves2016-11-041-2/+2
|\ \ \ | |/ / |/| | | | | | | | y-yagi/change_increment_and_decrement_to_public_api change `MemCacheStore#increment` and `MemCacheStore#decrement` to public API [ci skip]
| * | change `MemCacheStore#increment` and `MemCacheStore#decrement` to public API ↵yuuji.yaginuma2016-09-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] I'm not sure why these methods not public. But these methods are public in other cache stores, I think that may be in public. Ref: http://edgeapi.rubyonrails.org/classes/ActiveSupport/Cache/Store.html#method-i-increment http://edgeapi.rubyonrails.org/classes/ActiveSupport/Cache/FileStore.html#method-i-increment http://edgeapi.rubyonrails.org/classes/ActiveSupport/Cache/MemoryStore.html#method-i-increment http://edgeapi.rubyonrails.org/classes/ActiveSupport/Cache/NullStore.html#method-i-increment
* | | Don't assign default attributes until after loading schemaSean Griffin2016-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | If the call to `.define_attribute_methods` actually ends up loading the schema (*very* hard to do, as it requires the object being created without `allocate` having been called, but it can be done by manually calling `initialize` from inside `marshal_load` if you're crazy), the value of `_default_attributes` will change from that call.
* | | Merge pull request #26455 from kamipo/move_test_quoting_classesArthur Nogueira Neves2016-11-032-13/+4
|\ \ \ | | | | | | | | Move `test_quoting_classes` into `test/cases/quoting_test.rb`
| * | | Move `test_quoting_classes` into `test/cases/quoting_test.rb`Ryuta Kamizono2016-10-292-13/+4
| | | |
* | | | Merge pull request #24202 from Sen-Zhang/fix_datetime_errorArthur Nogueira Neves2016-11-033-1/+13
|\ \ \ \ | | | | | | | | | | fix datatime error
| * | | | fix datatime errorSen-Zhang2016-11-013-1/+13
| | | | |
* | | | | Fixes TypeError Exception when cache counter value equals nil (#26940)Daniel E. Garcia Shulman2016-11-022-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes TypeError when cache counter value equals nil * Test case for counter cache on unloaded has_many association
* | | | | Use tr instead of gsubAkira Matsuda2016-11-021-1/+1
| | | | |
* | | | | Merge pull request #26951 from y-yagi/fix_ruby_warningGuillermo Iguaran2016-11-011-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | remove warning from railtie
| * | | | remove warning from railtieyuuji.yaginuma2016-11-021-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the following warnings. ```ruby rails/railties/lib/rails/railtie.rb:186: warning: instance variable @rake_tasks not initialized rails/railties/lib/rails/railtie.rb:186: warning: instance variable @rake_tasks not initialized rails/railties/lib/rails/railtie.rb:186: warning: instance variable @load_console not initialized rails/railties/lib/rails/railtie.rb:186: warning: instance variable @rake_tasks not initialized ```
* | | | Make `register_block_for` privateArthur Neves2016-11-011-11/+11
| | | |
* | | | Merge pull request #26950 from bouk/exclude-dbmigrateSean Griffin2016-11-013-0/+10
|\ \ \ \ | | | | | | | | | | Don't put db:migrate and db:setup in binfiles if activerecord is excluded
| * | | | Don't put db:migrate and db:setup in binfiles if activerecord is excludedBouke van der Bijl2016-11-013-0/+10
| | | | |
* | | | | Merge pull request #26451 from kamipo/remove_target_uniq_sizeSean Griffin2016-11-011-5/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove unnecessary `target.uniq.size` in `CollectionAssociation#size`
| * | | | | Remove unnecessary `target.uniq.size` in `CollectionAssociation#size`Ryuta Kamizono2016-10-291-5/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `association_scope` have `distinct_value`, same record cannot exist in `target`. https://github.com/rails/rails/blob/v5.0.0/activerecord/lib/active_record/associations/collection_association.rb#L419-L424 ```ruby def add_to_target(record, skip_callbacks = false, &block) if association_scope.distinct_value index = @target.index(record) end replace_on_target(record, index, skip_callbacks, &block) end ```
* | | | | Merge pull request #26453 from kamipo/remove_unused_internal_dependent_optionSean Griffin2016-11-011-4/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Remove unused internal `:dependent` option in `CollectionAssociation#delete`
| * | | | Remove unused internal `:dependent` option in `CollectionAssociation#delete`Ryuta Kamizono2016-10-291-4/+1
| |/ / / | | | | | | | | | | | | | | | | The internal `:dependent` option was introduced at #10604. But currently unused.
* | | | Allow `autosave: true` to be used with inverse ofSean Griffin2016-11-015-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the changes in #25337, double save bugs are pretty much impossible, so we can just lift this restriction with pretty much no change. There were a handful of cases where we were relying on specific quirks in tests that had to be updated. The change to has_one associations was due to a particularly interesting test where an autosaved has_one association was replaced with a new child, where the child failed to save but the test wanted to check that the parent id persisted to `nil`. I think this is almost certainly the wrong behavior, and I may change that behavior later. But ultimately the root cause was because we never remove the parent in memory when nullifying the child. This makes #23197 no longer needed, but it is what we'll do to fix some issues on 5.0 Close #23197
* | | | Merge pull request #25337 from sgrif/sg-changes-in-callbacksSean Griffin2016-11-0118-53/+362
|\ \ \ \ | | | | | | | | | | Deprecate the behavior of AR::Dirty inside of after_(create|update|save) callbacks
| * | | | Deprecate the behavior of AR::Dirty inside of after_(create|update|save) ↵Sean Griffin2016-11-0118-53/+362
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | callbacks We pretty frequently get bug reports that "dirty is broken inside of after callbacks". Intuitively they are correct. You'd expect `Model.after_save { puts changed? }; model.save` to do the same thing as `model.save; puts model.changed?`, but it does not. However, changing this goes much farther than just making the behavior more intuitive. There are a _ton_ of places inside of AR that can be drastically simplified with this change. Specifically, autosave associations, timestamps, touch, counter cache, and just about anything else in AR that works with callbacks have code to try to avoid "double save" bugs which we will be able to flat out remove with this change. We introduce two new sets of methods, both with names that are meant to be more explicit than dirty. The first set maintains the old behavior, and their names are meant to center that they are about changes that occurred during the save that just happened. They are equivalent to `previous_changes` when called outside of after callbacks, or once the deprecation cycle moves. The second set is the new behavior. Their names imply that they are talking about changes from the database representation. The fact that this is what we really care about became clear when looking at `BelongsTo.touch_record` when tests were failing. I'm unsure that this set of methods should be in the public API. Outside of after callbacks, they are equivalent to the existing methods on dirty. Dirty itself is not deprecated, nor are the methods inside of it. They will only emit the warning when called inside of after callbacks. The scope of this breakage is pretty large, but the migration path is simple. Given how much this can improve our codebase, and considering that it makes our API more intuitive, I think it's worth doing.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 00:36:45 +0000