yam-db-charmer 1.7.4.9 → 1.7.4.10

data/lib/db_charmer/active_record/class_attributes.rb

@@ -97,6 +97,16 @@ module DbCharmer
         @@db_charmer_database_remappings = mappings || { }
       end
 
+      #-----------------------------------------------------------------------------
+      @@db_charmer_allocated_shard_connection = nil
+      def db_charmer_allocated_shard_connection
+        @@db_charmer_allocated_shard_connection
+      end
+
+      def db_charmer_allocated_shard_connection=(conn)
+        @@db_charmer_allocated_shard_connection = conn
+      end
+
       # For sharded models, return the table name without the schema prefix
       def table_name_without_schema
         if self.respond_to?(:orig_table_name)

data/lib/db_charmer/active_record/connection_switching.rb

@@ -36,6 +36,9 @@ module DbCharmer
         class << self
           # Make sure we check our accessors before going to the default connection retrieval method
           def connection_with_magic
+            if db_charmer_allocated_shard_connection 
+              return coerce_to_connection_proxy(db_charmer_allocated_shard_connection, true)
+            end
             db_charmer_remapped_connection || db_charmer_connection_proxy || connection_without_magic
           end
           alias_method_chain :connection, :magic

data/lib/db_charmer/active_record/sharding.rb

@@ -18,8 +18,11 @@ module DbCharmer
         group = sharder.least_loaded_group
         shard_info = sharder.shard_info_by_group_id(group.id)
         conn = sharder.shard_connection_config(shard_info, group.id)
+        # Set global shard connection obj
+        self.db_charmer_allocated_shard_connection = conn
         key_obj = on_db(conn, nil, &block)
-        allocate_new_block_for_key_on_group(key_obj.send(key_field), group)
+        self.db_charmer_allocated_shard_connection = nil
+        sharder.allocate_new_block_for_key_on_group(key_obj.send(key_field), group)
         key_obj
       end
 

data/lib/db_charmer/version.rb

@@ -3,7 +3,7 @@ module DbCharmer
     MAJOR = 1
     MINOR = 7
     PATCH = 4
-    BUILD = 9
+    BUILD = 10
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: yam-db-charmer
 version: !ruby/object:Gem::Version 
-  hash: 101
+  hash: 99
   prerelease: 
   segments: 
   - 1
   - 7
   - 4
-  - 9
-  version: 1.7.4.9
+  - 10
+  version: 1.7.4.10
 platform: ruby
 authors: 
 - Oleksiy Kovyrin
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-17 00:00:00 -07:00
+date: 2012-10-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency