activerecord-import 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb77d17b829e2ac21c8816b01c3d365b4f9ddc6e
-  data.tar.gz: 301500da2b010aaac8473af8c5436124c59c0ca0
+  metadata.gz: a877605fbbb5a9a7100063ad764a46d8a497708c
+  data.tar.gz: 4eee2b275df655fb6f63f47de0b1b60ae669629c
 SHA512:
-  metadata.gz: 242c10dbb23c6236cd2e2f10328a6c63e567c3fa55bb899c05771b37c7bc3507632495779deffdf52dcd8798c7785398be1493330d32f69953a20d3e0a1348be
-  data.tar.gz: 1c8eccfa18fef779eb2c6c86cde365cd6254efc453b09734e19ceafe62d93af445de0042e0ef6d840f7c7e9e5546f93432ff2a3fe9bde3f4a97d6319031be2f5
+  metadata.gz: f3457053406910b5e2d4d740ddb5dc2efa716f7ef8e54596998aec575568e62ebfa55570c46270c837bdc1f3c1e145e1ff954441ce58f881343f44cb9ea01be3
+  data.tar.gz: ae534e1dd917a93dc3c0907bba45e7d1e6a6fb553e1a3a86c08ab8d85cb019c322d70a7cc6c90e7c6b25367b059a730e2c6d886336abc7118d89e8fc22b253d4

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.0.0
+  - 2.2.3
 
 gemfile:
   - Gemfile

data/Gemfile

@@ -2,12 +2,13 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem "pry-byebug"
+
 # Database Adapters
 platforms :ruby do
-  gem "em-synchrony",           "1.0.3"
   gem "mysql2",                 "~> 0.3.0"
   gem "pg",                     "~> 0.9"
-  gem "sqlite3-ruby",           "~> 1.3.1"
+  gem "sqlite3",                "~> 1.3.10"
   gem "seamless_database_pool", "~> 1.0.13"
 end
 
@@ -37,10 +38,12 @@ platforms :mri_19 do
   gem "debugger"
 end
 
-version = ENV['AR_VERSION'] || "3.2"
+version = ENV['AR_VERSION'] || "4.2"
 
 if version > "4.0"
   gem "minitest"
+else
+  gem "test-unit"
 end
 
 eval_gemfile File.expand_path("../gemfiles/#{version}.gemfile", __FILE__)

data/README.markdown

@@ -1,4 +1,4 @@
-# activerecord-import
+# activerecord-import [![Build Status](https://travis-ci.org/zdennis/activerecord-import.svg?branch=master)](https://travis-ci.org/zdennis/activerecord-import)
 
 activerecord-import is a library for bulk inserting data using ActiveRecord.
 
@@ -6,8 +6,8 @@ One of its major features is following activerecord associations and generating
 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
+- 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.

data/benchmarks/benchmark.rb

@@ -1,45 +1,48 @@
-require "pathname"
-this_dir = Pathname.new File.dirname(__FILE__)
-require this_dir.join('boot')
+require 'pathname'
+require "fileutils"
+require "active_record"
 
-# Parse the options passed in via the command line
-options = BenchmarkOptionParser.parse( ARGV )
+benchmark_dir = File.dirname(__FILE__)
 
-# The support directory where we use to load our connections and models for the 
-# benchmarks.
-SUPPORT_DIR = this_dir.join('../test')
+# Get the gem into the load path
+$LOAD_PATH.unshift(File.join(benchmark_dir, '..', 'lib'))
 
-# Load the database adapter
-adapter = options.adapter
+# Load the benchmark files
+Dir[File.join( benchmark_dir, 'lib', '*.rb' ) ].sort.each{ |f| require f }
 
-# load the library
-LIB_DIR = this_dir.join("../lib")
-require LIB_DIR.join("activerecord-import/#{adapter}")
+# Parse the options passed in via the command line
+options = BenchmarkOptionParser.parse( ARGV )
 
+FileUtils.mkdir_p 'log'
+ActiveRecord::Base.configurations["test"] = YAML.load_file(File.join(benchmark_dir, "../test/database.yml"))[options.adapter]
 ActiveRecord::Base.logger = Logger.new("log/test.log")
 ActiveRecord::Base.logger.level = Logger::DEBUG
-ActiveRecord::Base.configurations["test"] = YAML.load(SUPPORT_DIR.join("database.yml").open)[adapter]
-ActiveRecord::Base.establish_connection "test"
+ActiveRecord::Base.default_timezone = :utc
+
+require "activerecord-import"
+ActiveRecord::Base.establish_connection(:test)
 
 ActiveSupport::Notifications.subscribe(/active_record.sql/) do |event, _, _, _, hsh|
   ActiveRecord::Base.logger.info hsh[:sql]
 end
 
-adapter_schema = SUPPORT_DIR.join("schema/#{adapter}_schema.rb")
+# Load base/generic schema
+require File.join(benchmark_dir, "../test/schema/version")
+require File.join(benchmark_dir, "../test/schema/generic_schema")
+adapter_schema = File.join(benchmark_dir, "schema/#{options.adapter}_schema.rb")
 require adapter_schema if File.exists?(adapter_schema)
-Dir[this_dir.join("models/*.rb")].each{ |file| require file }
 
-# Load databse specific benchmarks
-require File.join( File.dirname( __FILE__ ), 'lib', "#{adapter}_benchmark" )
+Dir[File.dirname(__FILE__) + "/models/*.rb"].each{ |file| require file }
+
+
+require File.join( benchmark_dir, 'lib', "#{options.adapter}_benchmark" )
 
-# TODO implement method/table-type selection
 table_types = nil
 if options.benchmark_all_types
   table_types = [ "all" ]
 else
   table_types = options.table_types.keys
 end
-puts
 
 letter = options.adapter[0].chr
 clazz_str = letter.upcase + options.adapter[1..-1].downcase

data/benchmarks/lib/cli_parser.rb

@@ -1,7 +1,7 @@
 require 'optparse'
 require 'ostruct'
 
-# 
+#
 # == PARAMETERS
 # * a - database adapter. ie: mysql, postgresql, oracle, etc.
 # * n - number of objects to test with. ie: 1, 100, 1000, etc.
@@ -13,12 +13,12 @@ module BenchmarkOptionParser
   def self.print_banner
     puts BANNER
   end
-  
+
   def self.print_banner!
     print_banner
     exit
   end
-  
+
   def self.print_options( options )
     puts "Benchmarking the following options:"
     puts "  Database adapter: #{options.adapter}"
@@ -26,7 +26,7 @@ module BenchmarkOptionParser
     puts "  Table types:"
     print_valid_table_types( options, :prefix=>"    " )
   end
-  
+
   # TODO IMPLEMENT THIS
   def self.print_valid_table_types( options, hsh={:prefix=>''} )
     if options.table_types.keys.size > 0
@@ -35,36 +35,37 @@ module BenchmarkOptionParser
       puts 'No table types defined.'
     end
   end
-  
+
   def self.parse( args )
