aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2015-11-05 18:19:44 +0900
committerRyuta Kamizono <kamipo@gmail.com>2015-11-05 18:19:44 +0900
commitc723bca93a021f040cd2bcf7d35bec1bc6aacdee (patch)
treeb7ae4d104927c44dc3dacfb96884924319e48236 /activerecord
parent175515ad8bdbe1f87a52c3023d35d434b48e35fc (diff)
downloadrails-c723bca93a021f040cd2bcf7d35bec1bc6aacdee.tar.gz
rails-c723bca93a021f040cd2bcf7d35bec1bc6aacdee.tar.bz2
rails-c723bca93a021f040cd2bcf7d35bec1bc6aacdee.zip
No need `MysqlDouble` and `MysqlDouble.reset_column_information`
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/adapters/mysql/schema_test.rb18
-rw-r--r--activerecord/test/cases/adapters/mysql2/schema_test.rb18
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