connection_manager 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjczOGY2MmMzMzFiMDBiNDNjYzhiMTE5NGVkZWM2OGRmOGUxYzdiNA==
+  data.tar.gz: !binary |-
+    MTIwMjQ1ODQ3ZGMwYTY0YWI0ZDgwNDM4NGM1MTE0MGYxMzE5ZjQxZQ==
+SHA512:
+  metadata.gz: !binary |-
+    MjAxNjI1Y2JjOGU0YjMzMWQyMzI0NjMyYzVmMmEzYTFjNWU3ZjBlNjk5OWNm
+    MDEyMTRmZDQ5MmRmMmFjYmUzMWVkYzNiNzk1OTRiMzgwNTRjOGMxYmExYzY2
+    Yjk1ZTRjMjI0MjkwY2U5YzM3ODBjNTQ2MzY3ZmRhOGM5M2VkYTM=
+  data.tar.gz: !binary |-
+    N2ZlMDg5N2NmOTEwNzQxN2ZlYmZkNjQyMmFlZDNmMTI3MjZjOTIwZWNmNWIy
+    MjZmYTQxZjE4M2QxYzg5ZTJjODZlM2FkMDIwMjY2MTE2ZDI1YzNjZGZjZjRi
+    N2Y5ZjZhZmQyMWNmYmMxYWM2ZGNhZWExYjEyM2Y5ODk3YTFmYTk=

data/CHANGE.md

@@ -0,0 +1,12 @@
+ConnectionManager Changelog
+=====================
+
+HEAD
+=======
+- None yet!
+
+1.0.2
+=======
+- ActiveRecord 4.1 compatibility
+- Refactor Using to make use of active record relations
+- Better cross schema patching, make sure AR < 3.2 loads

data/connection_manager.gemspec

@@ -17,12 +17,12 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_runtime_dependency 'activerecord', '>= 3.0', '<= 4.0'
+  s.add_runtime_dependency 'activerecord', '>= 3.0', '<= 4.1'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'autotest'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'factory_girl'
-  s.add_development_dependency 'activesupport', '>= 3.0', '<= 4.0'
+  s.add_development_dependency 'activesupport', '>= 3.0', '<= 4.1'
   
   if(defined? RUBY_ENGINE and 'jruby' == RUBY_ENGINE)
     s.add_development_dependency 'jruby-openssl'

data/lib/connection_manager.rb

@@ -10,15 +10,12 @@ module ConnectionManager
   require 'connection_manager/shards'  
   require 'connection_manager/replication'
   require 'connection_manager/patches/cross_schema_patch'
-  require 'connection_manager/patches/reflections_patch'
-  require 'connection_manager/patches/query_methods_patch'
   require 'connection_manager/connection_manager_railtie' if defined?(Rails)
     
   ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include,(ConnectionManager::AbstractAdapterHelper))
   ActiveRecord::Base.extend(ConnectionManager::ConnectionHelpers) 
   ActiveRecord::Base.extend(ConnectionManager::ConnectionBuilder)
   ActiveRecord::Base.send(:include,ConnectionManager::Using)
-  ActiveRecord::QueryMethods.send(:include,ConnectionManager::UsingQueryMethod)
   ActiveRecord::Base.extend(ConnectionManager::Replication)
   ActiveRecord::Base.extend(ConnectionManager::Shards)
   

data/lib/connection_manager/helpers/abstract_adapter_helper.rb

@@ -3,44 +3,94 @@ module ConnectionManager
     def config
       @config
     end
-    
+
     # Determines if connection supports cross database queries
     def cross_database_support?
