aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel/table.rb
diff options
context:
space:
mode:
authorRaimonds Simanovskis <raimonds.simanovskis@gmail.com>2010-09-28 16:15:35 +0300
committerRaimonds Simanovskis <raimonds.simanovskis@gmail.com>2010-09-28 16:15:35 +0300
commitc66fcc2b151337d337e16ead970db11491d74bbe (patch)
tree3c58028c0fae3d15bbaf628e8f938c592b7393f7 /lib/arel/table.rb
parente75f0e5ae5dd225fe44bd3f6c582f86e18d91ceb (diff)
downloadrails-c66fcc2b151337d337e16ead970db11491d74bbe.tar.gz
rails-c66fcc2b151337d337e16ead970db11491d74bbe.tar.bz2
rails-c66fcc2b151337d337e16ead970db11491d74bbe.zip
pass primary key name and value to ActiveRecord adapter insert method
necessary for Oracle adapter for RETURNING ... INTO ... clause generation
Diffstat (limited to 'lib/arel/table.rb')
-rw-r--r--lib/arel/table.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/arel/table.rb b/lib/arel/table.rb
index ba31e3183b..3285037154 100644
--- a/lib/arel/table.rb
+++ b/lib/arel/table.rb
@@ -27,7 +27,11 @@ module Arel
end
def primary_key
- @primary_key ||= self[@engine.connection.primary_key(name)]
+ @primary_key ||= begin
+ primary_key_name = @engine.connection.primary_key(name)
+ # some tables might be without primary key
+ primary_key_name && self[primary_key_name]
+ end
end
def alias