aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/mysql
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2019-06-19 13:04:32 +0200
committerGitHub <noreply@github.com>2019-06-19 13:04:32 +0200
commitaae270de9e0862f31b14642908472d235a17936f (patch)
tree5767421c16e244e15de4043afaa2d8f7a539c8c5 /activerecord/lib/active_record/connection_adapters/mysql
parentaeba121a83965d242ed6d7fd46e9c166079a3230 (diff)
parent17acb771d815f030ac1cf36b1af4050f02816c39 (diff)
downloadrails-aae270de9e0862f31b14642908472d235a17936f.tar.gz
rails-aae270de9e0862f31b14642908472d235a17936f.tar.bz2
rails-aae270de9e0862f31b14642908472d235a17936f.zip
Merge pull request #35891 from Shopify/schema-cache-deduplication
Deduplicate various Active Record schema cache structures
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql/type_metadata.rb11
1 files changed, 10 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/type_metadata.rb b/activerecord/lib/active_record/connection_adapters/mysql/type_metadata.rb
index 9167593064..a7232fa249 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql/type_metadata.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql/type_metadata.rb
@@ -6,9 +6,11 @@ module ActiveRecord
class TypeMetadata < DelegateClass(SqlTypeMetadata) # :nodoc:
undef to_yaml if method_defined?(:to_yaml)
+ include Deduplicable
+
attr_reader :extra
- def initialize(type_metadata, extra: "")
+ def initialize(type_metadata, extra: nil)
super(type_metadata)
@extra = extra
end
@@ -25,6 +27,13 @@ module ActiveRecord
__getobj__.hash ^
extra.hash
end
+
+ private
+ def deduplicated
+ __setobj__(__getobj__.deduplicate)
+ @extra = -extra if extra
+ super
+ end
end
end
end