-     (@config[:cross_database_support] || @config[:adapter].match(/(mysql)|(postgres)|(sqlserver)/i)) 
+      (@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
-    
+
     def readonly?
       (@config[:readonly] == true)
-    end 
-    
+    end
+
     def replicated?
       (!slave_keys.blank? || !master_keys.blank?)
     end
-   
+
     def database_name
       @config[:database]
     end
-   
+
     def replication_keys(type=:slaves)
       return slave_keys if type == :slaves
       master_keys
     end
-    
+
     def slave_keys
-      slave_keys = []
-      slave_keys = @config[:slaves].collect{|r| r.to_sym} if @config[:slaves]
-      slave_keys  
+      return @config[:slaves].collect{|r| r.to_sym} if @config[:slaves]
+      []
     end
-    
+
     def master_keys
-      master_keys = []
-      master_keys = @config[:masters].collect{|r| r.to_sym} if @config[:masters]
-      master_keys
+      return @config[:masters].collect{|r| r.to_sym} if @config[:masters]
+      []
+    end
+
+    if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR <= 1
+
+      # Returns the schema for a give table. Returns nil of multiple matches are found  
+      def fetch_table_schema(table_name)
+        sql = "SELECT table_schema FROM INFORMATION_SCHEMA.TABLES WHERE table_name = '#{table_name}'"
+        found = nil
+        results = execute(sql, 'SCHEMA')
+        found = results.to_a
+        if (found.length == 1)
+          found = found[0][0]
+        end
+        found
+      end
+
+      # Returns table_schema.table_name for the given table. Returns nil if multiple matches are found
+      def fetch_full_table_name(table_name)
+        return table_name if (table_name.to_s.match(/(^$)|(\.)/))
+        sql = "SELECT CONCAT(table_schema,'.',table_name) FROM INFORMATION_SCHEMA.TABLES WHERE table_name = '#{table_name}'"
+        found = nil
+        results = execute(sql, 'SCHEMA')
+        found = results.to_a
+        if (found.length == 1)
+          found = found[0][0]
+        else
+          found = table_name
+        end
+        found
+      end
+    else
+      
+      # Returns the schema for a give table. Returns nil of multiple matches are found      
+      def fetch_table_schema(table_name)
+        sql = "SELECT table_schema FROM INFORMATION_SCHEMA.TABLES WHERE table_name = '#{table_name}'"
+        execute_and_free(sql, 'SCHEMA') do |result|
+          found = result.to_a
+          return nil unless (found.length == 1)
+          found[0][0]
+        end
+      end
+
+      # Returns table_schema.table_name for the given table. Returns nil if multiple matches are found
+      def fetch_full_table_name(table_name)
+        return table_name if (table_name.to_s.match(/(^$)|(\.)/))
+        sql = "SELECT CONCAT(table_schema,'.',table_name) FROM INFORMATION_SCHEMA.TABLES WHERE table_name = '#{table_name}'"
+        execute_and_free(sql, 'SCHEMA') do |result|
+          found = result.to_a
+          return table_name unless (found.length == 1)
+          found[0][0]
+        end
+      end
     end
   end
 end

data/lib/connection_manager/helpers/connection_helpers.rb

@@ -74,7 +74,7 @@ module ConnectionManager
     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?
+      unless self.abstract_class? || self.name == "ActiveRecord::Base"
         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]}"

data/lib/connection_manager/patches/cross_schema_patch.rb

@@ -1,10 +1,35 @@
-# ActiveRecord 3.0 BACK PORT ONLY
-# https://github.com/brianmario/mysql2/commit/14accdf8d1bf557f652c19b870316094a7441334#diff-0
-if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR <= 2
-  (require 'active_record/connection_adapters/abstract_mysql_adapter' if (ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 2))
+module ActiveRecord
+  class Base
+    class << self
+      unless ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR <= 1
+        # We want to make sure we get the full table name with schema
+        def arel_table # :nodoc:
+          @arel_table ||= Arel::Table.new(quoted_table_name.to_s.gsub('`',''), arel_engine)
+        end
+      end
+
+      private
+      alias :base_compute_table_name :compute_table_name
+      # In a schema schema environment we want to set table name prefix
+      # to the schema_name + . if its not set already
+      def compute_table_name
+        result = base_compute_table_name
+        if result.match(/^[^.]*$/) && connection.cross_schema_support?
+          t_schema = connection.fetch_table_schema(undecorated_table_name(name))
+          self.table_name_prefix = "#{t_schema}." if t_schema
+          result = base_compute_table_name
+        end
+        result
+      end
+    end
+  end
+end
+
+if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR <= 1
+  require 'active_record/connection_adapters/mysql2_adapter'
   module ActiveRecord
     module ConnectionAdapters
-      class Mysql2Adapter < ((ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 2) ? AbstractMysqlAdapter : AbstractAdapter)
+      class Mysql2Adapter < AbstractAdapter
 
         # Force all tables to be cached for the life connection
         def cached_tables
@@ -16,14 +41,13 @@ if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR <= 2
           cached_tables[database] ||= []
           return [like] if like && cached_tables[database].include?(like)
           sql = "SHOW TABLES "
-          sql << "IN #{quote_table_name(database)} " if database
+          sql << "IN #{database} " if database
           sql << "LIKE #{quote(like)}" if like
           result = execute(sql, 'SCHEMA')
           cached_tables[database] = (cached_tables[database] | result.collect { |field| field[0] }).compact
         end
 
-        alias :new_tables :tables
-
+        # We have to clean the name of '`' and fetch table name with schema
         def table_exists?(name)
           return false unless name
           name          = name.to_s
@@ -32,7 +56,7 @@ if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR <= 2
             table  = schema
             schema = nil
           end
-          new_tables(nil, schema, table).include?(table)
+          tables(nil, schema, table).include?(table)
         end
       end
     end

data/lib/connection_manager/using.rb

@@ -1,79 +1,92 @@
+require 'active_support/core_ext/module/delegation'
 module ConnectionManager
   module Using
     module ClassMethods
-      
-      def using(connection_class_name)
-        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
-        
-      private       
+
       # We use dup here because its just too tricky to make sure we override
-      # all the methods necessary when using a child class of the model. This 
+      # all the methods necessary when using a child class of the model. This
       # action is lazy and the created sub is named to a constant so we only
       # have to do it once.
-      def fetch_duplicate_class(connection_class_name)     
+      def fetch_duplicate_class(connection_class_name)
         begin
           return "#{self.name}::#{connection_class_name}Dup".constantize
         rescue NameError
           return build_dup_class(connection_class_name)
         end
       end
-      
+
+      private
       # Modifies the dup class to use the connection class connection.
       # We want to use the current class table name, but the connection
-      # class database as the prefix, useful when shards but normally 
-      # should be the same. We also want the superclass method to 
+      # class database as the prefix, useful when shards but normally
+      # should be the same. We also want the superclass method to
       # 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.current_database_name
-        dup_klass = dup              
+        dup_klass = dup
         dup_klass.class_eval <<-STR
-          self.use_database('#{db_name}',{:table_name => '#{table_name}'})
-          class << self
-            def model_name
-              #{self.name}.model_name
-            end
-            def connection_class
-              #{connection_class_name}
-            end
-            def connection
-              connection_class.connection
-            end
-            def superclass
-              connection_class
-            end
+        self.use_database('#{db_name}',{:table_name => '#{table_name}'})
+        class << self
+          def model_name
+            #{self.name}.model_name
+          end
+          def connection_class
+            #{connection_class_name}
+          end
+          def connection
+            connection_class.connection
           end
+          def superclass
+            connection_class
+          end
+        end
         STR
-        
+
         self.const_set("#{connection_class_name}Dup", dup_klass)
         "#{self.name}::#{connection_class_name}Dup".constantize
       end
     end
-    
+
     # Instance method for casting to a duplication class
     def using(connection_class)
       becomes(self.class.using(connection_class).klass)
     end
-    
+
     def self.included(host_class)
       host_class.extend(ClassMethods)
     end
   end
-  
-  module UsingQueryMethod
-    def using(connection_class_name)
-      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
+
+module ActiveRecord
+  # = Active Record Relation
+  class Relation
+   if ActiveRecord::VERSION::MAJOR == 4
+      def using(connection_class_name)
+        d = @klass.fetch_duplicate_class(connection_class_name)
+        self.instance_variable_set(:@arel_table, d.arel_table)
+        self.instance_variable_set(:@klass, d)
+        self
+      end
+    else
+      def using(connection_class_name)
+        d = @klass.fetch_duplicate_class(connection_class_name)
+        rel = clone
+        rel.instance_variable_set(:@arel_table, d.arel_table)
+        rel.instance_variable_set(:@klass, d)
+        rel
+      end
+    end
+  end
+end
+
+module ActiveRecord
+  class Base
+    class << self
+      delegate :using, :to => (ActiveRecord::VERSION::MAJOR == 4 ? :all : :scoped)
     end
   end
 end

