diff options
| author | Raimonds Simanovskis <raimonds.simanovskis@gmail.com> | 2010-03-01 14:19:25 +0200 |
|---|---|---|
| committer | Raimonds Simanovskis <raimonds.simanovskis@gmail.com> | 2010-03-01 14:19:25 +0200 |
| commit | 07dcfd4ea7c052063e912ab479f64da78848a66e (patch) | |
| tree | e6d724266baa51001ae98897f0bb08b6e6384a98 | |
| parent | 19c4de17ed40b323b5d771b81e28fe7b7490efc2 (diff) | |
| download | rails-07dcfd4ea7c052063e912ab479f64da78848a66e.tar.gz rails-07dcfd4ea7c052063e912ab479f64da78848a66e.tar.bz2 rails-07dcfd4ea7c052063e912ab479f64da78848a66e.zip | |
cache primary key per engine connection, updated gemspec file
| -rw-r--r-- | arel.gemspec | 8 | ||||
| -rw-r--r-- | lib/arel/engines/sql/relations/relation.rb | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/arel.gemspec b/arel.gemspec index 24a73d78cd..4e1a52d077 100644 --- a/arel.gemspec +++ b/arel.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Bryan Helmkamp", "Nick Kallen", "Emilio Tagua"] - s.date = %q{2010-02-13} + s.date = %q{2010-03-01} s.description = %q{Arel is a Relational Algebra for Ruby. It 1) simplifies the generation complex of SQL queries and it 2) adapts to various RDBMS systems. It is intended to be a framework framework; that is, you can build your own ORM with it, focusing on @@ -69,6 +69,11 @@ and query generation.} "lib/arel/engines/memory/relations/writes.rb", "lib/arel/engines/sql.rb", "lib/arel/engines/sql/christener.rb", + "lib/arel/engines/sql/compilers/ibm_db_compiler.rb", + "lib/arel/engines/sql/compilers/mysql_compiler.rb", + "lib/arel/engines/sql/compilers/oracle_compiler.rb", + "lib/arel/engines/sql/compilers/postgresql_compiler.rb", + "lib/arel/engines/sql/compilers/sqlite_compiler.rb", "lib/arel/engines/sql/core_extensions.rb", "lib/arel/engines/sql/core_extensions/array.rb", "lib/arel/engines/sql/core_extensions/nil_class.rb", @@ -79,6 +84,7 @@ and query generation.} "lib/arel/engines/sql/predicates.rb", "lib/arel/engines/sql/primitives.rb", "lib/arel/engines/sql/relations.rb", + "lib/arel/engines/sql/relations/compiler.rb", "lib/arel/engines/sql/relations/operations/alias.rb", "lib/arel/engines/sql/relations/operations/join.rb", "lib/arel/engines/sql/relations/relation.rb", 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 |