Merge pull request #15151 from sgrif/sg-add-type-to-column

Add a type object to Column constructor

5 files changed, 46 insertions, 45 deletions

diff --git a/activerecord/test/active_record/connection_adapters/fake_adapter.rb b/activerecord/test/active_record/connection_adapters/fake_adapter.rb
index 59324c4857..64cde143a1 100644
--- a/activerecord/test/active_record/connection_adapters/fake_adapter.rb
+++ b/activerecord/test/active_record/connection_adapters/fake_adapter.rb
@@ -29,6 +29,7 @@ module ActiveRecord
         @columns[table_name] << ActiveRecord::ConnectionAdapters::Column.new(
           name.to_s,
           options[:default],
+          lookup_cast_type(sql_type.to_s),
           sql_type.to_s,
           options[:null])
       end
diff --git a/activerecord/test/cases/adapters/mysql/quoting_test.rb b/activerecord/test/cases/adapters/mysql/quoting_test.rb
index 3d1330efb8..f650e3fde8 100644
--- a/activerecord/test/cases/adapters/mysql/quoting_test.rb
+++ b/activerecord/test/cases/adapters/mysql/quoting_test.rb
@@ -9,13 +9,13 @@ module ActiveRecord
         end
 
         def test_type_cast_true
-          c = Column.new(nil, 1, 'boolean')
+          c = Column.new(nil, 1, Type::Value.new, 'boolean')
           assert_equal 1, @conn.type_cast(true, nil)
           assert_equal 1, @conn.type_cast(true, c)
         end
 
         def test_type_cast_false
-          c = Column.new(nil, 1, 'boolean')
+          c = Column.new(nil, 1, Type::Value.new, 'boolean')
           assert_equal 0, @conn.type_cast(false, nil)
           assert_equal 0, @conn.type_cast(false, c)
         end
diff --git a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
index e4b69fdf7b..63170e710e 100644
--- a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
@@ -47,13 +47,13 @@ module ActiveRecord
         end
 
         def test_type_cast_true
-          c = Column.new(nil, 1, 'int')
+          c = Column.new(nil, 1, Type::Value.new, 'int')
           assert_equal 't', @conn.type_cast(true, nil)
           assert_equal 1, @conn.type_cast(true, c)
         end
 
         def test_type_cast_false
-          c = Column.new(nil, 1, 'int')
+          c = Column.new(nil, 1, Type::Value.new, 'int')
           assert_equal 'f', @conn.type_cast(false, nil)
           assert_equal 0, @conn.type_cast(false, c)
         end
@@ -61,16 +61,16 @@ module ActiveRecord
         def test_type_cast_string
           assert_equal '10', @conn.type_cast('10', nil)
 
-          c = Column.new(nil, 1, 'int')
+          c = Column.new(nil, 1, Type::Value.new, 'int')
           assert_equal 10, @conn.type_cast('10', c)
 
-          c = Column.new(nil, 1, 'float')
+          c = Column.new(nil, 1, Type::Value.new, 'float')
           assert_equal 10.1, @conn.type_cast('10.1', c)
 
-          c = Column.new(nil, 1, 'binary')
+          c = Column.new(nil, 1, Type::Value.new, 'binary')
           assert_equal '10.1', @conn.type_cast('10.1', c)
 
-          c = Column.new(nil, 1, 'date')
+          c = Column.new(nil, 1, Type::Value.new, 'date')
           assert_equal '10.1', @conn.type_cast('10.1', c)
         end
 
diff --git a/activerecord/test/cases/column_definition_test.rb b/activerecord/test/cases/column_definition_test.rb
index c1dd1f1c69..33aba6421e 100644
--- a/activerecord/test/cases/column_definition_test.rb
+++ b/activerecord/test/cases/column_definition_test.rb
@@ -12,13 +12,13 @@ module ActiveRecord
       end
 
       def test_can_set_coder
