Add migration history to schema.rb dump

4 files changed, 58 insertions, 15 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 7802cb02d8..a470e8de07 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -490,8 +490,8 @@ module ActiveRecord
         sm_table = ActiveRecord::Migrator.schema_migrations_table_name
 
         ActiveRecord::SchemaMigration.order('version').map { |sm|
-          "INSERT INTO #{sm_table} (version, migrated_at, name) VALUES ('#{sm.version}',LOCALTIMESTAMP,'#{sm.name}');"
-        }.join "\n\n"
+          "INSERT INTO #{sm_table} (version, migrated_at, fingerprint, name) VALUES ('#{sm.version}',LOCALTIMESTAMP,'#{sm.fingerprint}','#{sm.name}');"
+        }.join("\n\n")
       end
 
       # Should not be called normally, but this operation is non-destructive.
diff --git a/activerecord/lib/active_record/schema.rb b/activerecord/lib/active_record/schema.rb
index eaa4aa7086..7ec06e699b 100644
--- a/activerecord/lib/active_record/schema.rb
+++ b/activerecord/lib/active_record/schema.rb
@@ -34,27 +34,45 @@ module ActiveRecord
     end
 
     def define(info, &block)
+      @using_deprecated_version_setting = info[:version].present?
+      SchemaMigration.drop_table
+      initialize_schema_migrations_table
+
       instance_eval(&block)
 
-      unless info[:version].blank?
-        initialize_schema_migrations_table
-        assume_migrated_upto_version(info[:version], migrations_paths)
-      end
+      # handle files from pre-4.0 that used :version option instead of dumping migration table
+      assume_migrated_upto_version(info[:version], migrations_paths) if @using_deprecated_version_setting
     end
 
     # Eval the given block. All methods available to the current connection
     # adapter are available within the block, so you can easily use the
     # database definition DSL to build up your schema (+create_table+,
     # +add_index+, etc.).
-    #
-    # The +info+ hash is optional, and if given is used to define metadata
-    # about the current schema (currently, only the schema's version):
-    #
-    #   ActiveRecord::Schema.define(version: 20380119000001) do
-    #     ...
-    #   end
     def self.define(info={}, &block)
       new.define(info, &block)
     end
+
+    # Create schema migration history. Include migration statements in a block to this method.
+    #
+    #   migrations do
+    #     migration 20121128235959, "44f1397e3b92442ca7488a029068a5ad", "add_horn_color_to_unicorns"
+    #     migration 20121129235959, "4a1eb3965d94406b00002b370854eae8", "add_magic_power_to_unicorns"
+    #   end
+    def migrations
+      raise(ArgumentError, "Can't set migrations while using :version option") if @using_deprecated_version_setting
+      yield
+    end
+
+    # Add a migration to the ActiveRecord::SchemaMigration table.
+    #
+    # The +version+ argument is an integer.
+    # The +fingerprint+ and +name+ arguments are required but may be empty strings.
+    # The migration's +migrated_at+ attribute is set to the current time,
+    # instead of being set explicitly as an argument to the method.
+    #
+    #   migration 20121129235959, "4a1eb3965d94406b00002b370854eae8", "add_magic_power_to_unicorns"
+    def migration(version, fingerprint, name)
+      SchemaMigration.create!(version: version, migrated_at: Time.now, fingerprint: fingerprint, name: name)
+    end
   end
 end
diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb
index 36bde44e7c..73c0f5b9eb 100644
--- a/activerecord/lib/active_record/schema_dumper.rb
+++ b/activerecord/lib/active_record/schema_dumper.rb
@@ -24,6 +24,7 @@ module ActiveRecord
 
     def dump(stream)
       header(stream)
+      migrations(stream)
       tables(stream)
       trailer(stream)
       stream
@@ -44,7 +45,7 @@ module ActiveRecord
           stream.puts "# encoding: #{stream.external_encoding.name}"
         end
 
-        stream.puts <<HEADER
+        header_text = <<HEADER_RUBY
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -59,13 +60,25 @@ module ActiveRecord
 
 ActiveRecord::Schema.define(#{define_params}) do
 
-HEADER
+HEADER_RUBY
+        stream.puts header_text
       end
 
       def trailer(stream)
         stream.puts "end"
       end
 
+      def migrations(stream)
+        all_migrations = ActiveRecord::SchemaMigration.all.to_a
+        if all_migrations.any?
+          stream.puts("  migrations do")
+          all_migrations.each do |migration|
+            stream.puts(migration.schema_line("    "))
+          end
+          stream.puts("  end")
+        end
+      end
+
       def tables(stream)
         @connection.tables.sort.each do |tbl|
           next if ['schema_migrations', ignore_tables].flatten.any? do |ignored|
diff --git a/activerecord/lib/active_record/schema_migration.rb b/activerecord/lib/active_record/schema_migration.rb
index fd226d5eba..4464f54145 100644
--- a/activerecord/lib/active_record/schema_migration.rb
+++ b/activerecord/lib/active_record/schema_migration.rb
@@ -53,5 +53,17 @@ module ActiveRecord
     def version
       super.to_i
     end
+
+    # Construct ruby source to include in schema.rb dump for this migration.
+    # Pass a string of spaces as +indent+ to allow calling code to control how deeply indented the line is.
+    # The generated line includes the migration version, fingerprint, and name. Either fingerprint or name
+    # can be an empty string.
+    #
+    # Example output:
+    #
+    #   migration 20121129235959, "ee4be703f9e6e2fc0f4baddebe6eb8f7", "add_magic_power_to_unicorns"
+    def schema_line(indent)
+      %Q(#{indent}migration %s, "%s", "%s") % [version, fingerprint, name]
+    end
   end
 end