lib/db_charmer/connection_switch.rb in glebpom-db-charmer-1.3.0 vs lib/db_charmer/connection_switch.rb in glebpom-db-charmer-1.4.0

@@ -1,9 +1,9 @@
 module DbCharmer
   module ConnectionSwitch
     module ClassMethods
       def coerce_to_connection_proxy(conn, should_exist = true)
-        return nil if conn.nil?
+        return nil if conn.nil? || !DbCharmer.switch_connections?
 
         if conn.kind_of?(Symbol) || conn.kind_of?(String)
           return DbCharmer::ConnectionFactory.connect(conn, should_exist)
         end