Don't type cast the default on the column

If we want to have type decorators mess with the attribute, but not the
column, we need to stop type casting on the column. Where possible, we
changed the tests to test the value of `column_defaults`, which is
public API. `Column#default` is not.

2 files changed, 19 insertions, 12 deletions

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