1 files changed, 10 insertions, 16 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/schema_test.rb b/activerecord/test/cases/adapters/mysql2/schema_test.rb
index 17e674e652..43957791b1 100644
--- a/activerecord/test/cases/adapters/mysql2/schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/schema_test.rb
@@ -20,10 +20,6 @@ module ActiveRecord
         end
       end
 
-      class MysqlDouble < ActiveRecord::Base
-        self.table_name = "mysql_doubles"
-      end
-
       def test_float_limits
         @connection.create_table :mysql_doubles do |t|
           t.float :float_no_limit
@@ -35,15 +31,13 @@ module ActiveRecord
           t.float :float_25, limit: 25
         end
 
-        MysqlDouble.reset_column_information
-
-        column_no_limit = MysqlDouble.columns.find { |c| c.name == 'float_no_limit' }
-        column_short = MysqlDouble.columns.find { |c| c.name == 'float_short' }
-        column_long = MysqlDouble.columns.find { |c| c.name == 'float_long' }
+        column_no_limit = @connection.columns(:mysql_doubles).find { |c| c.name == 'float_no_limit' }
+        column_short = @connection.columns(:mysql_doubles).find { |c| c.name == 'float_short' }
+        column_long = @connection.columns(:mysql_doubles).find { |c| c.name == 'float_long' }
 
-        column_23 = MysqlDouble.columns.find { |c| c.name == 'float_23' }
-        column_24 = MysqlDouble.columns.find { |c| c.name == 'float_24' }
-        column_25 = MysqlDouble.columns.find { |c| c.name == 'float_25' }
+        column_23 = @connection.columns(:mysql_doubles).find { |c| c.name == 'float_23' }
+        column_24 = @connection.columns(:mysql_doubles).find { |c| c.name == 'float_24' }
+        column_25 = @connection.columns(:mysql_doubles).find { |c| c.name == 'float_25' }
 
         # Mysql floats are precision 0..24, Mysql doubles are precision 25..53
         assert_equal 24, column_no_limit.limit
@@ -65,13 +59,13 @@ module ActiveRecord
         assert_equal 'id', @omgpost.primary_key
       end
 
-      def test_table_exists?
+      def test_data_source_exists?
         name = @omgpost.table_name
-        assert @connection.table_exists?(name), "#{name} table should exist"
+        assert @connection.data_source_exists?(name), "#{name} data_source should exist"
       end
 
-      def test_table_exists_wrong_schema
-        assert(!@connection.table_exists?("#{@db_name}.zomg"), "table should not exist")
+      def test_data_source_exists_wrong_schema
+        assert(!@connection.data_source_exists?("#{@db_name}.zomg"), "data_source should not exist")
       end
 
       def test_dump_indexes