master_slave_adapter 1.0.0 → 1.1.0

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-# 1.0.0 (not released yet)
+# 1.1.0 (November 15, 2012)
+
+* [BUGFIX] Don't raise MasterUnavailable if a slave is unavailable
+
+# 1.0.0 (July 24, 2012)
 
 * Add support for unavailable master connection
 * Restrict the public interface. Removed the following methods:

data/lib/active_record/connection_adapters/master_slave_adapter.rb

@@ -225,7 +225,7 @@ module ActiveRecord
               begin
                 #{to}.__send__(:#{method}, *args, &block)
               rescue ActiveRecord::StatementInvalid => error
-                master_connection?(#{to}) ? handle_master_error(error) : raise
+                handle_error(#{to}, error)
               end
             end
           EOS
@@ -331,7 +331,7 @@ module ActiveRecord
           })
         end
       rescue ActiveRecord::StatementInvalid => exception
-        handle_master_error(exception)
+        handle_error(master_connection, exception)
       end
 
       # UTIL ==================================================================
@@ -442,11 +442,11 @@ module ActiveRecord
         end
       end
 
-      def with(conn)
-        self.current_connection = conn
-        yield(conn).tap { connection_stack.shift if connection_stack.size > 1 }
+      def with(connection)
+        self.current_connection = connection
+        yield(connection).tap { connection_stack.shift if connection_stack.size > 1 }
       rescue ActiveRecord::StatementInvalid => exception
-        handle_master_error(exception)
+        handle_error(connection, exception)
       end
 
       def connect(cfg, name)
@@ -477,8 +477,8 @@ module ActiveRecord
         raise NotImplementedError
       end
 
-      def handle_master_error(exception)
-        if connection_error?(exception)
+      def handle_error(connection, exception)
+        if master_connection?(connection) && connection_error?(exception)
           reset_master_connection
           raise MasterUnavailable
         else

data/lib/active_record/connection_adapters/master_slave_adapter/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module MasterSlaveAdapter
-      VERSION = "1.0.0"
+      VERSION = "1.1.0"
     end
   end
 end

data/spec/common/master_slave_adapter_spec.rb

@@ -90,6 +90,19 @@ describe ActiveRecord::ConnectionAdapters::MasterSlaveAdapter do
           end.to raise_error(ActiveRecord::MasterUnavailable)
         end
       end
+
+      context 'given slave is not available' do
+        it 'raises statement invalid exception' do
+          adapter_connection.stub(:connection_error?).and_return(true)
+          slave_connection.should_receive(method).with('testing').and_raise(ActiveRecord::StatementInvalid)
+
+          expect do
+            ActiveRecord::Base.with_slave do
+              adapter_connection.send(method, 'testing')
+            end
+          end.to raise_error(ActiveRecord::StatementInvalid)
+        end
+      end
     end # /SelectMethods.each
 
     SchemaStatements.each do |method|

data/spec/integration/support/shared_mysql_examples.rb

@@ -22,6 +22,8 @@ shared_examples_for "a MySQL MasterSlaveAdapter" do
 
   let(:test_table) { MysqlSetupHelper::TEST_TABLE }
 
+  let(:logger) { nil }
+
   def connection
     ActiveRecord::Base.connection
   end
@@ -52,6 +54,8 @@ shared_examples_for "a MySQL MasterSlaveAdapter" do
 
   before do
     ActiveRecord::Base.establish_connection(configuration)
+    ActiveRecord::Base.logger = logger
+    ActiveRecord::Base.connection.should be_active
   end
 
   it "connects to the database" do
@@ -59,7 +63,7 @@ shared_examples_for "a MySQL MasterSlaveAdapter" do
   end
 
   context "given a debug logger" do
-    let(:debug_logger) do
+    let(:logger) do
       logger = []
       def logger.debug(*args)
         push(args.join)
@@ -71,18 +75,10 @@ shared_examples_for "a MySQL MasterSlaveAdapter" do
       logger
     end
 
-    before do
-      ActiveRecord::Base.logger = debug_logger
-    end
-
-    after do
-      ActiveRecord::Base.logger = nil
-    end
-
     it "logs the connection info" do
       ActiveRecord::Base.connection.select_value("SELECT 42")
 
-      debug_logger.last.should =~ /\[slave:127.0.0.1:3311\] SQL .*SELECT 42/
+      logger.last.should =~ /\[slave:127.0.0.1:3311\] SQL .*SELECT 42/
     end
   end
 
@@ -185,11 +181,11 @@ shared_examples_for "a MySQL MasterSlaveAdapter" do
   end
 
   context "given master is not available" do
-    before(:all) do
+    before do
       stop_master
     end
 
-    after(:all) do
+    after do
       start_master
     end
 
@@ -209,4 +205,24 @@ shared_examples_for "a MySQL MasterSlaveAdapter" do
       end
     end
   end
+
+  context "given slave is not available" do
+    before do
+      stop_slave
+    end
+
+    after do
+      start_slave
+    end
+
+    context "when asked for slave" do
+      it "fails" do
+        expect do
+          ActiveRecord::Base.with_slave { should_read_from :slave }
+        end.to raise_error(ActiveRecord::StatementInvalid)
+      end
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: master_slave_adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord