Create an AbstractMysqlAdapter to abstract the common code between MysqlAdapter and Mysql2Adapter.

1 files changed, 16 insertions, 16 deletions

diff --git a/activerecord/test/cases/column_definition_test.rb b/activerecord/test/cases/column_definition_test.rb
index d1dddd4c2c..14884e42af 100644
--- a/activerecord/test/cases/column_definition_test.rb
+++ b/activerecord/test/cases/column_definition_test.rb
@@ -58,68 +58,68 @@ module ActiveRecord
 
       if current_adapter?(:MysqlAdapter)
         def test_should_set_default_for_mysql_binary_data_types
-          binary_column = MysqlColumn.new("title", "a", "binary(1)")
+          binary_column = MysqlAdapter::Column.new("title", "a", "binary(1)")
           assert_equal "a", binary_column.default
 
-          varbinary_column = MysqlColumn.new("title", "a", "varbinary(1)")
+          varbinary_column = MysqlAdapter::Column.new("title", "a", "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
-            MysqlColumn.new("title", "a", "blob")
+            MysqlAdapter::Column.new("title", "a", "blob")
           end
 
           assert_raise ArgumentError do
-            MysqlColumn.new("title", "Hello", "text")
+            MysqlAdapter::Column.new("title", "Hello", "text")
           end
 
-          text_column = MysqlColumn.new("title", nil, "text")
+          text_column = MysqlAdapter::Column.new("title", nil, "text")
           assert_equal nil, text_column.default
 
-          not_null_text_column = MysqlColumn.new("title", nil, "text", false)
+          not_null_text_column = MysqlAdapter::Column.new("title", nil, "text", false)
           assert_equal "", not_null_text_column.default
         end
 
         def test_has_default_should_return_false_for_blog_and_test_data_types
-          blob_column = MysqlColumn.new("title", nil, "blob")
+          blob_column = MysqlAdapter::Column.new("title", nil, "blob")
           assert !blob_column.has_default?
 
-          text_column = MysqlColumn.new("title", nil, "text")
+          text_column = MysqlAdapter::Column.new("title", nil, "text")
           assert !text_column.has_default?
         end
       end
 
       if current_adapter?(:Mysql2Adapter)
         def test_should_set_default_for_mysql_binary_data_types
-          binary_column = Mysql2Column.new("title", "a", "binary(1)")
+          binary_column = Mysql2Adapter::Column.new("title", "a", "binary(1)")
           assert_equal "a", binary_column.default
 
-          varbinary_column = Mysql2Column.new("title", "a", "varbinary(1)")
+          varbinary_column = Mysql2Adapter::Column.new("title", "a", "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
-            Mysql2Column.new("title", "a", "blob")
+            Mysql2Adapter::Column.new("title", "a", "blob")
           end
 
           assert_raise ArgumentError do
-            Mysql2Column.new("title", "Hello", "text")
+            Mysql2Adapter::Column.new("title", "Hello", "text")
           end
 
-          text_column = Mysql2Column.new("title", nil, "text")
+          text_column = Mysql2Adapter::Column.new("title", nil, "text")
           assert_equal nil, text_column.default
 
-          not_null_text_column = Mysql2Column.new("title", nil, "text", false)
+          not_null_text_column = Mysql2Adapter::Column.new("title", nil, "text", false)
           assert_equal "", not_null_text_column.default
         end
 
         def test_has_default_should_return_false_for_blog_and_test_data_types
-          blob_column = Mysql2Column.new("title", nil, "blob")
+          blob_column = Mysql2Adapter::Column.new("title", nil, "blob")
           assert !blob_column.has_default?
 
-          text_column = Mysql2Column.new("title", nil, "text")
+          text_column = Mysql2Adapter::Column.new("title", nil, "text")
           assert !text_column.has_default?
         end
       end