master_slave_adapter 1.1.1 → 1.1.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.1.2 (November 26, 2012)
+
+  * Avoid trying to connect to master twice if unavailable
+
 # 1.1.1 (November 17, 2012)
 
   * [BUGFIX] Fix activerecord 3.2 compatibility

data/lib/active_record/connection_adapters/master_slave_adapter.rb

@@ -210,6 +210,10 @@ module ActiveRecord
         connections.each { |connection| connection.clear_query_cache }
       end
 
+      def outside_transaction?
+        nil
+      end
+
       # ADAPTER INTERFACE DELEGATES ===========================================
 
       def self.rescued_delegate(*methods)
@@ -249,7 +253,6 @@ module ActiveRecord
                        :release_savepoint,
                        :current_savepoint_name,
                        :begin_db_transaction,
-                       :outside_transaction?,
                        :add_limit!,
                        :default_sequence_name,
                        :reset_sequence!,

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

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module MasterSlaveAdapter
-      VERSION = "1.1.1"
+      VERSION = "1.1.2"
     end
   end
 end

data/spec/common/master_slave_adapter_spec.rb

@@ -183,8 +183,7 @@ describe ActiveRecord::ConnectionAdapters::MasterSlaveAdapter do
       %w(begin_db_transaction
          commit_db_transaction
          increment_open_transactions
-         decrement_open_transactions
-         outside_transaction?).each do |txstmt|
+         decrement_open_transactions).each do |txstmt|
         master_connection.
           should_receive(txstmt).exactly(1).times
       end
@@ -209,8 +208,7 @@ describe ActiveRecord::ConnectionAdapters::MasterSlaveAdapter do
         master_connection.
           should_receive(txstmt).exactly(1).times
       end
-      master_connection.
-        should_receive('outside_transaction?').exactly(2).times
+
       master_connection.
         should_receive('open_transactions').exactly(3).times.
         and_return(0, 1, 0)

data/spec/common/support/mysql_consistency_examples.rb

@@ -107,8 +107,7 @@ shared_examples_for 'mysql consistency' do
     %w(begin_db_transaction
        commit_db_transaction
        increment_open_transactions
-       decrement_open_transactions
-       outside_transaction?).each do |txstmt|
+       decrement_open_transactions).each do |txstmt|
       master_connection.should_receive(txstmt).exactly(1).times
     end
 

metadata

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