diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-05-31 11:51:13 -0400 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-05-31 11:51:13 -0400 |
| commit | fc3bfdbdf5173df3fba5940dbc20175d7a1bf308 (patch) | |
| tree | e6a6911265a0f2678ddab3bfa07a1b8d81ad9da8 /activerecord/test/cases/adapters | |
| parent | c8be4574a2a35c896560ff58b26111ad6dd9d60f (diff) | |
| parent | 706f7e9c3e2a4807e37b1a1ef21febd6444adf6f (diff) | |
| download | rails-fc3bfdbdf5173df3fba5940dbc20175d7a1bf308.tar.gz rails-fc3bfdbdf5173df3fba5940dbc20175d7a1bf308.tar.bz2 rails-fc3bfdbdf5173df3fba5940dbc20175d7a1bf308.zip | |
Merge pull request #25213 from kamipo/do_not_include_default_column_limit
Do not include default column limit in schema.rb
Diffstat (limited to 'activerecord/test/cases/adapters')
| -rw-r--r-- | activerecord/test/cases/adapters/mysql2/charset_collation_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/charset_collation_test.rb b/activerecord/test/cases/adapters/mysql2/charset_collation_test.rb index 668c07dacb..c8028b6b36 100644 --- a/activerecord/test/cases/adapters/mysql2/charset_collation_test.rb +++ b/activerecord/test/cases/adapters/mysql2/charset_collation_test.rb @@ -49,6 +49,6 @@ class Mysql2CharsetCollationTest < ActiveRecord::Mysql2TestCase test "schema dump includes collation" do output = dump_table_schema("charset_collations") assert_match %r{t.string\s+"string_ascii_bin",\s+collation: "ascii_bin"$}, output - assert_match %r{t.text\s+"text_ucs2_unicode_ci",\s+limit: 65535,\s+collation: "ucs2_unicode_ci"$}, output + assert_match %r{t.text\s+"text_ucs2_unicode_ci",\s+collation: "ucs2_unicode_ci"$}, output end end |