-        column = Column.new("title", nil, "varchar(20)")
+        column = Column.new("title", nil, Type::Value.new, "varchar(20)")
         column.coder = YAML
         assert_equal YAML, column.coder
       end
 
       def test_encoded?
-        column = Column.new("title", nil, "varchar(20)")
+        column = Column.new("title", nil, Type::Value.new, "varchar(20)")
         assert !column.encoded?
 
         column.coder = YAML
@@ -26,7 +26,7 @@ module ActiveRecord
       end
 
       def test_type_case_coded_column
-        column = Column.new("title", nil, "varchar(20)")
+        column = Column.new("title", nil, Type::Value.new, "varchar(20)")
         column.coder = YAML
         assert_equal "hello", column.type_cast("--- hello")
       end
@@ -34,7 +34,7 @@ module ActiveRecord
       # Avoid column definitions in create table statements like:
       # `title` varchar(255) DEFAULT NULL
       def test_should_not_include_default_clause_when_default_is_null
-        column = Column.new("title", nil, "varchar(20)")
+        column = Column.new("title", nil, Type::Value.new, "varchar(20)")
         column_def = ColumnDefinition.new(
           column.name, "string",
           column.limit, column.precision, column.scale, column.default, column.null)
@@ -42,7 +42,7 @@ module ActiveRecord
       end
 
       def test_should_include_default_clause_when_default_is_present
-        column = Column.new("title", "Hello", "varchar(20)")
+        column = Column.new("title", "Hello", Type::Value.new, "varchar(20)")
         column_def = ColumnDefinition.new(
           column.name, "string",
           column.limit, column.precision, column.scale, column.default, column.null)
@@ -50,7 +50,7 @@ module ActiveRecord
       end
 
       def test_should_specify_not_null_if_null_option_is_false
-        column = Column.new("title", "Hello", "varchar(20)", false)
+        column = Column.new("title", "Hello", Type::Value.new, "varchar(20)", false)
         column_def = ColumnDefinition.new(
           column.name, "string",
           column.limit, column.precision, column.scale, column.default, column.null)
@@ -59,68 +59,68 @@ module ActiveRecord
 
       if current_adapter?(:MysqlAdapter)
         def test_should_set_default_for_mysql_binary_data_types
-          binary_column = MysqlAdapter::Column.new("title", "a", "binary(1)")
+          binary_column = MysqlAdapter::Column.new("title", "a", Type::Value.new, "binary(1)")
           assert_equal "a", binary_column.default
 
-          varbinary_column = MysqlAdapter::Column.new("title", "a", "varbinary(1)")
+          varbinary_column = MysqlAdapter::Column.new("title", "a", Type::Value.new, "varbinary(1)")
           assert_equal "a", varbinary_column.default
         end
 
         def test_should_not_set_default_for_blob_and_text_data_types
           assert_raise ArgumentError do
-            MysqlAdapter::Column.new("title", "a", "blob")
+            MysqlAdapter::Column.new("title", "a", Type::Value.new, "blob")
           end
 
           assert_raise ArgumentError do
-            MysqlAdapter::Column.new("title", "Hello", "text")
+            MysqlAdapter::Column.new("title", "Hello", Type::Value.new, "text")
           end
 
-          text_column = MysqlAdapter::Column.new("title", nil, "text")
+          text_column = MysqlAdapter::Column.new("title", nil, Type::Value.new, "text")
           assert_equal nil, text_column.default
 
-          not_null_text_column = MysqlAdapter::Column.new("title", nil, "text", false)
+          not_null_text_column = MysqlAdapter::Column.new("title", nil, Type::Value.new, "text", false)
           assert_equal "", not_null_text_column.default
         end
 
         def test_has_default_should_return_false_for_blob_and_text_data_types
-          blob_column = MysqlAdapter::Column.new("title", nil, "blob")
+          blob_column = MysqlAdapter::Column.new("title", nil, Type::Value.new, "blob")
           assert !blob_column.has_default?
 
