Merge pull request rails#54585 from byroot/deserialize-column-defaults

Deserialize column defaults

Author: byroot

activerecord/lib/active_record/attributes.rb

@@ -244,7 +244,10 @@ def _default_attributes # :nodoc:
           # TODO: Remove the need for a connection after we release 8.1.
           attributes_hash = with_connection do |connection|
             columns_hash.transform_values do |column|
-              ActiveModel::Attribute.from_database(column.name, column.default, type_for_column(connection, column))
+              type = type_for_column(connection, column)
+              default = column.default
+              default = type.deserialize(default) unless default.nil?
+              ActiveModel::Attribute.from_database(column.name, default, type)
             end
           end
 

activerecord/test/cases/adapters/postgresql/geometric_test.rb

@@ -131,11 +131,11 @@ def test_legacy_column
   end
 
   def test_legacy_default
-    assert_equal [12.2, 13.3], PostgresqlPoint.column_defaults["legacy_y"]
-    assert_equal [12.2, 13.3], PostgresqlPoint.new.legacy_y
+    assert_equal ActiveRecord::Point.new(12.2, 13.3), PostgresqlPoint.column_defaults["legacy_y"]
+    assert_equal ActiveRecord::Point.new(12.2, 13.3), PostgresqlPoint.new.legacy_y
 
-    assert_equal [14.4, 15.5], PostgresqlPoint.column_defaults["legacy_z"]
-    assert_equal [14.4, 15.5], PostgresqlPoint.new.legacy_z
+    assert_equal ActiveRecord::Point.new(14.4, 15.5), PostgresqlPoint.column_defaults["legacy_z"]
+    assert_equal ActiveRecord::Point.new(14.4, 15.5), PostgresqlPoint.new.legacy_z
   end
 
   def test_legacy_schema_dumping

activerecord/test/cases/adapters/postgresql/money_test.rb

@@ -37,7 +37,7 @@ def test_column
   def test_default
     assert_equal BigDecimal("150.55"), PostgresqlMoney.column_defaults["depth"]
     assert_equal BigDecimal("150.55"), PostgresqlMoney.new.depth
-    assert_equal "150.55", PostgresqlMoney.new.depth_before_type_cast
+    assert_equal BigDecimal("150.55"), PostgresqlMoney.new.depth_before_type_cast
   end
 
   def test_money_values

activerecord/test/cases/defaults_test.rb

@@ -42,19 +42,19 @@ class DefaultNumber < ActiveRecord::Base; end
   def test_default_positive_integer
     record = DefaultNumber.new
     assert_equal 7, record.positive_integer
-    assert_equal "7", record.positive_integer_before_type_cast
+    assert_equal 7, record.positive_integer_before_type_cast
   end
 
   def test_default_negative_integer
     record = DefaultNumber.new
     assert_equal (-5), record.negative_integer
-    assert_equal "-5", record.negative_integer_before_type_cast
+    assert_equal (-5), record.negative_integer_before_type_cast
   end
 
   def test_default_decimal_number
     record = DefaultNumber.new
     assert_equal BigDecimal("2.78"), record.decimal_number
-    assert_equal "2.78", record.decimal_number_before_type_cast
+    assert_equal BigDecimal("2.78"), record.decimal_number_before_type_cast
   end
 end