-    options = OpenStruct.new( 
-      :table_types => {}, 
+    options = OpenStruct.new(
+      :adapter => 'mysql',
+      :table_types => {},
       :delete_on_finish => true,
       :number_of_objects => [],
       :outputs => [] )
-    
+
     opts = OptionParser.new do |opts|
       opts.banner = BANNER
-      
+
       # parse the database adapter
-      opts.on( "a", "--adapter [String]", 
+      opts.on( "a", "--adapter [String]",
         "The database adapter to use. IE: mysql, postgresql, oracle" ) do |arg|
         options.adapter = arg
       end
-      
+
       # parse do_not_delete flag
-      opts.on( "d", "--do-not-delete", 
+      opts.on( "d", "--do-not-delete",
         "By default all records in the benchmark tables will be deleted at the end of the benchmark. " +
         "This flag indicates not to delete the benchmark data." ) do |arg|
         options.delete_on_finish = false
       end
-      
+
       # parse the number of row objects to test
       opts.on( "n", "--num [Integer]",
         "The number of objects to benchmark." ) do |arg|
         options.number_of_objects << arg.to_i
       end
-      
+
       # parse the table types to test
       opts.on( "t", "--table-type [String]",
         "The table type to test. This can be used multiple times." ) do |arg|
@@ -72,7 +73,7 @@ module BenchmarkOptionParser
           options.table_types['all'] = options.benchmark_all_types = true
         else
           options.table_types[arg] = true
-        end        
+        end
       end
 
       # print results in CSV format
@@ -86,7 +87,7 @@ module BenchmarkOptionParser
       end
     end #end opt.parse!
 
-    begin 
+    begin
       opts.parse!( args )
       if options.table_types.size == 0
         options.table_types['all'] = options.benchmark_all_types = true
@@ -94,9 +95,12 @@ module BenchmarkOptionParser
     rescue Exception => ex
       print_banner!
     end
-    
+
+    options.number_of_objects = [1000] if options.number_of_objects.empty?
+    options.outputs = [ OpenStruct.new( :format => 'html', :filename => 'benchmark.html')] if options.outputs.empty?
+
     print_options( options )
-    
+
     options
   end
 

data/benchmarks/lib/output_to_csv.rb

@@ -1,12 +1,12 @@
-require 'fastercsv'
+require 'csv'
 
 module OutputToCSV
   def self.output_results( filename, results )
-    FasterCSV.open( filename, 'w' ) do |csv|
+    CSV.open( filename, 'w' ) do |csv|
       # Iterate over each result set, which contains many results
       results.each do |result_set|
         columns, times = [], []
-        result_set.each do |result| 
+        result_set.each do |result|
           columns << result.description
           times << result.tms.real
         end

data/benchmarks/models/test_innodb.rb

@@ -1,3 +1,3 @@
 class TestInnoDb < ActiveRecord::Base
-  set_table_name 'test_innodb'
+  self.table_name = 'test_innodb'
 end

data/benchmarks/models/test_memory.rb

@@ -1,3 +1,3 @@
 class TestMemory < ActiveRecord::Base
-  set_table_name 'test_memory'
+  self.table_name = 'test_memory'
 end

data/benchmarks/models/test_myisam.rb

@@ -1,3 +1,3 @@
 class TestMyISAM < ActiveRecord::Base
-  set_table_name 'test_myisam'
+  self.table_name = 'test_myisam'
 end

data/gemfiles/3.1.gemfile

@@ -1,4 +1,5 @@
 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,4 +1,5 @@
 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,4 +1,5 @@
 platforms :ruby do
   gem 'mysql',        '~> 2.9'
-  gem 'activerecord', '~> 4.0.0.rc2'
+  gem 'activerecord', '~> 4.0'
+  gem 'em-synchrony', '1.0.3'
 end

data/gemfiles/4.1.gemfile

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

data/gemfiles/4.2.gemfile

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

data/gemfiles/5.0.gemfile

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

data/lib/activerecord-import.rb

@@ -1,17 +1,16 @@
-class ActiveRecord::Base
-  class << self
-    def establish_connection_with_activerecord_import(*args)
-      establish_connection_without_activerecord_import(*args)
-      ActiveSupport.run_load_hooks(:active_record_connection_established, connection_pool)
-    end
-    alias_method_chain :establish_connection, :activerecord_import
-  end
-end
+ActiveSupport.on_load(:active_record) do
+  class ActiveRecord::Base
+    class << self
+      def establish_connection_with_activerecord_import(*args)
+        conn = establish_connection_without_activerecord_import(*args)
+        if !ActiveRecord.const_defined?(:Import) || !ActiveRecord::Import.respond_to?(:load_from_connection_pool)
+          require "activerecord-import/base"
+        end
 
-ActiveSupport.on_load(:active_record_connection_established) do |connection_pool|
-  if !ActiveRecord.const_defined?(:Import, false) || !ActiveRecord::Import.respond_to?(:load_from_connection_pool)
-    require "activerecord-import/base"
+        ActiveRecord::Import.load_from_connection_pool connection_pool
+        conn
+      end
+      alias_method_chain :establish_connection, :activerecord_import
+    end
   end
-
-  ActiveRecord::Import.load_from_connection_pool connection_pool
 end

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

@@ -13,6 +13,8 @@ module ActiveRecord::Import::PostgreSQLAdapter
     sql2insert = base_sql + values.join( ',' ) + post_sql
     ids = select_values( sql2insert, *args )
 
+    ActiveRecord::Base.connection.query_cache.clear
+
     [number_of_inserts,ids]
   end
 

data/lib/activerecord-import/import.rb

@@ -236,7 +236,7 @@ class ActiveRecord::Base
     # 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.
     # * num_inserts - the number of insert statements it took to import the data
-    # * ids - the priamry keys of the imported ids, if the adpater supports it, otherwise and empty array.
+    # * ids - the primary keys of the imported ids, if the adpater supports it, otherwise and empty array.
     def import(*args)
       if args.first.is_a?( Array ) and args.first.first.is_a? ActiveRecord::Base
         options = {}
@@ -253,6 +253,11 @@ class ActiveRecord::Base
       options = { :validate=>true, :timestamps=>true, :primary_key=>primary_key }
       options.merge!( args.pop ) if args.last.is_a? Hash
 
+      # Don't modify incoming arguments
+      if options[:on_duplicate_key_update]
+        options[:on_duplicate_key_update] = options[:on_duplicate_key_update].dup
+      end
+
       is_validating = options[:validate]
       is_validating = true unless options[:validate_with_context].nil?
 
@@ -285,6 +290,7 @@ class ActiveRecord::Base
       end
 
       # dup the passed in array so we don't modify it unintentionally
+      column_names = column_names.dup
       array_of_attributes = array_of_attributes.dup
 
       # Force the primary key col into the insert if it's not
@@ -349,6 +355,7 @@ class ActiveRecord::Base
         instance = new do |model|
           hsh.each_pair{ |k,v| model.send("#{k}=", v) }
         end
+
         if not instance.valid?(options[:validate_with_context])
           array_of_attributes[ i ] = nil
           failed_instances << instance
@@ -376,8 +383,13 @@ class ActiveRecord::Base
 
       unless scope_columns.blank?
         scope_columns.zip(scope_values).each do |name, value|
-          next if column_names.include?(name.to_sym)
-          column_names << name.to_sym
+          name_as_sym = name.to_sym
+          next if column_names.include?(name_as_sym)
+
+          is_sti = (name_as_sym == inheritance_column.to_sym && self < base_class)
+          value = value.first if is_sti
+
+          column_names << name_as_sym
           array_of_attributes.each { |attrs| attrs << value }
         end
       end
@@ -417,8 +429,14 @@ class ActiveRecord::Base
     def set_ids_and_mark_clean(models, import_result)
       unless models.nil?
         import_result.ids.each_with_index do |id, index|
-          models[index].id = id.to_i
-          models[index].instance_variable_get(:@changed_attributes).clear # mark the model as saved
+          model = models[index]
+          model.id = id.to_i
+          if model.respond_to?(:clear_changes_information) # Rails 4.0 and higher
+            model.clear_changes_information
+          else  # Rails 3.1
+            model.instance_variable_get(:@changed_attributes).clear
+          end
+          model.instance_variable_set(:@new_record, false)
         end
       end
     end
@@ -473,10 +491,12 @@ class ActiveRecord::Base
           if val.nil? && column.name == primary_key && !sequence_name.blank?
              connection_memo.next_value_for_sequence(sequence_name)
           elsif column
-            if column.respond_to?(:type_cast_from_user)                         # Rails 4.2 and higher
+            if respond_to?(:type_caster) && type_caster.respond_to?(:type_cast_for_database) # Rails 5.0 and higher
+              connection_memo.quote(type_caster.type_cast_for_database(column.name, val))
+            elsif column.respond_to?(:type_cast_from_user)                      # Rails 4.2 and higher
               connection_memo.quote(column.type_cast_from_user(val), column)
-            else
-              connection_memo.quote(column.type_cast(val), column)              # Rails 3.1, 3.2, and 4.1
+            else                                                                # Rails 3.1, 3.2, and 4.1
+              connection_memo.quote(column.type_cast(val), column)
             end
           end
         end
@@ -509,7 +529,7 @@ class ActiveRecord::Base
             array_of_attributes.each { |arr| arr << value }
           end
 
-          if supports_on_duplicate_key_update?
+          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)

data/lib/activerecord-import/synchronize.rb

@@ -40,8 +40,8 @@ module ActiveRecord # :nodoc:
         end
 
         if matched_instance
-          instance.clear_aggregation_cache
-          instance.clear_association_cache
+          instance.send :clear_aggregation_cache
+          instance.send :clear_association_cache
           instance.instance_variable_set :@attributes, matched_instance.instance_variable_get(:@attributes)
 
           if instance.respond_to?(:clear_changes_information)

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.10.0"
+    VERSION = "0.11.0"
   end
 end

data/test/import_test.rb

@@ -19,6 +19,22 @@ describe "#import" do
     end
   end
 
+  describe "argument safety" do
+    it "should not modify the passed in columns array" do
+      assert_nothing_raised do
+        columns = %w(title author_name).freeze
+        Topic.import columns, [["foo", "bar"]]
+      end
+    end
+
+    it "should not modify the passed in values array" do
+      assert_nothing_raised do
+        values = [["foo", "bar"]].freeze
+        Topic.import %w(title author_name), values
+      end
+    end
+  end
+
   describe "with non-default ActiveRecord models" do
     context "that have a non-standard primary key (that is no sequence)" do
       it "should import models successfully" do
@@ -139,7 +155,11 @@ describe "#import" do
 
       it "doesn't reload any data (doesn't work)" do
         Topic.import new_topics, :synchronize => new_topics
-        assert new_topics.all?(&:new_record?), "No record should have been reloaded"
+        if Topic.support_setting_primary_key_of_imported_objects?
+          assert new_topics.all?(&:persisted?), "Records should have been reloaded"
+        else
+          assert new_topics.all?(&:new_record?), "No record should have been reloaded"
+        end
       end
     end
 
@@ -374,8 +394,14 @@ describe "#import" do
       ]
       Book.import books
       assert_equal 2, Book.count
-      assert_equal 0, Book.first.read_attribute('status')
-      assert_equal 1, Book.last.read_attribute('status')
+
+      if ENV['AR_VERSION'].to_i >= 5.0
+        assert_equal 'draft', Book.first.read_attribute('status')
+        assert_equal 'published', Book.last.read_attribute('status')
+      else
+        assert_equal 0, Book.first.read_attribute('status')
+        assert_equal 1, Book.last.read_attribute('status')
+      end
     end
 
     if ENV['AR_VERSION'].to_i > 4.1
@@ -387,8 +413,14 @@ describe "#import" do
         ]
         Book.import books
         assert_equal 2, Book.count
