diff options
| author | Yehuda Katz <wycats@gmail.com> | 2011-11-13 13:38:45 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2011-11-13 13:38:45 -0800 |
| commit | 2ec8d52b0cb830412e02b2504f9f2c3a12483b52 (patch) | |
| tree | 121cb28811e4aad66fac50ae2b18fb4efd13dcc6 | |
| parent | d37e169856dbe022ce892af2f36d96b2f1f63d8e (diff) | |
| parent | bf6efa8d9cd0f7ce2eea7c1a0ff51f1d165cafc6 (diff) | |
| download | rails-2ec8d52b0cb830412e02b2504f9f2c3a12483b52.tar.gz rails-2ec8d52b0cb830412e02b2504f9f2c3a12483b52.tar.bz2 rails-2ec8d52b0cb830412e02b2504f9f2c3a12483b52.zip | |
Merge pull request #3622 from noefroidevaux/issue_3595
Fix pull request #3609
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 2 |
1 files changed, 1 insertions, 1 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 92dfb844db..0ec0576795 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -127,7 +127,7 @@ module ActiveRecord with_connection do |conn| conn.tables.each { |table| @tables[table] = true } - @tables[name] = !@tables.key?(name) && conn.table_exists?(name) + @tables[name] = conn.table_exists?(name) if !@tables.key?(name) end @tables[name] |