seamless_database_pool 1.0.3 → 1.0.4

data/Rakefile

@@ -22,10 +22,11 @@ end
 
 spec = Gem::Specification.new do |s| 
   s.name = "seamless_database_pool"
-  s.version = "1.0.3"
+  s.version = "1.0.4"
   s.author = "Brian Durand"
   s.platform = Gem::Platform::RUBY
   s.summary = "Support for master/slave database clusters in ActiveRecord"
+  s.description = "Add support for master/slave database clusters in ActiveRecord to improve performance."
   s.files = FileList["lib/**/*", "init.rb", "MIT-LICENSE", 'Rakefile'].to_a
   s.require_path = "lib"
   s.test_files = FileList["{spec}/**/*_spec.rb"].to_a

data/lib/active_record/connection_adapters/seamless_database_pool_adapter.rb

@@ -199,6 +199,14 @@ module ActiveRecord
         master_connection.delete(sql, name)
       end
       
+      def execute (*args)
+        proxy_connection_method(current_read_connection, :execute, :read, *args)
+      end
+      
+      def select_rows(*args)
+        proxy_connection_method(current_read_connection, :select_rows, :read, *args)
+      end
+      
       def using_master_connection?
         !!@use_master
       end
@@ -279,10 +287,10 @@ module ActiveRecord
       
       protected
       
-      def select (sql, name = nil)
+      def select (*args)
         connection = current_read_connection
         begin
-          proxy_connection_method(connection, :select, :read, *[sql, name])
+          proxy_connection_method(connection, :select, :read, *args)
         rescue DatabaseConnectionError => e
           unless using_master_connection?
             # Try again with a different connection if needed unless it could have a side effect
@@ -291,7 +299,7 @@ module ActiveRecord
               connection = current_read_connection
               SeamlessDatabasePool.set_persistent_read_connection(self, connection)
             end
-            proxy_connection_method(connection, :select, :retry, *[sql, name])
+            proxy_connection_method(connection, :select, :retry, *args)
           else
             raise e.wrapped_exception
           end

data/spec/seamless_database_pool_adapter_spec.rb

@@ -135,10 +135,22 @@ describe "SeamlessDatabasePoolAdapter" do
   
   it "should proxy select methods to a read connection" do
     @pool_connection.should_receive(:current_read_connection).and_return(@read_connection_1)
-    @read_connection_1.should_receive(:select).with('SQL', nil).and_return(:retval)
+    @read_connection_1.should_receive(:select).with('SQL').and_return(:retval)
     @pool_connection.send(:select, 'SQL').should == :retval
   end
   
+  it "should proxy execute methods to a read connection" do
+    @pool_connection.should_receive(:current_read_connection).and_return(@read_connection_1)
+    @read_connection_1.should_receive(:execute).with('SQL').and_return(:retval)
+    @pool_connection.execute('SQL').should == :retval
+  end
+  
+  it "should proxy select_rows methods to a read connection" do
+    @pool_connection.should_receive(:current_read_connection).and_return(@read_connection_1)
+    @read_connection_1.should_receive(:select_rows).with('SQL').and_return(:retval)
+    @pool_connection.select_rows('SQL').should == :retval
+  end
+  
   # Master connection methods
   
   it "should proxy insert method to the master connection" do
@@ -247,11 +259,11 @@ describe "SeamlessDatabasePoolAdapter" do
     connection_error = ActiveRecord::ConnectionAdapters::SeamlessDatabasePoolAdapter::DatabaseConnectionError.new
     connection_error.wrapped_exception = StandardError.new("Error")
     @pool_connection.should_receive(:current_read_connection).and_return(@read_connection_1)
-    @pool_connection.should_receive(:proxy_connection_method).with(@read_connection_1, :select, :read, 'SQL', nil).and_raise(connection_error)
+    @pool_connection.should_receive(:proxy_connection_method).with(@read_connection_1, :select, :read, 'SQL').and_raise(connection_error)
     @read_connection_1.should_receive(:active?).and_return(true)
     @pool_connection.should_not_receive(:suppress_read_connection)
     SeamlessDatabasePool.should_not_receive(:set_persistent_read_connection)
-    @pool_connection.should_receive(:proxy_connection_method).with(@read_connection_1, :select, :retry, 'SQL', nil).and_return(:results)
+    @pool_connection.should_receive(:proxy_connection_method).with(@read_connection_1, :select, :retry, 'SQL').and_return(:results)
     @pool_connection.send(:select, 'SQL').should == :results
   end
   
@@ -259,7 +271,7 @@ describe "SeamlessDatabasePoolAdapter" do
     connection_error = ActiveRecord::ConnectionAdapters::SeamlessDatabasePoolAdapter::DatabaseConnectionError.new
     connection_error.wrapped_exception = StandardError.new("Error")
     @pool_connection.should_receive(:current_read_connection).and_return(@read_connection_1)
-    @pool_connection.should_receive(:proxy_connection_method).with(@read_connection_1, :select, :read, 'SQL', nil).and_raise(connection_error)
+    @pool_connection.should_receive(:proxy_connection_method).with(@read_connection_1, :select, :read, 'SQL').and_raise(connection_error)
     @pool_connection.use_master_connection do
       lambda{@pool_connection.send(:select, 'SQL')}.should raise_error("Error")
     end
@@ -267,7 +279,7 @@ describe "SeamlessDatabasePoolAdapter" do
   
   it "should not try to execute a read statement again after a non-connection error" do
     @pool_connection.should_receive(:current_read_connection).and_return(@read_connection_1)
-    @pool_connection.should_receive(:proxy_connection_method).with(@read_connection_1, :select, :read, 'SQL', nil).and_raise("SQL Error")
+    @pool_connection.should_receive(:proxy_connection_method).with(@read_connection_1, :select, :read, 'SQL').and_raise("SQL Error")
     lambda{@pool_connection.send(:select, 'SQL')}.should raise_error("SQL Error")
   end
   
@@ -275,11 +287,11 @@ describe "SeamlessDatabasePoolAdapter" do
     connection_error = ActiveRecord::ConnectionAdapters::SeamlessDatabasePoolAdapter::DatabaseConnectionError.new
     connection_error.wrapped_exception = StandardError.new("Error")
     @pool_connection.should_receive(:current_read_connection).and_return(@read_connection_1, @read_connection_2)
-    @pool_connection.should_receive(:proxy_connection_method).with(@read_connection_1, :select, :read, 'SQL', nil).and_raise(connection_error)
+    @pool_connection.should_receive(:proxy_connection_method).with(@read_connection_1, :select, :read, 'SQL').and_raise(connection_error)
     @read_connection_1.should_receive(:active?).and_return(false)
     @pool_connection.should_receive(:suppress_read_connection).with(@read_connection_1, 30)
     SeamlessDatabasePool.should_receive(:set_persistent_read_connection).with(@pool_connection, @read_connection_2)
-    @pool_connection.should_receive(:proxy_connection_method).with(@read_connection_2, :select, :retry, 'SQL', nil).and_return(:results)
+    @pool_connection.should_receive(:proxy_connection_method).with(@read_connection_2, :select, :retry, 'SQL').and_return(:results)
     @pool_connection.send(:select, 'SQL').should == :results
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: seamless_database_pool
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Brian Durand
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-26 00:00:00 -05:00
+date: 2009-10-05 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: 
+description: Add support for master/slave database clusters in ActiveRecord to improve performance.
 email: brian@embellishedvisions.com
 executables: []
 
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - rspec 1.0.8 or higher is needed to run the tests
 rubyforge_project: seamlessdbpool
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Support for master/slave database clusters in ActiveRecord