mysql_online_migrations 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1d3abafbc4f5d4bb2e9ad2acd279698afeb9c84
-  data.tar.gz: ead1da79046e14307004120aaec6576417817791
+  metadata.gz: 5ec28875ae56b82a7591ae9067e57e1cab4d6124
+  data.tar.gz: 713d2a16703c64639066181adeeb2fa3d3acb26f
 SHA512:
-  metadata.gz: 27454fc3df6e87f5c3eb4779c4c15b24af040603dc434f990015637d7d5775ce3618d1b931cef391073873f721e1185f1219a446313c4928658c93e5514338b6
-  data.tar.gz: 0801d5ef9c79ff3ea3b973e9dd9e1f57672ea5de27bfe8630723a2654c1f95cac5c556f62a0901b77b0962a40f8ea7b962f9de32a3a3518c23d3f9308b3ba341
+  metadata.gz: 136c85eff0b974336cbdc123e8cf1d22fe972c0c6842f75a57be69cfb6968fe47a64a9e9525184515d3a69bf899f01f084cd750c2da2af060eb534e94a6e0dcd
+  data.tar.gz: f0060e523175fb1239c2b8a029b79c98ac9b8e68a4133d1a170294c70353ab001570b248eae4ca509aa5f72a358914a260597318d0162d69a49e5dcde774557b

data/Gemfile.lock

@@ -1,34 +1,40 @@
 PATH
   remote: .
   specs:
-    mysql_online_migrations (0.1.4)
-      activerecord (~> 3.2.15)
-      activesupport (~> 3.2.15)
+    mysql_online_migrations (1.0.1)
+      activerecord (>= 3.2.15)
+      activesupport (>= 3.2.15)
       mysql2
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.15)
-      activesupport (= 3.2.15)
-      builder (~> 3.0.0)
-    activerecord (3.2.15)
-      activemodel (= 3.2.15)
-      activesupport (= 3.2.15)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.15)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.2)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.2)
       i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.3)
-    builder (3.0.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.2)
+    atomic (1.1.14)
+    builder (3.1.4)
     coderay (1.0.9)
     diff-lcs (1.2.5)
     i18n (0.6.9)
     logger (1.2.8)
     method_source (0.8.2)
-    multi_json (1.8.2)
-    mysql2 (0.3.14)
+    minitest (4.7.5)
+    multi_json (1.8.4)
+    mysql2 (0.3.15)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -42,6 +48,8 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
     slop (3.4.6)
+    thread_safe (0.1.3)
+      atomic
     tzinfo (0.3.38)
 
 PLATFORMS

data/lib/mysql_online_migrations.rb

@@ -13,7 +13,23 @@ module MysqlOnlineMigrations
   end
 
   def connection
-    @no_lock_adapter ||= ActiveRecord::ConnectionAdapters::Mysql2AdapterWithoutLock.new(super)
+    original_connection = super
+    adapter_mode = original_connection.class.name == "ActiveRecord::ConnectionAdapters::Mysql2Adapter"
+
+    @original_adapter ||= if adapter_mode
+      original_connection
+    else
+      original_connection.instance_variable_get(:@delegate)
+    end
+
+    @no_lock_adapter ||= ActiveRecord::ConnectionAdapters::Mysql2AdapterWithoutLock.new(@original_adapter)
+
+    if adapter_mode
+      @no_lock_adapter
+    else
+      original_connection.instance_variable_set(:@delegate, @no_lock_adapter)
+      original_connection
+    end
   end
 
   def with_lock

data/mysql_online_migrations.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'mysql_online_migrations'
-  s.version     = '1.0.1'
+  s.version     = '1.0.2'
   s.summary     = "Use MySQL 5.6+ capacities to enforce online migrations"
   s.description = "MySQL 5.6 adds a `LOCK=NONE` option to make sure migrations are done with no locking. Let's use it."
   s.authors     = ["Anthony Alberto"]

data/spec/lib/mysql_online_migrations_spec.rb

@@ -10,11 +10,34 @@ describe MysqlOnlineMigrations do
   end
 
   context "#connection" do
-    it "memoizes an instance of Mysql2AdapterWithoutLock" do
-      ActiveRecord::ConnectionAdapters::Mysql2AdapterWithoutLock.should_receive(:new)
-        .with(an_instance_of(ActiveRecord::ConnectionAdapters::Mysql2Adapter)).once.and_call_original
-      3.times { @connection = migration.connection }
-      @connection.should be_an_instance_of(ActiveRecord::ConnectionAdapters::Mysql2AdapterWithoutLock)
+    shared_examples_for "Mysql2AdapterWithoutLock created" do
+      it "memoizes an instance of Mysql2AdapterWithoutLock" do
+        ActiveRecord::ConnectionAdapters::Mysql2AdapterWithoutLock.should_receive(:new)
+          .with(an_instance_of(ActiveRecord::ConnectionAdapters::Mysql2Adapter)).once.and_call_original
+        3.times { migration.connection }
+      end
+    end
+
+    context 'when migrating' do
+      it "returns an instance of Mysql2AdapterWithoutLock" do
+        migration.connection.should be_an_instance_of(ActiveRecord::ConnectionAdapters::Mysql2AdapterWithoutLock)
+      end
+
+      it_behaves_like "Mysql2AdapterWithoutLock created"
+    end
+
+    context 'when rolling back' do
+      before do
+        migration.instance_variable_set(:@connection, ActiveRecord::Migration::CommandRecorder.new(ActiveRecord::Base.connection))
+      end
+
+      it "returns an instance of ActiveRecord::Migration::CommandRecorder" do
+        recorder_connection = migration.connection
+        recorder_connection.should be_an_instance_of(ActiveRecord::Migration::CommandRecorder)
+        recorder_connection.instance_variable_get(:@delegate).should be_an_instance_of(ActiveRecord::ConnectionAdapters::Mysql2AdapterWithoutLock)
+      end
+
+      it_behaves_like "Mysql2AdapterWithoutLock created"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql_online_migrations
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Anthony Alberto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord