Merge pull request #15782 from sgrif/sg-column-defaults

Don't type cast the default on the column

13 files changed, 35 insertions, 49 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/array_test.rb b/activerecord/test/cases/adapters/postgresql/array_test.rb
index 4775b53eac..e9522d5956 100644
--- a/activerecord/test/cases/adapters/postgresql/array_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/array_test.rb
@@ -49,9 +49,8 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
   def test_default
     @connection.add_column 'pg_arrays', 'score', :integer, array: true, default: [4, 4, 2]
     PgArray.reset_column_information
-    column = PgArray.columns_hash["score"]
 
-    assert_equal([4, 4, 2], column.default)
+    assert_equal([4, 4, 2], PgArray.column_defaults['score'])
     assert_equal([4, 4, 2], PgArray.new.score)
   ensure
     PgArray.reset_column_information
@@ -60,9 +59,8 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
   def test_default_strings
     @connection.add_column 'pg_arrays', 'names', :string, array: true, default: ["foo", "bar"]
     PgArray.reset_column_information
-    column = PgArray.columns_hash["names"]
 
-    assert_equal(["foo", "bar"], column.default)
+    assert_equal(["foo", "bar"], PgArray.column_defaults['names'])
     assert_equal(["foo", "bar"], PgArray.new.names)
   ensure
     PgArray.reset_column_information
@@ -76,7 +74,7 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
     column = PgArray.columns_hash['snippets']
 
     assert_equal :text, column.type
-    assert_equal [], column.default
+    assert_equal [], PgArray.column_defaults['snippets']
     assert column.array
   end
 
@@ -93,8 +91,7 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
     @connection.change_column_default :pg_arrays, :tags, []
 
     PgArray.reset_column_information
-    column = PgArray.columns_hash['tags']
-    assert_equal [], column.default
+    assert_equal [], PgArray.column_defaults['tags']
   end
 
   def test_type_cast_array
diff --git a/activerecord/test/cases/adapters/postgresql/bit_string_test.rb b/activerecord/test/cases/adapters/postgresql/bit_string_test.rb
index 3a9397bc26..9ee3610afd 100644
--- a/activerecord/test/cases/adapters/postgresql/bit_string_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/bit_string_test.rb
@@ -43,12 +43,10 @@ class PostgresqlBitStringTest < ActiveRecord::TestCase
   end
 
   def test_default
-    column = PostgresqlBitString.columns_hash["a_bit"]
-    assert_equal "00000011", column.default
+    assert_equal "00000011", PostgresqlBitString.column_defaults['a_bit']
     assert_equal "00000011", PostgresqlBitString.new.a_bit
 
-    column = PostgresqlBitString.columns_hash["a_bit_varying"]
-    assert_equal "0011", column.default
+    assert_equal "0011", PostgresqlBitString.column_defaults['a_bit_varying']
     assert_equal "0011", PostgresqlBitString.new.a_bit_varying
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/enum_test.rb b/activerecord/test/cases/adapters/postgresql/enum_test.rb
index b809f1a79c..0e97f37a6c 100644
--- a/activerecord/test/cases/adapters/postgresql/enum_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/enum_test.rb
@@ -42,9 +42,8 @@ class PostgresqlEnumTest < ActiveRecord::TestCase
   def test_enum_defaults
     @connection.add_column 'postgresql_enums', 'good_mood', :mood, default: 'happy'
     PostgresqlEnum.reset_column_information
-    column = PostgresqlEnum.columns_hash["good_mood"]
 
-    assert_equal "happy", column.default
+    assert_equal "happy", PostgresqlEnum.column_defaults['good_mood']
     assert_equal "happy", PostgresqlEnum.new.good_mood
   ensure
     PostgresqlEnum.reset_column_information
diff --git a/activerecord/test/cases/adapters/postgresql/geometric_test.rb b/activerecord/test/cases/adapters/postgresql/geometric_test.rb
index aa737617c4..faf195783d 100644
--- a/activerecord/test/cases/adapters/postgresql/geometric_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/geometric_test.rb
@@ -35,12 +35,10 @@ class PostgresqlPointTest < ActiveRecord::TestCase
   end
 
   def test_default
-    column = PostgresqlPoint.columns_hash["y"]
-    assert_equal [12.2, 13.3], column.default
+    assert_equal [12.2, 13.3], PostgresqlPoint.column_defaults['y']
     assert_equal [12.2, 13.3], PostgresqlPoint.new.y
 
-    column = PostgresqlPoint.columns_hash["z"]
-    assert_equal [14.4, 15.5], column.default
+    assert_equal [14.4, 15.5], PostgresqlPoint.column_defaults['z']
     assert_equal [14.4, 15.5], PostgresqlPoint.new.z
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/hstore_test.rb b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
index c4e2917251..06788df4e1 100644
--- a/activerecord/test/cases/adapters/postgresql/hstore_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
@@ -64,9 +64,8 @@ class PostgresqlHstoreTest < ActiveRecord::TestCase
     def test_default
       @connection.add_column 'hstores', 'permissions', :hstore, default: '"users"=>"read", "articles"=>"write"'
       Hstore.reset_column_information
-      column = Hstore.columns_hash["permissions"]
 
-      assert_equal({"users"=>"read", "articles"=>"write"}, column.default)
+      assert_equal({"users"=>"read", "articles"=>"write"}, Hstore.column_defaults['permissions'])
       assert_equal({"users"=>"read", "articles"=>"write"}, Hstore.new.permissions)
     ensure
       Hstore.reset_column_information
diff --git a/activerecord/test/cases/adapters/postgresql/json_test.rb b/activerecord/test/cases/adapters/postgresql/json_test.rb
index 3c07209472..4cdb4a4893 100644
--- a/activerecord/test/cases/adapters/postgresql/json_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/json_test.rb
@@ -43,9 +43,8 @@ class PostgresqlJSONTest < ActiveRecord::TestCase
   def test_default
     @connection.add_column 'json_data_type', 'permissions', :json, default: '{"users": "read", "posts": ["read", "write"]}'
     JsonDataType.reset_column_information
-    column = JsonDataType.columns_hash["permissions"]
 
-    assert_equal({"users"=>"read", "posts"=>["read", "write"]}, column.default)
+    assert_equal({"users"=>"read", "posts"=>["read", "write"]}, JsonDataType.column_defaults['permissions'])
     assert_equal({"users"=>"read", "posts"=>["read", "write"]}, JsonDataType.new.permissions)
   ensure
     JsonDataType.reset_column_information
diff --git a/activerecord/test/cases/adapters/postgresql/money_test.rb b/activerecord/test/cases/adapters/postgresql/money_test.rb
index bdfeedafab..cf2a4ab6ea 100644
--- a/activerecord/test/cases/adapters/postgresql/money_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/money_test.rb
@@ -32,8 +32,7 @@ class PostgresqlMoneyTest < ActiveRecord::TestCase
   end
 
   def test_default
-    column = PostgresqlMoney.columns_hash["depth"]
-    assert_equal BigDecimal.new("150.55"), column.default
+    assert_equal BigDecimal.new("150.55"), PostgresqlMoney.column_defaults['depth']
     assert_equal BigDecimal.new("150.55"), PostgresqlMoney.new.depth
   end
 
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index e55525177f..b89caa3d55 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -339,7 +339,7 @@ module ActiveRecord
           column = @conn.columns('ex').find { |x|
             x.name == 'number'
           }
-          assert_equal 10, column.default
+          assert_equal '10', column.default
         end
       end
 
diff --git a/activerecord/test/cases/attribute_decorators_test.rb b/activerecord/test/cases/attribute_decorators_test.rb
index bc3e9a8cf5..b352d1a6c2 100644
--- a/activerecord/test/cases/attribute_decorators_test.rb
+++ b/activerecord/test/cases/attribute_decorators_test.rb
@@ -98,17 +98,7 @@ module ActiveRecord
       assert_equal 'Hello! decorated!', model.a_string
       assert_equal 'whatever', model.another_string
       assert_equal 'Hello! decorated! decorated!', child.a_string
-      # We are round tripping the default, and we don't undo our decoration
-      assert_equal 'whatever decorated! decorated!', child.another_string
-    end
-
-    test "defaults are decorated on the column" do
-      Model.attribute :a_string, Type::String.new, default: 'whatever'
-      Model.decorate_attribute_type(:a_string, :test) { |t| StringDecorator.new(t) }
-
-      column = Model.columns_hash['a_string']
-
-      assert_equal 'whatever decorated!', column.default
+      assert_equal 'whatever decorated!', child.another_string
     end
 
     class Multiplier < SimpleDelegator
diff --git a/activerecord/test/cases/defaults_test.rb b/activerecord/test/cases/defaults_test.rb
index 92144bc802..c089e63128 100644
--- a/activerecord/test/cases/defaults_test.rb
+++ b/activerecord/test/cases/defaults_test.rb
@@ -154,7 +154,7 @@ if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
         t.column :omit, :integer, :null => false
       end
 
-      assert_equal 0, klass.columns_hash['zero'].default
+      assert_equal '0', klass.columns_hash['zero'].default
       assert !klass.columns_hash['zero'].null
       # 0 in MySQL 4, nil in 5.
       assert [0, nil].include?(klass.columns_hash['omit'].default)
