activerecord_partitioning 0.0.6 → 0.0.7

data/lib/activerecord_partitioning.rb

@@ -17,13 +17,15 @@ module ActiveRecordPartitioning
 
   def with_connection_pool(config, &block)
     config.try(:symbolize_keys!)
-    self.current_connection_pool_config = (self.default_config || {}).merge(config || {})
+    origin = Thread.current[:current_connection_pool_config]
+    Thread.current[:current_connection_pool_config] = (self.default_config || {}).merge(config || {})
     if ActiveRecord::Base.connection_pool.nil?
       ActiveRecord::Base.establish_connection(self.current_connection_pool_config)
     end
     yield if block_given?
   ensure
-    self.current_connection_pool_config = nil
+    ActiveRecord::Base.clear_active_connections!
+    Thread.current[:current_connection_pool_config] = origin
   end
 
   def default_config
@@ -37,8 +39,4 @@ module ActiveRecordPartitioning
   def current_connection_pool_config
     Thread.current[:current_connection_pool_config] || self.default_config
   end
-
-  def current_connection_pool_config=(config)
-    Thread.current[:current_connection_pool_config] = config
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord_partitioning
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Xiao Li
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-10 00:00:00 Z
+date: 2013-10-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord