Merge pull request rails#15621 from sgrif/sg-column-type-decorations

No need to decorate columns twice

Author: rafaelfranca

activerecord/lib/active_record/persistence.rb

@@ -48,7 +48,6 @@ def create(attributes = nil, &block)
       # how this "single-table" inheritance mapping is implemented.
       def instantiate(attributes, column_types = {})
         klass = discriminate_class_for_record(attributes)
-        column_types = klass.decorate_columns(column_types.dup)
         klass.allocate.init_with(
           'raw_attributes' => attributes,
           'column_types' => column_types,

activerecord/lib/active_record/querying.rb

@@ -40,7 +40,7 @@ def find_by_sql(sql, binds = [])
       column_types = {}
 
       if result_set.respond_to? :column_types
-        column_types = result_set.column_types.merge(columns_hash)
+        column_types = result_set.column_types.except(*columns_hash.keys)
       else
         ActiveSupport::Deprecation.warn "the object returned from `select_all` must respond to `column_types`"
       end