diff options
| -rw-r--r-- | lib/arel/select_manager.rb | 12 | ||||
| -rw-r--r-- | lib/arel/table.rb | 6 |
2 files changed, 15 insertions, 3 deletions
diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb index 21b9395120..77930a6bb1 100644 --- a/lib/arel/select_manager.rb +++ b/lib/arel/select_manager.rb @@ -163,9 +163,17 @@ module Arel # FIXME: this method should go away def insert values im = InsertManager.new @engine - im.into @ctx.froms + table = @ctx.froms + primary_key_name = (primary_key = table.primary_key) && primary_key.name + # FIXME: in AR tests values sometimes were Array and not Hash therefore is_a?(Hash) check is added + primary_key_value = primary_key && values.is_a?(Hash) && values[primary_key] + im.into table im.insert values - @engine.connection.insert im.to_sql + # Oracle adapter needs primary key name to generate RETURNING ... INTO ... clause + # for tables which assign primary key value using trigger. + # RETURNING ... INTO ... clause will be added only if primary_key_value is nil + # therefore it is necessary to pass primary key value as well + @engine.connection.insert im.to_sql, 'AREL', primary_key_name, primary_key_value end private 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 |