data/lib/connection_manager/version.rb

@@ -1,3 +1,3 @@
 module ConnectionManager
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/helpers/database_spec_helper.rb

@@ -2,13 +2,13 @@ class TestDB
   def self.yml(driver='sqlite')
     YAML::load(File.open(File.join(File.dirname(__FILE__),'..',"#{driver}_database.yml")))
   end
-  
+
   def self.connect(driver='sqlite',logging=false)
     ActiveRecord::Base.configurations = yml(driver)
-    ActiveRecord::Base.establish_connection('test') 
+    ActiveRecord::Base.establish_connection('test')
     ActiveRecord::Base.logger = Logger.new(STDOUT) if logging
   end
-  
+
   def self.clean
     [:foos,:fruits,:baskets,:fruit_baskets,:regions,:types].each do |t|
       DBSpecManagement.connection.execute("DELETE FROM #{t.to_s}")
@@ -19,46 +19,63 @@ class TestDB
   end
 end
 
-
 #Put all the test migrations here
-class TestMigrations < ActiveRecord::Migration  
+class TestMigrations < ActiveRecord::Migration
   # all the ups
-  def self.up(connection_name='test',master_2_connection_name='master_2_cm_test', user_connection_name='cm_user_test')  
-    [connection_name,master_2_connection_name].each do |c|
-      ActiveRecord::Base.establish_connection(c) 
-      begin
-        create_table :foos do |t|
-          t.string :name
-          t.integer :user_id
-        end 
-        create_table :fruits do |t|
-          t.string :name
-          t.integer :region_id
-          t.timestamps
-        end
-        create_table :baskets do |t|
-          t.string :name
-          t.timestamps
-        end
-        create_table :fruit_baskets do |t|
-          t.integer :fruit_id
-          t.integer :basket_id
-          t.timestamps
-        end
-        create_table :regions do |t|
-          t.string :name
-          t.integer :type_id
-          t.timestamps
-        end
-        create_table :types do |t|
-          t.string :name
-          t.timestamps
-        end
-      rescue => e
-        puts "tables failed to create: #{e}"
+  def self.up(connection_name='test', user_connection_name='cm_user_test')
+    ActiveRecord::Base.establish_connection(connection_name)
+    begin
+      create_table "#{ActiveRecord::Base.schema_name}.foos" do |t|
+        t.string :name
+        t.integer :user_id
+      end
+    rescue => e
+      puts "tables failed to create: #{e}"
+    end
+    begin
+      create_table "#{ActiveRecord::Base.schema_name}.fruits" do |t|
+        t.string :name
+        t.integer :region_id
+        t.timestamps
+      end
+    rescue => e
+      puts "tables failed to create: #{e}"
+    end
+    begin
+      create_table "#{ActiveRecord::Base.schema_name}.baskets" do |t|
+        t.string :name
+        t.timestamps
+      end
+    rescue => e
+      puts "tables failed to create: #{e}"
+    end
+    begin
+      create_table "#{ActiveRecord::Base.schema_name}.fruit_baskets" do |t|
+        t.integer :fruit_id
+        t.integer :basket_id
+        t.timestamps
+      end
+    rescue => e
+      puts "tables failed to create: #{e}"
+    end
+    begin
+      create_table "#{ActiveRecord::Base.schema_name}.regions" do |t|
+        t.string :name
+        t.integer :type_id
+        t.timestamps
+      end
+    rescue => e
+      puts "tables failed to create: #{e}"
+    end
+    begin
+      create_table "#{ActiveRecord::Base.schema_name}.types" do |t|
+        t.string :name
+        t.timestamps
       end
+    rescue => e
+      puts "tables failed to create: #{e}"
     end
-    
+
     ActiveRecord::Base.establish_connection(user_connection_name)
     begin
       create_table :users do |t|
@@ -67,30 +84,28 @@ class TestMigrations < ActiveRecord::Migration
     rescue => e
       puts "tables failed to create: #{e}"
     end
-    
+
     ActiveRecord::Base.establish_connection(connection_name)
   end
-  
+
   # all the downs
