connection_manager 0.3.9 → 0.3.10

data/lib/connection_manager/connection_builder.rb

@@ -11,7 +11,7 @@ module ConnectionManager
       "development"
     end
     
-    # Grab only thoses connections that correspond to the current env. If env
+    # Grab only those connections that correspond to the current env. If env
     # is blank it grabs all the connection keys
     # 
     # If you current environment valid database keys can be:
@@ -27,7 +27,7 @@ module ConnectionManager
       ActiveRecord::Base.configurations[name_from_yml].symbolize_keys if found
     end
         
-    # Returns currently loaded configuations where :build_connection is true
+    # Returns currently loaded configurations where :build_connection is true
     def database_keys_for_auto_build
       ab_configs = []
       configuration_keys.each do |key|    
@@ -71,7 +71,7 @@ module ConnectionManager
     end
       
     # Given an connection key name from the database.yml, returns the string 
-    # equivelent of the class name for that entry.
+    # equivalent of the class name for that entry.
     def connection_class_name(name_from_yml)
       new_class_name = clean_yml_key(name_from_yml)
       new_class_name = new_class_name.gsub(/\_/,' ').titleize.gsub(/ /,'')

data/lib/connection_manager/helpers/abstract_adapter_helper.rb

@@ -4,6 +4,12 @@ module ConnectionManager
       @config
     end
     
+    # Determines if connection supports cross database queries
+    def cross_database_support?
+     (@config[:cross_database_support] || @config[:adapter].match(/(mysql)|(postgres)|(sqlserver)/i)) 
+    end
+    alias :cross_schema_support? :cross_database_support?
+    
     def using_em_adapter?
       (@config[:adapter].match(/^em\_/) && defined?(EM) && EM::reactor_running?)
     end

data/lib/connection_manager/helpers/connection_helpers.rb

@@ -3,18 +3,6 @@ module ConnectionManager
   module ConnectionHelpers       
     @@managed_connections = HashWithIndifferentAccess.new
     
-    # 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
-    
-    def database_name=database_name
-      @database_name = database_name
-    end
-    
-    alias :schema_name :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.
@@ -52,7 +40,7 @@ module ConnectionManager
     # 
     # Options:
     # * :table_name_prefix - the prefix required for making cross database/schema
-    # joins for you database managmenet system. By default table_name_prefix is the
+    # joins for you database management system. By default table_name_prefix is the
     # database/schema name followed by a period EX: "my_database."
     # * :table_name - the table name for the model if it does not match ActiveRecord
     # naming conventions
@@ -64,21 +52,21 @@ module ConnectionManager
     #     LegacyUser.limit(1).to_sql => "SELECT * FROM `BDUser`.`UserData` LIMIT 1
     #
     def use_database(database_name,opts={})
-      @database_name = database_name
-      opts[:table_name_prefix] ||= "#{database_name}."
-      opts[:table_name] ||= self.table_name.to_s.split('.').last
-      self.table_name = "#{opts[:table_name_prefix]}#{opts[:table_name]}"
-      self.table_name_prefix = opts[:table_name_prefix]
+      self.database_name = database_name
+      opts[:table_name_prefix] ||= "#{database_name}." if self.connection.cross_database_support?
+      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, noramlly for abstract classes aka connection classes.
+ 
+    # Establishes and checks in a connection, normally for abstract classes AKA connection classes.
     # 
     # Options:
     # * :abstract_class - used the set #abstract_class, default is true
     # * :readonly - force all instances to readonly
-    # * :class_name - name of connection class name, default is current class's name
+    # * :class_name - name of connection class name, default is current class name
     # * :table_name_prefix - prefix to append to table name for cross database joins,
     #     default is the "#{self.database_name}."
     # EX:
@@ -94,7 +82,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) unless self.abstract_class
+      use_database(self.database_name,opts)
     end
           
     # Override ActiveRecord::Base instance method readonly? to force 

data/lib/connection_manager/patches/cross_schema_patch.rb

@@ -38,3 +38,25 @@ if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR <= 2
     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

data/lib/connection_manager/replication.rb

@@ -1,9 +1,8 @@
 require 'active_support/core_ext/hash/indifferent_access'
 module ConnectionManager
   module Replication 
-    
     # Replication methods (replication_method_name, which is the option[:name] for the
