connection_manager 0.3.10 → 0.3.11

data/lib/connection_manager/connection_builder.rb

@@ -52,7 +52,7 @@ module ConnectionManager
         klass = Class.new(ActiveRecord::Base)
         new_connection_class = Object.const_set(class_name, klass)  
         new_connection_class.establish_managed_connection(connection_key)
-        new_connection_class.table_name_prefix = "#{new_connection_class.database_name}."
+        new_connection_class.use_database(new_connection_class.current_database_name)
       end
     end
     

data/lib/connection_manager/helpers/connection_helpers.rb

@@ -3,6 +3,26 @@ module ConnectionManager
   module ConnectionHelpers       
     @@managed_connections = HashWithIndifferentAccess.new
     
+    # Returns the database_name of the connection unless set otherwise
+    def current_database_name
+      return "#{connection.config[:database].to_s}" if @current_database_name.blank?
+      @current_database_name
+    end
+    alias :database_name :current_database_name
+    alias :current_schema_name :current_database_name
+    alias :schema_name :current_database_name
+    
+    
+    # Sometimes we need to manually set the database name, like when the connection
+    # has a database but our table is in a different database/schema but on the
+    # same DMS.
+    def current_database_name=current_database_name
+      @current_database_name= current_database_name
+    end
+    alias :database_name= :current_database_name=
+    alias :current_schema_name= :current_database_name=
+    alias :schema_name= :current_database_name=
+    
     # Returns true if this is a readonly only a readonly model
     # If the connection.readonly? then the model that uses the connection 
     # must be readonly.
@@ -51,16 +71,18 @@ module ConnectionManager
     #     
     #     LegacyUser.limit(1).to_sql => "SELECT * FROM `BDUser`.`UserData` LIMIT 1
     #
-    def use_database(database_name,opts={})
-      self.database_name = database_name
-      opts[:table_name_prefix] ||= "#{database_name}." if self.connection.cross_database_support?
+    def use_database(database_name=nil,opts={})
+      self.current_database_name = database_name if database_name
+      opts[:table_name_prefix] = "#{self.current_database_name}." if opts[:table_name_prefix].blank? && self.connection.cross_database_support?
+      unless self.abstract_class?
+        opts[:table_name] = self.table_name if opts[:table_name].blank?
+        opts[:table_name].gsub!(self.table_name_prefix,'') unless self.table_name_prefix.blank?
+        self.table_name = "#{opts[:table_name_prefix]}#{opts[:table_name]}"
+      end
       self.table_name_prefix = opts[:table_name_prefix] unless opts[:table_name_prefix].blank?
-      opts[:table_name] ||= self.table_name 
-      opts[:table_name] = opts[:table_name].to_s.split('.').last if self.connection.cross_database_support?
-      self.table_name = "#{opts[:table_name_prefix]}#{opts[:table_name]}" unless self.abstract_class? || opts[:table_name].blank?
     end
     alias :use_schema :use_database
- 
+   
     # Establishes and checks in a connection, normally for abstract classes AKA connection classes.
     # 
     # Options:
@@ -82,7 +104,7 @@ module ConnectionManager
       self.abstract_class = opts[:abstract_class]
       set_to_readonly if (readonly? || opts[:readonly] || self.connection.readonly?)
       add_managed_connections(yml_key,opts[:class_name])
-      use_database(self.database_name,opts)
+      use_database(self.current_database_name,opts)
     end
           
     # Override ActiveRecord::Base instance method readonly? to force 

data/lib/connection_manager/patches/cross_schema_patch.rb

@@ -36,27 +36,5 @@ if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR <= 2
         end
       end
     end
-  end 
-end
-
-# We need to make sure we override existing database_name name methods
-module ActiveRecord
-  class Base
-    class << self
-      # Returns the database_name of the connection unless set otherwise
-      def database_name
-        @database_name = "#{connection.config[:database].to_s}" if @database_name.blank?
-        @database_name
-      end
-      alias :schema_name :database_name
-    
-      # Sometimes we need to manually set the database name, like when the connection
-      # has a database but our table is in a different database/schema but on the
-      # same DMS.
-      def database_name=database_name
-        @database_name = database_name
-      end
-      alias :schema_name= :database_name=
-    end
   end
-end
+end

data/lib/connection_manager/replication.rb

@@ -38,7 +38,7 @@ module ConnectionManager
         options = {:name => "slaves"}.merge!(connections.extract_options!)
         options[:type] ||= :slaves
         options[:build_replicants] = true if (options[:build_replicants].blank? && options[:type] == :masters)
-        self.use_database(self.database_name,{:table_name => self.table_name}) if self.connection.cross_database_support?
+        use_database(current_database_name, :table_name => table_name) # make sure the base class has current_database_name set
         connections = connection.replication_keys(options[:type]) if connections.blank?
         set_replications_to_method(connections,options[:name])
         build_repliciation_class_method(options)

