kovyrin-db-charmer 1.1.3 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.2.0

data/db-charmer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.1.3"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]
-  s.date = %q{2009-09-18}
+  s.date = %q{2009-09-23}
   s.description = %q{ActiveRecord Connections Magic (slaves, multiple connections, etc)}
   s.email = %q{alexey@kovyrin.net}
   s.extra_rdoc_files = [

data/lib/db_charmer/finder_overrides.rb

@@ -27,7 +27,7 @@ module DbCharmer
     private
 
       def first_level_on_slave
-        if db_charmer_top_level_connection?
+        if db_charmer_top_level_connection? && on_master.connection.open_transactions.zero?
           on_slave { yield }
         else
           yield

data/lib/db_charmer.rb

@@ -28,6 +28,7 @@ require 'db_charmer/connection_factory'
 require 'db_charmer/connection_proxy'
 require 'db_charmer/connection_switch'
 require 'db_charmer/association_proxy'
+require 'db_charmer/multi_db_proxy'
 
 # Enable misc AR extensions
 ActiveRecord::Base.extend(DbCharmer::ActiveRecordExtensions::ClassMethods)
@@ -37,6 +38,7 @@ ActiveRecord::Base.extend(DbCharmer::ConnectionSwitch::ClassMethods)
 
 # Enable connection proxy in AR
 ActiveRecord::Base.extend(DbCharmer::MultiDbProxy::ClassMethods)
+ActiveRecord::Base.extend(DbCharmer::MultiDbProxy::MasterSlaveClassMethods)
 #ActiveRecord::Base.send(:include, DbCharmer::MultiDbProxy::InstanceMethods)
 
 # Enable connection proxy for associations

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kovyrin-db-charmer
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-18 00:00:00 -07:00
+date: 2009-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency