Merge pull request departurerb#55 from mavenlink/fix-alternating-departure-non-departure-migration-issue

Add ConnectionBase subclass for connecting with original adapter

Author: wyhaines

lib/departure/connection_base.rb

@@ -6,4 +6,6 @@ def self.establish_connection(config = nil)
       end
     end
   end
+
+  class OriginalAdapterConnection < ConnectionBase; end
 end

lib/departure/migration.rb

@@ -81,7 +81,7 @@ def reconnect_with_percona
     # enabled in a previous migration.
     def reconnect_without_percona
       return unless connection_config[:adapter] == 'percona'
-      Departure::ConnectionBase.establish_connection(connection_config.merge(adapter: original_adapter))
+      Departure::OriginalAdapterConnection.establish_connection(connection_config.merge(adapter: original_adapter))
     end
 
     private

spec/integration_spec.rb

@@ -1,12 +1,13 @@
 require 'spec_helper'
+require 'fixtures/migrate/0022_add_timestamp_on_comments'
 
 # TODO: Handle #change_table syntax
 describe Departure, integration: true do
   class Comment < ActiveRecord::Base; end
 
-  let(:migration_fixtures) do
-    ActiveRecord::MigrationContext.new([MIGRATION_FIXTURES], ActiveRecord::SchemaMigration).migrations
-  end
+  let(:migration_paths) { [MIGRATION_FIXTURES] }
+  let(:migration_context) { ActiveRecord::MigrationContext.new(migration_paths, ActiveRecord::SchemaMigration) }
+  let(:migration_fixtures) { migration_context.migrations }
 
   let(:direction) { :up }
   let(:pool) { ActiveRecord::Base.connection_pool }
@@ -204,4 +205,17 @@ class Comment < ActiveRecord::Base; end
       end
     end
   end
+
+  context 'when there are migrations that do not use departure' do
+    let(:migration) { AddTimestampOnComments }
+
+    before do
+      allow(migration).to receive(:uses_departure).and_return(false)
+    end
+
+    it 'uses Departure::OriginalConnectionAdapter' do
+      expect(Departure::OriginalAdapterConnection).to receive(:establish_connection)
+      migration_context.run(direction, 22)
+    end
+  end
 end