aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/schema
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-06-09 17:30:00 +0900
committerRyuta Kamizono <kamipo@gmail.com>2018-06-18 19:08:41 +0900
commitcad0b7d91dbc5abf4b0d7fdbcf2d0620557a3b0f (patch)
tree9931a8eb4a452c9de635661cad42353750452c43 /activerecord/test/schema
parenta865f621ee934e8741001bbed1b487698e44d914 (diff)
downloadrails-cad0b7d91dbc5abf4b0d7fdbcf2d0620557a3b0f.tar.gz
rails-cad0b7d91dbc5abf4b0d7fdbcf2d0620557a3b0f.tar.bz2
rails-cad0b7d91dbc5abf4b0d7fdbcf2d0620557a3b0f.zip
Fix `touch` option to behave consistently with `Persistence#touch` method
`touch` option was added to `increment!` (#27660) and `update_counters` (#26995). But that option behaves inconsistently with `Persistence#touch` method. If `touch` option is passed attribute names, it won't update update_at/on attributes unlike `Persistence#touch` method. Due to changed from `Persistence#touch` to `increment!` with `touch` option, #31405 has a regression that `counter_cache` with `touch` option which is passed attribute names won't update update_at/on attributes. I think that the inconsistency is not intended. To get back consistency, ensure that `touch` option updates update_at/on attributes.
Diffstat (limited to 'activerecord/test/schema')
-rw-r--r--activerecord/test/schema/schema.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 8bf2f93c26..266e55f682 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -36,6 +36,7 @@ ActiveRecord::Schema.define do
create_table :aircraft, force: true do |t|
t.string :name
t.integer :wheels_count, default: 0, null: false
+ t.datetime :wheels_owned_at
end
create_table :articles, force: true do |t|
@@ -126,7 +127,8 @@ ActiveRecord::Schema.define do
create_table :cars, force: true do |t|
t.string :name
t.integer :engines_count
- t.integer :wheels_count, default: 0
+ t.integer :wheels_count, default: 0, null: false
+ t.datetime :wheels_owned_at
t.column :lock_version, :integer, null: false, default: 0
t.timestamps null: false
end