From debd111a39a683592873e7af2d277233b6ec14d2 Mon Sep 17 00:00:00 2001 From: Emilio Tagua Date: Fri, 19 Feb 2010 12:08:47 -0300 Subject: Refactored primary_key to look up for the real primary_key and cache it. --- lib/arel/engines/sql/relations/relation.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/arel/engines/sql/relations/relation.rb b/lib/arel/engines/sql/relations/relation.rb index 52b91c71ea..4249cf9b0d 100644 --- a/lib/arel/engines/sql/relations/relation.rb +++ b/lib/arel/engines/sql/relations/relation.rb @@ -1,5 +1,6 @@ module Arel class Relation + @@tables_primary_keys = {} def compiler @compiler ||= begin @@ -22,10 +23,10 @@ module Arel end def primary_key - @primary_key ||= begin - table.name.classify.constantize.primary_key - rescue NameError - nil + if @@tables_primary_keys.has_key?(table.name) + @@tables_primary_keys[table.name] + else + @@tables_primary_keys[table.name] = engine.primary_key(table.name) end end -- cgit v1.2.3