Skip to content
Browse files

pass primary key name and value to ActiveRecord adapter insert method

necessary for Oracle adapter for RETURNING ... INTO ... clause generation
  • Loading branch information...
1 parent e75f0e5 commit c66fcc2b151337d337e16ead970db11491d74bbe @rsim rsim committed Sep 28, 2010
Showing with 15 additions and 3 deletions.
  1. +10 −2 lib/arel/select_manager.rb
  2. +5 −1 lib/arel/table.rb
View
12 lib/arel/select_manager.rb
@@ -163,9 +163,17 @@ def to_a # :nodoc:
# 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
View
6 lib/arel/table.rb
@@ -27,7 +27,11 @@ def initialize name, engine = Table.engine
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

0 comments on commit c66fcc2

Please sign in to comment.
Something went wrong with that request. Please try again.