From f0301e3de6e6ee394af0b120d05290f984338382 Mon Sep 17 00:00:00 2001 From: Arthur Neves Date: Mon, 9 Sep 2013 13:47:07 -0400 Subject: on SchemaCache use the connection getter instead of the obj given --- activerecord/lib/active_record/connection_adapters/schema_cache.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/activerecord/lib/active_record/connection_adapters/schema_cache.rb b/activerecord/lib/active_record/connection_adapters/schema_cache.rb index bc8d24a03f..9fc218d815 100644 --- a/activerecord/lib/active_record/connection_adapters/schema_cache.rb +++ b/activerecord/lib/active_record/connection_adapters/schema_cache.rb @@ -9,7 +9,7 @@ module ActiveRecord @tables = {} @columns = Hash.new do |h, table_name| - h[table_name] = conn.columns(table_name, "#{table_name} Columns") + h[table_name] = connection.columns(table_name, "#{table_name} Columns") end @columns_hash = Hash.new do |h, table_name| @@ -19,7 +19,7 @@ module ActiveRecord end @primary_keys = Hash.new do |h, table_name| - h[table_name] = table_exists?(table_name) ? conn.primary_key(table_name) : nil + h[table_name] = table_exists?(table_name) ? connection.primary_key(table_name) : nil end end -- cgit v1.2.3