deac/activerecord-import
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Consolidate insert_sql between supports_import? cases so both make use of options[:ignore]

Browse source
This commit is contained in:
Ben Woosley 2010-11-17 00:28:39 -08:00 committed by Zach Dennis
parent 9727a04362
commit c9f246f4e2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/activerecord-import/import.rb
View file

@ -258,16 +258,16 @@ class ActiveRecord::Base
columns = column_names.map { |name| columns_hash[name.to_s] } columns = column_names.map { |name| columns_hash[name.to_s] }
columns_sql = "(#{column_names.map{|name| connection.quote_column_name(name) }.join(',')})" columns_sql = "(#{column_names.map{|name| connection.quote_column_name(name) }.join(',')})"
insert_sql = "INSERT #{options[:ignore] ? 'IGNORE ':''}INTO #{quoted_table_name} #{columns_sql} VALUES "
values_sql = values_sql_for_column_names_and_attributes(column_names, array_of_attributes) values_sql = values_sql_for_column_names_and_attributes(column_names, array_of_attributes)
if not supports_import? if not supports_import?
number_inserted = 0 number_inserted = 0
values_sql.each do |values| values_sql.each do |values|
connection.execute("INSERT INTO #{quoted_table_name} #{columns_sql} VALUES#{values}") connection.execute(insert_sql + values)
number_inserted += 1 number_inserted += 1
end end
else else
# generate the sql # generate the sql
insert_sql = "INSERT #{options[:ignore] ? 'IGNORE ':''}INTO #{quoted_table_name} #{columns_sql} VALUES "
post_sql_statements = connection.post_sql_statements( quoted_table_name, options ) post_sql_statements = connection.post_sql_statements( quoted_table_name, options )
# perform the inserts # perform the inserts