activerecord-import 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a877605fbbb5a9a7100063ad764a46d8a497708c
-  data.tar.gz: 4eee2b275df655fb6f63f47de0b1b60ae669629c
+  metadata.gz: 9f8e8fa0974d52a903ef20a78f196030a515687d
+  data.tar.gz: 0ccc98cac5b73a78e9e9ffe57c2b74504c2b9e81
 SHA512:
-  metadata.gz: f3457053406910b5e2d4d740ddb5dc2efa716f7ef8e54596998aec575568e62ebfa55570c46270c837bdc1f3c1e145e1ff954441ce58f881343f44cb9ea01be3
-  data.tar.gz: ae534e1dd917a93dc3c0907bba45e7d1e6a6fb553e1a3a86c08ab8d85cb019c322d70a7cc6c90e7c6b25367b059a730e2c6d886336abc7118d89e8fc22b253d4
+  metadata.gz: 1562542547afcea6d646e3a5fcf2aabd806471f0000b2434d6fd979a60c2bc93b90e115e09e2b67df00b35a2244c67d0f2554e9480f0c5c6bb6f3dbdebd2e8be
+  data.tar.gz: 45f2552a368c3b9c70bf7abec385462f34a66e423a65db1e99536b8f3b383c02d21af4cb5b5a313c3769aa59a919bd4db34ddb6927ced52fae88272afaeb28de

data/CHANGELOG.md

@@ -0,0 +1,24 @@
+## Changes in 0.12.0
+
+### New Features
+
+* PostgreSQL UPSERT support has been added. Thanks @jkowens via \#218
+
+### Fixes
+
+* has_one and has_many associations will now be recursively imported regardless of :autosave being set. Thanks @sferik, @jkowens via \#243, \#234
+* Fixing an issue with enum column support for Rails > 4.1. Thanks @aquajach via \#235
+
+### Removals
+
+* Support for em-synchrony has been removed since it appears the project has been abandoned. Thanks @sferik, @zdennis via \#239
+* Support for the mysql gem/adapter has been removed since it has officially been abandoned. Use the mysql2 gem/adapter instead. Thanks @sferik, @zdennis via \#239
+
+### Misc
+
+* Cleaned up TravisCI output and removing deprecation warnings. Thanks @jkowens, @zdennis \#242
+
+
+## Changes before 0.12.0
+
+> Never look back. What's gone is now history. But in the process make memory of events to help you understand what will help you to make your dream a true story. Mistakes of the past are lessons, success of the past is inspiration. – Dr. Anil Kr Sinha

data/Gemfile

@@ -2,8 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem "pry-byebug"
-
 # Database Adapters
 platforms :ruby do
   gem "mysql2",                 "~> 0.3.0"
@@ -38,6 +36,10 @@ platforms :mri_19 do
   gem "debugger"
 end
 
+platforms :ruby do
+  gem "pry-byebug"
+end
+
 version = ENV['AR_VERSION'] || "4.2"
 
 if version > "4.0"

data/README.markdown

@@ -5,19 +5,19 @@ activerecord-import is a library for bulk inserting data using ActiveRecord.
 One of its major features is following activerecord associations and generating the minimal
 number of SQL insert statements required, avoiding the N+1 insert problem. An example probably
 explains it best. Say you had a schema like this:
- 
+
 - Publishers have Books
 - Books have Reviews
- 
+
 and you wanted to bulk insert 100 new publishers with 10K books and 3 reviews per book. This library will follow the associations
 down and generate only 3 SQL insert statements - one for the publishers, one for the books, and one for the reviews.
- 
+
 In contrast, the standard ActiveRecord save would generate
 100 insert statements for the publishers, then it would visit each publisher and save all the books:
 100 * 10,000 = 1,000,000 SQL insert statements
 and then the reviews:
 100 * 10,000 * 3 = 3M SQL insert statements,
- 
+
 That would be about 4M SQL insert statements vs 3, which results in vastly improved performance. In our case, it converted
 an 18 hour batch process to <2 hrs.
 
@@ -54,7 +54,7 @@ To understand how rubygems loads code you can reference the following:
   http://guides.rubygems.org/patterns/#loading_code
 
 And an example of how active_record dynamically load adapters:
