connection_manager 0.3.7 → 0.3.8

data/Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
 gemspec
+
+gem 'ZenTest', '4.8.2'

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2012 Joshua T. Mckinney
+Copyright (c) 2011-2013 Joshua T. Mckinney
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -174,6 +174,24 @@ to your shard requirements.
     # Calls the supplied block on all the shards available to User, including the User model itself.
     User.shards{ |shard| shard.where(:user_name => "some_user").all} => [<User ...>,<LegacyUser ...>]
 
+## Caching
+
+ActiveRecord only caches queries for the ActiveRecord::Base connection. Inorder to cache queries that
+originate from classes that used establish_connection you must surround your code with a cache block:
+
+    MyOtherConnectionClass.cache {
+      Some queries...
+    }
+
+In Rails for less complicated schemas you could simply create an around filter for your controllers
+
+    class ApplicationController < ActionController::Base
+      around_filter :cache_slaves
+      private
+      def cache_slaves
+        MyOnlySlaveConnection.cache { yield }
+      end
+
 ## Migrations
 
 Nothing implement now to help but there are lots of potential solutions [here] (http://stackoverflow.com/questions/1404620/using-rails-migration-on-different-database-than-standard-production-or-devel)

data/lib/connection_manager/helpers/connection_helpers.rb

@@ -67,7 +67,7 @@ module ConnectionManager
       @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]
+      self.table_name = "#{opts[:table_name_prefix]}#{opts[:table_name]}"
       self.table_name_prefix = opts[:table_name_prefix]
     end
     

data/lib/connection_manager/patches/cross_schema_patch.rb

@@ -1,28 +1,40 @@
 # ActiveRecord 3.0 BACK PORT ONLY
 # https://github.com/brianmario/mysql2/commit/14accdf8d1bf557f652c19b870316094a7441334#diff-0
-
-if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 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
     module ConnectionAdapters
-      class Mysql2Adapter < AbstractAdapter     
-        def new_tables(database = nil) #:nodoc:
-          sql = ["SHOW TABLES", database].compact.join(' IN ')
-          execute(sql, 'SCHEMA').collect do |field|
-            field.first
-          end
+      class Mysql2Adapter < ((ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 2) ? AbstractMysqlAdapter : AbstractAdapter)
+        
+        # Force all tables to be cached for the life connection
+        def cached_tables
+          @cached_tables ||= {}
+        end
+        
+        def tables(name = nil, database = nil, like =nil)
+          return cached_tables[database] if cached_tables[database] && like.nil?
+          cached_tables[database] ||= []
+          return [like] if like && cached_tables[database].include?(like)
+          sql = "SHOW TABLES "
+          sql << "IN #{quote_table_name(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
+        
         def table_exists?(name)
-          return true if super
+          return false unless name
           name          = name.to_s
           schema, table = name.split('.', 2)
           unless table # A table was provided without a schema
             table  = schema
             schema = nil
           end
-          new_tables(schema).include? table
+          new_tables(nil, schema, table).include?(table)
         end
       end
     end
-  end
-end
+  end 
+end

data/lib/connection_manager/using.rb

@@ -24,12 +24,15 @@ module ConnectionManager
       
       def build_dup_class(connection_class_name)
         con_class = connection_class_name.constantize
+        db_name = con_class.database_name
         dup_klass = dup              
         dup_klass.class_eval <<-STR 
-          self.table_name = '#{table_name_for_dup(con_class)}'
+          self.database_name = '#{db_name}'
+          self.table_name_prefix = '#{db_name}.'
+          self.table_name = '#{db_name}.#{table_name.split('.').last}'
           class << self
             def model_name
-              '#{self.name}'.constantize.model_name
+              #{self.name}.model_name
             end
           end
         STR
@@ -37,14 +40,6 @@ module ConnectionManager
         extend_dup_class(dup_klass,connection_class_name)          
         self.const_set("#{connection_class_name}Dup", dup_klass)
       end
-      
-      def table_name_for_dup(con_class)
-        "#{table_name_prefix_for_dup(con_class)}#{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
       def extend_dup_class(dup_class,connection_class_name)
@@ -63,7 +58,7 @@ module ConnectionManager
         connection_class_name.constantize.class_eval <<-STR
         module ConnectionOverrideMod      
           def connection_class
-            "#{connection_class_name}".constantize
+            #{connection_class_name}
           end
         
           def connection

data/lib/connection_manager/version.rb

@@ -1,4 +1,4 @@
 module ConnectionManager
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end
 

data/spec/lib/connection_helpers_spec.rb

@@ -56,13 +56,13 @@ describe ConnectionManager::ConnectionHelpers do
   
     it "should set the contactinate the schema_name and table_name; and set the table_name to that value" do
       Fruit.use_database('my_schema')
-      Fruit.table_name.should eql('fruits')
+      Fruit.table_name.should eql('my_schema.fruits')
       Fruit.table_name_prefix.should eql('my_schema.')
     end
   
     it "should set the table_name if one is supplied" do
       Fruit.use_database('my_schema',{:table_name => 'apples'})
-      Fruit.table_name.should eql('apples')
+      Fruit.table_name.should eql('my_schema.apples')
       Fruit.table_name_prefix.should eql('my_schema.')
     end
   end

data/spec/lib/replication_spec.rb

@@ -107,10 +107,10 @@ describe ConnectionManager::Replication do
     end
     
     # We'd like this to happen magically some day. Possible in 3.2
-    it "should eager load with replication instances" do
-      user = User.includes(:foos).slaves.where(:id => @user.id).first
-      user.foos.first.should_not be_kind_of(Foo)
-    end
+    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
     
     context "specifically defined replication association" do
       it "should eager load with replication instances" do

data/spec/lib/using_spec.rb

@@ -25,7 +25,6 @@ describe ConnectionManager::Using do
     lambda { "Fruit::CmFooSlaveConnectionDup".constantize}.should_not raise_error(NameError)
   end
 
-  
   describe '#using' do
     it "should return an ActiveRecord::Relation" do
       Fruit.using("CmFooSlaveConnection").should be_kind_of(ActiveRecord::Relation)
@@ -34,10 +33,10 @@ describe ConnectionManager::Using do
       Fruit.using("CmFooSlaveConnection").connection.config.should_not eql(Fruit.connection.config)
     end
   
-    it "should create the 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 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 have the same connection if called from model or from relation" do
       Fruit.where(:name => "malarky").using("CmFooSlaveConnection").connection.config.should eql(
@@ -62,7 +61,7 @@ describe ConnectionManager::Using do
       Fruit.using("CmMasterConnection").where(:name => f.name).first.should_not be_nil
     end
     
-    it "should save to schema/database set in connection class different" do
+    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)

data/spec/mysql2_database.yml

@@ -14,7 +14,7 @@ master: &master
   password: omegared
   
 readonly: &readonly
-  username: readonly
+  username: root
   password: omegared
   
 test:

metadata

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