db-charmer 1.6.18 → 1.6.19

data/CHANGES

@@ -1,4 +1,4 @@
-1.6.17/1.6.18 (2011-04-25):
+1.6.17-19 (2011-04-25):
 
 Bugfixes: Do not touch database for sharded models until we really need to. Before 1.6.17
 if a database server was dead and there were any other connection issues, class loading

data/VERSION

@@ -1 +1 @@
-1.6.18
+1.6.19

data/db-charmer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.6.18"
+  s.version = "1.6.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]

data/lib/db_charmer/sharding/stub_connection.rb

@@ -23,13 +23,14 @@ module DbCharmer
         return @real_conn if @real_conn
 
         # If sharded connection supports shards enumeration, get the first shard
-        @real_conn = sharded_connection.shard_connections.try(:first)
+        conn = sharded_connection.shard_connections.try(:first)
 
         # If we do not have real connection yet, try to use the default one (if it is supported by the sharder)
-        @real_conn ||= sharded_connection.sharder.shard_for_key(:default) if sharded_connection.support_default_shard?
+        conn ||= sharded_connection.sharder.shard_for_key(:default) if sharded_connection.support_default_shard?
 
         # Get connection proxy for our real connection
-        @real_conn && coerce_to_connection_proxy(@real_conn, DbCharmer.connections_should_exist?)
+        return nil unless conn
+        @real_conn = ActiveRecord::Base.coerce_to_connection_proxy(conn, DbCharmer.connections_should_exist?)
       end
 
       def method_missing(meth, *args, &block)
@@ -39,12 +40,12 @@ module DbCharmer
         end
 
         # Fail if no connection has been established yet
-        unless @real_conn
+        unless real_connection
           raise ActiveRecord::ConnectionNotEstablished, "No real connection to proxy this method to!"
         end
 
         # Proxy the call to our real connection target
-        @real_conn.__send__(meth, *args, &block)
+        real_connection.__send__(meth, *args, &block)
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: db-charmer
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: false
   segments: 
   - 1
   - 6
-  - 18
-  version: 1.6.18
+  - 19
+  version: 1.6.19
 platform: ruby
 authors: 
 - Alexey Kovyrin