-        assert_equal 0, Book.first.read_attribute('status')
-        assert_equal 1, Book.last.read_attribute('status')
+
+        if ENV['AR_VERSION'].to_i >= 5.0
+          assert_equal 'draft', Book.first.read_attribute('status')
+          assert_equal 'published', Book.last.read_attribute('status')
+        else
+          assert_equal 0, Book.first.read_attribute('status')
+          assert_equal 1, Book.last.read_attribute('status')
+        end
       end
     end
   end
@@ -419,5 +451,14 @@ describe "#import" do
       end
       assert_equal({:a => :b}, Widget.find_by_w_id(1).data)
     end
+
+    requires_active_record_version ">= 4" do
+      it "imports values for serialized JSON fields" do
+        assert_difference "Widget.unscoped.count", +1 do
+          Widget.import [:w_id, :json_data], [[9, {:a => :b}]]
+        end
+        assert_equal({:a => :b}.as_json, Widget.find_by_w_id(9).json_data)
+      end
+    end
   end
 end

data/test/models/widget.rb

@@ -4,4 +4,5 @@ class Widget < ActiveRecord::Base
   default_scope lambda { where(active: true) }
 
   serialize :data, Hash
-end
+  serialize :json_data, JSON
+end

data/test/schema/generic_schema.rb