-    # #replication method) and all thier associated connections. The key is the
+    # #replication method) and all their associated connections. The key is the
     # replication_method_name and the value is an array of all the replication_classes
     # the replication_method has access to.
     # 
@@ -34,33 +33,22 @@ module ConnectionManager
     # * :name - name of class method to call to access replication, default to slaves
     # * :readonly - forces all results to readonly
     # * :type - the type of replication; :slave or :master, defaults to :slave
-    # * :using - list of connections to use; can be database.yml key or the name of the connection class --- DEPRECIATED
-    # * A Block may be passed that will be called on each of the newly created child classes  
     def replicated(*connections)
-      @replicated = true
-      options = {:name => "slaves"}.merge!(connections.extract_options!)
-      options[:type] ||= :slaves
-      options[:build_replicants] = true if (options[:build_replicants].blank? && options[:type] == :masters)
-      if options[:using]
-        connections = options[:using] 
-        warn "[DEPRECATION] :using option is deprecated.  Please list replication connections instead. EX: replicated :slave_connection,'OtherSlaveConnectionChild', :name => 'my_slaves'."
-      end
-      
-      # Just incase its blank. Should be formally set by using connection class or at the model manually
-      self.table_name_prefix = "#{database_name}." if self.table_name_prefix.blank?
-      
-      connections = connection.replication_keys(options[:type]) if connections.blank?
-      set_replications_to_method(connections,options[:name])
-      build_repliciation_class_method(options)
-      build_replication_association_class(options)
-      build_query_method_alias_method(options[:name])
-      build_repliciation_instance_method(options[:name])
-      options[:name]
+        @replicated = true
+        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?
+        connections = connection.replication_keys(options[:type]) if connections.blank?
+        set_replications_to_method(connections,options[:name])
+        build_repliciation_class_method(options)
+        build_replication_association_class(options)
+        build_query_method_alias_method(options[:name])
+        build_repliciation_instance_method(options[:name])
+        options[:name]
     end
       
-    
-    # Get a connection class name from out replication_methods pool
-    # could add mutex but not sure blocking is with it.
+    # Get a connection class name from out replication_methods pool.
     def fetch_replication_method(method_name)
       available_connections = @replication_methods[method_name]
       raise ArgumentError, "No connections found for #{method_name}." if available_connections.blank?
@@ -112,7 +100,7 @@ module ConnectionManager
     end
     
     # Builds a class within the model with the name of replication method. Use this
-    # class as the :class_name options for associations when it is nesseccary to
+    # class as the :class_name options for associations when it is necessary to
     # ensure eager loading uses a replication connection.
     # 
     # EX:
@@ -142,7 +130,7 @@ module ConnectionManager
       STR
     end
        
-    # Build a query method with the name of our replicaiton method. This method 
+    # Build a query method with the name of our replication method. This method 
     # uses the relation.klass to fetch the appropriate connection, ensuring the
     # correct connection is used even if the method is already defined by another class.
     # We want to make sure we don't override existing methods in ActiveRecord::QueryMethods

data/lib/connection_manager/using.rb

@@ -32,9 +32,7 @@ module ConnectionManager
         db_name = con_class.database_name
         dup_klass = dup              
         dup_klass.class_eval <<-STR 
-          self.database_name = '#{db_name}'
-          self.table_name_prefix = '#{db_name}.'
-          self.table_name = '#{db_name}.#{table_name.split('.').last}'
+          self.use_database('#{db_name}',{:table_name => '#{table_name}'})
           class << self
             def model_name
               #{self.name}.model_name

data/lib/connection_manager/version.rb

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

data/spec/lib/using_spec.rb

@@ -22,9 +22,9 @@ describe ConnectionManager::Using do
     end
   
     it "should create the exact same sql if called from model or from relation" #do
-#      Fruit.where(:name => "malarky").using("CmFooSlaveConnection").to_sql.should eql(
-#        Fruit.using("CmFooSlaveConnection").where(:name => "malarky").to_sql)
-#    end
+      #Fruit.where(:name => "malarky").using("CmFooSlaveConnection").to_sql.should eql(
+        #Fruit.using("CmFooSlaveConnection").where(:name => "malarky").to_sql)
+    #end
   
     it "should have the same connection if called from model or from relation" do
       Fruit.where(:name => "malarky").using("CmFooSlaveConnection").connection.config.should eql(

metadata

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