activerecord_partitioning 0.0.2 → 0.0.3

data/lib/activerecord_partitioning.rb

@@ -3,21 +3,22 @@ require 'activerecord_partitioning/connection_pools'
 
 module ActiveRecordPartitioning
   module_function
-  def setup(key_name, base_config = {}, store = {})
-    @base_config = base_config.symbolize_keys
+  def setup(key_name, default_config = nil, store = {})
+    @default_config = default_config.try(:symbolize_keys)
     new_pools = ConnectionPools.new(key_name, store)
     new_pools.merge!(ActiveRecord::Base.connection_handler.connection_pools)
     ActiveRecord::Base.connection_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new(new_pools)
   end
 
   def reset_connection_handler
+    @default_config = nil
     ActiveRecord::Base.connection_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
   end
 
   def with_connection_pool(config, &block)
     self.current_connection_pool_config = config = config.symbolize_keys
     if ActiveRecord::Base.connection_pool.nil?
-      ActiveRecord::Base.establish_connection(@base_config.merge(config))
+      ActiveRecord::Base.establish_connection((@default_config || {}).merge(config))
     end
     yield if block_given?
   ensure
@@ -25,7 +26,7 @@ module ActiveRecordPartitioning
   end
 
   def current_connection_pool_config
-    Thread.current[:current_connection_pool_config]
+    Thread.current[:current_connection_pool_config] || @default_config
   end
 
   def current_connection_pool_config=(config)

data/lib/activerecord_partitioning/connection_pools.rb

@@ -34,6 +34,10 @@ module ActiveRecordPartitioning
       @store.each_value(&block)
     end
 
+    def each(&block)
+      @store.each(&block)
+    end
+
     def size
       @store.size
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord_partitioning
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Xiao Li