connection_manager 0.3.2 → 0.3.3

data/lib/connection_manager/using.rb

@@ -23,22 +23,29 @@ module ConnectionManager
       end
       
       def build_dup_class(connection_class_name)
-        dup_klass =  class_eval <<-STR
+        con_class = connection_class_name.constantize
+        dup_klass = class_eval <<-STR
              #{connection_class_name}Dup = dup              
-          STR
-          
-          dup_klass.class_eval <<-STR 
-            class << self
-              def model_name
-                '#{self.name}'.constantize.model_name
-              end
+        STR
+        dup_klass.class_eval <<-STR 
+          self.table_name = '#{table_name_for_dup(con_class)}'
+          class << self
+            def model_name
+              '#{self.name}'.constantize.model_name
             end
-          STR
+          end
+        STR
           
-          extend_dup_class(dup_klass,connection_class_name)
-          dup_klass.table_name = table_name.to_s.split('.').last
-          dup_klass.table_name_prefix =  connection_class_name.constantize.table_name_prefix
-          dup_klass
+        extend_dup_class(dup_klass,connection_class_name)
+        dup_klass
+      end
+      
+      def table_name_for_dup(con_class)
+        (con_class.database_name == database_name ) ? table_name : "#{con_class.table_name_prefix}#{table_name.split('.').last}"
+      end
+      
+      def table_name_prefix_for_dup(con_class)
+        con_class.abstract_class? ? table_name_prefix : con_class.table_name_prefix
       end
     
       # Extend the connection override module from the connetion to the supplied class

data/lib/connection_manager/version.rb

@@ -1,4 +1,4 @@
 module ConnectionManager
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end
 

data/spec/lib/connection_helpers_spec.rb

@@ -30,10 +30,6 @@ describe ConnectionManager::ConnectionHelpers do
       it "should create abstract class" do
         MyConnectionClass.abstract_class.should be_true
       end
-  
-      it "should prefix table name with database" do
-        MyConnectionClass.table_name_prefix.should eql('cm_test.')
-      end
       
       it "should checkin the connection" do
         ActiveRecord::Base.managed_connection_classes.include?("MyConnectionClass").should be_true

data/spec/lib/replication_spec.rb

@@ -40,6 +40,12 @@ describe ConnectionManager::Replication do
         Fruit.replicated
         Fruit.slaves.connection.config.should_not eql(Fruit.connection.config)
       end
+      
+      it "should produce the same query string" do
+        Fruit.replicated
+        Fruit.slaves.joins(:region).to_sql.should eql(Fruit.joins(:region).to_sql)
+        Fruit.slaves.joins(:fruit_baskets).to_sql.should eql(Fruit.joins(:fruit_baskets).to_sql)
+      end
     end
     
     context "the objects return from a query" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: connection_manager
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000Z
+date: 2012-06-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70332644333500 !ruby/object:Gem::Requirement
+  requirement: &70198847335500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70332644333500
+  version_requirements: *70198847335500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70332644332560 !ruby/object:Gem::Requirement
+  requirement: &70198847335080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70332644332560
+  version_requirements: *70198847335080
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70332644331540 !ruby/object:Gem::Requirement
+  requirement: &70198847334620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70332644331540
+  version_requirements: *70198847334620
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70332644330700 !ruby/object:Gem::Requirement
+  requirement: &70198847334200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70332644330700
+  version_requirements: *70198847334200
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70332644317680 !ruby/object:Gem::Requirement
+  requirement: &70198847333780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70332644317680
+  version_requirements: *70198847333780
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70332644316100 !ruby/object:Gem::Requirement
+  requirement: &70198847333260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70332644316100
+  version_requirements: *70198847333260
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70332644315060 !ruby/object:Gem::Requirement
+  requirement: &70198847332800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70332644315060
+  version_requirements: *70198847332800
 description: Simplifies connecting to Muliple and Replication databases with rails
   and active_record
 email: