Remove deprecated handling of PG Points

There are some minor changes to the point type as I had forgotten that
this will affect the behavior of `t.point` in migrations and the schema
dumper so we need to handle those as well.

I'll say this again so I can convince myself to come up with a better
structure... TYPES SHOULD NOT CARE ABOUT SCHEMA DUMPING AND WE NEED TO
BETTER SEPARATE THESE.

6 files changed, 32 insertions, 56 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
index 8c318886cf..0e526f6201 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
@@ -12,7 +12,7 @@ require "active_record/connection_adapters/postgresql/oid/json"
 require "active_record/connection_adapters/postgresql/oid/jsonb"
 require "active_record/connection_adapters/postgresql/oid/money"
 require "active_record/connection_adapters/postgresql/oid/point"
-require "active_record/connection_adapters/postgresql/oid/rails_5_1_point"
+require "active_record/connection_adapters/postgresql/oid/legacy_point"
 require "active_record/connection_adapters/postgresql/oid/range"
 require "active_record/connection_adapters/postgresql/oid/specialized_string"
 require "active_record/connection_adapters/postgresql/oid/uuid"
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/rails_5_1_point.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb
index 845ff5b6a9..775eecaf85 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/rails_5_1_point.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb
@@ -1,10 +1,8 @@
 module ActiveRecord
-  Point = Struct.new(:x, :y)
-
   module ConnectionAdapters
     module PostgreSQL
       module OID # :nodoc:
-        class Rails51Point < Type::Value # :nodoc:
+        class LegacyPoint < Type::Value # :nodoc:
           include Type::Helpers::Mutable
 
           def type
@@ -14,23 +12,20 @@ module ActiveRecord
           def cast(value)
             case value
             when ::String
-              return if value.blank?
-
               if value[0] == "(" && value[-1] == ")"
                 value = value[1...-1]
               end
-              x, y = value.split(",")
-              build_point(x, y)
+              cast(value.split(","))
             when ::Array
-              build_point(*value)
+              value.map { |v| Float(v) }
             else
               value
             end
           end
 
           def serialize(value)
-            if value.is_a?(ActiveRecord::Point)
-              "(#{number_for_point(value.x)},#{number_for_point(value.y)})"
+            if value.is_a?(::Array)
+              "(#{number_for_point(value[0])},#{number_for_point(value[1])})"
             else
               super
             end
@@ -41,10 +36,6 @@ module ActiveRecord
             def number_for_point(number)
               number.to_s.gsub(/\.0$/, "")
             end
-
-            def build_point(x, y)
-              ActiveRecord::Point.new(Float(x), Float(y))
-            end
         end
       end
     end
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/point.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/point.rb
index bb4db2564c..7c764e7287 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/point.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/point.rb
@@ -1,4 +1,6 @@
 module ActiveRecord
+  Point = Struct.new(:x, :y)
+
   module ConnectionAdapters
     module PostgreSQL
       module OID # :nodoc:
@@ -12,20 +14,34 @@ module ActiveRecord
           def cast(value)
             case value
             when ::String
+              return if value.blank?
+
               if value[0] == "(" && value[-1] == ")"
                 value = value[1...-1]
               end
-              cast(value.split(","))
+              x, y = value.split(",")
+              build_point(x, y)
             when ::Array
-              value.map { |v| Float(v) }
+              build_point(*value)
             else
               value
             end
           end
 
           def serialize(value)
-            if value.is_a?(::Array)
-              "(#{number_for_point(value[0])},#{number_for_point(value[1])})"
+            case value
+            when ActiveRecord::Point
+              "(#{number_for_point(value.x)},#{number_for_point(value.y)})"
+            when ::Array
+              serialize(build_point(*value))
+            else
+              super
+            end
+          end
+
+          def type_cast_for_schema(value)
+            if ActiveRecord::Point === value
+              [value.x, value.y]
             else
               super
             end
