master_slave_adapter_tcurdt 0.0.3 → 0.0.4

data/lib/master_slave_adapter/active_record_extensions.rb

@@ -1,13 +1,5 @@
 ActiveRecord::Base.class_eval do
 
-  def reload_with_master( options = nil )
-    ActiveRecord::ConnectionAdapters::MasterSlaveAdapter.with_master do
-      reload_without_master( options )
-    end
-  end
-
-  alias_method_chain :reload, :master
-
   class << self
 
     # Call this method to force a block of code to use the master connection
@@ -51,18 +43,6 @@ ActiveRecord::Base.class_eval do
       end
     end
 
-    def transaction_with_master(*args, &block)
-      if connection.respond_to? :transaction
-        connection.transaction do
-          transaction_without_master(*args, &block)
-        end
-      else
-        transaction_without_master(*args, &block)
-      end
-    end
-    alias_method_chain :transaction, :master
-
-
     def master_slave_connection( config )
       config = config.symbolize_keys
       raise "You must provide a configuration for the master database - #{config.inspect}" if config[:master].blank?
@@ -87,12 +67,31 @@ ActiveRecord::Base.class_eval do
       ActiveRecord::ConnectionAdapters::MasterSlaveAdapter.new(config)
     end
 
+    def transaction_with_master(*args, &block)
+      if connection.respond_to? :transaction
+        connection.transaction do
+          transaction_without_master(*args, &block)
+        end
+      else
+        transaction_without_master(*args, &block)
+      end
+    end
+    alias_method_chain :transaction, :master
+
     def columns_with_master
-      ActiveRecord::ConnectionAdapters::MasterSlaveAdapter.with_master do
+      with_master do
         columns_without_master
       end
     end
     alias_method_chain :columns, :master
 
   end
+
+  def reload_with_master(options = nil)
+    ActiveRecord::Base.with_master do
+      reload_without_master(options)
+    end
+  end
+  alias_method_chain :reload, :master
+
 end

data/lib/master_slave_adapter/adapter.rb

@@ -152,9 +152,9 @@ module ActiveRecord
       end
 
       def transaction(*args)
-        puts "<transaction"
+        # puts "<transaction"
         yield
-        puts "</transaction"
+        # puts "</transaction"
         update_clock
       end
 
@@ -187,7 +187,7 @@ module ActiveRecord
       private
 
       def update_clock
-        puts " update clock"
+        # puts " update clock"
         # update the clock, if there was problem keep using the old one
         self.current_clock[0] = master_clock || self.current_clock[0]
         # it's a write so from now on we use the master connection
@@ -245,7 +245,7 @@ module ActiveRecord
       end
 
       def master_clock
-        puts " master clock"
+        # puts " master clock"
         connection = connect_to_master
         if status = connection.uncached { connection.select_one("SHOW MASTER STATUS") }
           Clock.new(status['File'], status['Position'])
@@ -253,7 +253,7 @@ module ActiveRecord
       end
 
       def slave_clock
-        puts " slave clock"
+        # puts " slave clock"
         connection = connect_to_slave
         if status = connection.uncached { connection.select_one("SHOW SLAVE STATUS") }
           Clock.new(status['Relay_Master_Log_File'], status['Exec_Master_Log_Pos'])

data/lib/master_slave_adapter/version.rb

@@ -1,3 +1,3 @@
 module MasterSlaveAdapter
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/specs/specs.rb

@@ -75,6 +75,9 @@ describe ActiveRecord::ConnectionAdapters::MasterSlaveAdapter do
 
     end
 
+    it "should call 'columns' on master" do
+    end
+
     ActiveRecord::ConnectionAdapters::MasterSlaveAdapter::SELECT_METHODS.each do |method|
 
       it "should send the method '#{method}' to the slave connection" do
@@ -334,27 +337,27 @@ describe ActiveRecord::ConnectionAdapters::MasterSlaveAdapter do
 
       old_clock = zero
       new_clock = ActiveRecord::Base.with_consistency(old_clock) do
-        puts "slave: select"
+        # puts "slave: select"
         ActiveRecord::Base.connection.send('select_all', 'testing') # slave  s=0 m=0
-        puts "master: update"
+        # puts "master: update"
         ActiveRecord::Base.connection.send('update', 'testing')     # master s=0 m=1
-        puts "master: select"
+        # puts "master: select"
         ActiveRecord::Base.connection.send('select_all', 'testing') # master s=0 m=1
 
         ActiveRecord::Base.transaction do
-          puts "master: select"
+          # puts "master: select"
           ActiveRecord::Base.connection.send('select_all', 'testing') # master s=0 m=1
-          puts "master: update"
+          # puts "master: update"
           ActiveRecord::Base.connection.send('update', 'testing')     # master s=0 m=1
-          puts "master: select"
+          # puts "master: select"
           ActiveRecord::Base.connection.send('select_all', 'testing') # master s=0 m=1
         end
 
-        puts "master: select"
+        # puts "master: select"
         ActiveRecord::Base.connection.send('select_all', 'testing') # master s=0 m=2
-        puts "master: update"
+        # puts "master: update"
         ActiveRecord::Base.connection.send('update', 'testing')     # master s=0 m=3
-        puts "master: select"
+        # puts "master: select"
         ActiveRecord::Base.connection.send('select_all', 'testing') # master s=0 m=3
       end
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Mauricio Linhares