From 07dcfd4ea7c052063e912ab479f64da78848a66e Mon Sep 17 00:00:00 2001
From: Raimonds Simanovskis <raimonds.simanovskis@gmail.com>
Date: Mon, 1 Mar 2010 14:19:25 +0200
Subject: cache primary key per engine connection, updated gemspec file
---
lib/arel/engines/sql/relations/relation.rb | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
(limited to 'lib/arel/engines')
diff --git a/lib/arel/engines/sql/relations/relation.rb b/lib/arel/engines/sql/relations/relation.rb
index 4249cf9b0d..5e8fc2e83e 100644
--- a/lib/arel/engines/sql/relations/relation.rb
+++ b/lib/arel/engines/sql/relations/relation.rb
@@ -1,6 +1,6 @@
module Arel
class Relation
- @@tables_primary_keys = {}
+ @@connection_tables_primary_keys = {}
def compiler
@compiler ||= begin
@@ -23,10 +23,12 @@ module Arel
end
def primary_key
- if @@tables_primary_keys.has_key?(table.name)
- @@tables_primary_keys[table.name]
+ connection_id = engine.connection.object_id
+ if @@connection_tables_primary_keys[connection_id] && @@connection_tables_primary_keys[connection_id].has_key?(table.name)
+ @@connection_tables_primary_keys[connection_id][table.name]
else
- @@tables_primary_keys[table.name] = engine.primary_key(table.name)
+ @@connection_tables_primary_keys[connection_id] ||= {}
+ @@connection_tables_primary_keys[connection_id][table.name] = engine.connection.primary_key(table.name)
end
end
--
cgit v1.2.3