diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-27 10:21:18 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-27 10:21:18 -0800 |
| commit | a19dd29e554ee9578bb7f95a35bc5712bb06ab4d (patch) | |
| tree | 28f83ed288ec3ed193bbc2fd508036f013008782 /activerecord/test | |
| parent | 9ad7767aba737fc19496a5475083c45048210180 (diff) | |
| parent | fe7cacb5106cd240e4d18ae518fa4e56c7e4ec5d (diff) | |
| download | rails-a19dd29e554ee9578bb7f95a35bc5712bb06ab4d.tar.gz rails-a19dd29e554ee9578bb7f95a35bc5712bb06ab4d.tar.bz2 rails-a19dd29e554ee9578bb7f95a35bc5712bb06ab4d.zip | |
Merge pull request #5173 from kennyj/fix_3931-2
Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931 (Try again).
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/schema/mysql2_specific_schema.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/schema/mysql_specific_schema.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/schema/mysql2_specific_schema.rb b/activerecord/test/schema/mysql2_specific_schema.rb index ab2c7ccc10..65b6f9f227 100644 --- a/activerecord/test/schema/mysql2_specific_schema.rb +++ b/activerecord/test/schema/mysql2_specific_schema.rb @@ -1,5 +1,5 @@ ActiveRecord::Schema.define do - create_table :binary_fields, :force => true, :options => 'CHARACTER SET latin1' do |t| + create_table :binary_fields, :force => true do |t| t.binary :tiny_blob, :limit => 255 t.binary :normal_blob, :limit => 65535 t.binary :medium_blob, :limit => 16777215 @@ -32,4 +32,4 @@ CREATE TABLE collation_tests ( ) CHARACTER SET utf8 COLLATE utf8_general_ci SQL -end
\ No newline at end of file +end diff --git a/activerecord/test/schema/mysql_specific_schema.rb b/activerecord/test/schema/mysql_specific_schema.rb index a0adfe3752..7d324f98c4 100644 --- a/activerecord/test/schema/mysql_specific_schema.rb +++ b/activerecord/test/schema/mysql_specific_schema.rb @@ -1,5 +1,5 @@ ActiveRecord::Schema.define do - create_table :binary_fields, :force => true, :options => 'CHARACTER SET latin1' do |t| + create_table :binary_fields, :force => true do |t| t.binary :tiny_blob, :limit => 255 t.binary :normal_blob, :limit => 65535 t.binary :medium_blob, :limit => 16777215 |