5 1 stable #32423

Replace Erubis with Erubi in a part of guide [ci skip]

This change was introduced by #18109. The intent of that change was to specifically apply `unscoped`, not to allow all changes to `current_scope` to affect the join. The idea of allowing `current_scope` to affect joins is interesting and potentially more consistent, but has sever problems associated with it. The fact that we're specifically stripping out joins indicates one such problem (and potentially leads to invalid queries). Ultimately it's difficult to reason about what `Posts.joins(:users)` actually means if it's affected by `User.current_scope`, and it's difficult to specifically control what does or doesn't get added. If we were starting from scratch, I don't think I'd have `joins` be affected by `default_scope` either, but that's too big of a breaking change to make at this point. With this change, we no longer apply `current_scope` when bringing in joins, with the singular exception of the motivating use case which introduced this bug, which is providing a way to *opt-out* of having the default scope apply to joins. Fixes #29338.

…ivesupport-railsguide Added fixed links to code for Rails Guides ActiveSupport

…_msg Scrub the invalid paramter value before using it in the error

…fault Fix HashWithIndifferentAccess#default when include?(nil)

…fault_5_1 Merge pull request #29757 from lugray/hash_with_indifferent_access_default

…cation_file Set `RAILS_ENV` before load application file

Backport #29821 to 5-1-stable

Create `rails@localhost` user on travis ci

`test_middleware_caches` is sometimes failed since #29454. The failure is due to schema statements are affected by query caching. Bypassing query caching for schema statements to avoid the issue.

Currently `version` method always returns `5.5.5` because the `full_version` is `5.5.5-10.x.y-MariaDB...` since MariaDB 10.x. It should be ignored if the prefix is `5.5.5-`.

Since MariaDB 10.2.5, `information_schema` supports Virtual Columns. Fixes #29670.

Since MariaDB 10.2, `CURRENT_TIMESTAMP` is shown as a function (`current_timestamp()`). Fix matching column default to address that case. Fixes #29698.

Since 5c71000, it has lost to be able to unscope `default_scope` in STI associations. This change will use `.empty_scope?` instead of `.values.empty?` to regard as an empty scope if only have `type_condition`.

…sometimes Post.where(id: 1).or(Post.where(id: 2)).where(foo: 3).unscope(where: :foo).where_clause.binds.map(&:value) Would return [2, 3] instead of the expected [1,2]

Match destroyed_by_association for has_one to has_many

Updates Rails upgrade guide on `ActionView::Helpers::RecordTagHelper`

5-1-stable: Fix unscoping `default_scope` in STI associations

5-1-stable: Don't cache queries for schema statements

…nd_virtual_columns 5-1-stable: Fix default `CURRENT_TIMESTAMP` and Virtual Columns for MariaDB 10.2

…r_5-1 5-1-stable: bugfix: unscope(where: [columns]) would not remove the correct binds sometimes

Delegate respond_to? in ActionView::Helpers::ControllerHelper

Do not show URL in boot info when using Puma

…nd_limit Fix `COUNT(DISTINCT ...)` with `ORDER BY` and `LIMIT`

5-1-stable: Don't cache queries for schema statements

…_location_engine_mounting Fix regression introduced by fixing mounting the same engine in multiple locations

Fix division where a duration is the denominator

We were expecting those classes to be loaded when an association is defined but they are not. If you add a debugger on the first line of any of those classes and try to define the corresponding association you will see that the classes are not loaded. Fixes #26273

Rails 5.1 introduce an `ActiveSupport::Duration::Scalar` class as a wrapper around a numeric value as a way of ensuring a duration was the outcome of an expression. However the implementation was missing support for modulo operations. This commit adds support for those operations and should result in a duration being returned from expressions involving them. Fixes #29603 and #29743.

[ Orhan Toy & Kasper Timm Hansen ]

This commit changes the behavior such the path_params now default to UTF8 just like regular parameters. This also changes the behavior such that if a path parameter contains invalid UTF8 it returns a 400 bad request. Previously the behavior was to encode the path params as binary but that's not the same as query params. So this commit makes path params behave the same as query params. It's important to test with a path that's encoded as binary because that's how paths are encoded from the socket. The test that was altered was changed to make the behavior for bad encoding the same as query params. We want to treat path params the same as query params. The params in the test are invalid UTF8 so they should return a bad request. Fixes #29669 *Eileen M. Uchitelle, Aaron Patterson, & Tsukuru Tanimichi*

Since this test changed in 9220935 I noticed that it really doesn't make sense anymore. I split the tests into 2 groups to explain what each one does. First these routes should throw a `bad_request` when the encoding isn't valid. We're expecting UTF8 encoding and passing binary, that should be a bad request. For the second test we are setting the `show` route to set `self.binary_params_for?` for that route which will convert the parameters and return a `:ok` instead of a `:bad_request`.

…tization Allow non-English values for collection_radio_buttons

…lence-puma-in-system-test Add an option to silence puma in system tests.

