aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorYasuo Honda <yasuo.honda@gmail.com>2016-10-13 22:24:49 +0000
committerYasuo Honda <yasuo.honda@gmail.com>2016-10-13 22:31:58 +0000
commit32fc0331227ab9b14c875837ea66be8ee70ab96b (patch)
treed7d45d0c1c3d940a8e6df3ead4e36469f62502e4 /activerecord
parente10e3c7da215ef848db7592068993f14aac00fa6 (diff)
downloadrails-32fc0331227ab9b14c875837ea66be8ee70ab96b.tar.gz
rails-32fc0331227ab9b14c875837ea66be8ee70ab96b.tar.bz2
rails-32fc0331227ab9b14c875837ea66be8ee70ab96b.zip
Support index.length for MySQL 8.0.0-dmr
MySQL 8.0.0-dmr `SUB_PART` column of `information_schema.statistics` changed to varbinary(12), which is bigint(3) in MySQL 5.6. Addresses #26774
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb2
1 files changed, 1 insertions, 1 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 003ba6eff5..e7bd0e7c12 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -388,7 +388,7 @@ module ActiveRecord
end
indexes.last.columns << row[:Column_name]
- indexes.last.lengths.merge!(row[:Column_name] => row[:Sub_part]) if row[:Sub_part]
+ indexes.last.lengths.merge!(row[:Column_name] => row[:Sub_part].to_i) if row[:Sub_part]
end
end