@@ -116,5 +116,6 @@ ActiveRecord::Schema.define do
     t.integer :w_id
     t.boolean :active, :default => false
     t.text    :data
+    t.text    :json_data
   end
 end

data/test/support/active_support/test_case_extensions.rb

@@ -3,6 +3,12 @@ class ActiveSupport::TestCase
   self.use_transactional_fixtures = true
   
   class << self
+    def requires_active_record_version(version_string, &blk)
+      if Gem::Dependency.new("expected",version_string).match?("actual", ActiveRecord::VERSION::STRING)
+        instance_eval(&blk)
+      end
+    end
+
     def assertion(name, &block)
       mc = class << self ; self ; end
       mc.class_eval do

data/test/support/em-synchrony_extensions.rb

@@ -0,0 +1,13 @@
+if defined?(EM::Synchrony) && ActiveRecord::VERSION::STRING >= "4.0"
+  module EM::Synchrony
+    module ActiveRecord
+      module Adapter
+        def reset_transaction
+          @transaction_manager = ::ActiveRecord::ConnectionAdapters::TransactionManager.new(self)
+        end
+
+        delegate :open_transactions, :current_transaction, :begin_transaction, :commit_transaction, :rollback_transaction, to: :transaction_manager
+      end
+    end
+  end
+end

data/test/support/mysql/assertions.rb

@@ -39,6 +39,15 @@ class ActiveSupport::TestCase
           assert_equal "johndoe@example.com", updated_topic.author_email_address
         end
 
+        assertion(:should_raise_update_fields_mentioned) do
+          assert_raise ActiveRecord::RecordNotUnique do 
+            perform_import
+          end
+          
+          assert_equal "Book", updated_topic.title
+          assert_equal "john@doe.com", updated_topic.author_email_address
+        end
+
         assertion(:should_update_fields_mentioned_with_hash_mappings) do
           perform_import
           assert_equal "johndoe@example.com", updated_topic.title

data/test/support/mysql/import_examples.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 def should_support_mysql_import_functionality
   # Forcefully disable strict mode for this session.
-  ActiveRecord::Base.connection.execute "set sql_mode=''"
+  ActiveRecord::Base.connection.execute "set sql_mode='STRICT_ALL_TABLES'"
 
   describe "#import with :on_duplicate_key_update option (mysql specific functionality)" do
     extend ActiveSupport::TestCase::MySQLAssertions
@@ -16,6 +16,15 @@ def should_support_mysql_import_functionality
     macro(:perform_import){ raise "supply your own #perform_import in a context below" }
     macro(:updated_topic){ Topic.find(@topic.id) }
 
+    describe "argument safety" do
+      it "should not modify the passed in :on_duplicate_key_update columns array" do
+        assert_nothing_raised do
+          columns = %w(title author_name).freeze
+          Topic.import columns, [["foo", "bar"]], :on_duplicate_key_update => columns
+        end
+      end
+    end
+
     context "given columns and values with :validation checks turned off" do
       let(:columns){  %w( id title author_name author_email_address parent_id ) }
       let(:values){ [ [ 99, "Book", "John Doe", "john@doe.com", 17 ] ] }
@@ -116,13 +125,33 @@ def should_support_mysql_import_functionality
         should_update_fields_mentioned_with_hash_mappings
       end
     end
+  
+    context "given array of model instances with :on_duplicate_key_update turned off" do
+      let(:columns){  %w( id title author_name author_email_address parent_id ) }
+      let(:values){ [ [ 100, "Book", "John Doe", "john@doe.com", 17 ] ] }
+      let(:updated_values){ [ [ 100, "Book - 2nd Edition", "This should raise an exception", "john@nogo.com", 57 ] ] }
+
+      macro(:perform_import) do |*opts|
+        # `:on_duplicate_key_update => false` is the tested feature
+        Topic.import columns, updated_values, opts.extract_options!.merge(:on_duplicate_key_update => false, :validate => false)
+      end
 
+      setup do
+        Topic.import columns, values, :validate => false
+        @topic = Topic.find 100
+      end
+    
+      context "using string column names" do
+        let(:update_columns){ [ "title", "author_email_address", "parent_id" ] }
+        should_raise_update_fields_mentioned
+      end
+    end
   end
 
   describe "#import with :synchronization option" do
     let(:topics){ Array.new }
-    let(:values){ [ [topics.first.id, "Jerry Carter"], [topics.last.id, "Chad Fowler"] ]}
-    let(:columns){ %W(id author_name) }
+    let(:values){ [ [topics.first.id, "Jerry Carter", "title1"], [topics.last.id, "Chad Fowler", "title2"] ]}
+    let(:columns){ %W(id author_name title) }
 
     setup do
       topics << Topic.create!(:title=>"LDAP", :author_name=>"Big Bird")

data/test/support/postgresql/import_examples.rb

@@ -101,5 +101,29 @@ def should_support_postgresql_import_functionality
         end
       end
     end