-  https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/connection_specification.rb 
+  https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/connection_specification.rb
 
 In summary, when a gem is loaded rubygems adds the `lib` folder of the gem to the global load path `$LOAD_PATH` so that all `require` lookups will not propegate through all of the folders on the load path. When a `require` is issued each folder on the `$LOAD_PATH` is checked for the file and/or folder referenced. This allows a gem (like activerecord-import) to define push the activerecord-import folder (or namespace) on the `$LOAD_PATH` and any adapters provided by activerecord-import will be found by rubygems when the require is issued.
 
@@ -77,7 +77,7 @@ When rubygems pushes the `lib` folder onto the load path a `require` will now fi
 
 # License
 
-This is licensed under the ruby license. 
+This is licensed under the ruby license.
 
 # Author
 
@@ -85,11 +85,12 @@ Zach Dennis (zach.dennis@gmail.com)
 
 # Contributors
 
+* Jordan Owens
 * Blythe Dunham
 * Gabe da Silveira
 * Henry Work
 * James Herdman
 * Marcus Crafter
 * Thibaud Guillaume-Gentil
-* Mark Van Holstyn 
+* Mark Van Holstyn
 * Victor Costan

data/Rakefile

@@ -13,7 +13,7 @@ namespace :display do
 end
 task :default => ["display:notice"]
 
-ADAPTERS = %w(mysql mysql2 em_mysql2 jdbcmysql jdbcpostgresql postgresql sqlite3 seamless_database_pool mysqlspatial mysql2spatial spatialite postgis)
+ADAPTERS = %w(mysql2 jdbcmysql jdbcpostgresql postgresql sqlite3 seamless_database_pool mysql2spatial spatialite postgis)
 ADAPTERS.each do |adapter|
   namespace :test do
     desc "Runs #{adapter} database tests."

data/benchmarks/benchmark.rb

@@ -4,6 +4,8 @@ require "active_record"
 
 benchmark_dir = File.dirname(__FILE__)
 
+$LOAD_PATH.unshift('.')
+
 # Get the gem into the load path
 $LOAD_PATH.unshift(File.join(benchmark_dir, '..', 'lib'))
 
@@ -64,4 +66,3 @@ end
 
 puts
 puts "Done with benchmark!"
-

data/benchmarks/lib/cli_parser.rb

