From c9f246f4e2de6fbb82a7bf05837f3903fdb47e60 Mon Sep 17 00:00:00 2001 From: Ben Woosley Date: Wed, 17 Nov 2010 00:28:39 -0800 Subject: [PATCH] Consolidate insert_sql between supports_import? cases so both make use of options[:ignore] --- lib/activerecord-import/import.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/activerecord-import/import.rb b/lib/activerecord-import/import.rb index 5f674a5..7ec9a77 100644 --- a/lib/activerecord-import/import.rb +++ b/lib/activerecord-import/import.rb @@ -258,16 +258,16 @@ class ActiveRecord::Base columns = column_names.map { |name| columns_hash[name.to_s] } 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) if not supports_import? number_inserted = 0 values_sql.each do |values| - connection.execute("INSERT INTO #{quoted_table_name} #{columns_sql} VALUES#{values}") + connection.execute(insert_sql + values) number_inserted += 1 end else # 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 ) # perform the inserts