aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-04-10 12:16:35 +0900
committerRyuta Kamizono <kamipo@gmail.com>2019-04-10 12:24:43 +0900
commit7cb3e8b8efb193c13281c0d6c0354bbcc91c3b8e (patch)
tree43e138478a6c224a297723f0d9a5ccc55ee42d7f /activerecord/lib
parenta35a7603c2080bb42604af3ef6932366d83aa678 (diff)
downloadrails-7cb3e8b8efb193c13281c0d6c0354bbcc91c3b8e.tar.gz
rails-7cb3e8b8efb193c13281c0d6c0354bbcc91c3b8e.tar.bz2
rails-7cb3e8b8efb193c13281c0d6c0354bbcc91c3b8e.zip
Accidentally lost `comment` in `Column#==` and `Column#hash`
Refer #35875.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/connection_adapters/column.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/column.rb b/activerecord/lib/active_record/connection_adapters/column.rb
index 21c5e43ea0..279d0b9e84 100644
--- a/activerecord/lib/active_record/connection_adapters/column.rb
+++ b/activerecord/lib/active_record/connection_adapters/column.rb
@@ -68,7 +68,8 @@ module ActiveRecord
sql_type_metadata == other.sql_type_metadata &&
null == other.null &&
default_function == other.default_function &&
- collation == other.collation
+ collation == other.collation &&
+ comment == other.comment
end
alias :eql? :==
@@ -79,7 +80,8 @@ module ActiveRecord
sql_type_metadata.hash ^
null.hash ^
default_function.hash ^
- collation.hash
+ collation.hash ^
+ comment.hash
end
end