Merge branch 'master' into pr/18316

Conflicts:
	activerecord/CHANGELOG.md

1 files changed, 8 insertions, 13 deletions

diff --git a/activerecord/lib/active_record/type_caster/connection.rb b/activerecord/lib/active_record/type_caster/connection.rb
index 9e4a130b40..3878270770 100644
--- a/activerecord/lib/active_record/type_caster/connection.rb
+++ b/activerecord/lib/active_record/type_caster/connection.rb
@@ -1,34 +1,29 @@
 module ActiveRecord
   module TypeCaster
     class Connection
-      def initialize(connection, table_name)
-        @connection = connection
+      def initialize(klass, table_name)
+        @klass = klass
         @table_name = table_name
       end
 
       def type_cast_for_database(attribute_name, value)
         return value if value.is_a?(Arel::Nodes::BindParam)
-        type = type_for(attribute_name)
-        type.type_cast_for_database(value)
+        column = column_for(attribute_name)
+        connection.type_cast_from_column(column, value)
       end
 
       protected
 
-      attr_reader :connection, :table_name
+      attr_reader :table_name
+      delegate :connection, to: :@klass
 
       private
 
-      def type_for(attribute_name)
+      def column_for(attribute_name)
         if connection.schema_cache.table_exists?(table_name)
-          column_for(attribute_name).cast_type
-        else
-          Type::Value.new
+          connection.schema_cache.columns_hash(table_name)[attribute_name.to_s]
         end
       end
-
-      def column_for(attribute_name)
-        connection.schema_cache.columns_hash(table_name)[attribute_name.to_s]
-      end
     end
   end
 end