1 files changed, 9 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/type_metadata.rb b/activerecord/lib/active_record/connection_adapters/postgresql/type_metadata.rb
index cd69d28139..403b3ead98 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/type_metadata.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/type_metadata.rb
@@ -22,19 +22,20 @@ module ActiveRecord
 
       def ==(other)
         other.is_a?(PostgreSQLTypeMetadata) &&
-          attributes_for_hash == other.attributes_for_hash
+          __getobj__ == other.__getobj__ &&
+          oid == other.oid &&
+          fmod == other.fmod &&
+          array == other.array
       end
       alias eql? ==
 
       def hash
-        attributes_for_hash.hash
+        PostgreSQLTypeMetadata.hash ^
+          __getobj__.hash ^
+          oid.hash ^
+          fmod.hash ^
+          array.hash
       end
-
-      protected
-
-        def attributes_for_hash
-          [self.class, @type_metadata, oid, fmod]
-        end
     end
   end
 end