diff options
| author | Raimonds Simanovskis <raimonds.simanovskis@gmail.com> | 2010-03-01 13:14:52 +0200 |
|---|---|---|
| committer | Raimonds Simanovskis <raimonds.simanovskis@gmail.com> | 2010-03-01 13:14:52 +0200 |
| commit | 19c4de17ed40b323b5d771b81e28fe7b7490efc2 (patch) | |
| tree | 311a7eef8c4e7e2e44289ad79397c23ce1c61187 /lib | |
| parent | 20a10e5302ce8f912d27c57702b542a019c7f9f9 (diff) | |
| download | rails-19c4de17ed40b323b5d771b81e28fe7b7490efc2.tar.gz rails-19c4de17ed40b323b5d771b81e28fe7b7490efc2.tar.bz2 rails-19c4de17ed40b323b5d771b81e28fe7b7490efc2.zip | |
use primary_key method in OracleCompiler#select_sql
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/arel/engines/sql/compilers/oracle_compiler.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/arel/engines/sql/compilers/oracle_compiler.rb b/lib/arel/engines/sql/compilers/oracle_compiler.rb index 1f6b82dd2f..ce575c2170 100644 --- a/lib/arel/engines/sql/compilers/oracle_compiler.rb +++ b/lib/arel/engines/sql/compilers/oracle_compiler.rb @@ -16,15 +16,9 @@ module Arel # when limit or offset subquery is used then cannot use FOR UPDATE directly # and need to construct separate subquery for primary key if use_subquery_for_lock = limit_or_offset && !locked.blank? - primary_key = begin - engine.quote_column_name(table.name.classify.constantize.primary_key) - rescue NameError - engine.quote_column_name("id") - end - select_attributes_string = primary_key - else - select_attributes_string = select_clauses.join(', ') + quoted_primary_key = engine.quote_column_name(primary_key) end + select_attributes_string = use_subquery_for_lock ? quoted_primary_key : select_clauses.join(', ') # OracleEnhanced adapter workaround when ORDER BY is used with columns not # present in DISTINCT columns list @@ -51,7 +45,7 @@ module Arel build_query \ "SELECT #{select_clauses.join(', ')}", "FROM #{from_clauses}", - "WHERE #{primary_key} IN (#{query})", + "WHERE #{quoted_primary_key} IN (#{query})", "#{locked}" elsif !locked.blank? build_query query, "#{locked}" |