From dc73c2c38feb018da37eda0a23c9411e15888eeb Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Thu, 9 Jun 2011 09:01:50 +0200 Subject: [PATCH] don't reinitialize the arel_table unless the table_name changes --- activerecord/lib/active_record/base.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 7d02970ba0..37fae55619 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -659,6 +659,7 @@ module ActiveRecord #:nodoc: def set_table_name(value = nil, &block) @quoted_table_name = nil define_attr_method :table_name, value, &block + @arel_table = nil @arel_table = Arel::Table.new(table_name, arel_engine) @relation = Relation.new(self, arel_table) @@ -892,7 +893,7 @@ module ActiveRecord #:nodoc: end def arel_table - Arel::Table.new(table_name, arel_engine) + @arel_table ||= Arel::Table.new(table_name, arel_engine) end def arel_engine