From 2b795050de72c6d68aba7513510f74ddc8959ee7 Mon Sep 17 00:00:00 2001 From: Raimonds Simanovskis Date: Thu, 23 Dec 2010 21:55:42 +0800 Subject: fixed retrieval of primary key value in Ralation#insert method previously primary key value was always assigned nil which caused Oracle enhanced adapter failing tests --- activerecord/lib/active_record/relation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/relation.rb') diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 7ecba1c43a..d4c5c85594 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -31,7 +31,7 @@ module ActiveRecord im = arel.compile_insert values im.into @table primary_key_name = @klass.primary_key - primary_key_value = Hash === values ? values[primary_key_name] : nil + primary_key_value = primary_key_name && Hash === values ? values[primary_key] : nil @klass.connection.insert( im.to_sql, -- cgit v1.2.3