0
@@ -1,5 +1,7 @@
0
 *Edge*
0
 
0
+* db:migrate:down and :up update schema_migrations.  #369 [Michael Raidel, RaceCondition]
0
+
0
 * PostgreSQL: support :conditions => [':foo::integer', { :foo => 1 }] without treating the ::integer typecast as a bind variable.  [Tarmo Tänav]
0
 
0
 * MySQL: rename_column preserves column defaults.  #466 [Diego Algorta]

0
@@ -399,7 +399,10 @@ module ActiveRecord
0
     def run
0
       target = migrations.detect { |m| m.version == @target_version }
0
       raise UnknownMigrationVersionError.new(@target_version) if target.nil?
0
-      target.migrate(@direction)
0
+      unless (up? && migrated.include?(target.version.to_i)) || (down? && !migrated.include?(target.version.to_i))
0
+        target.migrate(@direction)
0
+        record_version_state_after_migrating(target.version)
0
+      end
0
     end
0
 
0
     def migrate

0
@@ -825,6 +825,21 @@ if ActiveRecord::Base.connection.supports_migrations?
0
       assert !Reminder.table_exists?
0
     end
0
 
0
+    def test_migrator_double_up
0
+      assert_equal(0, ActiveRecord::Migrator.current_version)
0
+      ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT + "/valid", 1)
0
+      assert_nothing_raised { ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT + "/valid", 1) }
0
+      assert_equal(1, ActiveRecord::Migrator.current_version)
0
+    end
0
+
0
+    def test_migrator_double_down
0
+      assert_equal(0, ActiveRecord::Migrator.current_version)
0
+      ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT + "/valid", 1)
0
+      ActiveRecord::Migrator.run(:down, MIGRATIONS_ROOT + "/valid", 1)
0
+      assert_nothing_raised { ActiveRecord::Migrator.run(:down, MIGRATIONS_ROOT + "/valid", 1) }
0
+      assert_equal(0, ActiveRecord::Migrator.current_version)
0
+    end
0
+
0
     def test_finds_migrations
0
       migrations = ActiveRecord::Migrator.new(:up, MIGRATIONS_ROOT + "/valid").migrations
0
       [['1', 'people_have_last_names'],
0
@@ -914,16 +929,6 @@ if ActiveRecord::Base.connection.supports_migrations?
0
       ActiveRecord::Migrator.rollback(MIGRATIONS_ROOT + "/valid")
0
       assert_equal(0, ActiveRecord::Migrator.current_version)
0
     end
0
-    
0
-    def test_migrator_run
0
-      assert_equal(0, ActiveRecord::Migrator.current_version)
0
-      ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT + "/valid", 3)
0
-      assert_equal(0, ActiveRecord::Migrator.current_version)
0
-
0
-      assert_equal(0, ActiveRecord::Migrator.current_version)
0
-      ActiveRecord::Migrator.run(:down, MIGRATIONS_ROOT + "/valid", 3)
0
-      assert_equal(0, ActiveRecord::Migrator.current_version)
0
-    end
0
 
0
     def test_schema_migrations_table_name
0
       ActiveRecord::Base.table_name_prefix = "prefix_"