Merge remote-tracking branch 'origin/master' into guides-template-inheritance

1 files changed, 19 insertions, 15 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 a1c370b05d..037fb69dfb 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -1,4 +1,5 @@
 require 'arel/visitors/bind_visitor'
+require 'active_support/core_ext/string/strip'
 
 module ActiveRecord
   module ConnectionAdapters
@@ -161,10 +162,6 @@ module ActiveRecord
         end
       end
 
-      def adapter_name #:nodoc:
-        self.class::ADAPTER_NAME
-      end
-
       # Returns true, since this connection adapter supports migrations.
       def supports_migrations?
         true
@@ -200,6 +197,10 @@ module ActiveRecord
         true
       end
 
+      def supports_views?
+        version[0] >= 5
+      end
+
       def native_database_types
         NATIVE_DATABASE_TYPES
       end
@@ -639,18 +640,21 @@ module ActiveRecord
 
       def initialize_type_map(m) # :nodoc:
         super
+
         m.register_type(%r(enum)i) do |sql_type|
           limit = sql_type[/^enum\((.+)\)/i, 1]
             .split(',').map{|enum| enum.strip.length - 2}.max
           Type::String.new(limit: limit)
         end
 
-        m.register_type %r(tinytext)i,   Type::Text.new(limit: 255)
-        m.register_type %r(tinyblob)i,   Type::Binary.new(limit: 255)
-        m.register_type %r(mediumtext)i, Type::Text.new(limit: 16777215)
-        m.register_type %r(mediumblob)i, Type::Binary.new(limit: 16777215)
-        m.register_type %r(longtext)i,   Type::Text.new(limit: 2147483647)
-        m.register_type %r(longblob)i,   Type::Binary.new(limit: 2147483647)
+        m.register_type %r(tinytext)i,   Type::Text.new(limit: 2**8 - 1)
+        m.register_type %r(tinyblob)i,   Type::Binary.new(limit: 2**8 - 1)
+        m.register_type %r(text)i,       Type::Text.new(limit: 2**16 - 1)
+        m.register_type %r(blob)i,       Type::Binary.new(limit: 2**16 - 1)
+        m.register_type %r(mediumtext)i, Type::Text.new(limit: 2**24 - 1)
+        m.register_type %r(mediumblob)i, Type::Binary.new(limit: 2**24 - 1)
+        m.register_type %r(longtext)i,   Type::Text.new(limit: 2**32 - 1)
+        m.register_type %r(longblob)i,   Type::Binary.new(limit: 2**32 - 1)
         m.register_type %r(^bigint)i,    Type::Integer.new(limit: 8)
         m.register_type %r(^int)i,       Type::Integer.new(limit: 4)
         m.register_type %r(^mediumint)i, Type::Integer.new(limit: 3)
@@ -782,10 +786,6 @@ module ActiveRecord
         full_version =~ /mariadb/i
       end
 
-      def supports_views?
-        version[0] >= 5
-      end
-
       def supports_rename_index?
         mariadb? ? false : (version[0] == 5 && version[1] >= 7) || version[0] >= 6
       end
@@ -812,7 +812,11 @@ module ActiveRecord
         # NAMES does not have an equals sign, see
         # http://dev.mysql.com/doc/refman/5.0/en/set-statement.html#id944430
         # (trailing comma because variable_assignments will always have content)
-        encoding = "NAMES #{@config[:encoding]}, " if @config[:encoding]
+        if @config[:encoding]
+          encoding = "NAMES #{@config[:encoding]}"
+          encoding << " COLLATE #{@config[:collation]}" if @config[:collation]
+          encoding << ", "
+        end
 
         # Gather up all of the SET variables...
         variable_assignments = variables.map do |k, v|