When the path info is read from the socket it's encoded as ASCII 8BIT. The unescape method changes the encoding to UTF8 but it should maintain the encoding of the string that's passed in. This causes parameters to be force encoded to UTF8 when we don't actually know what the encoding of the parameter should be.

Caused the regression in #30025. We didn't have the right fix in time for the final release, so this get's reverted instead. This reverts commit 6b0606a.

It was right as originally written in #15440.

Ensure `false` is preserved in attr serialization

Update rack-test dependency constraint

…docs add reload_association to documentation

This module has behavior that is not present in `ActiveModel::Dirty`, which is intended to be public API.

…nderer-defaults-automatic-reload-in-dev Fix ApplicationController.renderer.defaults overriding in development

Both `mysql2/json_test.rb` and `postgresql/json_test.rb` have same test cases.

…`AbstractJson` Structured type values sometimes caused representation problems (keys sort order, spaces, etc). A raw value from the database should be deserialized (normalized) to prevent the problems.

Because other bug report templates specify branch. https://github.com/rails/rails/blob/5-1-stable/guides/bug_report_templates/action_controller_master.rb#L10 https://github.com/rails/rails/blob/5-1-stable/guides/bug_report_templates/active_job_master.rb#L10 https://github.com/rails/rails/blob/5-1-stable/guides/bug_report_templates/active_record_master.rb#L10 https://github.com/rails/rails/blob/5-1-stable/guides/bug_report_templates/active_record_migrations_master.rb#L10 https://github.com/rails/rails/blob/5-1-stable/guides/bug_report_templates/generic_master.rb#L10 This also fixes broken tests. Ref: https://travis-ci.org/rails/rails/jobs/262443113

Specify branch in the benchmark template

A part for JSON was splitted from #28416 as #29273 and #29273 has already been merged. Closes #28754. Closes #27588. [Ryuta Kamizono & Bradley Priest]

#29058) Fixes #29045.

More robust PostgreSQL database duplication check

5-1-stable: Deserialize a raw value from the database in `changed_in_place?` for `AbstractJson`

Fix `reflection.association_primary_key` for `has_many` association

Allow irb options to be passed from `rails console` command

…tinct-bug Ensure sum honors distinct on has_many through

Backport #29010 to 5-1-stable

…ected_by_scoping Through scope should not be affected by scoping

…arameters-regression Load Parameters configurations on :action_controller only once

Test case for #30045

…onview-controller-helper Suppress warning from actionview controller helper.

Backport #29918 to 5-1-stable

…bute Pass missing name attribute to execute_hook

The initial commit (efaa6e4) that changed this behavior was intended to be a minor change, but ended up becoming a large-ish breaking change within Active Record. This is because instead of only JSON encoding `Hash`es or `Array`s in `#serialize`, we now encode all values passed in. This is an issue if you're passing in a `String`, that has already been transformed from a `Hash` to a `String`, since your data is now being double encoded. Unfortunately, the change was included in one of the v5.0.0 beta releases, and it is too late to revert without huge ripple effects. Thus, all we can do is update the documentation (via this commit), and add some test coverage (coming soon in a PR) for the new behavior. Please note that in the documentation I talk about deserialization, not about serialization, where the actual change occurred. This is because you won't notice any changes in serialized data until you try and deserialize it. Also to make the change itself (confusing until you read through everything multiple times) easier to understand. Related #27788, #25594, #26101, #24234, #28292, #28285, #28285, and probably others. [ci skip]

[ci skip] form_with in the getting started guide.

[ci skip]Revert commits changing wrong place

Backport #30421 to 5-1-stable

This regression was caused by caa178c. The block for `set_inverse_instance` should also be passed to join dependency. Fixes #30402.

Previously, saved_changes would return a hash of changes corresponding to the outermost save in the callbacks for the nested save, but now it will return the hash of changes for the nested save in its callbacks.

