aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-06-23 23:42:06 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-06-23 23:42:06 -0700
commitf6520b7dc7e460c62ba36dc761e39480bf77fe83 (patch)
tree6d779bd26ee691444946dbb14390a0f7a20977cc /activerecord/test/cases
parentb40947432540ad29abacaad9d9254bf70048190d (diff)
downloadrails-f6520b7dc7e460c62ba36dc761e39480bf77fe83.tar.gz
rails-f6520b7dc7e460c62ba36dc761e39480bf77fe83.tar.bz2
rails-f6520b7dc7e460c62ba36dc761e39480bf77fe83.zip
Test for tinyint
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/migration_test.rb2
-rw-r--r--activerecord/test/cases/schema_dumper_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 4735f136df..908951590c 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -175,7 +175,7 @@ if ActiveRecord::Base.connection.supports_migrations?
assert_equal 'bigint', eight.sql_type
elsif current_adapter?(:MysqlAdapter)
assert_match /^int\(\d+\)/, default.sql_type
- assert_match /^smallint\(\d+\)/, one.sql_type
+ assert_match /^tinyint\(\d+\)/, one.sql_type
assert_match /^int\(\d+\)/, four.sql_type
assert_match /^bigint\(\d+\)/, eight.sql_type
elsif current_adapter?(:OracleAdapter)
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb
index 942d686b92..ee7e285a73 100644
--- a/activerecord/test/cases/schema_dumper_test.rb
+++ b/activerecord/test/cases/schema_dumper_test.rb
@@ -90,7 +90,7 @@ class SchemaDumperTest < ActiveRecord::TestCase
assert_match %r{c_int_4.*}, output
assert_no_match %r{c_int_4.*:limit}, output
elsif current_adapter?(:MysqlAdapter)
- assert_match %r{c_int_1.*:limit => 2}, output
+ assert_match %r{c_int_1.*:limit => 1}, output
assert_match %r{c_int_2.*:limit => 2}, output
assert_match %r{c_int_3.*:limit => 3}, output