Merge pull request #3609 from noefroidevaux/issue_3595

Prevent multiple SHOW TABLES calls when a table don't exists in database...

1 files changed, 3 insertions, 3 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index 77a5fe1efb..92dfb844db 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -123,14 +123,14 @@ module ActiveRecord
 
       # A cached lookup for table existence.
       def table_exists?(name)
-        return true if @tables.key? name
+        return @tables[name] if @tables.key? name
 
         with_connection do |conn|
           conn.tables.each { |table| @tables[table] = true }
-          @tables[name] = true if !@tables.key?(name) && conn.table_exists?(name)
+          @tables[name] = !@tables.key?(name) && conn.table_exists?(name)
         end
 
-        @tables.key? name
+        @tables[name]
       end
 
       # Clears out internal caches: