Merge pull request #22189 from kamipo/no_need_mysql_doubles_reset_col…

…umn_information No need `MysqlDouble` and `MysqlDouble.reset_column_information`
rails · Nov 5, 2015 · b2e1b51 · b2e1b51
2 parents 1759922 + c723bca
commit b2e1b51
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 24 deletions.
diff --git a/activerecord/test/cases/adapters/mysql/schema_test.rb b/activerecord/test/cases/adapters/mysql/schema_test.rb
@@ -20,10 +20,6 @@ def self.name; 'Post'; end
         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 @@ def test_float_limits
           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

diff --git a/activerecord/test/cases/adapters/mysql2/schema_test.rb b/activerecord/test/cases/adapters/mysql2/schema_test.rb
@@ -20,10 +20,6 @@ def self.name; 'Post'; end
         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 @@ def test_float_limits
           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