active_record_shards 2.4.2 → 2.4.3

data/lib/active_record_shards/migration.rb

@@ -31,6 +31,30 @@ module ActiveRecord
         end
       end
     end
+
+    # don't allow Migrator class to cache versions
+    def migrated
+      self.class.get_all_versions
+    end
+
+    # list of pending migrations is any migrations that haven't run on all shards.
+    def pending_migrations
+      migration_counts = Hash.new(0)
+      ActiveRecord::Base.on_shard(nil) do
+        migrated.each { |v| migration_counts[v] += 1 }
+      end
+
+      shard_count = 1
+      ActiveRecord::Base.on_all_shards do
+        migrated.each { |v| migration_counts[v] += 1 }
+        shard_count += 1
+      end
+   
+      migrations.select do |m|
+        count = migration_counts[m.version]
+        count.nil? || count < shard_count
+      end
+    end
   end
 end
 

data/test/migrator_test.rb

@@ -75,19 +75,28 @@ class MigratorTest < ActiveSupport::TestCase
 
   def test_failing_migration
     # like, if you have to break a migration in the middle somewhere.
+    migration_path = File.join(File.dirname(__FILE__), "/failure_migration")
+
+    assert failure_migration_pending?(migration_path)
     begin
-      migration_path = File.join(File.dirname(__FILE__), "/failure_migration")
       ActiveRecord::Migrator.migrate(migration_path)
     rescue
+      # after first fail, should still be pending
+      assert failure_migration_pending?(migration_path)
       retry
     end
 
+    assert !failure_migration_pending?(migration_path)
     ActiveRecord::Base.on_all_shards do
       assert table_has_column?("tickets", "sharded_column")
     end
   end
 
   private
+  def failure_migration_pending?(migration_path)
+    ActiveRecord::Migrator.new(:up, migration_path).pending_migrations.detect { |f| f.name == "FailureMigration" }
+  end
+
   def table_has_column?(table, column)
     ActiveRecord::Base.connection.select_value("show create table #{table}") =~ /#{column}/
   end