Merge branch 'joshsusser-master' into merge

* joshsusser-master:
  style cleanup
  Add migration history to schema.rb dump
  Add metadata to schema_migrations

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/schema.rb

1 files changed, 51 insertions, 0 deletions

diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb
index b2eac0349b..bd47ba8741 100644
--- a/activerecord/test/cases/ar_schema_test.rb
+++ b/activerecord/test/cases/ar_schema_test.rb
@@ -46,4 +46,55 @@ if ActiveRecord::Base.connection.supports_migrations?
     end
   end
 
+  class ActiveRecordSchemaMigrationsTest < ActiveRecordSchemaTest
+    def setup
+      super
+      ActiveRecord::SchemaMigration.delete_all
+    end
+
+    def test_migration_adds_row_to_migrations_table
+      schema = ActiveRecord::Schema.new
+      schema.migration(1001, "", "")
+      schema.migration(1002, "123456789012345678901234567890ab", "add_magic_power_to_unicorns")
+
+      migrations = ActiveRecord::SchemaMigration.all.to_a
+      assert_equal 2, migrations.length
+
+      assert_equal 1001, migrations[0].version
+      assert_match %r{^2\d\d\d-}, migrations[0].migrated_at.to_s(:db)
+      assert_equal "", migrations[0].fingerprint
+      assert_equal "", migrations[0].name
+
+      assert_equal 1002, migrations[1].version
+      assert_match %r{^2\d\d\d-}, migrations[1].migrated_at.to_s(:db)
+      assert_equal "123456789012345678901234567890ab", migrations[1].fingerprint
+      assert_equal "add_magic_power_to_unicorns", migrations[1].name
+    end
+
+    def test_define_clears_schema_migrations
+      assert_nothing_raised do
+        ActiveRecord::Schema.define do
+          migrations do
+            migration(123001, "", "")
+          end
+        end
+        ActiveRecord::Schema.define do
+          migrations do
+            migration(123001, "", "")
+          end
+        end
+      end
+    end
+
+    def test_define_raises_if_both_version_and_explicit_migrations
+      assert_raise(ArgumentError) do
+        ActiveRecord::Schema.define(version: 123001) do
+          migrations do
+            migration(123001, "", "")
+          end
+        end
+      end
+    end
+  end
+
 end