Unscoping `default_scope` in associations has already supported (#17360 for preloading, c9cf8b8 for eager loading). Fixes #20679. Closes #16531.

…and type columns Fixes #30496.

Otherwise using reserved words as composite primary key names will be failed as an invalid SQL. Fixes #30518.

activerecord: Fix saved_changes for saves nested in after callbacks

Update CHANGELOG.md [ci skip]

Correctly set user_supplied_options when there is no whitespace in option specification

Backport #29146 to 5-1-stable

PERF: Restore memoization when preloading associations.

Ensure `1 AS one` for SQL Server with Calculations

…bility make create_join_table compatible.

https://travis-ci.org/rails/rails/jobs/279300966#L2600 The result of `Loofah::HTML5::Scrub.scrub_css` was changed since v2.1.0.rc1. flavorjones/loofah@ca56295

Fixes #30539.

```ruby require 'active_record' require 'benchmark/ips' ActiveRecord::Base.establish_connection(ENV.fetch('DATABASE_URL')) ActiveRecord::Migration.verbose = false ActiveRecord::Schema.define do create_table :users, force: true do |t| t.string :name, :email t.timestamps null: false end end attributes = { name: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', email: 'foobar@email.com' } class User < ActiveRecord::Base; end 1000.times do User.create!(attributes) end Benchmark.ips do |x| x.config(time: 10, warmup: 2) x.report('pluck 1 column') do User.pluck(:id) end x.report('pluck 2 columns') do User.pluck(:id, :email) end x.report('pluck 1 column with scope') do User.where(id: 1000).pluck(:id) end x.report('pluck 2 columns with scope') do User.where(id: 1000).pluck(:id, :email) end end ``` ``` Calculating ------------------------------------- pluck 1 column 122.000 i/100ms pluck 2 columns 74.000 i/100ms pluck 1 column with scope 615.000 i/100ms pluck 2 columns with scope 515.000 i/100ms ------------------------------------------------- pluck 1 column 1.272k (± 3.9%) i/s - 12.810k pluck 2 columns 750.096 (± 3.3%) i/s - 7.548k pluck 1 column with scope 6.074k (± 4.1%) i/s - 60.885k pluck 2 columns with scope 5.158k (± 2.7%) i/s - 52.015k ``` ``` Calculating ------------------------------------- pluck 1 column 126.000 i/100ms pluck 2 columns 78.000 i/100ms pluck 1 column with scope 457.000 i/100ms pluck 2 columns with scope 434.000 i/100ms ------------------------------------------------- pluck 1 column 1.266k (± 2.1%) i/s - 12.726k pluck 2 columns 795.061 (± 3.0%) i/s - 7.956k pluck 1 column with scope 4.660k (± 2.1%) i/s - 46.614k pluck 2 columns with scope 4.355k (± 2.3%) i/s - 43.834k ``` ``` Calculating ------------------------------------- pluck 1 column 126.000 i/100ms pluck 2 columns 78.000 i/100ms pluck 1 column with scope 539.000 i/100ms pluck 2 columns with scope 481.000 i/100ms ------------------------------------------------- pluck 1 column 1.308k (± 3.4%) i/s - 13.104k pluck 2 columns 798.604 (± 2.8%) i/s - 8.034k pluck 1 column with scope 5.530k (± 3.4%) i/s - 55.517k pluck 2 columns with scope 4.914k (± 2.7%) i/s - 49.543k ``` ``` Calculating ------------------------------------- pluck 1 column 139.000 i/100ms pluck 2 columns 79.000 i/100ms pluck 1 column with scope 580.000 i/100ms pluck 2 columns with scope 526.000 i/100ms ------------------------------------------------- pluck 1 column 1.337k (± 3.0%) i/s - 13.483k pluck 2 columns 806.776 (± 2.7%) i/s - 8.137k pluck 1 column with scope 5.924k (± 4.1%) i/s - 59.160k pluck 2 columns with scope 5.276k (± 3.1%) i/s - 53.126k ```

…::Association`. ``` require 'active_record' require 'benchmark/ips' ActiveRecord::Base.establish_connection(ENV.fetch('DATABASE_URL')) ActiveRecord::Migration.verbose = false ActiveRecord::Schema.define do create_table :users, force: true do |t| t.string :name, :email t.integer :topic_id t.timestamps null: false end create_table :topics, force: true do |t| t.string :title t.timestamps null: false end end attributes = { name: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', email: 'foobar@email.com' } class Topic < ActiveRecord::Base has_many :users end class User < ActiveRecord::Base belongs_to :topic end 100.times do User.create!(attributes) end users = User.first(50) 100.times do Topic.create!(title: 'This is a topic', users: users) end Benchmark.ips do |x| x.config(time: 10, warmup: 5) x.report("preload") do User.includes(:topic).all.to_a end end ``` ``` Calculating ------------------------------------- preload 25.000 i/100ms ------------------------------------------------- preload 251.772 (± 1.2%) i/s - 2.525k ``` ``` Calculating ------------------------------------- preload 26.000 i/100ms ------------------------------------------------- preload 270.392 (± 1.1%) i/s - 2.704k ```

…:SystemTesting defaults

Backport Capybara :puma defaults to 5.1.x

since r59328

This is the fix for the regression of #29848. In #29848, I've kept existing select list in the subquery for the count if ORDER BY is given. But it had accidentally affect to GROUP BY queries also. It should keep the previous behavior in that case. Fixes #30886.

Currently `AUTO_INCREMENT` is implicitly used in the default primary key definition. But `AUTO_INCREMENT` is not only used for single column primary key, but also for composite primary key. In that case, `auto_increment: true` should be dumped explicitly in the `db/schema.rb`. Fixes #30894.

If collided named sequence already exists, newly created serial column will generate alternative sequence name. Fix sequence name detection to allow the alternative names.

We already found the longer sequence name, but we could not consider whether it was the sequence name created by serial type due to missed a max identifier length limitation. I've addressed the sequence name consideration to respect the max identifier length. Fixes #28332.

Fix `bin/rails db:setup` and `bin/rails db:test:prepare` create wrong ar_internal_metadata's data for a test database. [Sean Griffin & bogdanvlviv]

Backport #30579

Backport perf changes

Currently `with_lock` checks whether the record has `changed?`, but when called within a callback `changed?` triggers deprecation warnings. Instead use `has_changes_to_save?`. Fixes #30307

Fix deprecation warnings from with_lock

specify minimum capybara version for system tests

Does not include disabled element in params

Allow symbol list for ignored_columns

Enable query cache if set a configurations

…uery_cache Should use the same connection in using query cache

42 compatibility - use int instead of bigint

We have already specified to install `bundler` 1.15.4 in `.travis.yml`. https://github.com/rails/rails/blob/master/.travis.yml#L31..L32 However, `bundler` 1.16.0 may be used in the test. https://travis-ci.org/rails/rails/jobs/296582467#L2208 The test failed due to this influence. In order to avoid this, specifying `bundler` version in bug report templates.

Fix 5-1-stable CI

…lumns Do not use `Arel.star` when `ignored_columns`

This fixes an issue where competing threads deadlock each other. - Thread A holds the load interlock but is blocked on getting the DB lock - Thread B holds the DB lock but is blocked on getting the load interlock (for example when there is a `Model.transaction` block that needs to autoload) This solution allows for dependency loading in other threads while a thread is waiting to acquire the DB lock. Fixes #31019

Backport prevent deadlocks with load interlock and DB lock to 5-1-stable

Backport changelog links

Fixes #31220. (cherry picked from commit 00c0e40)

Previously, if a record was created with a custom primary key, that table could not be migrated using sqlite. While attempting to copy the table, the type of the primary key was ignored. Once that was corrected, copying the indexes would fail because custom primary keys are autoindexed by sqlite by default. To correct that, this skips copying the index if the index name begins with "sqlite_". This is a reserved word that indicates that the index is an internal schema object. SQLite prohibits applications from creating objects whose names begin with "sqlite_", so this string should be safe to use as a check. ref https://www.sqlite.org/fileformat2.html#intschema

…lite Backport fix sqlite migrations with custom primary keys to 5-1-stable

https://travis-ci.org/rails/rails/jobs/304428814#L1977 Backports the fix from master for the rack-test failure with some additional work. 1) 0.7.1 has been yanked so this updates rack test to 0.8.2 as does travis CI and 2) since `cookie_body` was changed in 5f37e16 also take that change and compare against the `cookies[SessionKey]` instead of cookie body. Fixes the following error on travis: ``` Failure: CookieStoreTest#test_session_store_with_expire_after [/home/travis/build/rails/rails/actionpack/test/dispatch/session/cookie_store_test.rb:300]: --- expected +++ actual @@ -1 +1 @@ -"_myapp_session=BAh7B0kiCGZvbwY6BkVGSSIIYmFyBjsAVEkiD3Nlc3Npb25faWQGOwBGSSIlNTRiODg2NDM3YzAxYThmYTA3YWRhYmIwNDI5NTg1OWIGOwBG--e92675cf54c0656741f780418801e207fdb1d4c8; path=/; expires=Fri, 25 Apr 2008 05:00:00 -0000; HttpOnly" +nil ```

Rails master adds support for redis-rb 4.0 but when Rails 5-1-stable branch gets an updated redis there are exceptions in the travis log. ``` Error: RedisAdapterTest#test_channel_filtered_broadcast: Gem::LoadError: Specified 'redis' for Action Cable pubsub adapter, but the gem is not loaded. Add `gem 'redis'` to your Gemfile (and ensure its version is at the minimum required by Action Cable). ``` This PR backports Jeremy's work so that the build can be green. [Eileen M. Uchitelle & Jeremy Daer]

- Travis CI is migrating Ubuntu version to Trusty - MariaDB 10.2 is supported on Ubuntu Trusty

CI with the latest stable(GA) version of MariaDB 10.2

Fix Rails environment when running tests with Ruby

Quote colum_names when building select:

…e-with-touch-by-optimistic_locking Fix conflicts `counter_cache` with `touch: true` by optimistic locking.

…od-visibility Preserve original method visibility when deprecating a method

…by25 Suppress expected exceptions by `report_on_exception` = `false`

44103bc changed the circular loading message to include more details, but the corresponding test was not updated. This commit fixes the corresponding test to use `assert_match` so we don't need to build a bunch of file paths for the tests.

We have already specified to install `bundler` 1.15.4 in `.travis.yml`. https://github.com/rails/rails/blob/master/.travis.yml#L31..L32 However, `bundler` 1.16.0 may be used in the test. https://travis-ci.org/rails/rails/jobs/296582467#L2208 The test failed due to this influence. In order to avoid this, specifying `bundler` version in bug report templates.

This reverts commit e6fca71. I didn't realize this was already cherry-picked. Reverting.

Bundler 1.16.0 doesnt work with our executable test cases. This is causing travis to fail, so locking travis to use bundler 1.15.4.

This reverts commit 44103bc. This should not be here

This reverts commit 97bc205. 44103bc was reverted in a33e934 so this test no longer passes.

`make_tmpname` was removed by ruby/ruby@25d56ea. In this case, we want a file name, not a `File`. So cannot use `Tempfile`. Fixes #31458

Fix callback in rails ujs

@history

…e contexts.` Though the validation have supported multiple context since #21069, its callbacks don't support multiple context currently. So I regarded this as the bug and fixed. Example: ```ruby class Dog include ActiveModel::Validations include ActiveModel::Validations::Callbacks attr_accessor :history def initialize @history = [] end before_validation :set_before_validation_on_a, on: :a before_validation :set_before_validation_on_b, on: :b after_validation :set_after_validation_on_a, on: :a after_validation :set_after_validation_on_b, on: :b def set_before_validation_on_a; history << "before_validation on a"; end def set_before_validation_on_b; history << "before_validation on b"; end def set_after_validation_on_a; history << "after_validation on a" ; end def set_after_validation_on_b; history << "after_validation on b" ; end end ``` Before: ``` d = Dog.new d.valid?([:a, :b]) d.history # [] ``` After: ``` d = Dog.new d.valid?([:a, :b]) d.history # ["before_validation on a", "before_validation on b", "after_validation on a", "after_validation on b"] ```

Backport #31483 to 5-1-stable

This pull request handles `FrozenError` introduced by Ruby 2.5. Refer https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/61131 Since `FrozenError` is a subclass of `RuntimeError` minitest used by master branch can handle it, though it would be better to handle `FrozenError` explicitly if possible. `FrozenError` does not exist in Ruby 2.4 or lower, `frozen_error_class` handles which exception is expected to be raised.

Currently `count(:all)` with `distinct` doesn't work correctly because SELECT list is always replaced to `*` or primary key in that case even if having custom SELECT list. And also, PostgreSQL has a limitation that ORDER BY expressions must appear in select list for SELECT DISTINCT. Therefore, we should not replace custom SELECT list when using `count(:all)` with `distinct`. Closes #31277.

Use `Tempfile.create`

Handle `FrozenError` if it is available to 5-1-stable

Set counter caches to correct values in fixtures

Relax bundler version on Travis CI

This reverts commit fa81f88.

Relax bundler version in 5-1-stable

`connection.primary_key` also return composite primary keys, so `from_primary_key_column` may not be found even if `from_primary_key` is presented. ``` % ARCONN=sqlite3 be ruby -w -Itest test/cases/adapters/sqlite3/sqlite3_adapter_test.rb -n test_copy_table_with_composite_primary_keys Using sqlite3 Run options: -n test_copy_table_with_composite_primary_keys --seed 19041 # Running: E Error: ActiveRecord::ConnectionAdapters::SQLite3AdapterTest#test_copy_table_with_composite_primary_keys: NoMethodError: undefined method `type' for nil:NilClass /path/to/rails/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb:411:in `block in copy_table' ``` This change fixes `copy_table` to do not lose composite primary keys.

Fix `add_column` with :primary_key type compatibility for SQLite SQLite: Add more test cases for adding primary key

Fix recreating partial indexes after alter table for sqlite

Fix Illegal parameter data type bigint for operation 'get_lock' error

Optimizing information_schema query for `foreign_keys`

…errors_on_dealloc Catch postgres connection errors when trying to dealloc

…llbacks-issue save attributes changed by callbacks after update_attribute

…ation Use `count(:all)` in HasManyAssociation#count_records

We can't replace existing SELECT list as long as having DISTINCT, it will cause incorrect result. And also, PostgreSQL has a limitation that ORDER BY expressions must appear in select list for SELECT DISTINCT. Therefore, we should not replace existing SELECT list when using DISTINCT. Fixes #29779.

…licitly Previously table name qualified `*` is used in that case. If it is not qualified with a table name, an ambiguous column name error will occur when using JOINs.

…-with-symbols Fix protected environments with symbols

PostgreSQL: Allow pg-1.0 gem to be used with ActiveRecord

This will avoid the branch being deleted by mistake making all builds to fail.

Add support for Minitest 5.11

Because Minitest is locked by 5.3.3.

`profiling.md` was removed by 8abf2f5. But it remained on the document list. Because of that, generation of kindle edition got an error. Fixes #29865.

Currently reflections keeps the order when first added even if when redefining association. As a result of the order, redefining through association which use newly added association will raise `HasManyThroughOrderError`. We need to redefine reflection order as well when redefining association. Fixes #31068.

Fix actionmailer lambda default

…he driving table This is a regression caused by 6beb4de. In PostgreSQL, ORDER BY expressions must appear in SELECT list when using DISTINCT. When using `count(:all)` with eager loading, Active Record enforces DISTINCT to count the driving table records only. 6beb4de was caused the regression because `count(:all)` with DISTINCT path no longer removes ORDER BY. We need to ignore ORDER BY when DISTINCT is enforced, otherwise not always generated valid SQL for PostgreSQL. Fixes #31783.

Fix infinite loop when unloading autoloaded modules

There are two concerns which are both being combined into one here, but both have the same goal. There are certain attributes which we want to always consider initialized. Previously, they were handled separately. The primary key (which is assumed to be backed by a database column) needs to be initialized, because there is a ton of code in Active Record that assumes `foo.id` will never raise. Additionally, we want attributes which aren't backed by a database column to always be initialized, since we would never receive a database value for them. Ultimately these two concerns can be combined into one. The old implementation hid a lot of inherent complexity, and is hard to optimize from the outside. We can simplify things significantly by just passing in a hash. This has slightly different semantics from the old behavior, in that `Foo.select(:bar).first.id` will return the default value for the primary key, rather than `nil` unconditionally -- however, the default value is always `nil` in practice.

* PERF: Recover marshaling dump/load performance This performance regression which is described in #30680 was caused by f0ddf87 due to force materialized `LazyAttributeHash`. Since 95b86e5, default proc has been removed in the class, so it is no longer needed that force materialized. Avoiding force materialized will recover marshaling dump/load performance. Benchmark: https://gist.github.com/blimmer/1360ea51cd3147bae8aeb7c6d09bff17 Before: ``` it took 0.6248569069430232 seconds to unmarshal the objects Total allocated: 38681544 bytes (530060 objects) allocated memory by class ----------------------------------- 12138848 Hash 10542384 String 7920000 ActiveModel::Attribute::Uninitialized 5600000 ActiveModel::Attribute::FromDatabase 1200000 Foo 880000 ActiveModel::LazyAttributeHash 400000 ActiveModel::AttributeSet 80 Integer 72 ActiveRecord::ConnectionAdapters::SQLite3Adapter::SQLite3Integer 40 ActiveModel::Type::String 40 ActiveRecord::Type::DateTime 40 Object 40 Range allocated objects by class ----------------------------------- 250052 String 110000 ActiveModel::Attribute::Uninitialized 70001 Hash 70000 ActiveModel::Attribute::FromDatabase 10000 ActiveModel::AttributeSet 10000 ActiveModel::LazyAttributeHash 10000 Foo 2 Integer 1 ActiveModel::Type::String 1 ActiveRecord::ConnectionAdapters::SQLite3Adapter::SQLite3Integer 1 ActiveRecord::Type::DateTime 1 Object 1 Range ``` After: ``` it took 0.1660824950085953 seconds to unmarshal the objects Total allocated: 13883811 bytes (220090 objects) allocated memory by class ----------------------------------- 5743371 String 4940008 Hash 1200000 Foo 880000 ActiveModel::LazyAttributeHash 720000 Array 400000 ActiveModel::AttributeSet 80 ActiveModel::Attribute::FromDatabase 80 Integer 72 ActiveRecord::ConnectionAdapters::SQLite3Adapter::SQLite3Integer 40 ActiveModel::Type::String 40 ActiveModel::Type::Value 40 ActiveRecord::Type::DateTime 40 Object 40 Range allocated objects by class ----------------------------------- 130077 String 50004 Hash 10000 ActiveModel::AttributeSet 10000 ActiveModel::LazyAttributeHash 10000 Array 10000 Foo 2 Integer 1 ActiveModel::Attribute::FromDatabase 1 ActiveModel::Type::String 1 ActiveModel::Type::Value 1 ActiveRecord::ConnectionAdapters::SQLite3Adapter::SQLite3Integer 1 ActiveRecord::Type::DateTime 1 Object 1 Range ``` Fixes #30680. * Keep the `@delegate_hash` to avoid to lose any mutations that have been made to the record

5-1-stable: PERF: Recover marshaling dump/load performance

Fix yaml deserialization of ActiveSupport::Duration

Bump i18n to 1.0

Follow up to e6ee1ac.

Without this require, an error occurs when executing only `duration_test.rb`. Ref: https://travis-ci.org/rails/rails/jobs/338817558#L2205-L2210

Use SuppressedSummaryReporter and Rails::TestUnitReporter only if needed

Fixes #32021.

Some timezones like `Europe/London` have multiple mappings in `ActiveSupport::TimeZone::MAPPING` so return all of them instead of the first one found by using `Hash#value`. e.g: # Before ActiveSupport::TimeZone.country_zones("GB") # => ["Edinburgh"] # After ActiveSupport::TimeZone.country_zones("GB") # => ["Edinburgh", "London"] Fixes #31668. (cherry picked from commit 2d95956)

Although not a direct dependency, it's pulled in by Resque for Active Job integration tests so we need to update because the rack-protection gem has a security vulnerability[1]. [1]: https://nvd.nist.gov/vuln/detail/CVE-2018-7212

…ession Active Record distinct & order #count regression

Add pg 1.0.0 compatibility to 5.1.5 Changelog [ci skip]

…olumn-value-null Fix destroy with locking_column value null

…locking Fix ActiveRecord::Persistence#touch with locking

Currently the place where we limit what gets sent to the database is in the implementation for `partial_writes`. We should also be restricting it to column names when partial writes are turned off. Note that we're using `&` instead of just defaulting to `self.class.column_names`, as the instance version of `attribute_names` does not include attributes which are uninitialized (were not included in the select clause)

See 948b931 for context

Suppress `warning: BigDecimal.new is deprecated` in activerecord

This removes `|| id` which were added in #9963 and #23887 since it is no longer necessary.

…Persistence` module

…imistic locking is enabled This issue is caused by `@_trigger_update_callback` won't be updated due to `_update_record` in `Locking::Optimistic` doesn't call `super` when optimistic locking is enabled. Now optimistic locking concern when updating is supported by `_update_row` low level API, therefore overriding `_update_record` is no longer necessary. Removing the method just fix the issue. Closes #29096. Closes #29321. Closes #30823.

5-1-stable: Fix that after commit callbacks on update does not triggered when optimistic locking is enabled

#30748 was backported to `5-1-stable` by 3789531. This commit adds missing changelog entry and fixes others.

Time column improvements

Add `ActiveRecord::Migration.verbose = true` to be sure that verbose is turned on in the test. Related to #28865

#32262) * Check exclude before flagging cookies as secure. * Update comments in ActionDispatch::SSL. [Catherine Khuu + Rafael Mendonça França]

This test fails in specific time. Example: If run this test on the machine with time 01:00 am UTC+2, this test will fail. Changing representing of 2000-01-01 01:00 am UTC+2 to UTC+0 change the day, month and even year in our case, so substitution `"2000-01-01 "` to `""` isn't possible. ``` Failure: ActiveRecord::ConnectionAdapters::QuotingTest#test_quoted_time_utc Expected: "1999-12-31 23:01:27" Actual: "23:01:27" ``` Related to 7c479cb

Fix digesting templates with mixed formats

The urls helpers module returned by Rails.application.routes.url_helpers isn't cached so to prevent the cost of building the module cache it locally.

See flavorjones/loofah#144

Support mysql2 0.4.x and 0.5.x

Somehow `test_config_another_database` didn't fail on CI, but it will fail locally. https://travis-ci.org/rails/rails/jobs/356212950#L2474-L2482 ``` % bundle exec ruby -w -Itest test/generators/app_generator_test.rb -n test_config_another_database Run options: -n test_config_another_database --seed 7260 # Running: F Failure: AppGeneratorTest#test_config_another_database [test/generators/app_generator_test.rb:417]: Expected /^\s*gem\s+["']mysql2["'], '~> 0.4.4'$*/ to match "source 'https://rubygems.org'\ngit_source(:github) { |repo| \"https://github.com/\#{repo}.git\" }\n\nruby '2.5.0'\n\n# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'\ngem 'rails', '~> 6.0.0.alpha'\n# Use mysql as the database for Active Record\ngem 'mysql2', '>= 0.4.4', '< 0.6.0'\n# Use Puma as the app server\ngem 'puma', '~> 3.11'\n# Use SCSS for stylesheets\ngem 'sass-rails', '~> 5.0'\n# Use Uglifier as compressor for JavaScript assets\ngem 'uglifier', '>= 1.3.0'\n# See https://github.com/rails/execjs#readme for more supported runtimes\n# gem 'mini_racer', platforms: :ruby\n\n# Use CoffeeScript for .coffee assets and views\ngem 'coffee-rails', '~> 4.2'\n# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks\ngem 'turbolinks', '~> 5'\n# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder\ngem 'jbuilder', '~> 2.5'\n# Use Redis adapter to run Action Cable in production\n# gem 'redis', '~> 4.0'\n# Use ActiveModel has_secure_password\n# gem 'bcrypt', '~> 3.1.7'\n\n# Use ActiveStorage variant\n# gem 'mini_magick', '~> 4.8'\n\n# Use Capistrano for deployment\n# gem 'capistrano-rails', group: :development\n\n# Reduces boot times through caching; required in config/boot.rb\ngem 'bootsnap', '>= 1.1.0', require: false\n\ngroup :development, :test do\n # Call 'byebug' anywhere in the code to stop execution and get a debugger console\n gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]\nend\n\ngroup :development do\n # Access an interactive console on exception pages or by calling 'console' anywhere in the code.\n gem 'web-console', '>= 3.3.0'\n gem 'listen', '>= 3.0.5', '< 3.2'\n # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring\n gem 'spring'\n gem 'spring-watcher-listen', '~> 2.0.0'\nend\n\ngroup :test do\n # Adds support for Capybara system testing and selenium driver\n gem 'capybara', '>= 2.15', '< 4.0'\n gem 'selenium-webdriver'\n # Easy installation and use of chromedriver to run system tests with Chrome\n gem 'chromedriver-helper'\nend\n\n# Windows does not include zoneinfo files, so bundle the tzinfo-data gem\ngem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]\n". bin/rails test test/generators/app_generator_test.rb:411 Finished in 0.174681s, 5.7247 runs/s, 34.3483 assertions/s. 1 runs, 6 assertions, 1 failures, 0 errors, 0 skips ```

…le-30748 Fix changelog entries of `5-1-stable` [ci skip]

The multiple assignments was caused by 37a1dfa due to lost the `to_s` normalization for given names. Fixes #32323.

Also switch testing of ruby-head to ruby-2.5.1 since focus of future compatibility has switched to 5-2-stable and master.

The removal of path separators from the tmpname value affects all four supported versions of Ruby - 2.2.10, 2.3.7, 2.4.4, and 2.5.1.

Sidekiq has a version check error for Ruby 2.2.10.

Commits on Jul 23, 2017

Merge branch 'verify-release'

kaspth committed Jul 23, 2017

Configuration menu

View commit details

Copy full SHA for fa1fa72

Browse repository at this point

Copy the full SHA

fa1fa72 View commit details

Browse the repository at this point in the history

Commits on Sep 7, 2017

Preparing for 5.1.4 release

matthewd committed Sep 7, 2017

Configuration menu

View commit details

Copy full SHA for 813af46

Browse repository at this point

Copy the full SHA

813af46 View commit details

Browse the repository at this point in the history

Commits on Sep 8, 2017

Merge branch '5-1-4' into 5-1-stable

matthewd committed Sep 8, 2017

Configuration menu

View commit details

Copy full SHA for 8f70c67

Browse repository at this point

Copy the full SHA

8f70c67 View commit details

Browse the repository at this point in the history

Commits on Feb 1, 2018

Preparing for 5.1.5.rc1 release

rafaelfranca committed Feb 1, 2018

Configuration menu

View commit details

Copy full SHA for f8c00c1

Browse repository at this point

Copy the full SHA

f8c00c1 View commit details

Browse the repository at this point in the history

Commits on Feb 20, 2018

Add missing dependency for i18n gem

pixeltrix committed Feb 20, 2018

Configuration menu

View commit details

Copy full SHA for 6186f9c

Browse repository at this point

Copy the full SHA

6186f9c View commit details

Browse the repository at this point in the history

5 1 stable #32423

5 1 stable #32423

Commits on Jul 16, 2017

Commits on Jul 17, 2017

Commits on Jul 18, 2017

Commits on Jul 19, 2017

Commits on Jul 20, 2017

Commits on Jul 21, 2017

Commits on Jul 23, 2017

Commits on Jul 24, 2017

Commits on Jul 25, 2017

Commits on Jul 27, 2017

Commits on Jul 30, 2017

Commits on Jul 31, 2017

Commits on Aug 1, 2017

Commits on Aug 2, 2017

Commits on Aug 3, 2017

Commits on Aug 5, 2017

Commits on Aug 8, 2017

Commits on Aug 9, 2017

Commits on Aug 10, 2017

Commits on Aug 11, 2017

Commits on Aug 14, 2017

Commits on Aug 15, 2017

Commits on Aug 16, 2017

Commits on Aug 17, 2017

Commits on Aug 21, 2017

Commits on Aug 24, 2017

Commits on Aug 27, 2017

Commits on Aug 28, 2017

Commits on Aug 29, 2017

Commits on Aug 30, 2017

Commits on Sep 4, 2017

Commits on Sep 5, 2017

Commits on Sep 6, 2017

Commits on Sep 7, 2017

Commits on Sep 8, 2017

Commits on Sep 13, 2017

Commits on Sep 14, 2017

Commits on Sep 26, 2017

Commits on Sep 27, 2017

Commits on Sep 28, 2017

Commits on Oct 5, 2017

Commits on Oct 13, 2017

Commits on Oct 14, 2017

Commits on Oct 15, 2017

Commits on Oct 18, 2017

Commits on Oct 22, 2017

Commits on Oct 23, 2017

Commits on Oct 25, 2017

Commits on Oct 29, 2017

Commits on Nov 11, 2017

Commits on Nov 13, 2017

Commits on Nov 17, 2017

Commits on Nov 25, 2017

Commits on Nov 29, 2017

Commits on Dec 7, 2017

Commits on Dec 8, 2017

Commits on Dec 12, 2017

Commits on Dec 13, 2017

Commits on Dec 14, 2017

Commits on Dec 15, 2017

Commits on Dec 17, 2017

Commits on Dec 19, 2017

Commits on Dec 20, 2017

Commits on Dec 25, 2017

Commits on Dec 26, 2017

Commits on Jan 3, 2018

Commits on Jan 11, 2018

Commits on Jan 13, 2018

Commits on Jan 19, 2018

Commits on Jan 22, 2018

Commits on Jan 25, 2018

Commits on Jan 26, 2018

Commits on Feb 1, 2018

Commits on Feb 5, 2018

Commits on Feb 6, 2018

Commits on Feb 7, 2018

Commits on Feb 14, 2018

Commits on Feb 17, 2018