diff --git a/activerecord/test/cases/migration/change_schema_test.rb b/activerecord/test/cases/migration/change_schema_test.rb
index 9b26c30d14..c66eaf1ee1 100644
--- a/activerecord/test/cases/migration/change_schema_test.rb
+++ b/activerecord/test/cases/migration/change_schema_test.rb
@@ -68,9 +68,9 @@ module ActiveRecord
         five = columns.detect { |c| c.name == "five" } unless mysql
 
         assert_equal "hello", one.default
-        assert_equal true, two.default
-        assert_equal false, three.default
-        assert_equal 1, four.default
+        assert_equal true, two.type_cast_from_database(two.default)
+        assert_equal false, three.type_cast_from_database(three.default)
+        assert_equal '1', four.default
         assert_equal "hello", five.default unless mysql
       end
 
@@ -275,7 +275,7 @@ module ActiveRecord
 
         person_klass.connection.add_column "testings", "wealth", :integer, :null => false, :default => 99
         person_klass.reset_column_information
-        assert_equal 99, person_klass.columns_hash["wealth"].default
+        assert_equal 99, person_klass.column_defaults["wealth"]
         assert_equal false, person_klass.columns_hash["wealth"].null
         # Oracle needs primary key value from sequence
         if current_adapter?(:OracleAdapter)
@@ -287,20 +287,20 @@ module ActiveRecord
         # change column default to see that column doesn't lose its not null definition
         person_klass.connection.change_column_default "testings", "wealth", 100
         person_klass.reset_column_information
-        assert_equal 100, person_klass.columns_hash["wealth"].default
+        assert_equal 100, person_klass.column_defaults["wealth"]
         assert_equal false, person_klass.columns_hash["wealth"].null
 
         # rename column to see that column doesn't lose its not null and/or default definition
         person_klass.connection.rename_column "testings", "wealth", "money"
         person_klass.reset_column_information
         assert_nil person_klass.columns_hash["wealth"]
-        assert_equal 100, person_klass.columns_hash["money"].default
+        assert_equal 100, person_klass.column_defaults["money"]
         assert_equal false, person_klass.columns_hash["money"].null
 
         # change column
         person_klass.connection.change_column "testings", "money", :integer, :null => false, :default => 1000
         person_klass.reset_column_information
-        assert_equal 1000, person_klass.columns_hash["money"].default
+        assert_equal 1000, person_klass.column_defaults["money"]
         assert_equal false, person_klass.columns_hash["money"].null
 
         # change column, make it nullable and clear default
diff --git a/activerecord/test/cases/migration/columns_test.rb b/activerecord/test/cases/migration/columns_test.rb
index a7c287515d..4e6d7963aa 100644
--- a/activerecord/test/cases/migration/columns_test.rb
+++ b/activerecord/test/cases/migration/columns_test.rb
@@ -53,13 +53,13 @@ module ActiveRecord
         add_column 'test_models', 'salary', :integer, :default => 70000
 
         default_before = connection.columns("test_models").find { |c| c.name == "salary" }.default
-        assert_equal 70000, default_before
+        assert_equal '70000', default_before
 
         rename_column "test_models", "salary", "annual_salary"
 
         assert TestModel.column_names.include?("annual_salary")
         default_after = connection.columns("test_models").find { |c| c.name == "annual_salary" }.default
-        assert_equal 70000, default_after
+        assert_equal '70000', default_after
       end
 
       if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
@@ -193,14 +193,21 @@ module ActiveRecord
 
         old_columns = connection.columns(TestModel.table_name)
         assert old_columns.find { |c|
-          c.name == 'approved' && c.type == :boolean && c.default == true
+          default = c.type_cast_from_database(c.default)
+          c.name == 'approved' && c.type == :boolean && default == true
         }
 
         change_column :test_models, :approved, :boolean, :default => false
         new_columns = connection.columns(TestModel.table_name)
 
-        assert_not new_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == true }
-        assert new_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == false }
+        assert_not new_columns.find { |c|
+          default = c.type_cast_from_database(c.default)
+          c.name == 'approved' and c.type == :boolean and default == true
+        }
+        assert new_columns.find { |c|
+          default = c.type_cast_from_database(c.default)
+          c.name == 'approved' and c.type == :boolean and default == false
+        }
         change_column :test_models, :approved, :boolean, :default => true
       end
 
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 9855835e27..6b840e16bb 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -567,7 +567,7 @@ if ActiveRecord::Base.connection.supports_bulk_alter?
 
       assert_equal 8, columns.size
       [:name, :qualification, :experience].each {|s| assert_equal :string, column(s).type }
-      assert_equal 0, column(:age).default
+      assert_equal '0', column(:age).default
     end
 
     def test_removing_columns