-          text_column = MysqlAdapter::Column.new("title", nil, "text")
+          text_column = MysqlAdapter::Column.new("title", nil, Type::Value.new, "text")
           assert !text_column.has_default?
         end
       end
 
       if current_adapter?(:Mysql2Adapter)
         def test_should_set_default_for_mysql_binary_data_types
-          binary_column = Mysql2Adapter::Column.new("title", "a", "binary(1)")
+          binary_column = Mysql2Adapter::Column.new("title", "a", Type::Value.new, "binary(1)")
           assert_equal "a", binary_column.default
 
-          varbinary_column = Mysql2Adapter::Column.new("title", "a", "varbinary(1)")
+          varbinary_column = Mysql2Adapter::Column.new("title", "a", Type::Value.new, "varbinary(1)")
           assert_equal "a", varbinary_column.default
         end
 
         def test_should_not_set_default_for_blob_and_text_data_types
           assert_raise ArgumentError do
-            Mysql2Adapter::Column.new("title", "a", "blob")
+            Mysql2Adapter::Column.new("title", "a", Type::Value.new, "blob")
           end
 
           assert_raise ArgumentError do
-            Mysql2Adapter::Column.new("title", "Hello", "text")
+            Mysql2Adapter::Column.new("title", "Hello", Type::Value.new, "text")
           end
 
-          text_column = Mysql2Adapter::Column.new("title", nil, "text")
+          text_column = Mysql2Adapter::Column.new("title", nil, Type::Value.new, "text")
           assert_equal nil, text_column.default
 
-          not_null_text_column = Mysql2Adapter::Column.new("title", nil, "text", false)
+          not_null_text_column = Mysql2Adapter::Column.new("title", nil, Type::Value.new, "text", false)
           assert_equal "", not_null_text_column.default
         end
 
         def test_has_default_should_return_false_for_blob_and_text_data_types
-          blob_column = Mysql2Adapter::Column.new("title", nil, "blob")
+          blob_column = Mysql2Adapter::Column.new("title", nil, Type::Value.new, "blob")
           assert !blob_column.has_default?
 
-          text_column = Mysql2Adapter::Column.new("title", nil, "text")
+          text_column = Mysql2Adapter::Column.new("title", nil, Type::Value.new, "text")
           assert !text_column.has_default?
         end
       end
diff --git a/activerecord/test/cases/column_test.rb b/activerecord/test/cases/column_test.rb
index 39489c3718..c2135d75da 100644
--- a/activerecord/test/cases/column_test.rb
+++ b/activerecord/test/cases/column_test.rb
@@ -5,7 +5,7 @@ module ActiveRecord
   module ConnectionAdapters
     class ColumnTest < ActiveRecord::TestCase
       def test_type_cast_boolean
-        column = Column.new("field", nil, "boolean")
+        column = Column.new("field", nil, Type::Value.new, "boolean")
         assert column.type_cast('').nil?
         assert column.type_cast(nil).nil?
 
@@ -36,14 +36,14 @@ module ActiveRecord
       end
 
       def test_type_cast_string
-        column = Column.new("field", nil, "varchar")
+        column = Column.new("field", nil, Type::Value.new, "varchar")
         assert_equal "1", column.type_cast(true)
         assert_equal "0", column.type_cast(false)
         assert_equal "123", column.type_cast(123)
       end
 
       def test_type_cast_integer
-        column = Column.new("field", nil, "integer")
+        column = Column.new("field", nil, Type::Value.new, "integer")
         assert_equal 1, column.type_cast(1)
         assert_equal 1, column.type_cast('1')
         assert_equal 1, column.type_cast('1ignore')
@@ -56,50 +56,50 @@ module ActiveRecord
       end
 
       def test_type_cast_non_integer_to_integer
