diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-11-05 10:05:16 -0500 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-11-05 10:05:16 -0500 |
| commit | b2e1b514b2e61790c7b220a3c4d4f1fabeb10137 (patch) | |
| tree | 95eeefaadf5f3a352f10ca8791621bd71876a5b8 | |
| parent | 175992285b4ba1f9a69a8fba4f1cc90d267323c2 (diff) | |
| parent | c723bca93a021f040cd2bcf7d35bec1bc6aacdee (diff) | |
| download | rails-b2e1b514b2e61790c7b220a3c4d4f1fabeb10137.tar.gz rails-b2e1b514b2e61790c7b220a3c4d4f1fabeb10137.tar.bz2 rails-b2e1b514b2e61790c7b220a3c4d4f1fabeb10137.zip | |
Merge pull request #22189 from kamipo/no_need_mysql_doubles_reset_column_information
No need `MysqlDouble` and `MysqlDouble.reset_column_information`
| -rw-r--r-- | activerecord/test/cases/adapters/mysql/schema_test.rb | 18 | ||||
| -rw-r--r-- | activerecord/test/cases/adapters/mysql2/schema_test.rb | 18 |
2 files changed, 12 insertions, 24 deletions
diff --git a/activerecord/test/cases/adapters/mysql/schema_test.rb b/activerecord/test/cases/adapters/mysql/schema_test.rb index 566324dcae..04bcf0d839 100644 --- a/activerecord/test/cases/adapters/mysql/schema_test.rb +++ b/activerecord/test/cases/adapters/mysql/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 diff --git a/activerecord/test/cases/adapters/mysql2/schema_test.rb b/activerecord/test/cases/adapters/mysql2/schema_test.rb index 17e674e652..0d9f07917c 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 |