activerecord 5.0.7.2 → 6.0.3.4

data/lib/active_record/migration/command_recorder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   class Migration
     # <tt>ActiveRecord::Migration::CommandRecorder</tt> records commands done during
@@ -12,6 +14,8 @@ module ActiveRecord
     # * change_column
     # * change_column_default (must supply a :from and :to option)
     # * change_column_null
+    # * change_column_comment (must supply a :from and :to option)
+    # * change_table_comment (must supply a :from and :to option)
     # * create_join_table
     # * create_table
     # * disable_extension
@@ -28,12 +32,14 @@ module ActiveRecord
     # * rename_index
     # * rename_table
     class CommandRecorder
-      ReversibleAndIrreversibleMethods = [:create_table, :create_join_table, :rename_table, :add_column, :remove_column,
+      ReversibleAndIrreversibleMethods = [
+        :create_table, :create_join_table, :rename_table, :add_column, :remove_column,
         :rename_index, :rename_column, :add_index, :remove_index, :add_timestamps, :remove_timestamps,
         :change_column_default, :add_reference, :remove_reference, :transaction,
         :drop_join_table, :drop_table, :execute_block, :enable_extension, :disable_extension,
         :change_column, :execute, :remove_columns, :change_column_null,
-        :add_foreign_key, :remove_foreign_key
+        :add_foreign_key, :remove_foreign_key,
+        :change_column_comment, :change_table_comment
       ]
       include JoinTable
 
@@ -83,7 +89,7 @@ module ActiveRecord
       # invert the +command+.
       def inverse_of(command, args, &block)
         method = :"invert_#{command}"
-        raise IrreversibleMigration, <<-MSG.strip_heredoc unless respond_to?(method, true)
+        raise IrreversibleMigration, <<~MSG unless respond_to?(method, true)
           This migration uses #{command}, which is not automatically reversible.
           To make the migration reversible you can either:
           1. Define #up and #down methods in place of the #change method.
@@ -92,147 +98,175 @@ module ActiveRecord
         send(method, args, &block)
       end
 
-      def respond_to?(*args) # :nodoc:
-        super || delegate.respond_to?(*args)
-      end
-
       ReversibleAndIrreversibleMethods.each do |method|
         class_eval <<-EOV, __FILE__, __LINE__ + 1
           def #{method}(*args, &block)          # def create_table(*args, &block)
             record(:"#{method}", args, &block)  #   record(:create_table, args, &block)
           end                                   # end
         EOV
+        ruby2_keywords(method) if respond_to?(:ruby2_keywords, true)
       end
       alias :add_belongs_to :add_reference
       alias :remove_belongs_to :remove_reference
 
-      def change_table(table_name, options = {}) # :nodoc:
+      def change_table(table_name, **options) # :nodoc:
         yield delegate.update_table_definition(table_name, self)
       end
 
+      def replay(migration)
+        commands.each do |cmd, args, block|
+          migration.send(cmd, *args, &block)
+        end
+      end
+
       private
+        module StraightReversions # :nodoc:
+          private
+            {
+              execute_block:     :execute_block,
+              create_table:      :drop_table,
+              create_join_table: :drop_join_table,
+              add_column:        :remove_column,
+              add_timestamps:    :remove_timestamps,
+              add_reference:     :remove_reference,
+              add_foreign_key:   :remove_foreign_key,
+              enable_extension:  :disable_extension
+            }.each do |cmd, inv|
+              [[inv, cmd], [cmd, inv]].uniq.each do |method, inverse|
+                class_eval <<-EOV, __FILE__, __LINE__ + 1
+                  def invert_#{method}(args, &block)    # def invert_create_table(args, &block)
+                    [:#{inverse}, args, block]          #   [:drop_table, args, block]
+                  end                                   # end
+                EOV
+              end
+            end
+        end
+
+        include StraightReversions
+
+        def invert_transaction(args)
+          sub_recorder = CommandRecorder.new(delegate)
+          sub_recorder.revert { yield }
+
+          invertions_proc = proc {
+            sub_recorder.replay(self)
+          }
+
+          [:transaction, args, invertions_proc]
+        end
 
-      module StraightReversions
-        private
-        { transaction:       :transaction,
-          execute_block:     :execute_block,
-          create_table:      :drop_table,
-          create_join_table: :drop_join_table,
-          add_column:        :remove_column,
-          add_timestamps:    :remove_timestamps,
-          add_reference:     :remove_reference,
-          enable_extension:  :disable_extension
-        }.each do |cmd, inv|
-          [[inv, cmd], [cmd, inv]].uniq.each do |method, inverse|
-            class_eval <<-EOV, __FILE__, __LINE__ + 1
-              def invert_#{method}(args, &block)    # def invert_create_table(args, &block)
-                [:#{inverse}, args, block]          #   [:drop_table, args, block]
-              end                                   # end
-            EOV
+        def invert_drop_table(args, &block)
+          if args.size == 1 && block == nil
+            raise ActiveRecord::IrreversibleMigration, "To avoid mistakes, drop_table is only reversible if given options or a block (can be empty)."
           end
+          super
         end
-      end
 
-      include StraightReversions
+        def invert_rename_table(args)
+          [:rename_table, args.reverse]
+        end
 
-      def invert_drop_table(args, &block)
-        if args.size == 1 && block == nil
-          raise ActiveRecord::IrreversibleMigration, "To avoid mistakes, drop_table is only reversible if given options or a block (can be empty)."
+        def invert_remove_column(args)
+          raise ActiveRecord::IrreversibleMigration, "remove_column is only reversible if given a type." if args.size <= 2
+          super
         end
-        super
-      end
 
-      def invert_rename_table(args)
-        [:rename_table, args.reverse]
-      end
+        def invert_rename_index(args)
+          [:rename_index, [args.first] + args.last(2).reverse]
+        end
 
-      def invert_remove_column(args)
-        raise ActiveRecord::IrreversibleMigration, "remove_column is only reversible if given a type." if args.size <= 2
-        super
-      end
+        def invert_rename_column(args)
+          [:rename_column, [args.first] + args.last(2).reverse]
+        end
 
-      def invert_rename_index(args)
-        [:rename_index, [args.first] + args.last(2).reverse]
-      end
+        def invert_add_index(args)
+          table, columns, options = *args
+          options ||= {}
 
-      def invert_rename_column(args)
-        [:rename_column, [args.first] + args.last(2).reverse]
-      end
+          options_hash = options.slice(:name, :algorithm)
+          options_hash[:column] = columns if !options_hash[:name]
+
+          [:remove_index, [table, options_hash]]
+        end
 
-      def invert_add_index(args)
-        table, columns, options = *args
-        options ||= {}
+        def invert_remove_index(args)
+          table, options_or_column = *args
+          if (options = options_or_column).is_a?(Hash)
+            unless options[:column]
+              raise ActiveRecord::IrreversibleMigration, "remove_index is only reversible if given a :column option."
+            end
+            options = options.dup
+            [:add_index, [table, options.delete(:column), options]]
+          elsif (column = options_or_column).present?
+            [:add_index, [table, column]]
+          end
+        end
 
-        index_name = options[:name]
-        options_hash = index_name ? { name: index_name } : { column: columns }
+        alias :invert_add_belongs_to :invert_add_reference
+        alias :invert_remove_belongs_to :invert_remove_reference
 
-        [:remove_index, [table, options_hash]]
-      end
+        def invert_change_column_default(args)
+          table, column, options = *args
 
-      def invert_remove_index(args)
-        table, options_or_column = *args
-        if (options = options_or_column).is_a?(Hash)
-          unless options[:column]
-            raise ActiveRecord::IrreversibleMigration, "remove_index is only reversible if given a :column option."
+          unless options && options.is_a?(Hash) && options.has_key?(:from) && options.has_key?(:to)
+            raise ActiveRecord::IrreversibleMigration, "change_column_default is only reversible if given a :from and :to option."
           end
-          options = options.dup
-          [:add_index, [table, options.delete(:column), options]]
-        elsif (column = options_or_column).present?
-          [:add_index, [table, column]]
+
+          [:change_column_default, [table, column, from: options[:to], to: options[:from]]]
         end
-      end
 
-      alias :invert_add_belongs_to :invert_add_reference
-      alias :invert_remove_belongs_to :invert_remove_reference
+        def invert_change_column_null(args)
+          args[2] = !args[2]
+          [:change_column_null, args]
+        end
 
-      def invert_change_column_default(args)
-        table, column, options = *args
+        def invert_remove_foreign_key(args)
+          options = args.extract_options!
+          from_table, to_table = args
 
-        unless options && options.is_a?(Hash) && options.has_key?(:from) && options.has_key?(:to)
-          raise ActiveRecord::IrreversibleMigration, "change_column_default is only reversible if given a :from and :to option."
-        end
+          to_table ||= options.delete(:to_table)
 
-        [:change_column_default, [table, column, from: options[:to], to: options[:from]]]
-      end
+          raise ActiveRecord::IrreversibleMigration, "remove_foreign_key is only reversible if given a second table" if to_table.nil?
 
-      def invert_change_column_null(args)
-        args[2] = !args[2]
-        [:change_column_null, args]
-      end
+          reversed_args = [from_table, to_table]
+          reversed_args << options unless options.empty?
 
-      def invert_add_foreign_key(args)
-        from_table, to_table, add_options = args
-        add_options ||= {}
+          [:add_foreign_key, reversed_args]
+        end
 
-        if add_options[:name]
-          options = { name: add_options[:name] }
-        elsif add_options[:column]
-          options = { column: add_options[:column] }
-        else
-          options = to_table
+        def invert_change_column_comment(args)
+          table, column, options = *args
+
+          unless options && options.is_a?(Hash) && options.has_key?(:from) && options.has_key?(:to)
+            raise ActiveRecord::IrreversibleMigration, "change_column_comment is only reversible if given a :from and :to option."
+          end
+
+          [:change_column_comment, [table, column, from: options[:to], to: options[:from]]]
         end
 
-        [:remove_foreign_key, [from_table, options]]
-      end
+        def invert_change_table_comment(args)
+          table, options = *args
 
-      def invert_remove_foreign_key(args)
-        from_table, to_table, remove_options = args
-        raise ActiveRecord::IrreversibleMigration, "remove_foreign_key is only reversible if given a second table" if to_table.nil? || to_table.is_a?(Hash)
+          unless options && options.is_a?(Hash) && options.has_key?(:from) && options.has_key?(:to)
+            raise ActiveRecord::IrreversibleMigration, "change_table_comment is only reversible if given a :from and :to option."
+          end
 
-        reversed_args = [from_table, to_table]
-        reversed_args << remove_options if remove_options
+          [:change_table_comment, [table, from: options[:to], to: options[:from]]]
+        end
 
-        [:add_foreign_key, reversed_args]
-      end
+        def respond_to_missing?(method, _)
+          super || delegate.respond_to?(method)
+        end
 
-      # Forwards any missing method call to the \target.
-      def method_missing(method, *args, &block)
-        if @delegate.respond_to?(method)
-          @delegate.send(method, *args, &block)
-        else
-          super
+        # Forwards any missing method call to the \target.
+        def method_missing(method, *args, &block)
+          if delegate.respond_to?(method)
+            delegate.public_send(method, *args, &block)
+          else
+            super
+          end
         end
-      end
+        ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
     end
   end
 end

data/lib/active_record/migration/compatibility.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   class Migration
     module Compatibility # :nodoc: all
@@ -5,61 +7,189 @@ module ActiveRecord
         version = version.to_s
         name = "V#{version.tr('.', '_')}"
         unless const_defined?(name)
-          versions = constants.grep(/\AV[0-9_]+\z/).map { |s| s.to_s.delete('V').tr('_', '.').inspect }
+          versions = constants.grep(/\AV[0-9_]+\z/).map { |s| s.to_s.delete("V").tr("_", ".").inspect }
           raise ArgumentError, "Unknown migration version #{version.inspect}; expected one of #{versions.sort.join(', ')}"
         end
         const_get(name)
       end
 
-      V5_0 = Current
+      V6_0 = Current
 
-      module FourTwoShared
+      class V5_2 < V6_0
         module TableDefinition
-          def references(*, **options)
-            options[:index] ||= false
+          def timestamps(**options)
+            options[:precision] ||= nil
             super
           end
-          alias :belongs_to :references
+        end
 
-          def timestamps(*, **options)
-            options[:null] = true if options[:null].nil?
+        module CommandRecorder
+          def invert_transaction(args, &block)
+            [:transaction, args, block]
+          end
+
+          def invert_change_column_comment(args)
+            table_name, column_name, comment = args
+            [:change_column_comment, [table_name, column_name, from: comment, to: comment]]
+          end
+
+          def invert_change_table_comment(args)
+            table_name, comment = args
+            [:change_table_comment, [table_name, from: comment, to: comment]]
+          end
+        end
+
+        def create_table(table_name, **options)
+          if block_given?
+            super { |t| yield compatible_table_definition(t) }
+          else
             super
           end
         end
 
-        def create_table(table_name, options = {})
+        def change_table(table_name, **options)
           if block_given?
-            super(table_name, options) do |t|
-              class << t
-                prepend TableDefinition
-              end
-              yield t
-            end
+            super { |t| yield compatible_table_definition(t) }
           else
             super
           end
         end
 
-        def change_table(table_name, options = {})
+        def create_join_table(table_1, table_2, **options)
           if block_given?
-            super(table_name, options) do |t|
-              class << t
-                prepend TableDefinition
-              end
-              yield t
+            super { |t| yield compatible_table_definition(t) }
+          else
+            super
+          end
+        end
+
+        def add_timestamps(table_name, **options)
+          options[:precision] ||= nil
+          super
+        end
+
+        private
+          def compatible_table_definition(t)
+            class << t
+              prepend TableDefinition
+            end
+            t
+          end
+
+          def command_recorder
+            recorder = super
+            class << recorder
+              prepend CommandRecorder
             end
+            recorder
+          end
+      end
+
+      class V5_1 < V5_2
+        def change_column(table_name, column_name, type, options = {})
+          if connection.adapter_name == "PostgreSQL"
+            super(table_name, column_name, type, options.except(:default, :null, :comment))
+            connection.change_column_default(table_name, column_name, options[:default]) if options.key?(:default)
+            connection.change_column_null(table_name, column_name, options[:null], options[:default]) if options.key?(:null)
+            connection.change_column_comment(table_name, column_name, options[:comment]) if options.key?(:comment)
           else
             super
           end
         end
 
-        def add_reference(*, **options)
+        def create_table(table_name, **options)
+          if connection.adapter_name == "Mysql2"
+            super(table_name, options: "ENGINE=InnoDB", **options)
+          else
+            super
+          end
+        end
+      end
+
+      class V5_0 < V5_1
+        module TableDefinition
+          def primary_key(name, type = :primary_key, **options)
+            type = :integer if type == :primary_key
+            super
+          end
+
+          def references(*args, **options)
+            super(*args, type: :integer, **options)
+          end
+          alias :belongs_to :references
+        end
+
+        def create_table(table_name, **options)
+          if connection.adapter_name == "PostgreSQL"
+            if options[:id] == :uuid && !options.key?(:default)
+              options[:default] = "uuid_generate_v4()"
+            end
+          end
+
+          unless connection.adapter_name == "Mysql2" && options[:id] == :bigint
+            if [:integer, :bigint].include?(options[:id]) && !options.key?(:default)
+              options[:default] = nil
+            end
+          end
+
+          # Since 5.1 PostgreSQL adapter uses bigserial type for primary
+          # keys by default and MySQL uses bigint. This compat layer makes old migrations utilize
+          # serial/int type instead -- the way it used to work before 5.1.
+          unless options.key?(:id)
+            options[:id] = :integer
+          end
+
+          super
+        end
+
+        def create_join_table(table_1, table_2, column_options: {}, **options)
+          column_options.reverse_merge!(type: :integer)
+          super
+        end
+
+        def add_column(table_name, column_name, type, **options)
+          if type == :primary_key
+            type = :integer
+            options[:primary_key] = true
+          end
+          super
+        end
+
+        def add_reference(table_name, ref_name, **options)
+          super(table_name, ref_name, type: :integer, **options)
+        end
+        alias :add_belongs_to :add_reference
+
+        private
+          def compatible_table_definition(t)
+            class << t
+              prepend TableDefinition
+            end
+            super
+          end
+      end
+
+      class V4_2 < V5_0
+        module TableDefinition
+          def references(*, **options)
+            options[:index] ||= false
+            super
+          end
+          alias :belongs_to :references
+
+          def timestamps(**options)
+            options[:null] = true if options[:null].nil?
+            super
+          end
+        end
+
+        def add_reference(table_name, ref_name, **options)
           options[:index] ||= false
           super
         end
         alias :add_belongs_to :add_reference
 
-        def add_timestamps(*, **options)
+        def add_timestamps(table_name, **options)
           options[:null] = true if options[:null].nil?
           super
         end
@@ -70,7 +200,7 @@ module ActiveRecord
             if options[:name].present?
               options[:name].to_s
             else
-              index_name(table_name, column: column_names)
+              connection.index_name(table_name, column: column_names)
             end
           super
         end
@@ -82,44 +212,32 @@ module ActiveRecord
         end
 
         private
-
-        def index_name_for_remove(table_name, options = {})
-          index_name = index_name(table_name, options)
-
-          unless index_name_exists?(table_name, index_name, true)
-            if options.is_a?(Hash) && options.has_key?(:name)
-              options_without_column = options.dup
-              options_without_column.delete :column
-              index_name_without_column = index_name(table_name, options_without_column)
-
-              return index_name_without_column if index_name_exists?(table_name, index_name_without_column, false)
+          def compatible_table_definition(t)
+            class << t
+              prepend TableDefinition
             end
-
-            raise ArgumentError, "Index name '#{index_name}' on table '#{table_name}' does not exist"
+            super
           end
 
-          index_name
-        end
-      end
+          def index_name_for_remove(table_name, options = {})
+            index_name = connection.index_name(table_name, options)
 
-      class V4_2 < V5_0
-        # 4.2 is defined as a module because it needs to be shared with
-        # Legacy. When the time comes, V5_0 should be defined straight
-        # in its class.
-        include FourTwoShared
-      end
+            unless connection.index_name_exists?(table_name, index_name)
+              if options.is_a?(Hash) && options.has_key?(:name)
+                options_without_column = options.dup
+                options_without_column.delete :column
+                index_name_without_column = connection.index_name(table_name, options_without_column)
 
-      module Legacy
-        include FourTwoShared
+                if connection.index_name_exists?(table_name, index_name_without_column)
+                  return index_name_without_column
+                end
+              end
 
-        def migrate(*)
-          ActiveSupport::Deprecation.warn \
-            "Directly inheriting from ActiveRecord::Migration is deprecated. " \
-            "Please specify the Rails release the migration was written for:\n" \
-            "\n" \
-            "  class #{self.class.name} < ActiveRecord::Migration[4.2]"
-          super
-        end
+              raise ArgumentError, "Index name '#{index_name}' on table '#{table_name}' does not exist"
+            end
+
+            index_name
+          end
       end
     end
   end