Refactor around sql_type metadata and column

* remove useless `@type_metadata` and `@array`
* move the compatibility code (for array) into column
* etc.

1 files changed, 10 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/column.rb b/activerecord/lib/active_record/connection_adapters/postgresql/column.rb
index ef98d2b37a..ec25bb1e19 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/column.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/column.rb
@@ -4,8 +4,7 @@ module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL
       class Column < ConnectionAdapters::Column # :nodoc:
-        delegate :array, :oid, :fmod, to: :sql_type_metadata
-        alias :array? :array
+        delegate :oid, :fmod, to: :sql_type_metadata
 
         def initialize(*, serial: nil, **)
           super
@@ -15,6 +14,15 @@ module ActiveRecord
         def serial?
           @serial
         end
+
+        def array
+          sql_type_metadata.sql_type.end_with?("[]")
+        end
+        alias :array? :array
+
+        def sql_type
+          super.sub(/\[\]\z/, "")
+        end
       end
     end
     PostgreSQLColumn = PostgreSQL::Column # :nodoc: