Model#import fails to find model's primary key sequence

Fixes a bug where Model#import does not work when a model's primary key
has no associated 'sequence' in the database. If a value for the primary
key is specified, then the insert should not require a database
'sequence' to generate a value for that primary key field.
This commit is contained in:
Jared Luxenberg 2012-08-04 17:31:56 -07:00
parent f74bd2fbbd
commit e12f9c4951
4 changed files with 15 additions and 2 deletions

View file

@ -297,7 +297,7 @@ class ActiveRecord::Base
array_of_attributes.map do |arr|
my_values = arr.each_with_index.map do |val,j|
column = columns[j]
if !sequence_name.blank? && column.name == primary_key && val.nil?
if val.nil? && !sequence_name.blank? && column.name == primary_key
connection.next_value_for_sequence(sequence_name)
else
connection.quote(column.type_cast(val), column)