db-charmer 1.6.4 → 1.6.5

data/CHANGES

@@ -1,6 +1,12 @@
+1.6.5 (2010-04-05):
+
+Bugfix release: Fixed :connection vs :slave in db_magic behaviour. Model.on_master should
+run queries on the master, not on AR's default connection.
+
+----------------------------------------------------------------------------------------
 1.6.4 (2010-04-05):
 
-Default behaviour changed: DbCharmer.connections_should_exist is true in all environments 
+Default behaviour changed: DbCharmer.connections_should_exist is true in all environments
 by default. Old default behaviour was too misleading for many developers.
 
 ----------------------------------------------------------------------------------------

data/VERSION

@@ -1 +1 @@
-1.6.4
+1.6.5

data/db-charmer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.6.4"
+  s.version = "1.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]

data/lib/db_charmer/active_record_extensions.rb

@@ -36,6 +36,16 @@ module DbCharmer
         @@db_charmer_connection_proxies[self.name]
       end
 
+      #-----------------------------------------------------------------------------
+      @@db_charmer_default_connection = nil
+      def db_charmer_default_connection=(conn)
+        @@db_charmer_default_connection = conn
+      end
+
+      def db_charmer_default_connection
+        @@db_charmer_default_connection
+      end
+
       #-----------------------------------------------------------------------------
       @@db_charmer_slaves = {}
       def db_charmer_slaves=(slaves)

data/lib/db_charmer/db_magic.rb

@@ -9,7 +9,7 @@ module DbCharmer
         should_exist = opt[:should_exist] || DbCharmer.connections_should_exist?
 
         # Main connection management
-        setup_connection_magic(opt[:connection], should_exist) if opt[:connection]
+        setup_connection_magic(opt[:connection], should_exist)
 
         # Set up slaves pool
         opt[:slaves] ||= []
@@ -59,6 +59,7 @@ module DbCharmer
 
       def setup_connection_magic(conn, should_exist = false)
         switch_connection_to(conn, should_exist)
+        self.db_charmer_default_connection = conn
       end
 
       def setup_slaves_magic(slaves, should_exist = false)

data/lib/db_charmer/multi_db_proxy.rb

@@ -56,7 +56,7 @@ module DbCharmer
       end
 
       def on_master(proxy_target = nil, &block)
-        on_db(nil, proxy_target, &block)
+        on_db(db_charmer_default_connection, proxy_target, &block)
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 4
-  version: 1.6.4
+  - 5
+  version: 1.6.5
 platform: ruby
 authors: 
 - Alexey Kovyrin