Ticket #11493: interleaved_migrations_with_tests_and_docs.2.diff

a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

@@ -232 +232 @@
-
-      # Should not be called normally, but this operation is non-destructive.
-      # The migrations module handles this automatically.
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-          end
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
-          end
-        rescue ActiveRecord::StatementInvalid 
-          # No Schema Info
-        end
-      end
-
+      def assume_migrated_upto_version(version)
+        sm_table = quote_table_name(ActiveRecord::Migrator.schema_migrations_table_name)
+        migrated = select_values("SELECT version FROM #{sm_table}").map(&:to_i)
+        versions = Dir['db/migrate/[0-9]*_*.rb'].map do |filename|
+          filename.split('/').last.split('_').first.to_i
+        end
+
+        execute "INSERT INTO #{sm_table} (version) VALUES ('#{version}')" unless migrated.include?(version.to_i)
+        (versions - migrated).select { |v| v < version.to_i }.each do |v|
+          execute "INSERT INTO #{sm_table} (version) VALUES ('#{v}')"
+        end
+      end
-
-      def type_to_sql(type, limit = nil, precision = nil, scale = nil) #:nodoc:
-        if native = native_database_types[type]

a/activerecord/lib/active_record/migration.rb

@@ -123 +123 @@
-  # 
-  # To run migrations against the currently configured database, use
-  # <tt>rake db:migrate</tt>. This will update the database by running all of the
-
+
+
-  #
-  # To roll the database back to a previous migration version, use
-  # <tt>rake db:migrate VERSION=X</tt> where <tt>X</tt> is the version to which
@@ -216 +217 @@
-  #
-  # The phrase "Updating salaries..." would then be printed, along with the
-  # benchmark for the block when the block completes.
+  #
+  # == About the schema_migrations table
+  #
+  # Rails versions 2.0 and prior used to create a table called
+  # <tt>schema_info</tt> when using migrations. This table contained the
+  # version of the schema as of the last applied migration.
+  #
+  # Starting with Rails 2.1, the <tt>schema_info</tt> table is
+  # (automatically) replaced by the <tt>schema_migrations</tt> table, which
+  # contains the version numbers of all the migrations applied.
+  #
+  # As a result, it is now possible to add migration files that are numbered
+  # lower than the current schema version: when migrating up, those
+  # never-applied "interleaved" migrations will be automatically applied, and
+  # when migrating down, never-applied "interleaved" migrations will be skipped.
-  class Migration
-    @@verbose = true
-    cattr_accessor :verbose
@@ -315 +331 @@
-    class << self
-      def migrate(migrations_path, target_version = nil)
-        case
-
-
-
-
-
-
+
+
+
-        end
-      end
-
+
-      def rollback(migrations_path, steps=1)
-        migrator = self.new(:down, migrations_path)
-        start_index = migrator.migrations.index(migrator.current_migration)
@@ -346 +359 @@
-        self.new(direction, migrations_path, target_version).run
-      end
-
-info
-"schema_info"
+migrations
+'schema_migrations'
-      end
-
-      def current_version
-
+
+
-      end
-
-      def proper_table_name(name)
@@ -362 +376 @@
-
-    def initialize(direction, migrations_path, target_version = nil)
-      raise StandardError.new("This database does not yet support migrations") unless Base.connection.supports_migrations?
-information
+migrations_table
-      @direction, @migrations_path, @target_version = direction, migrations_path, target_version      
-    end
-
@@ -383 +397 @@
-    def migrate
-      current = migrations.detect { |m| m.version == current_version }
-      target = migrations.detect { |m| m.version == @target_version }
-
+
-      if target.nil? && !@target_version.nil? && @target_version > 0
-        raise UnknownMigrationVersionError.new(@target_version)
-      end
-      
-migrations.index(current) || 0
-      
+up? ? 0 : (migrations.index(current) || 0)
+
-      runnable = migrations[start..finish]
-      
-      # skip the current migration if we're heading upwards
-      runnable.shift if up? && runnable.first == current
-      
-      # skip the last migration if we're headed down, but not ALL the way down
-      runnable.pop if down? && !target.nil?
-      
-      runnable.each do |migration|
-        Base.logger.info "Migrating to #{migration} (#{migration.version})"
-
-
+
+
+
+
+
+
+
+
+
+
+
-      end
-    end
-
@@ -412 +432 @@
-        migrations = files.inject([]) do |klasses, file|
-          version, name = file.scan(/([0-9]+)_([_a-z0-9]*).rb/).first
-          
-
+ile
-          version = version.to_i
-          
-          if klasses.detect { |m| m.version == version }
@@ -432 +452 @@
-      end
-    end
-
-
-
+
+
+
-    end
-
-    private
-set_schema_version_after_migrating(migrat
-version = migration.version
-
+record_version_state_after_migrating(vers
+sm_table = self.class.schema_migrations_table_name
+
-        if down?
-
-
+
+
+
-        end
-            
-        Base.connection.update("UPDATE #{self.class.schema_info_table_name} SET version = #{version}")
-      end
-
-      def up?

a/activerecord/lib/active_record/schema.rb

@@ -34 +34 @@
-    # #add_index, etc.).
-    #
-    # The +info+ hash is optional, and if given is used to define metadata
-like
+currently, only
-    #
-15
+20380119000001
-    #     ...
-    #   end
-    def self.define(info={}, &block)
-      instance_eval(&block)
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-      end
-    end
-  end

a/activerecord/lib/active_record/schema_dumper.rb

@@ -30 +30 @@
-      def initialize(connection)
-        @connection = connection
-        @types = @connection.native_database_types
-info = @connection.select_one("SELECT * FROM schema_info")
+version = Migrator::current_version
-      end
-
-      def header(stream)
-info ? ":version => #{@info['version']
+version ? ":version => #{@version
-
-        stream.puts <<HEADER
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
@@ -59 +59 @@
-
-      def tables(stream)
-        @connection.tables.sort.each do |tbl|
-"schema_info"
+'schema_migrations'
-            case ignored
-            when String; tbl == ignored
-            when Regexp; tbl =~ ignored

a/activerecord/test/cases/ar_schema_test.rb

@@ -25 +25 @@
-      end
-
-      assert_nothing_raised { @connection.select_all "SELECT * FROM fruits" }
-info
-@connection.select_one("SELECT version FROM schema_info")['version'].to_i
+migrations
+Migrator::current_version
-    end
-  end
-

a/activerecord/test/cases/migration_test.rb

@@ -7 +7 @@
-require MIGRATIONS_ROOT + "/valid/1_people_have_last_names"
-require MIGRATIONS_ROOT + "/valid/2_we_need_reminders"
-require MIGRATIONS_ROOT + "/decimal/1_give_me_big_numbers"
+require MIGRATIONS_ROOT + "/interleaved/pass_3/2_i_raise_on_down"
-
-if ActiveRecord::Base.connection.supports_migrations?
-  class BigNumber < ActiveRecord::Base; end
@@ -34 +35 @@
-    end
-
-    def teardown
-information
-update "UPDATE #{ActiveRecord::Migrator.schema_info_table_name} SET version = 0
+migrations_table
+execute "DELETE FROM #{ActiveRecord::Migrator.schema_migrations_table_name}
-
-      %w(reminders people_reminders prefix_reminders_suffix).each do |table|
-        Reminder.connection.drop_table(table) rescue nil
@@ -779 +780 @@
-      assert !Reminder.table_exists?
-    end
-
+    def test_migrator_interleaved_migrations
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/interleaved/pass_1")
+
+      assert_nothing_raised do
+        ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/interleaved/pass_2")
+      end
+
+      Person.reset_column_information
+      assert Person.column_methods_hash.include?(:last_name)
+
+      assert_nothing_raised do
+        ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/interleaved/pass_3")
+      end
+    end
+
-    def test_migrator_verbosity
-      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
-      assert PeopleHaveLastNames.message_count > 0
@@ -839 +855 @@
-      assert_equal(0, ActiveRecord::Migrator.current_version)
-    end
-
-info
+migrations
-      ActiveRecord::Base.table_name_prefix = "prefix_"
-      ActiveRecord::Base.table_name_suffix = "_suffix"
-      Reminder.reset_table_name
-info_suffix", ActiveRecord::Migrator.schema_info
+migrations_suffix", ActiveRecord::Migrator.schema_migrations
-      ActiveRecord::Base.table_name_prefix = ""
-      ActiveRecord::Base.table_name_suffix = ""
-      Reminder.reset_table_name
-info", ActiveRecord::Migrator.schema_info
+migrations", ActiveRecord::Migrator.schema_migrations
-    ensure
-      ActiveRecord::Base.table_name_prefix = ""
-      ActiveRecord::Base.table_name_suffix = ""

a/activerecord/test/cases/schema_dumper_test.rb

@@ -16 +16 @@
-      output = standard_dump
-      assert_match %r{create_table "accounts"}, output
-      assert_match %r{create_table "authors"}, output
-info
+migrations
-    end
-
-    def test_schema_dump_excludes_sqlite_sequence
@@ -81 +81 @@
-      output = stream.string
-      assert_no_match %r{create_table "accounts"}, output
-      assert_match %r{create_table "authors"}, output
-info
+migrations
-    end
-
-    def test_schema_dump_with_regexp_ignored_table
@@ -92 +92 @@
-      output = stream.string
-      assert_no_match %r{create_table "accounts"}, output
-      assert_match %r{create_table "authors"}, output
-info
+migrations
-    end
-
-    def test_schema_dump_illegal_ignored_table_value

/dev/null

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

/dev/null

@@ +1 @@
+class PeopleHaveLastNames < ActiveRecord::Migration
+  def self.up
+    add_column "people", "last_name", :string
+  end
+
+  def self.down
+    remove_column "people", "last_name"
+  end
+end

/dev/null

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

/dev/null

@@ +1 @@
+class PeopleHaveLastNames < ActiveRecord::Migration
+  def self.up
+    add_column "people", "last_name", :string
+  end
+
+  def self.down
+    remove_column "people", "last_name"
+  end
+end

/dev/null

@@ +1 @@
+class IRaiseOnDown < ActiveRecord::Migration
+  def self.up
+  end
+
+  def self.down
+    raise
+  end
+end

/dev/null

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

a/activerecord/test/schema/sybase.drop.sql

@@ -31 +31 @@
-DROP TABLE numeric_data
-DROP TABLE mixed_case_monkeys
-DROP TABLE minimalistics
-info
+migrations
-go