+
+    describe "with query cache enabled" do
+      setup do
+        unless ActiveRecord::Base.connection.query_cache_enabled
+          ActiveRecord::Base.connection.enable_query_cache!
+          @disable_cache_on_teardown = true
+        end
+      end
+
+      it "clears cache on insert" do
+        before_import = Topic.all.to_a
+
+        Topic.import(Build(2, :topics), validate: false)
+
+        after_import = Topic.all.to_a
+        assert_equal 2, after_import.size - before_import.size
+      end
+
+      teardown do
+        if @disable_cache_on_teardown
+          ActiveRecord::Base.connection.disable_query_cache!
+        end
+      end
+    end
   end
 end

data/test/test_helper.rb

@@ -10,6 +10,8 @@ ENV["RAILS_ENV"] = "test"
 require "bundler"
 Bundler.setup
 
+require 'pry'
+
 require "active_record"
 require "active_record/fixtures"
 require "active_support/test_case"
@@ -34,7 +36,7 @@ ActiveRecord::Base.configurations["test"] = YAML.load_file(test_dir.join("databa
 ActiveRecord::Base.default_timezone = :utc
 
 require "activerecord-import"
-ActiveRecord::Base.establish_connection "test"
+ActiveRecord::Base.establish_connection :test
 
 ActiveSupport::Notifications.subscribe(/active_record.sql/) do |event, _, _, _, hsh|
   ActiveRecord::Base.logger.info hsh[:sql]

data/test/travis/build.sh

@@ -7,12 +7,12 @@ function run {
   $@
 }
 
-for activerecord_version in "3.1" "3.2" "4.1" "4.2" ; do
+for activerecord_version in "3.1" "3.2" "4.0" "4.1" "4.2" "5.0" ; do
   export AR_VERSION=$activerecord_version
 
   bundle update activerecord
 
-  run run bundle exec rake test:em_mysql2               # Run tests for em_mysql2
+  run bundle exec rake test:em_mysql2               # Run tests for em_mysql2
   run bundle exec rake test:mysql                   # Run tests for mysql
   run bundle exec rake test:mysql2                  # Run tests for mysql2
   run bundle exec rake test:mysql2spatial           # Run tests for mysql2spatial

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2016-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -56,7 +56,6 @@ files:
 - activerecord-import.gemspec
 - benchmarks/README
 - benchmarks/benchmark.rb
-- benchmarks/boot.rb
 - benchmarks/lib/base.rb
 - benchmarks/lib/cli_parser.rb
 - benchmarks/lib/float.rb
@@ -72,6 +71,7 @@ files:
 - gemfiles/4.0.gemfile
 - gemfiles/4.1.gemfile
 - gemfiles/4.2.gemfile
+- gemfiles/5.0.gemfile
 - lib/activerecord-import.rb
 - lib/activerecord-import/active_record/adapters/abstract_adapter.rb
 - lib/activerecord-import/active_record/adapters/em_mysql2_adapter.rb
@@ -132,6 +132,7 @@ files:
 - test/schema/version.rb
 - test/sqlite3/import_test.rb
 - test/support/active_support/test_case_extensions.rb
+- test/support/em-synchrony_extensions.rb
 - test/support/factories.rb
 - test/support/generate.rb
 - test/support/mysql/assertions.rb
@@ -163,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Bulk-loading extension for ActiveRecord
@@ -202,6 +203,7 @@ test_files:
 - test/schema/version.rb
 - test/sqlite3/import_test.rb
 - test/support/active_support/test_case_extensions.rb
+- test/support/em-synchrony_extensions.rb
 - test/support/factories.rb
 - test/support/generate.rb
 - test/support/mysql/assertions.rb
@@ -213,4 +215,3 @@ test_files:
 - test/travis/database.yml
 - test/value_sets_bytes_parser_test.rb
 - test/value_sets_records_parser_test.rb
-has_rdoc: 

data/benchmarks/boot.rb

@@ -1,18 +0,0 @@
-begin ; require 'rubygems' ; rescue LoadError ; end
-require 'active_record' # ActiveRecord loads the Benchmark library automatically
-require 'active_record/version'
-require 'fastercsv'
-require 'fileutils'
-require 'logger'
-
-# Files are loaded alphabetically. If this is a problem then manually specify the files
-# that need to be loaded here.
-Dir[ File.join( File.dirname( __FILE__ ), 'lib', '*.rb' ) ].sort.each{ |f| require f }
-
-ActiveRecord::Base.logger = Logger.new STDOUT
-
-
-
-
-
-