mysql_replication_adapter 0.1.1 → 0.2.0

data/License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2007 FIXME full name
+Copyright (c) 2007 Bryan Duxbury
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.txt

@@ -23,7 +23,7 @@ development:
   username: writeuser
   password: yourwritepassword
   database: yourapp_development
-  clones:
+  slaves:
     - host: slavedb1
       port: 3306
       username: user
@@ -41,7 +41,7 @@ And that's it. It's configured now.
 
 Usage
 ================
-There are three ways to make use of the MysqlReplicationAdapter's slave-balancing capabilities. The simplest way is to pass a new option to ActiveRecord::Base#find. The option is called :use_slave, and it should => true when you want to send the query to a slave. For instance:
+There are a number of ways to make use of the MysqlReplicationAdapter's slave-balancing capabilities. The simplest way is to pass a new option to ActiveRecord::Base#find. The option is called :use_slave, and it should => true when you want to send the query to a slave. For instance:
 
 class Author < ActiveRecord::Base; end;
 
@@ -57,6 +57,10 @@ end
 
 Note: if you use the block syntax and cause a write query to be generated somehow, then you will receive an exception. The adapter explicitly stops you from writing to any database but the master.
 
+Another set of methods that can take advantage of the slave balancing is the calculations. For instance:
+
+Author.count(:age, :use_slave => true)
+
 Finally, I'm sure there are those of you saying, "But I use find_by_sql and that doesn't take an options hash!" Well, good news! There is now an optional second parameter to find_by_sql. If you pass true as that second parameter, it will select a random database and load balance that individual query. Snazzy! Example:
 
 Author.find_by_sql("SELECT * FROM authors WHERE name = 'bryan';", true) # will be load balanced

data/lib/mysql_replication_adapter.rb

@@ -110,8 +110,6 @@ module ActiveRecord
         result
       end
 
-      
-    
       alias_method :old_find_by_sql, :find_by_sql
       # Override find_by_sql so that you can tell it to selectively use a slave machine
       def find_by_sql(sql, use_slave = false)
@@ -121,6 +119,17 @@ module ActiveRecord
           old_find_by_sql sql
         end
       end
+      
+      alias_method :old_calculate, :calculate
+      
+      def calculate(operation, column_name, options ={})
+        use_slave = options.delete(:use_slave)
+        if use_slave && connection.is_a?(ConnectionAdapters::MysqlReplicationAdapter)
+          connection.load_balance_query {old_calculate(operation, column_name, options)}
+        else
+          old_calculate(operation, column_name, options)
+        end
+      end
     end
     
   end
@@ -483,8 +492,10 @@ module ActiveRecord
           
           # connect to all the clone machines
           @clones = []
-          if @config[:clones]
-            @config[:clones].each do |clone|
+          clone_config = @config[:clones] || @config[:slaves]
+          
+          if clone_config
+            clone_config.each do |clone|
               conn = Mysql.init
               if encoding
                 conn.options(Mysql::SET_CHARSET_NAME, encoding) rescue nil

data/lib/mysql_replication_adapter/version.rb

@@ -1,8 +1,8 @@
 module MysqlReplicationAdapter #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 1
-    TINY  = 1
+    MINOR = 2
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>mysql_replication_adapter</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/mysql_replication_adapter"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/mysql_replication_adapter" class="numbers">0.1.1</a>
+      <a href="http://rubyforge.org/projects/mysql_replication_adapter" class="numbers">0.2.0</a>
     </div>
     <h1>&#x2192; &#8216;mysql_replication_adapter&#8217;</h1>
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: mysql_replication_adapter
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2007-07-23 00:00:00 -07:00
+  version: 0.2.0
+date: 2007-08-01 00:00:00 -07:00
 summary: An ActiveRecord database adapter that allows you to specify a single write master and multiple read-only slaves.
 require_paths: 
 - lib