-  def self.down(connection_name='test',master_2_connection_name='master_2_cm_test',user_connection_name='cm_user_test')  
-    [connection_name,master_2_connection_name].each do |c|
-      ActiveRecord::Base.establish_connection(c) 
+  def self.down(connection_name='test',user_connection_name='cm_user_test')
+    ActiveRecord::Base.establish_connection(connection_name)
+    [:foos,:fruits,:baskets,:fruit_baskets,:regions,:types].each do |t|
       begin
-        [:foos,:fruits,:baskets,:fruit_baskets,:regions,:types].each do |t|
-          drop_table t 
-        end
+        drop_table t
       rescue => e
         puts "tables were not dropped: #{e}"
       end
     end
-    ActiveRecord::Base.establish_connection(user_connection_name) 
+    ActiveRecord::Base.establish_connection(user_connection_name)
     begin
       [:users].each do |t|
-        drop_table t 
+        drop_table t
       end
     rescue => e
       puts "tables were not dropped: #{e}"
     end
-    ActiveRecord::Base.establish_connection(connection_name)  
-  end  
-end 
+    ActiveRecord::Base.establish_connection(connection_name)
+  end
+end

data/spec/jdbcmysql_database.yml

@@ -38,11 +38,6 @@ slave_2_cm_test:
   <<: *common
   <<: *readonly
   database: cm_test
-
-master_2_cm_test:
-  <<: *common
-  <<: *master
-  database: cm_master_2_test
   
 shard_1_cm_test:  
    <<: *common

data/spec/lib/patches/cross_schema_path_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+describe ActiveRecord::ConnectionAdapters::Mysql2Adapter do
+  describe '#fetch_full_table_name' do
+    it "should return a string consisting of the schema name, a '.' and the table_name" do
+      Fruit.connection.fetch_full_table_name('fruits').should eql('cm_test.fruits')
+    end
+  end
+
+  describe '#table_exists?' do
+    it "should return true for unquoted full_names" do
+      Fruit.connection.table_exists?('cm_test.fruits').should be_true
+    end
+     it "should return true for table only names" do
+      Fruit.connection.table_exists?('fruits').should be_true
+    end
+  end
+end
+describe ActiveRecord::Base do
+  describe '#arel_table' do
+    it "should use quote_table_name" do
+      Fruit.arel_table.name.should eql('cm_test.fruits')
+    end
+  end
+end

data/spec/lib/replication_spec.rb

@@ -68,11 +68,10 @@ describe ConnectionManager::Replication do
     end
 
     context "the objects return from a query" do
-      # The default connection is the original connection for the model
-      it "should have the connection as the replication" do
+      it "should not have the same connection as the master class" do
         Fruit.replicated
         FactoryGirl.create(:fruit)
-        Fruit.slaves.first.connection.config.should eql(Fruit.slaves.connection.config)
+        Fruit.slaves.connection.config.should_not eql(Fruit.connection.config)
         Fruit.slaves.first.should_not be_nil
       end
     end

data/spec/lib/using_spec.rb

@@ -2,9 +2,6 @@ require 'spec_helper'
 class CmFooSlaveConnection < ActiveRecord::Base
   establish_managed_connection(:slave_1_cm_test)
 end
-class CmMasterConnection < ActiveRecord::Base
-  establish_managed_connection(:master_2_cm_test)
-end
 
 describe ConnectionManager::Using do
   
@@ -21,10 +18,11 @@ describe ConnectionManager::Using do
       Fruit.using("CmFooSlaveConnection").connection.config.should_not eql(Fruit.connection.config)
     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
