db-charmer 1.6.6 → 1.6.7

data/CHANGES

@@ -1,3 +1,9 @@
+1.6.7 (2010-04-07):
+
+Changed the way we handle associations in on_db(:foo).find(:include) calls. Now we
+switch association's connection only if its default connection is the same as the
+master model's connection (not more "table does not exist" problems I hope).
+
 1.6.5 (2010-04-05):
 
 Bugfix release: Fixed :connection vs :slave in db_magic behaviour. Model.on_master should

data/README.rdoc

@@ -135,6 +135,10 @@ in your single database (especially useful in test databases).
 This behaviour is controlled by the <tt>DbCharmer.connections_should_exist</tt>
 configuration attribute which could be set from a rails initializer.
 
+Warning: if in test environment you use separate connections and master-slave support
+in DbCharmer, make sure you disable transactional fixtures support in Rails. Without
+this change you're going to see all kinds of weird data visibility problems in your tests.
+
 
 == Using Models in Master-Slave Environments
 

data/VERSION

@@ -1 +1 @@
-1.6.6
+1.6.7

data/db-charmer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.6.6"
+  s.version = "1.6.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]
-  s.date = %q{2010-04-05}
+  s.date = %q{2010-04-07}
   s.description = %q{ActiveRecord Connections Magic (slaves, multiple connections, etc)}
   s.email = %q{alexey@kovyrin.net}
   s.extra_rdoc_files = [
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/kovyrin/db-charmer}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{ActiveRecord Connections Magic}
 
   if s.respond_to? :specification_version then

data/lib/db_charmer/association_preload.rb

@@ -5,7 +5,9 @@ module DbCharmer
       ASSOCIATION_TYPES.each do |association_type|
         class_eval <<-EOF, __FILE__, __LINE__ + 1
           def preload_#{association_type}_association(records, reflection, preload_options = {})
-            return super(records, reflection, preload_options) if self.db_charmer_top_level_connection?
+            if self.db_charmer_top_level_connection? || self.db_charmer_default_connection != reflection.klass.db_charmer_default_connection
+              return super(records, reflection, preload_options)
+            end
             reflection.klass.on_db(self) do
               super(records, reflection, preload_options)
             end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: db-charmer
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 6
-  - 6
-  version: 1.6.6
+  version: 1.6.7
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -14,35 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -04:00
+date: 2010-04-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        - 0
         version: 2.2.0
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: blankslate
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+    version: 
 description: ActiveRecord Connections Magic (slaves, multiple connections, etc)
 email: alexey@kovyrin.net
 executables: []
@@ -94,20 +83,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: ActiveRecord Connections Magic