Ticket #6799: parallel_migrations.diff

test/migration_test.rb

@@ -3 +3 @@
-
-require 'fixtures/person'
-require 'fixtures/topic'
+require 'fixtures/monkey'
+require 'fixtures/task'
-require File.dirname(__FILE__) + '/fixtures/migrations/1_people_have_last_names'
-require File.dirname(__FILE__) + '/fixtures/migrations/2_we_need_reminders'
-require File.dirname(__FILE__) + '/fixtures/migrations_with_decimal/1_give_me_big_numbers'
@@ -34 +36 @@
-      ActiveRecord::Base.connection.initialize_schema_information
-      ActiveRecord::Base.connection.update "UPDATE #{ActiveRecord::Migrator.schema_info_table_name} SET version = 0"
-
-
+ monkeys tasks 
-        Reminder.connection.drop_table(table) rescue nil
-      end
-      Reminder.reset_column_information
@@ -508 +510 @@
-    def test_migrator
-      assert !Person.column_methods_hash.include?(:last_name)
-      assert !Reminder.table_exists?
+      assert !Task.table_exists?
+      assert !Monkey.table_exists?
-
-      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/')
-
-3
+4
-      Person.reset_column_information
-      assert Person.column_methods_hash.include?(:last_name)
-      assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
@@ -542 +546 @@
-    end
-
-    def test_migrator_one_down
-
-
+
+
+
+
+
+
+
+
+
-      ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/', 1)
-
-      Person.reset_column_information
-
+, Person.column_methods_hash.inspect
-      assert !Reminder.table_exists?
+      assert !Monkey.table_exists?
+      assert !Task.table_exists?
-    end
-
-    def test_migrator_one_up_one_down

test/fixtures/monkey.rb

@@ +1 @@
+class Monkey < ActiveRecord::Base
+end

test/fixtures/migrations/4_duplicate_one.rb

@@ +1 @@
+class DuplicateOne < ActiveRecord::IndependentMigration
+  def self.up
+    create_table("tasks", :id => false) do |t|
+      t.column :person_id, :integer
+    end
+  end
+
+  def self.down
+    drop_table "tasks"
+  end
+end

test/fixtures/migrations/4_duplicate_two.rb

@@ +1 @@
+class DuplicateTwo < ActiveRecord::IndependentMigration
+  def self.up
+    create_table("monkeys", :id => false) do |t|
+      t.column :person_id, :integer
+    end
+  end
+
+  def self.down
+    drop_table "monkeys"
+  end
+end

lib/active_record/migration.rb

@@ -3 +3 @@
-  end
-  
-  class DuplicateMigrationVersionError < ActiveRecordError#:nodoc:
-
-
+, name
+ (bad file: #{name})
-    end
-  end
-  
@@ -276 +276 @@
-      end
-    end
-  end
+  
+  # An IndependentMigration is used whenener you have two or more migrations occurring with the same number.
+  # This is useful if you are mirroring another project where you don't have control of the migration numbering,
+  # but want to modify your local database, or if you want to indicate that a succession of migrations 
+  # are independent of each other, and can occur in parallel.
+  #
+  # Additionally, when merging multiple branches to trunk, setting conflicting migration classes to IndependentMigration
+  # will remove the DuplicateMigrationVersionError error that is normally raised, so you don't have to renumber. 
+  # Note that all migrations sharing the same number should be IndependentMigration class.
+  #
+  # == Usage
+  #
+  # Use like a normal migration.
+  #
+  #   db/migrate
+  #     067_add_person_field.rb  # ActiveRecord::Migration
+  #     068_add_monkey_table.rb  # ActiveRecord::IndependentMigration
+  #     068_add_banana_table.rb  # ActiveRecord::IndependentMigration
+  #     069_remove_link_id.rb    # ActiveRecord::Migration
+  #
+  class IndependentMigration < Migration
+  end
-
-  class Migrator#:nodoc:
-    class << self
@@ -326 +348 @@
-    end
-
-    def migrate
-
-
-
-
+
+
+
+
+
+
+
+
-        Base.logger.info "Migrating to #{migration_class} (#{version})"
-        migration_class.migrate(@direction)
-        set_schema_version(version)
@@ -341 +367 @@
-        migrations = migration_files.inject([]) do |migrations, migration_file|
-          load(migration_file)
-          version, name = migration_version_and_name(migration_file)
-
+, name
-          migrations << [ version.to_i, migration_class(name) ] 
-        end
-
-.reverse : migrations.sort
+_by { |a| -a[0] } : migrations.sort_by {|a| a[0] }
-      end
-      
-
+, name
-        if !migrations.empty? && migrations.transpose.first.include?(version)
-
+
+
+
+
+
+
+
+
-        end
-      end
-      
@@ -368 +401 @@
-      def migration_version_and_name(migration_file)
-        return *migration_file.scan(/([0-9]+)_([_a-z0-9]*).rb/).first
-      end
-  
+
-      def set_schema_version(version)
-        Base.connection.update("UPDATE #{self.class.schema_info_table_name} SET version = #{down? ? version.to_i - 1 : version.to_i}")
-      end
@@ -380 +413 @@
-      def down?
-        @direction == :down
-      end
-      
-      def reached_target_version?(version)
-        return false if @target_version == nil
-        (up? && version.to_i - 1 >= @target_version) || (down? && version.to_i <= @target_version)
-      end
-      
-      def irrelevant_migration?(version)
-        (up? && version.to_i <= current_version) || (down? && version.to_i > current_version)
-      end
-  end
-end