+    it "should create the exact same sql if called from model or from relation" do
+      class_sql = Fruit.using("CmFooSlaveConnection").where(:name => "malarky").to_sql
+      relation_sql = Fruit.where(:name => "malarky").using("CmFooSlaveConnection").to_sql
+      class_sql.should eql(relation_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(
@@ -34,30 +32,6 @@ describe ConnectionManager::Using do
       Fruit.where(:name => "malarky").using("CmFooSlaveConnection").connection.config.should_not eql(
         Fruit.where(:name => "malarky").connection.config)
     end
-    
-    it "should work" do
-      FactoryGirl.create(:fruit)
-      Fruit.using("CmFooSlaveConnection").first
-    end
-    
-    it "should really use a different connection" do   
-      f = Fruit.using("CmMasterConnection").new
-      f.name = FactoryGirl.generate(:rand_name)
-      f.save
-      Fruit.where(:name => "malarky").first.should be_nil
-      Fruit.using("CmFooSlaveConnection").where(:name => f.name).first.should be_nil
-      Fruit.using("CmMasterConnection").where(:name => f.name).first.should_not be_nil
-    end
-    
-    it "should save to schema/database set in connection class" do
-      Fruit.table_name_prefix = "cm_test."
-      f = Fruit.using("CmMasterConnection").new
-      f.name = FactoryGirl.generate(:rand_name)
-      f.save
-      Fruit.where(:name => f.name).first.should be_nil
-      Fruit.using("CmFooSlaveConnection").where(:name => f.name).first.should be_nil
-      Fruit.using("CmMasterConnection").where(:name => f.name).first.should_not be_nil
-    end
   end
 end
   

data/spec/mysql2_database.yml

@@ -39,11 +39,6 @@ slave_2_cm_test:
   <<: *readonly
   database: cm_test
 
-master_2_cm_test:
-  <<: *common
-  <<: *master
-  database: cm_master_2_test
-  
 shard_1_cm_test:  
    <<: *common
    <<: *master

metadata

@@ -1,42 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: connection_manager
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Joshua Mckinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
     - - <=
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
     - - <=
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -44,7 +40,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -52,7 +47,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: autotest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -60,7 +54,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -68,7 +61,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,7 +68,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -84,7 +75,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -92,7 +82,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -100,29 +89,26 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
     - - <=
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
     - - <=
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -130,7 +116,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -145,6 +130,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- CHANGE.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -156,8 +142,6 @@ files:
 - lib/connection_manager/helpers/abstract_adapter_helper.rb
 - lib/connection_manager/helpers/connection_helpers.rb
 - lib/connection_manager/patches/cross_schema_patch.rb
-- lib/connection_manager/patches/query_methods_patch.rb
-- lib/connection_manager/patches/reflections_patch.rb
 - lib/connection_manager/replication.rb
 - lib/connection_manager/shards.rb
 - lib/connection_manager/using.rb
@@ -168,6 +152,7 @@ files:
 - spec/jdbcmysql_database.yml
 - spec/lib/connection_builder_spec.rb
 - spec/lib/connection_helpers_spec.rb
+- spec/lib/patches/cross_schema_path_spec.rb
 - spec/lib/replication_spec.rb
 - spec/lib/shards_spec.rb
 - spec/lib/using_spec.rb
@@ -177,27 +162,26 @@ files:
 - spec/sqlite_database.yml
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: connection_manager
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simplifies connecting to Multiple and Replication databases with rails and
   active_record
 test_files:
@@ -207,6 +191,7 @@ test_files:
 - spec/jdbcmysql_database.yml
 - spec/lib/connection_builder_spec.rb
 - spec/lib/connection_helpers_spec.rb
+- spec/lib/patches/cross_schema_path_spec.rb
 - spec/lib/replication_spec.rb
 - spec/lib/shards_spec.rb
 - spec/lib/using_spec.rb

data/lib/connection_manager/patches/query_methods_patch.rb

@@ -1,15 +0,0 @@
-module ActiveRecord
-  module QueryMethods
-    private
-    # For some reason on .include or a custom join
-    # Arel drops the table name prefix on slave classes
-    def build_select(arel, selects)
-      unless selects.empty?
-        @implicit_readonly = false
-        arel.project(*selects)
-      else
-        arel.project("#{quoted_table_name}.*")
-      end
-    end
-  end
-end

data/lib/connection_manager/patches/reflections_patch.rb

@@ -1,19 +0,0 @@
-if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR <= 0
-  # Sometimes for some reason the quoted_table_name  instance methods
-  # drops the schema. If the quoted table name does not include a '.'
-  # want to retrieve the quoted_table_name from the class and reset
-  module ActiveRecord
-    # = Active Record Reflection
-    module Reflection # :nodoc:
-      class AssociationReflection < MacroReflection
-        def table_name
-          @table_name = klass.table_name
-        end
-
-        def quoted_table_name
-          @quoted_table_name = klass.quoted_table_name
-        end
-      end
-    end
-  end
-end