aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-09-13 03:47:54 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-09-13 03:47:54 -0300
commit602ec7a4a21846db74f0371eb27784f19f80e28c (patch)
treef7461644d161e8d16487fbb177b4f5acd99cdf8a
parent65f189da2d3a91ffc73673190fbc39012dbbcfc2 (diff)
parent48ec433ea247d9a360a6bc8b253e2cef26d6be61 (diff)
downloadrails-602ec7a4a21846db74f0371eb27784f19f80e28c.tar.gz
rails-602ec7a4a21846db74f0371eb27784f19f80e28c.tar.bz2
rails-602ec7a4a21846db74f0371eb27784f19f80e28c.zip
Merge pull request #21591 from kamipo/text_and_blob_limit_is_byte_length
TEXT and BLOB limit is byte length, not character length.
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index 17efc3025e..597f0d0597 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -1027,7 +1027,7 @@ module ActiveRecord
when 0..0xfff; "varbinary(#{limit})"
when nil; "blob"
when 0x1000..0xffffffff; "blob(#{limit})"
- else raise(ActiveRecordError, "No binary type has character length #{limit}")
+ else raise(ActiveRecordError, "No binary type has byte length #{limit}")
end
end
@@ -1048,7 +1048,7 @@ module ActiveRecord
when nil, 0x100..0xffff; 'text'
when 0x10000..0xffffff; 'mediumtext'
when 0x1000000..0xffffffff; 'longtext'
- else raise(ActiveRecordError, "No text type has character length #{limit}")
+ else raise(ActiveRecordError, "No text type has byte length #{limit}")
end
end