aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
diff options
context:
space:
mode:
authorSean Griffin <sean@thoughtbot.com>2014-10-28 17:52:58 -0600
committerSean Griffin <sean@thoughtbot.com>2014-10-28 17:54:03 -0600
commitec012e446ad5a502ce5fcf5139a3ed7ee9e220ba (patch)
treecadfd477c3e4505aab1ce6151d96a79708b6193e /activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
parentcd45306dbdf229ada6783c36cbd9cc18da26954a (diff)
downloadrails-ec012e446ad5a502ce5fcf5139a3ed7ee9e220ba.tar.gz
rails-ec012e446ad5a502ce5fcf5139a3ed7ee9e220ba.tar.bz2
rails-ec012e446ad5a502ce5fcf5139a3ed7ee9e220ba.zip
Add mysql and pg specific attributes to Column#== and hash
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb11
1 files changed, 11 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index e4cfe843a8..c5dd93ee89 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -91,6 +91,13 @@ module ActiveRecord
collation && !collation.match(/_ci$/)
end
+ def ==(other)
+ super &&
+ collation == other.collation &&
+ strict == other.strict &&
+ extra == other.extra
+ end
+
private
# MySQL misreports NOT NULL column default when none is given.
@@ -109,6 +116,10 @@ module ActiveRecord
raise ArgumentError, "#{type} columns cannot have a default value: #{default.inspect}"
end
end
+
+ def attributes_for_hash
+ super + [collation, strict, extra]
+ end
end
##