@@ -36,6 +52,10 @@ module ActiveRecord
             def number_for_point(number)
               number.to_s.gsub(/\.0$/, "")
             end
+
+            def build_point(x, y)
+              ActiveRecord::Point.new(Float(x), Float(y))
+            end
         end
       end
     end
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 2013f24d74..03ee0eec5b 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -838,8 +838,8 @@ module ActiveRecord
         ActiveRecord::Type.register(:json, OID::Json, adapter: :postgresql)
         ActiveRecord::Type.register(:jsonb, OID::Jsonb, adapter: :postgresql)
         ActiveRecord::Type.register(:money, OID::Money, adapter: :postgresql)
-        ActiveRecord::Type.register(:point, OID::Rails51Point, adapter: :postgresql)
-        ActiveRecord::Type.register(:legacy_point, OID::Point, adapter: :postgresql)
+        ActiveRecord::Type.register(:point, OID::Point, adapter: :postgresql)
+        ActiveRecord::Type.register(:legacy_point, OID::LegacyPoint, adapter: :postgresql)
         ActiveRecord::Type.register(:uuid, OID::Uuid, adapter: :postgresql)
         ActiveRecord::Type.register(:vector, OID::Vector, adapter: :postgresql)
         ActiveRecord::Type.register(:xml, OID::Xml, adapter: :postgresql)
diff --git a/activerecord/lib/active_record/model_schema.rb b/activerecord/lib/active_record/model_schema.rb
index 4ccc5fbb21..f49f8da2ed 100644
--- a/activerecord/lib/active_record/model_schema.rb
+++ b/activerecord/lib/active_record/model_schema.rb
@@ -370,7 +370,6 @@ module ActiveRecord
         def load_schema!
           @columns_hash = connection.schema_cache.columns_hash(table_name).except(*ignored_columns)
           @columns_hash.each do |name, column|
-            warn_if_deprecated_type(column)
             define_attribute(
               name,
               connection.lookup_cast_type_from_column(column),
@@ -421,28 +420,6 @@ module ActiveRecord
             base.table_name
           end
         end
-
-        def warn_if_deprecated_type(column)
-          return if attributes_to_define_after_schema_loads.key?(column.name)
-          if column.respond_to?(:oid) && column.sql_type.start_with?("point")
-            if column.array?
-              array_arguments = ", array: true"
-            else
-              array_arguments = ""
-            end
-            ActiveSupport::Deprecation.warn(<<-WARNING.strip_heredoc)
-            The behavior of the `:point` type will be changing in Rails 5.1 to
-            return a `Point` object, rather than an `Array`. If you'd like to
-            keep the old behavior, you can add this line to #{name}:
-
-              attribute :#{column.name}, :legacy_point#{array_arguments}
-
-            If you'd like the new behavior today, you can add this line:
-
-              attribute :#{column.name}, :point#{array_arguments}
-          WARNING
-          end
-        end
     end
   end
 end
diff --git a/activerecord/test/cases/adapters/postgresql/geometric_test.rb b/activerecord/test/cases/adapters/postgresql/geometric_test.rb
index 27a7467326..a65d4d1ad9 100644
--- a/activerecord/test/cases/adapters/postgresql/geometric_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/geometric_test.rb
@@ -27,22 +27,10 @@ class PostgresqlPointTest < ActiveRecord::PostgreSQLTestCase
       t.point :legacy_y, default: [12.2, 13.3]
       t.point :legacy_z, default: "(14.4,15.5)"
     end
-    @connection.create_table("deprecated_points") do |t|
-      t.point :x
-    end
   end
 
   teardown do
     @connection.drop_table "postgresql_points", if_exists: true
-    @connection.drop_table "deprecated_points", if_exists: true
-  end
-
-  class DeprecatedPoint < ActiveRecord::Base; end
-
-  def test_deprecated_legacy_type
-    assert_deprecated do
-      DeprecatedPoint.new
-    end
   end
 
   def test_column