-        column = Column.new("field", nil, "integer")
+        column = Column.new("field", nil, Type::Value.new, "integer")
         assert_nil column.type_cast([1,2])
         assert_nil column.type_cast({1 => 2})
         assert_nil column.type_cast((1..2))
       end
 
       def test_type_cast_activerecord_to_integer
-        column = Column.new("field", nil, "integer")
+        column = Column.new("field", nil, Type::Value.new, "integer")
         firm = Firm.create(:name => 'Apple')
         assert_nil column.type_cast(firm)
       end
 
       def test_type_cast_object_without_to_i_to_integer
-        column = Column.new("field", nil, "integer")
+        column = Column.new("field", nil, Type::Value.new, "integer")
         assert_nil column.type_cast(Object.new)
       end
 
       def test_type_cast_nan_and_infinity_to_integer
-        column = Column.new("field", nil, "integer")
+        column = Column.new("field", nil, Type::Value.new, "integer")
         assert_nil column.type_cast(Float::NAN)
         assert_nil column.type_cast(1.0/0.0)
       end
 
       def test_type_cast_float
-        column = Column.new("field", nil, "float")
+        column = Column.new("field", nil, Type::Value.new, "float")
         assert_equal 1.0, column.type_cast("1")
       end
 
       def test_type_cast_decimal
-        column = Column.new("field", nil, "decimal")
+        column = Column.new("field", nil, Type::Value.new, "decimal")
         assert_equal BigDecimal.new("0"), column.type_cast(BigDecimal.new("0"))
         assert_equal BigDecimal.new("123"), column.type_cast(123.0)
         assert_equal BigDecimal.new("1"), column.type_cast(:"1")
       end
 
       def test_type_cast_binary
-        column = Column.new("field", nil, "binary")
+        column = Column.new("field", nil, Type::Value.new, "binary")
         assert_equal nil, column.type_cast(nil)
         assert_equal "1", column.type_cast("1")
         assert_equal 1, column.type_cast(1)
       end
 
       def test_type_cast_time
-        column = Column.new("field", nil, "time")
+        column = Column.new("field", nil, Type::Value.new, "time")
         assert_equal nil, column.type_cast(nil)
         assert_equal nil, column.type_cast('')
         assert_equal nil, column.type_cast('ABC')
@@ -109,7 +109,7 @@ module ActiveRecord
       end
 
       def test_type_cast_datetime_and_timestamp
-        [Column.new("field", nil, "datetime"), Column.new("field", nil, "timestamp")].each do |column|
+        [Column.new("field", nil, Type::Value.new, "datetime"), Column.new("field", nil, Type::Value.new, "timestamp")].each do |column|
           assert_equal nil, column.type_cast(nil)
           assert_equal nil, column.type_cast('')
           assert_equal nil, column.type_cast('  ')
@@ -121,7 +121,7 @@ module ActiveRecord
       end
 
       def test_type_cast_date
-        column = Column.new("field", nil, "date")
+        column = Column.new("field", nil, Type::Value.new, "date")
         assert_equal nil, column.type_cast(nil)
         assert_equal nil, column.type_cast('')
         assert_equal nil, column.type_cast(' ')
@@ -132,7 +132,7 @@ module ActiveRecord
       end
 
       def test_type_cast_duration_to_integer
-        column = Column.new("field", nil, "integer")
+        column = Column.new("field", nil, Type::Value.new, "integer")
         assert_equal 1800, column.type_cast(30.minutes)
         assert_equal 7200, column.type_cast(2.hours)
       end
@@ -147,7 +147,7 @@ module ActiveRecord
 
       if current_adapter?(:SQLite3Adapter)
         def test_binary_encoding
-          column = SQLite3Column.new("field", nil, "binary")
+          column = SQLite3Column.new("field", nil, Type::Value.new, "binary")
           utf8_string = "a string".encode(Encoding::UTF_8)
           type_cast = column.type_cast(utf8_string)