lib/apartment/database.rb in apartment-0.18.0 vs lib/apartment/database.rb in apartment-0.19.0

@@ -21,11 +21,11 @@
     #   Fetch the proper multi-tenant adapter based on Rails config
     #
     #   @return {subclass of Apartment::AbstractAdapter}
     #
     def adapter
-      @adapter ||= begin
+      Thread.current[:apartment_adapter] ||= begin
         adapter_method = "#{config[:adapter]}_adapter"
 
         begin
           require "apartment/adapters/#{adapter_method}"
         rescue LoadError
@@ -41,10 +41,10 @@
     end
 
     #   Reset config and adapter so they are regenerated
     #
     def reload!
-      @adapter = nil
+      Thread.current[:apartment_adapter] = nil
       @config = nil
     end
 
   private
 
\ No newline at end of file