@@ -38,7 +38,7 @@ module BenchmarkOptionParser
 
   def self.parse( args )
     options = OpenStruct.new(
-      :adapter => 'mysql',
+      :adapter => 'mysql2',
       :table_types => {},
       :delete_on_finish => true,
       :number_of_objects => [],

data/benchmarks/lib/{mysql_benchmark.rb → mysql2_benchmark.rb}

@@ -1,22 +1,21 @@
-class MysqlBenchmark < BenchmarkBase
-    
+class Mysql2Benchmark < BenchmarkBase
+
   def benchmark_all( array_of_cols_and_vals )
     methods = self.methods.find_all { |m| m =~ /benchmark_/ }
     methods.delete_if{ |m| m =~ /benchmark_(all|model)/ }
     methods.each { |method| self.send( method, array_of_cols_and_vals ) }
   end
-  
+
   def benchmark_myisam( array_of_cols_and_vals )
     bm_model( TestMyISAM, array_of_cols_and_vals )
   end
-    
+
   def benchmark_innodb( array_of_cols_and_vals )
     bm_model( TestInnoDb, array_of_cols_and_vals )
   end
-  
+
   def benchmark_memory( array_of_cols_and_vals )
     bm_model( TestMemory, array_of_cols_and_vals )
   end
-    
-end
 
+end

data/gemfiles/3.1.gemfile

@@ -1,5 +1,3 @@
 platforms :ruby do
-  gem 'mysql',        '>= 2.8.1'
   gem 'activerecord', '~> 3.1.0'
-  gem 'em-synchrony', '1.0.3'
 end

data/gemfiles/3.2.gemfile

@@ -1,5 +1,3 @@
 platforms :ruby do
-  gem 'mysql',        '>= 2.8.1'
   gem 'activerecord', '~> 3.2.0'
-  gem 'em-synchrony', '1.0.3'
 end

data/gemfiles/4.0.gemfile

@@ -1,5 +1,3 @@
 platforms :ruby do
-  gem 'mysql',        '~> 2.9'
   gem 'activerecord', '~> 4.0'
-  gem 'em-synchrony', '1.0.3'
 end

data/gemfiles/4.1.gemfile

@@ -1,5 +1,3 @@
 platforms :ruby do
-  gem 'mysql',        '~> 2.9'
   gem 'activerecord', '~> 4.1'
-  gem 'em-synchrony', '1.0.4'
 end

data/gemfiles/4.2.gemfile

@@ -1,5 +1,3 @@
 platforms :ruby do
-  gem 'mysql',        '~> 2.9'
   gem 'activerecord', '~> 4.2'
-  gem 'em-synchrony', '1.0.4'
 end

data/gemfiles/5.0.gemfile

@@ -1,5 +1,3 @@
 platforms :ruby do
-  gem 'mysql',        '~> 2.9'
   gem 'activerecord', '~> 5.0.0.beta1'
-  gem 'em-synchrony', '1.0.4'
 end

data/lib/activerecord-import/adapters/abstract_adapter.rb

@@ -44,8 +44,13 @@ module ActiveRecord::Import::AbstractAdapter
     # Returns an array of post SQL statements given the passed in options.
     def post_sql_statements( table_name, options ) # :nodoc:
       post_sql_statements = []
-      if options[:on_duplicate_key_update]
-        post_sql_statements << sql_for_on_duplicate_key_update( table_name, options[:on_duplicate_key_update] )
+
+      if supports_on_duplicate_key_update?
+        if options[:on_duplicate_key_ignore] && respond_to?(:sql_for_on_duplicate_key_ignore)
+          post_sql_statements << sql_for_on_duplicate_key_ignore( table_name, options[:on_duplicate_key_ignore] )
+        elsif options[:on_duplicate_key_update]
+          post_sql_statements << sql_for_on_duplicate_key_update( table_name, options[:on_duplicate_key_update] )
+        end
       end
 
       #custom user post_sql
@@ -62,5 +67,9 @@ module ActiveRecord::Import::AbstractAdapter
     def max_allowed_packet
       NO_MAX_PACKET
     end
+
+    def supports_on_duplicate_key_update?
+      false
+    end
   end
 end

data/lib/activerecord-import/adapters/mysql_adapter.rb

@@ -60,6 +60,19 @@ module ActiveRecord::Import::MysqlAdapter
     end
   end
 
+  # Add a column to be updated on duplicate key update
+  def add_column_for_on_duplicate_key_update( column, options={} ) # :nodoc:
+    if options.include?(:on_duplicate_key_update)
+      columns = options[:on_duplicate_key_update]
+      case columns
+      when Array then columns << column.to_sym unless columns.include?(column.to_sym)
+      when Hash then columns[column.to_sym] = column.to_sym
+      end
+    else
+      options[:on_duplicate_key_update] = [ column.to_sym ]
+    end
+  end
+
   # Returns a generated ON DUPLICATE KEY UPDATE statement given the passed
   # in +args+.
   def sql_for_on_duplicate_key_update( table_name, *args ) # :nodoc:
@@ -86,7 +99,6 @@ module ActiveRecord::Import::MysqlAdapter
   end
 
   def sql_for_on_duplicate_key_update_as_hash( table_name, hsh ) # :nodoc:
-    sql = ' ON DUPLICATE KEY UPDATE '
     results = hsh.map do |column1, column2|
       qc1 = quote_column_name( column1 )
       qc2 = quote_column_name( column2 )
@@ -95,7 +107,7 @@ module ActiveRecord::Import::MysqlAdapter
     results.join( ',')
   end
 
-  #return true if the statement is a duplicate key record error
+  # Return true if the statement is a duplicate key record error
   def duplicate_key_update_error?(exception)# :nodoc:
     exception.is_a?(ActiveRecord::StatementInvalid) && exception.to_s.include?('Duplicate entry')
   end

data/lib/activerecord-import/adapters/postgresql_adapter.rb

@@ -1,5 +1,8 @@
 module ActiveRecord::Import::PostgreSQLAdapter
   include ActiveRecord::Import::ImportSupport
+  include ActiveRecord::Import::OnDuplicateKeyUpdateSupport
+
+  MIN_VERSION_FOR_UPSERT = 90500
 
   def insert_many( sql, values, *args ) # :nodoc:
     number_of_inserts = 1
@@ -24,12 +27,113 @@ module ActiveRecord::Import::PostgreSQLAdapter
 
   def post_sql_statements( table_name, options ) # :nodoc:
     unless options[:primary_key].blank?
-      super(table_name, options) << (" RETURNING #{options[:primary_key]}")
+      super(table_name, options) << ("RETURNING #{options[:primary_key]}")
     else
       super(table_name, options)
     end
   end
 
+  # Add a column to be updated on duplicate key update
+  def add_column_for_on_duplicate_key_update( column, options={} ) # :nodoc:
+    arg = options[:on_duplicate_key_update]
+    if arg.is_a?( Hash )
+      columns = arg.fetch( :columns ) { arg[:columns] = [] }
+      case columns
+      when Array then columns << column.to_sym unless columns.include?( column.to_sym )
+      when Hash then columns[column.to_sym] = column.to_sym
+      end
+    elsif arg.is_a?( Array )
+      arg << column.to_sym unless arg.include?( column.to_sym )
+    end
+  end
+
+  # Returns a generated ON CONFLICT DO NOTHING statement given the passed
+  # in +args+.
+  def sql_for_on_duplicate_key_ignore( table_name, *args ) # :nodoc:
+    arg = args.first
+    if arg.is_a?( Hash )
+      conflict_target = sql_for_conflict_target( arg )
+    end
+    " ON CONFLICT #{conflict_target}DO NOTHING"
+  end
+
+  # Returns a generated ON CONFLICT DO UPDATE statement given the passed
+  # in +args+.
+  def sql_for_on_duplicate_key_update( table_name, *args ) # :nodoc:
+    arg = args.first
+    if arg.is_a?( Array ) || arg.is_a?( String )
+      arg = { :columns => arg }
+    end
+    return unless arg.is_a?( Hash )
+
+    sql = " ON CONFLICT "
+    conflict_target = sql_for_conflict_target( arg )
+
+    columns = arg.fetch( :columns, [] )
+    if columns.respond_to?( :empty? ) && columns.empty?
+      return sql << "#{conflict_target}DO NOTHING"
+    end
+
+    conflict_target ||= sql_for_default_conflict_target( table_name )
+    unless conflict_target
+      raise ArgumentError, 'Expected :conflict_target or :constraint_name to be specified'
+    end
+
+    sql << "#{conflict_target}DO UPDATE SET "
+    if columns.is_a?( Array )
+      sql << sql_for_on_duplicate_key_update_as_array( table_name, columns )
+    elsif columns.is_a?( Hash )
+      sql << sql_for_on_duplicate_key_update_as_hash( table_name, columns )
+    elsif columns.is_a?( String )
+      sql << columns
+    else
+      raise ArgumentError, 'Expected :columns to be an Array or Hash'
+    end
+    sql
+  end
+
+  def sql_for_on_duplicate_key_update_as_array( table_name, arr )  # :nodoc:
+    results = arr.map do |column|
+      qc = quote_column_name( column )
+      "#{qc}=EXCLUDED.#{qc}"
+    end
+    results.join( ',' )
+  end
+
+  def sql_for_on_duplicate_key_update_as_hash( table_name, hsh ) # :nodoc:
+    results = hsh.map do |column1, column2|
+      qc1 = quote_column_name( column1 )
+      qc2 = quote_column_name( column2 )
+      "#{qc1}=EXCLUDED.#{qc2}"
+    end
+    results.join( ',' )
+  end
+
+  def sql_for_conflict_target( args={} )
+    if constraint_name = args[:constraint_name]
+      "ON CONSTRAINT #{constraint_name} "
+    elsif conflict_target = args[:conflict_target]
+      '(' << Array( conflict_target ).join( ', ' ) << ') '
+    end
+  end
+
+  def sql_for_default_conflict_target( table_name )
+    "(#{primary_key( table_name )}) "
+  end
+
+  # Return true if the statement is a duplicate key record error
+  def duplicate_key_update_error?(exception)# :nodoc:
+    exception.is_a?(ActiveRecord::StatementInvalid) && exception.to_s.include?('duplicate key')
+  end
+
+  def supports_on_duplicate_key_update?(current_version=self.postgresql_version)
+    current_version >= MIN_VERSION_FOR_UPSERT
+  end
+
+  def supports_on_duplicate_key_ignore?(current_version=self.postgresql_version)
+    supports_on_duplicate_key_update?(current_version)
+  end
+
   def support_setting_primary_key_of_imported_objects?
     true
   end

data/lib/activerecord-import/base.rb

@@ -7,7 +7,6 @@ module ActiveRecord::Import
 
   def self.base_adapter(adapter)
     case adapter
-    when 'mysqlspatial' then 'mysql'
     when 'mysql2spatial' then 'mysql2'
     when 'spatialite' then 'sqlite3'
     when 'postgis' then 'postgresql'

data/lib/activerecord-import/import.rb

@@ -116,7 +116,7 @@ class ActiveRecord::Base
     # supports on duplicate key update functionality, otherwise
     # returns false.
     def supports_on_duplicate_key_update?
-      connection.respond_to?(:supports_on_duplicate_key_update?) && connection.supports_on_duplicate_key_update?
+      connection.supports_on_duplicate_key_update?
     end
 
     # returns true if the current database connection adapter
@@ -165,19 +165,23 @@ class ActiveRecord::Base
     # below for what +options+ are available.
     #
     # == Options
-    # * +validate+ - true|false, tells import whether or not to use \
+    # * +validate+ - true|false, tells import whether or not to use
     #    ActiveRecord validations. Validations are enforced by default.
-    # * +on_duplicate_key_update+ - an Array or Hash, tells import to \
-    #    use MySQL's ON DUPLICATE KEY UPDATE ability. See On Duplicate\
-    #    Key Update below.
+    # * +ignore+ - true|false, tells import to use MySQL's INSERT IGNORE
+    #    to discard records that contain duplicate keys.
+    # * +on_duplicate_key_ignore+ - true|false, tells import to use
+    #    Postgres 9.5+ ON CONFLICT DO NOTHING.
+    # * +on_duplicate_key_update+ - an Array or Hash, tells import to
+    #    use MySQL's ON DUPLICATE KEY UPDATE or Postgres 9.5+ ON CONFLICT
+    #    DO UPDATE ability. See On Duplicate Key Update below.
     # * +synchronize+ - an array of ActiveRecord instances for the model
     #   that you are currently importing data into. This synchronizes
     #   existing model instances in memory with updates from the import.
-    # * +timestamps+ - true|false, tells import to not add timestamps \
+    # * +timestamps+ - true|false, tells import to not add timestamps
     #   (if false) even if record timestamps is disabled in ActiveRecord::Base
-    # * +recursive - true|false, tells import to import all autosave association
-    #   if the adapter supports setting the primary keys of the newly imported
-    #   objects.
+    # * +recursive - true|false, tells import to import all has_many/has_one
+    #   associations if the adapter supports setting the primary keys of the
+    #   newly imported objects.
     #
     # == Examples
     #  class BlogPost < ActiveRecord::Base ; end
@@ -211,7 +215,7 @@ class ActiveRecord::Base
     #  BlogPost.import posts, :synchronize => posts, :synchronize_keys => [:title]
     #  puts posts.first.persisted? # => true
     #
-    # == On Duplicate Key Update (MySQL only)
+    # == On Duplicate Key Update (MySQL)
     #
     # The :on_duplicate_key_update option can be either an Array or a Hash.
     #
@@ -225,13 +229,73 @@ class ActiveRecord::Base
     #
     # ====  Using A Hash
     #
-    # The :on_duplicate_key_update option can be a hash of column name
+    # The :on_duplicate_key_update option can be a hash of column names
     # to model attribute name mappings. This gives you finer grained
     # control over what fields are updated with what attributes on your
     # model. Below is an example:
     #
     #   BlogPost.import columns, attributes, :on_duplicate_key_update=>{ :title => :title }
     #
+    # == On Duplicate Key Update (Postgres 9.5+)
+    #
+    # The :on_duplicate_key_update option can be an Array or a Hash with up to
+    # two attributes, :conflict_target or :constraint_name and :columns.
+    #
+    # ==== Using an Array
+    #
+    # The :on_duplicate_key_update option can be an array of column
+    # names. This option only handles inserts that conflict with the
+    # primary key. If a table does not have a primary key, this will
+    # not work. The column names are the only fields that are updated
+    # if a duplicate record is found. Below is an example:
+    #
+    #   BlogPost.import columns, values, :on_duplicate_key_update=>[ :date_modified, :content, :author ]
+    #
+    # ====  Using a Hash
+    #
+    # The :on_duplicate_update option can be a hash with up to two attributes,
+    # :conflict_target or constraint_name, and :columns. Unlike MySQL, Postgres
+    # requires the conflicting constraint to be explicitly specified. Using this
+    # option allows you to specify a constraint other than the primary key.
+    #
+    # ====== :conflict_target
+    #
+    # The :conflict_target attribute specifies the columns that make up the
+    # conflicting unique constraint and can be a single column or an array of
+    # column names. This attribute is ignored if :constraint_name is included,
+    # but it is the preferred method of identifying a constraint. It will
+    # default to the primary key. Below is an example:
+    #
+    #   BlogPost.import columns, values, :on_duplicate_key_update=>{ :conflict_target => [:author_id, :slug], :columns => [ :date_modified ] }
+    #
+    # ====== :constraint_name
+    #
+    # The :constraint_name attribute explicitly identifies the conflicting
+    # unique index by name. Postgres documentation discourages using this method
+    # of identifying an index unless absolutely necessary. Below is an example:
+    #
+    #   BlogPost.import columns, values, :on_duplicate_key_update=>{ :constraint_name => :blog_posts_pkey, :columns => [ :date_modified ] }
+    #
+    # ====== :columns
+    #
+    # The :columns attribute can be either an Array or a Hash.
+    #
+    # ======== Using an Array
+    #
+    # The :columns attribute can be an array of column names. The column names
+    # are the only fields that are updated if a duplicate record is found.
+    # Below is an example:
+    #
+    #   BlogPost.import columns, values, :on_duplicate_key_update=>{ :conflict_target => :slug, :columns => [ :date_modified, :content, :author ] }
+    #
+    # ========  Using a Hash
+    #
+    # The :columns option can be a hash of column names to model attribute name
+    # mappings. This gives you finer grained control over what fields are updated
+    # with what attributes on your model. Below is an example:
+    #
+    #   BlogPost.import columns, attributes, :on_duplicate_key_update=>{ :conflict_target => :slug, :columns => { :title => :title } }
+    #
     # = Returns
     # This returns an object which responds to +failed_instances+ and +num_inserts+.
     # * failed_instances - an array of objects that fails validation and were not committed to the database. An empty array if no validation is performed.
@@ -275,7 +339,14 @@ class ActiveRecord::Base
           # this next line breaks sqlite.so with a segmentation fault
           # if model.new_record? || options[:on_duplicate_key_update]
             column_names.map do |name|
-              model.read_attribute_before_type_cast(name.to_s)
+              name = name.to_s
+              if respond_to?(:defined_enums) && defined_enums.has_key?(name) # ActiveRecord 5
+                model.read_attribute(name)
+              elsif model.class.column_defaults[name].is_a?(Integer)
+                model.read_attribute(name)
+              else
+                model.read_attribute_before_type_cast(name)
+              end
             end
           # end
         end
@@ -445,7 +516,6 @@ class ActiveRecord::Base
       # now, for all the dirty associations, collect them into a new set of models, then recurse.
       # notes:
       #    does not handle associations that reference themselves
-      #    assumes that the only associations to be saved are marked with :autosave
       #    should probably take a hash to associations to follow.
       associated_objects_by_class={}
       models.each {|model| find_associated_objects_for_import(associated_objects_by_class, model) }
@@ -462,12 +532,18 @@ class ActiveRecord::Base
     def find_associated_objects_for_import(associated_objects_by_class, model)
       associated_objects_by_class[model.class.name]||={}
 
-      model.class.reflect_on_all_autosave_associations.each do |association_reflection|
+      association_reflections =
+        model.class.reflect_on_all_associations(:has_one) +
+        model.class.reflect_on_all_associations(:has_many)
+      association_reflections.each do |association_reflection|
         associated_objects_by_class[model.class.name][association_reflection.name]||=[]
 
         association = model.association(association_reflection.name)
         association.loaded!
 
+        # Wrap target in an array if not already
+        association = Array(association.target)
+
         changed_objects = association.select {|a| a.new_record? || a.changed?}
         changed_objects.each do |child|
           child.send("#{association_reflection.foreign_key}=", model.id)
@@ -529,13 +605,8 @@ class ActiveRecord::Base
             array_of_attributes.each { |arr| arr << value }
           end
 
-          if supports_on_duplicate_key_update? and options[:on_duplicate_key_update] != false
-            if options[:on_duplicate_key_update]
-              options[:on_duplicate_key_update] << key.to_sym if options[:on_duplicate_key_update].is_a?(Array) && !options[:on_duplicate_key_update].include?(key.to_sym)
-              options[:on_duplicate_key_update][key.to_sym] = key.to_sym if options[:on_duplicate_key_update].is_a?(Hash)
-            else
-              options[:on_duplicate_key_update] = [ key.to_sym ]
-            end
+          if supports_on_duplicate_key_update?
+            connection.add_column_for_on_duplicate_key_update(key, options)
           end
         end
       end