data/lib/connection_manager/using.rb

@@ -6,6 +6,7 @@ module ConnectionManager
         d = fetch_duplicate_class(connection_class_name)
         r = ActiveRecord::Relation.new(d, d.arel_table)
         r = r.readonly if d.connection.readonly?
+        r = r.from(d.quoted_table_name) unless (ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0)
         r
       end
         
@@ -28,10 +29,11 @@ module ConnectionManager
       # return the connection class as AR sometimes uses the the superclass
       # connection
       def build_dup_class(connection_class_name)
+        use_database(self.current_database_name) # make sure we are consistent from super to dup
         con_class = connection_class_name.constantize
-        db_name = con_class.database_name
+        db_name = con_class.current_database_name
         dup_klass = dup              
-        dup_klass.class_eval <<-STR 
+        dup_klass.class_eval <<-STR
           self.use_database('#{db_name}',{:table_name => '#{table_name}'})
           class << self
             def model_name
@@ -50,6 +52,7 @@ module ConnectionManager
         STR
         
         self.const_set("#{connection_class_name}Dup", dup_klass)
+        "#{self.name}::#{connection_class_name}Dup".constantize
       end
     end
     
@@ -68,6 +71,7 @@ module ConnectionManager
       d = klass.using(connection_class_name)
       relation = clone
       relation.instance_variable_set(:@klass, d.klass)
+      relation = relation.from(d.quoted_table_name) unless (ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0)
       relation
     end
   end

data/lib/connection_manager/version.rb

@@ -1,3 +1,3 @@
 module ConnectionManager
-  VERSION = "0.3.10"
+  VERSION = "0.3.11"
 end

data/spec/lib/connection_builder_spec.rb

@@ -25,5 +25,4 @@ describe ConnectionManager::ConnectionBuilder do
       MyConnectionClass.superclass.should eql(ActiveRecord::Base)
     end
   end   
-end
-
+end

data/spec/lib/connection_helpers_spec.rb

@@ -16,6 +16,11 @@ describe ConnectionManager::ConnectionHelpers do
         }, {:readonly => true})
     end
     
+    class MyPrefixedConnection < MyConnectionClass
+      self.abstract_class = true
+      self.use_database("boo")
+    end
+    
     class MyFoo < MyConnectionClass
       self.table_name = 'foos'
     end
@@ -51,7 +56,7 @@ describe ConnectionManager::ConnectionHelpers do
   describe '#use_database' do
     it "should set the database/schema for the model to the supplied schema_name" do
       Fruit.use_database('my_schema')
-      Fruit.database_name.should eql('my_schema')
+      Fruit.current_database_name.should eql('my_schema')
     end
   
     it "should set the contactinate the schema_name and table_name; and set the table_name to that value" do
@@ -66,5 +71,9 @@ describe ConnectionManager::ConnectionHelpers do
       Fruit.table_name_prefix.should eql('my_schema.')
     end
   end
+  
+  it "should have the correct database name" do
+    MyPrefixedConnection.current_database_name.should eql('boo')
+  end
 end
 

data/spec/lib/replication_spec.rb

@@ -3,7 +3,7 @@ describe ConnectionManager::Replication do
   
   describe '#database_name' do
     it "should return the name of the database the model is using" do
-      Fruit.database_name.should eql('cm_test')
+      Fruit.current_database_name.should eql('cm_test')
     end
   end
 
@@ -45,6 +45,7 @@ describe ConnectionManager::Replication 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)
+        Fruit.slaves.joins(:region).joins("LEFT OUTER JOIN `fruit_baskets` ON `fruit_baskets`.`fruit_id` = `cm_test`.`fruits`.`id`").to_sql.should eql(Fruit.joins(:region).joins("LEFT OUTER JOIN `fruit_baskets` ON `fruit_baskets`.`fruit_id` = `cm_test`.`fruits`.`id`").to_sql)
         Fruit.slaves.includes(:fruit_baskets).to_sql.should eql(Fruit.includes(:fruit_baskets).to_sql)
         Fruit.slaves.includes(:region).to_sql.should eql(Fruit.includes(:region).to_sql)
       end
@@ -108,9 +109,9 @@ describe ConnectionManager::Replication do
     
     # We'd like this to happen magically some day. Possible in 3.2
     it "should eager load with replication instances" #do
-      #user = User.slaves.includes(:foos).where(:id => @user.id).first
-      #user.foos.first.should_not be_kind_of(Foo)
-    #end
+#      user = User.slaves.includes(:foos).where(:id => @user.id).first
+#      user.foos.first.should_not be_kind_of(Foo)
+#    end
     
     context "specifically defined replication association" do
       it "should eager load with replication instances" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: connection_manager
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord