activerecord-import 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f525ceb164067e5f2c49042b1a8f3312eab016a
-  data.tar.gz: c9817adb82be93259525dc52a85b42bf7829d585
+  metadata.gz: 0f9f37b3a5f830a11ae96be25ce6f5c4b17a0644
+  data.tar.gz: 54a38cb34a3dcea2712144881922db6391dffb95
 SHA512:
-  metadata.gz: 974e9a0491e43cd9a9a22e167f1b9dede5bcdececbb3d480c2b4edf2e293e50c0cf3e85f39b4d10f624c541a0651db5de2f85bad0d5ca7142c4de28017e1809f
-  data.tar.gz: 4e31a0c10174ba285b08d47abbac06c2089c62488c5f3775d24c6b993b4c7bd465d051e5238e6df511da6ad8b152f47f5827b41cf316d5e8713dc9bd2c64e9bc
+  metadata.gz: e5711460969d86ad105727048bb1f86aa323f9bf9f48239b845ec7c2b95d5113e8bf0cf2e7bdafaca5d7a53dc5ce93b57e85e8468b69982c394e8d46d7dbadc5
+  data.tar.gz: 3877050ee37099c68deafb1f3532d781a4efbf3f50c049787e24676d7cc5131df70782e00f17abaef866766c30212b7cceceee41031cf7e2c834c20f18fbd381

data/.travis.yml

@@ -8,7 +8,6 @@ env:
     # https://github.com/discourse/discourse/blob/master/.travis.yml
     - RUBY_GC_MALLOC_LIMIT=50000000
   matrix:
-    - AR_VERSION=3.1
     - AR_VERSION=3.2
     - AR_VERSION=4.0
     - AR_VERSION=4.1
@@ -16,6 +15,13 @@ env:
     - AR_VERSION=5.0
 
 matrix:
+  include:
+    - rvm: jruby-9.0.5.0
+      env: AR_VERSION=4.2
+      script:
+        - bundle exec rake test:jdbcmysql
+        - bundle exec rake test:jdbcpostgresql
+
   fast_finish: true
 
 before_script:
@@ -33,9 +39,11 @@ addons:
 
 script:
   - bundle exec rake test:mysql2
+  - bundle exec rake test:mysql2_makara
   - bundle exec rake test:mysql2spatial
   - bundle exec rake test:postgis
   - bundle exec rake test:postgresql
+  - bundle exec rake test:postgresql_makara
   - bundle exec rake test:seamless_database_pool
   - bundle exec rake test:spatialite
   - bundle exec rake test:sqlite3

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## Changes in 0.14.0
+
+### New Features
+
+* Support for ActiveRecord 3.1 has been dropped. Thanks to @sferik via \#254
+* SQLite3 has learned the :recursive option. Thanks to @jkowens via \#281
+* :on_duplicate_key_ignore will be ignored when imports are being done with :recursive. Thanks to @jkowens via \#268
+* :activerecord-import learned how to tell PostgreSQL to return no data back from the import via the :no_returning boolean option. Thanks to @makaroni4 via \#276
+
+### Fixes
+
+* Polymorphic associations will not import the :type column. Thanks to @seanlinsley via \#282 and \#283
+* ~2X speed increase for importing models with validations. Thanks to @jkowens via \#266
+
+### Misc
+
+* Benchmark HTML report has been fixed. Thanks to @jkowens via \#264
+* seamless_database_pool has been updated to work with AR 5.0. Thanks to @jkowens via \#280
+* Code cleanup, removal of redundant condition checks. Thanks to @pavlik4k via \#273
+* Code cleanup, removal of deprecated `alias_method_chain`. Thanks to @codeodor via \#271
+
+
+
 ## Changes in 0.13.0
 
 ### New Features

data/Gemfile

@@ -11,7 +11,7 @@ platforms :ruby do
   gem "mysql2",                 "~> 0.3.0"
   gem "pg",                     "~> 0.9"
   gem "sqlite3",                "~> 1.3.10"
-  gem "seamless_database_pool", "~> 1.0.13"
+  gem "seamless_database_pool", "~> 1.0.18"
 end
 
 platforms :jruby do

data/Rakefile

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

data/activerecord-import.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 1.9.2"
 
-  gem.add_runtime_dependency "activerecord", ">= 3.0"
+  gem.add_runtime_dependency "activerecord", ">= 3.2"
   gem.add_development_dependency "rake"
 end

data/benchmarks/lib/base.rb

@@ -126,7 +126,9 @@ class BenchmarkBase
   # Deletes all records from all ActiveRecord subclasses
   def delete_all
     ActiveRecord::Base.send( :subclasses ).each do |subclass|
-      subclass.delete_all if subclass.respond_to? :delete_all
+      if subclass.table_exists? && subclass.respond_to?(:delete_all)
+        subclass.delete_all
+      end
     end
   end
 

data/benchmarks/lib/output_to_html.rb

@@ -51,7 +51,7 @@ EOT
         else
           time = result.tms.real.round_to( 3 )
           speedup = ( result_set.first.tms.real / result.tms.real ).round
-          times << result == result_set.first ? time.to_s : "#{time} (#{speedup}x speedup)"
+          times << (result == result_set.first ? time.to_s : "#{time} (#{speedup}x speedup)")
         end
       end
 

data/lib/activerecord-import.rb

@@ -12,7 +12,8 @@ ActiveSupport.on_load(:active_record) do
         ActiveRecord::Import.load_from_connection_pool connection_pool
         conn
       end
-      alias_method_chain :establish_connection, :activerecord_import
+      alias establish_connection_without_activerecord_import establish_connection
+      alias establish_connection establish_connection_with_activerecord_import
     end
   end
 end

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

@@ -47,7 +47,10 @@ module ActiveRecord::Import::AbstractAdapter
 
       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] )
+          # Options :recursive and :on_duplicate_key_ignore are mutually exclusive
+          unless options[:recursive]
+            post_sql_statements << sql_for_on_duplicate_key_ignore( table_name, options[:on_duplicate_key_ignore] )
+          end
         elsif options[:on_duplicate_key_update]
           post_sql_statements << sql_for_on_duplicate_key_update( table_name, options[:on_duplicate_key_update] )
         end

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

@@ -26,7 +26,7 @@ module ActiveRecord::Import::PostgreSQLAdapter
   end
 
   def post_sql_statements( table_name, options ) # :nodoc:
-    if options[:primary_key].blank?
+    if options[:no_returning] || options[:primary_key].blank?
       super(table_name, options)
     else
       super(table_name, options) << "RETURNING #{options[:primary_key]}"

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

@@ -19,6 +19,8 @@ module ActiveRecord::Import::SQLite3Adapter
   # elements that are in position >= 1 will be appended to the final SQL.
   def insert_many(sql, values, *args) # :nodoc:
     number_of_inserts = 0
+    ids = []
+
     base_sql, post_sql = if sql.is_a?( String )
       [sql, '']
     elsif sql.is_a?( Array )
@@ -31,13 +33,19 @@ module ActiveRecord::Import::SQLite3Adapter
     value_sets.each do |value_set|
       number_of_inserts += 1
       sql2insert = base_sql + value_set.join( ',' ) + post_sql
-      insert( sql2insert, *args )
+      first_insert_id = insert( sql2insert, *args )
+      last_insert_id = first_insert_id + value_set.size - 1
+      ids.concat((first_insert_id..last_insert_id).to_a)
     end
 
-    [number_of_inserts, []]
+    [number_of_inserts, ids]
   end
 
   def next_value_for_sequence(sequence_name)
     %{nextval('#{sequence_name}')}
   end
+
+  def support_setting_primary_key_of_imported_objects?
+    true
+  end
 end

data/lib/activerecord-import/base.rb

@@ -7,8 +7,10 @@ module ActiveRecord::Import
 
   def self.base_adapter(adapter)
     case adapter
+    when 'mysql2_makara' then 'mysql2'
     when 'mysql2spatial' then 'mysql2'
     when 'spatialite' then 'sqlite3'
+    when 'postgresql_makara' then 'postgresql'
     when 'postgis' then 'postgresql'
     else adapter
     end

data/lib/activerecord-import/import.rb

@@ -61,13 +61,14 @@ class ActiveRecord::Associations::CollectionAssociation
 
       models.each do |m|
         m.public_send "#{symbolized_foreign_key}=", owner_primary_key_value
+        m.public_send "#{reflection.type}=", owner.class.name if reflection.type
       end
 
       return model_klass.import column_names, models, options
 
     # supports empty array
     elsif args.last.is_a?( Array ) && args.last.empty?
-      return ActiveRecord::Import::Result.new([], 0, []) if args.last.empty?
+      return ActiveRecord::Import::Result.new([], 0, [])
 
     # supports 2-element array and array
     elsif args.size == 2 && args.first.is_a?( Array ) && args.last.is_a?( Array )
@@ -82,6 +83,11 @@ class ActiveRecord::Associations::CollectionAssociation
         array_of_attributes.each { |attrs| attrs << owner_primary_key_value }
       end
 
+      if reflection.type
+        column_names << reflection.type
+        array_of_attributes.each { |attrs| attrs << owner.class.name }
+      end
+
       return model_klass.import column_names, array_of_attributes, options
     else
       raise ArgumentError, "Invalid arguments!"
@@ -168,7 +174,8 @@ class ActiveRecord::Base
     # * +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.
+    #    Postgres 9.5+ ON CONFLICT DO NOTHING. Cannot be enabled on a
+    #    recursive import.
     # * +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.
@@ -350,18 +357,13 @@ 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|
-            name = name.to_s
-            if respond_to?(:defined_enums) && defined_enums.key?(name) # ActiveRecord 5
-              model.read_attribute(name)
-            else
-              model.read_attribute_before_type_cast(name)
-            end
+            model.read_attribute_before_type_cast(name.to_s)
           end
           # end
         end
         # supports empty array
       elsif args.last.is_a?( Array ) && args.last.empty?
-        return ActiveRecord::Import::Result.new([], 0, []) if args.last.empty?
+        return ActiveRecord::Import::Result.new([], 0, [])
         # supports 2-element array and array
       elsif args.size == 2 && args.first.is_a?( Array ) && args.last.is_a?( Array )
         column_names, array_of_attributes = args
@@ -387,7 +389,19 @@ class ActiveRecord::Base
       end
 
       return_obj = if is_validating
-        import_with_validations( column_names, array_of_attributes, options )
+        if models
+          import_with_validations( column_names, array_of_attributes, options ) do |failed|
+            models.each_with_index do |model, i|
+              model = model.dup if options[:recursive]
+              next if model.valid?(options[:validate_with_context])
+              model.send(:raise_record_invalid) if options[:raise_error]
+              array_of_attributes[i] = nil
+              failed << model
+            end
+          end
+        else
+          import_with_validations( column_names, array_of_attributes, options )
+        end
       else
         (num_inserts, ids) = import_without_validations_or_callbacks( column_names, array_of_attributes, options )
         ActiveRecord::Import::Result.new([], num_inserts, ids)
@@ -424,21 +438,24 @@ class ActiveRecord::Base
     def import_with_validations( column_names, array_of_attributes, options = {} )
       failed_instances = []
 
-      # create instances for each of our column/value sets
-      arr = validations_array_for_column_names_and_attributes( column_names, array_of_attributes )
+      if block_given?
+        yield failed_instances
+      else
+        # create instances for each of our column/value sets
+        arr = validations_array_for_column_names_and_attributes( column_names, array_of_attributes )
 
-      # keep track of the instance and the position it is currently at. if this fails
-      # validation we'll use the index to remove it from the array_of_attributes
-      arr.each_with_index do |hsh, i|
-        instance = new do |model|
+        # keep track of the instance and the position it is currently at. if this fails
+        # validation we'll use the index to remove it from the array_of_attributes
+        model = new
+        arr.each_with_index do |hsh, i|
           hsh.each_pair { |k, v| model[k] = v }
+          next if model.valid?(options[:validate_with_context])
+          raise(ActiveRecord::RecordInvalid, model) if options[:raise_error]
+          array_of_attributes[i] = nil
+          failed_instances << model.dup
         end
-
-        next if instance.valid?(options[:validate_with_context])
-        raise(ActiveRecord::RecordInvalid, instance) if options[:raise_error]
-        array_of_attributes[i] = nil
-        failed_instances << instance
       end
+
       array_of_attributes.compact!
 
       num_inserts, ids = if array_of_attributes.empty? || options[:all_or_none] && failed_instances.any?
@@ -501,7 +518,7 @@ class ActiveRecord::Base
         end
       else
         values_sql.each do |values|
-          connection.execute(insert_sql + values)
+          ids << connection.insert(insert_sql + values)
           number_inserted += 1
         end
       end
@@ -517,7 +534,7 @@ class ActiveRecord::Base
         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
+        else # Rails 3.2
           model.instance_variable_get(:@changed_attributes).clear
         end
         model.instance_variable_set(:@new_record, false)
@@ -590,7 +607,7 @@ class ActiveRecord::Base
               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                                                                             # Rails 3.1, 3.2, 4.0 and 4.1
+            else                                                                             # Rails 3.2, 4.0 and 4.1
               if serialized_attributes.include?(column.name)
                 val = serialized_attributes[column.name].dump(val)
               end
@@ -636,9 +653,7 @@ class ActiveRecord::Base
 
     # Returns an Array of Hashes for the passed in +column_names+ and +array_of_attributes+.
     def validations_array_for_column_names_and_attributes( column_names, array_of_attributes ) # :nodoc:
-      array_of_attributes.map do |attributes|
-        Hash[attributes.each_with_index.map { |attr, c| [column_names[c], attr] }]
-      end
+      array_of_attributes.map { |values| Hash[column_names.zip(values)] }
     end
   end
 end

data/lib/activerecord-import/synchronize.rb

@@ -47,7 +47,7 @@ module ActiveRecord # :nodoc:
           instance.clear_changes_information                      # Rails 4.2 and higher
         else
           instance.instance_variable_set :@attributes_cache, {}   # Rails 4.0, 4.1
-          instance.changed_attributes.clear                       # Rails 3.1, 3.2
+          instance.changed_attributes.clear                       # Rails 3.2
           instance.previous_changes.clear
         end
 

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.13.0".freeze
+    VERSION = "0.14.0".freeze
   end
 end

data/test/adapters/mysql2_makara.rb

@@ -0,0 +1 @@
+ENV["ARE_DB"] = "mysql2_makara"

data/test/adapters/postgresql_makara.rb

@@ -0,0 +1 @@
+ENV["ARE_DB"] = "postgresql"

data/test/database.yml.sample

@@ -12,12 +12,8 @@ mysql2: &mysql2
 mysql2spatial:
   <<: *mysql2
 
-seamless_database_pool:
-  <<: *common
-  adapter: seamless_database_pool
-  pool_adapter: mysql2
-  master:
-    host: localhost
+mysql2_makara:
+  <<: *mysql2
 
 postgresql: &postgresql
   <<: *common
@@ -25,6 +21,9 @@ postgresql: &postgresql
   adapter: postgresql
   min_messages: warning
 
+postresql_makara:
+  <<: *postgresql
+
 postgis:
   <<: *postgresql
 
@@ -33,6 +32,14 @@ oracle:
   adapter: oracle
   min_messages: debug
 
+seamless_database_pool:
+  <<: *common
+  adapter: seamless_database_pool
+  prepared_statements: false
+  pool_adapter: mysql2
+  master:
+    host: localhost
+
 sqlite:
   adapter: sqlite
   dbfile: test.db

data/test/import_test.rb

@@ -363,36 +363,30 @@ describe "#import" do
   end
 
   context "importing through an association scope" do
-    [true, false].each do |bool|
-      context "when validation is " + (bool ? "enabled" : "disabled") do
-        it "should automatically set the foreign key column" do
-          books = [["David Chelimsky", "The RSpec Book"], ["Chad Fowler", "Rails Recipes"]]
-          topic = FactoryGirl.create :topic
-          topic.books.import [:author_name, :title], books, validate: bool
-          assert_equal 2, topic.books.count
-          assert topic.books.all? { |book| book.topic_id == topic.id }
+    { has_many: :chapters, polymorphic: :discounts }.each do |association_type, association|
+      let(:book)   { FactoryGirl.create :book }
+      let(:scope)  { book.public_send association }
+      let(:klass)  { { chapters: Chapter, discounts: Discount }[association] }
+      let(:column) { { chapters: :title,  discounts: :amount  }[association] }
+      let(:val1)   { { chapters: 'A',     discounts: 5        }[association] }
+      let(:val2)   { { chapters: 'B',     discounts: 6        }[association] }
+
+      context "for #{association_type}" do
+        it "works importing models" do
+          scope.import [
+            klass.new(column => val1),
+            klass.new(column => val2)
+          ]
+
+          assert_equal [val1, val2], scope.map(&column).sort
         end
-      end
-    end
 
-    it "works importing models" do
-      topic = FactoryGirl.create :topic
-      books = [
-        Book.new(author_name: "Author #1", title: "Book #1"),
-        Book.new(author_name: "Author #2", title: "Book #2"),
-      ]
-      topic.books.import books
-      assert_equal 2, topic.books.count
-      assert topic.books.detect { |b| b.title == "Book #1" && b.author_name == "Author #1" }
-      assert topic.books.detect { |b| b.title == "Book #2" && b.author_name == "Author #2" }
-    end
+        it "works importing array of columns and values" do
+          scope.import [column], [[val1], [val2]]
 
-    it "works importing array of columns and values" do
-      topic = FactoryGirl.create :topic
-      topic.books.import [:author_name, :title], [["Author #1", "Book #1"], ["Author #2", "Book #2"]]
-      assert_equal 2, topic.books.count
-      assert topic.books.detect { |b| b.title == "Book #1" && b.author_name == "Author #1" }
-      assert topic.books.detect { |b| b.title == "Book #2" && b.author_name == "Author #2" }
+          assert_equal [val1, val2], scope.map(&column).sort
+        end
+      end
     end
   end
 
@@ -451,6 +445,25 @@ describe "#import" do
     end
   end
 
+  context 'When importing arrays of values with Enum fields' do
+    let(:columns) { [:author_name, :title, :status] }
+    let(:values) { [['Author #1', 'Book #1', 0], ['Author #2', 'Book #2', 1]] }
+
+    it 'should be able to import enum fields' do
+      Book.delete_all if Book.count > 0
+      Book.import columns, values
+      assert_equal 2, Book.count
+
+      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
+
   describe "importing when model has default_scope" do
     it "doesn't import the default scope values" do
       assert_difference "Widget.unscoped.count", +2 do

data/test/mysql2_makara/import_test.rb

@@ -0,0 +1,6 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+require File.expand_path(File.dirname(__FILE__) + '/../support/assertions')
+require File.expand_path(File.dirname(__FILE__) + '/../support/mysql/import_examples')
+
+should_support_mysql_import_functionality

data/test/sqlite3/import_test.rb

@@ -1,5 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
+should_support_recursive_import
+
 describe "#supports_imports?" do
   context "and SQLite is 3.7.11 or higher" do
     it "supports import" do

data/test/support/factories.rb

@@ -49,4 +49,9 @@ FactoryGirl.define do
       end
     end
   end
+
+  factory :book do
+    title 'Tortilla Flat'
+    author_name 'John Steinbeck'
+  end
 end

data/test/support/postgresql/import_examples.rb

@@ -1,5 +1,7 @@
 # encoding: UTF-8
 def should_support_postgresql_import_functionality
+  should_support_recursive_import
+
   describe "#supports_imports?" do
     it "should support import" do
       assert ActiveRecord::Base.supports_import?
@@ -18,112 +20,6 @@ def should_support_postgresql_import_functionality
       end
     end
 
-    describe "importing objects with associations" do
-      let(:new_topics) { Build(num_topics, :topic_with_book) }
-      let(:new_topics_with_invalid_chapter) do
-        chapter = new_topics.first.books.first.chapters.first
-        chapter.title = nil
-        new_topics
-      end
-      let(:num_topics) { 3 }
-      let(:num_books) { 6 }
-      let(:num_chapters) { 18 }
-      let(:num_endnotes) { 24 }
-
-      let(:new_question_with_rule) { FactoryGirl.build :question, :with_rule }
-
-      it 'imports top level' do
-        assert_difference "Topic.count", +num_topics do
-          Topic.import new_topics, recursive: true
-          new_topics.each do |topic|
-            assert_not_nil topic.id
-          end
-        end
-      end
-
-      it 'imports first level associations' do
-        assert_difference "Book.count", +num_books do
-          Topic.import new_topics, recursive: true
-          new_topics.each do |topic|
-            topic.books.each do |book|
-              assert_equal topic.id, book.topic_id
-            end
-          end
-        end
-      end
-
-      it 'imports polymorphic associations' do
-        discounts = Array.new(1) { |i| Discount.new(amount: i) }
-        books = Array.new(1) { |i| Book.new(author_name: "Author ##{i}", title: "Book ##{i}") }
-        books.each do |book|
-          book.discounts << discounts
-        end
-        Book.import books, recursive: true
-        books.each do |book|
-          book.discounts.each do |discount|
-            assert_not_nil discount.discountable_id
-            assert_equal 'Book', discount.discountable_type
-          end
-        end
-      end
-
-      [{ recursive: false }, {}].each do |import_options|
-        it "skips recursion for #{import_options}" do
-          assert_difference "Book.count", 0 do
-            Topic.import new_topics, import_options
-          end
-        end
-      end
-
-      it 'imports deeper nested associations' do
-        assert_difference "Chapter.count", +num_chapters do
-          assert_difference "EndNote.count", +num_endnotes do
-            Topic.import new_topics, recursive: true
-            new_topics.each do |topic|
-              topic.books.each do |book|
-                book.chapters.each do |chapter|
-                  assert_equal book.id, chapter.book_id
-                end
-                book.end_notes.each do |endnote|
-                  assert_equal book.id, endnote.book_id
-                end
-              end
-            end
-          end
-        end
-      end
-
-      it "skips validation of the associations if requested" do
-        assert_difference "Chapter.count", +num_chapters do
-          Topic.import new_topics_with_invalid_chapter, validate: false, recursive: true
-        end
-      end
-
-      it 'imports has_one associations' do
-        assert_difference 'Rule.count' do
-          Question.import [new_question_with_rule], recursive: true
-        end
-      end
-
-      # These models dont validate associated.  So we expect that books and topics get inserted, but not chapters
-      # Putting a transaction around everything wouldn't work, so if you want your chapters to prevent topics from
-      # being created, you would need to have validates_associated in your models and insert with validation
-      describe "all_or_none" do
-        [Book, Topic, EndNote].each do |type|
-          it "creates #{type}" do
-            assert_difference "#{type}.count", send("num_#{type.to_s.downcase}s") do
-              Topic.import new_topics_with_invalid_chapter, all_or_none: true, recursive: true
-            end
-          end
-        end
-        it "doesn't create chapters" do
-          assert_difference "Chapter.count", 0 do
-            Topic.import new_topics_with_invalid_chapter, all_or_none: true, recursive: true
-          end
-        end
-      end
-    end
-
     describe "with query cache enabled" do
       setup do
         unless ActiveRecord::Base.connection.query_cache_enabled
@@ -147,6 +43,20 @@ def should_support_postgresql_import_functionality
         end
       end
     end
+
+    describe "no_returning" do
+      let(:books) { [Book.new(author_name: "foo", title: "bar")] }
+
+      it "creates records" do
+        assert_difference "Book.count", +1 do
+          Book.import books, no_returning: true
+        end
+      end
+
+      it "returns no ids" do
+        assert_equal [], Book.import(books, no_returning: true).ids
+      end
+    end
   end
 end
 
@@ -164,28 +74,32 @@ def should_support_postgresql_upsert_functionality
       let(:values) { [[99, "Book", "John Doe", "john@doe.com", 17]] }
       let(:updated_values) { [[99, "Book - 2nd Edition", "Author Should Not Change", "johndoe@example.com", 57]] }
 
-      macro(:perform_import) do |*opts|
-        Topic.import columns, updated_values, opts.extract_options!.merge(on_duplicate_key_ignore: value, validate: false)
-      end
-
       setup do
         Topic.import columns, values, validate: false
-        @topic = Topic.find 99
       end
 
-      context "using true" do
-        let(:value) { true }
-        should_not_update_updated_at_on_timestamp_columns
+      it "should not update any records" do
+        result = Topic.import columns, updated_values, on_duplicate_key_ignore: true, validate: false
+        assert_equal [], result.ids
       end
+    end
+
+    context "with :on_duplicate_key_ignore and :recursive enabled" do
+      let(:new_topic) { Build(1, :topic_with_book) }
+      let(:mixed_topics) { Build(1, :topic_with_book) + new_topic + Build(1, :topic_with_book) }
 
-      context "using hash with :conflict_target" do
-        let(:value) { { conflict_target: :id } }
-        should_not_update_updated_at_on_timestamp_columns
+      setup do
+        Topic.import new_topic, recursive: true
       end
 
-      context "using hash with :constraint_target" do
-        let(:value) { { constraint_name: :topics_pkey } }
-        should_not_update_updated_at_on_timestamp_columns
+      # Recursive import depends on the primary keys of the parent model being returned
+      # on insert. With on_duplicate_key_ignore enabled, not all ids will be returned
+      # and it is possible that a model will be assigned the wrong id and then its children
+      # would be associated with the wrong parent.
+      it ":on_duplicate_key_ignore is ignored" do
+        assert_raise ActiveRecord::RecordNotUnique do
+          Topic.import mixed_topics, recursive: true, on_duplicate_key_ignore: true
+        end
       end
     end
 
@@ -294,19 +208,6 @@ def should_support_postgresql_upsert_functionality
           should_update_updated_at_on_timestamp_columns
         end
       end
-
-      context "with recursive: true" do
-        let(:new_topics) { Build(1, :topic_with_book) }
-
-        it "imports objects with associations" do
-          assert_difference "Topic.count", +1 do
-            Topic.import new_topics, recursive: true, on_duplicate_key_update: [:updated_at], validate: false
-            new_topics.each do |topic|
-              assert_not_nil topic.id
-            end
-          end
-        end
-      end
     end
   end
 end

data/test/support/shared_examples/on_duplicate_key_update.rb

@@ -5,65 +5,76 @@ def should_support_basic_on_duplicate_key_update
     macro(:perform_import) { raise "supply your own #perform_import in a context below" }
     macro(:updated_topic) { Topic.find(@topic.id) }
 
-    context "with :on_duplicate_key_update and validation checks turned off" do
-      asssertion_group(:should_support_on_duplicate_key_update) do
-        should_not_update_fields_not_mentioned
-        should_update_foreign_keys
-        should_not_update_created_at_on_timestamp_columns
-        should_update_updated_at_on_timestamp_columns
+    context "with :on_duplicate_key_update" do
+      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, [%w(foo, bar)], on_duplicate_key_update: columns
+          end
+        end
       end
 
-      let(:columns) { %w( id title author_name author_email_address parent_id ) }
-      let(:values) { [[99, "Book", "John Doe", "john@doe.com", 17]] }
-      let(:updated_values) { [[99, "Book - 2nd Edition", "Author Should Not Change", "johndoe@example.com", 57]] }
+      context "with validation checks turned off" do
+        asssertion_group(:should_support_on_duplicate_key_update) do
+          should_not_update_fields_not_mentioned
+          should_update_foreign_keys
+          should_not_update_created_at_on_timestamp_columns
+          should_update_updated_at_on_timestamp_columns
+        end
 
-      macro(:perform_import) do |*opts|
-        Topic.import columns, updated_values, opts.extract_options!.merge(on_duplicate_key_update: update_columns, validate: false)
-      end
+        let(:columns) { %w( id title author_name author_email_address parent_id ) }
+        let(:values) { [[99, "Book", "John Doe", "john@doe.com", 17]] }
+        let(:updated_values) { [[99, "Book - 2nd Edition", "Author Should Not Change", "johndoe@example.com", 57]] }
 
-      setup do
-        Topic.import columns, values, validate: false
-        @topic = Topic.find 99
-      end
+        macro(:perform_import) do |*opts|
+          Topic.import columns, updated_values, opts.extract_options!.merge(on_duplicate_key_update: update_columns, validate: false)
+        end
 
-      context "using an empty array" do
-        let(:update_columns) { [] }
-        should_not_update_fields_not_mentioned
-        should_update_updated_at_on_timestamp_columns
-      end
+        setup do
+          Topic.import columns, values, validate: false
+          @topic = Topic.find 99
+        end
 
-      context "using string column names" do
-        let(:update_columns) { %w(title author_email_address parent_id) }
-        should_support_on_duplicate_key_update
-        should_update_fields_mentioned
-      end
+        context "using an empty array" do
+          let(:update_columns) { [] }
+          should_not_update_fields_not_mentioned
+          should_update_updated_at_on_timestamp_columns
+        end
 
-      context "using symbol column names" do
-        let(:update_columns) { [:title, :author_email_address, :parent_id] }
-        should_support_on_duplicate_key_update
-        should_update_fields_mentioned
+        context "using string column names" do
+          let(:update_columns) { %w(title author_email_address parent_id) }
+          should_support_on_duplicate_key_update
+          should_update_fields_mentioned
+        end
+
+        context "using symbol column names" do
+          let(:update_columns) { [:title, :author_email_address, :parent_id] }
+          should_support_on_duplicate_key_update
+          should_update_fields_mentioned
+        end
       end
-    end
 
-    context "with a table that has a non-standard primary key" do
-      let(:columns) { [:promotion_id, :code] }
-      let(:values) { [[1, 'DISCOUNT1']] }
-      let(:updated_values) { [[1, 'DISCOUNT2']] }
-      let(:update_columns) { [:code] }
+      context "with a table that has a non-standard primary key" do
+        let(:columns) { [:promotion_id, :code] }
+        let(:values) { [[1, 'DISCOUNT1']] }
+        let(:updated_values) { [[1, 'DISCOUNT2']] }
+        let(:update_columns) { [:code] }
 
-      macro(:perform_import) do |*opts|
-        Promotion.import columns, updated_values, opts.extract_options!.merge(on_duplicate_key_update: update_columns, validate: false)
-      end
-      macro(:updated_promotion) { Promotion.find(@promotion.promotion_id) }
+        macro(:perform_import) do |*opts|
+          Promotion.import columns, updated_values, opts.extract_options!.merge(on_duplicate_key_update: update_columns, validate: false)
+        end
+        macro(:updated_promotion) { Promotion.find(@promotion.promotion_id) }
 
-      setup do
-        Promotion.import columns, values, validate: false
-        @promotion = Promotion.find 1
-      end
+        setup do
+          Promotion.import columns, values, validate: false
+          @promotion = Promotion.find 1
+        end
 
-      it "should update specified columns" do
-        perform_import
-        assert_equal 'DISCOUNT2', updated_promotion.code
+        it "should update specified columns" do
+          perform_import
+          assert_equal 'DISCOUNT2', updated_promotion.code
+        end
       end
     end
 

data/test/support/shared_examples/recursive_import.rb

@@ -0,0 +1,122 @@
+def should_support_recursive_import
+  describe "importing objects with associations" do
+    let(:new_topics) { Build(num_topics, :topic_with_book) }
+    let(:new_topics_with_invalid_chapter) do
+      chapter = new_topics.first.books.first.chapters.first
+      chapter.title = nil
+      new_topics
+    end
+    let(:num_topics) { 3 }
+    let(:num_books) { 6 }
+    let(:num_chapters) { 18 }
+    let(:num_endnotes) { 24 }
+
+    let(:new_question_with_rule) { FactoryGirl.build :question, :with_rule }
+
+    it 'imports top level' do
+      assert_difference "Topic.count", +num_topics do
+        Topic.import new_topics, recursive: true
+        new_topics.each do |topic|
+          assert_not_nil topic.id
+        end
+      end
+    end
+
+    it 'imports first level associations' do
+      assert_difference "Book.count", +num_books do
+        Topic.import new_topics, recursive: true
+        new_topics.each do |topic|
+          topic.books.each do |book|
+            assert_equal topic.id, book.topic_id
+          end
+        end
+      end
+    end
+
+    it 'imports polymorphic associations' do
+      discounts = Array.new(1) { |i| Discount.new(amount: i) }
+      books = Array.new(1) { |i| Book.new(author_name: "Author ##{i}", title: "Book ##{i}") }
+      books.each do |book|
+        book.discounts << discounts
+      end
+      Book.import books, recursive: true
+      books.each do |book|
+        book.discounts.each do |discount|
+          assert_not_nil discount.discountable_id
+          assert_equal 'Book', discount.discountable_type
+        end
+      end
+    end
+
+    [{ recursive: false }, {}].each do |import_options|
+      it "skips recursion for #{import_options}" do
+        assert_difference "Book.count", 0 do
+          Topic.import new_topics, import_options
+        end
+      end
+    end
+
+    it 'imports deeper nested associations' do
+      assert_difference "Chapter.count", +num_chapters do
+        assert_difference "EndNote.count", +num_endnotes do
+          Topic.import new_topics, recursive: true
+          new_topics.each do |topic|
+            topic.books.each do |book|
+              book.chapters.each do |chapter|
+                assert_equal book.id, chapter.book_id
+              end
+              book.end_notes.each do |endnote|
+                assert_equal book.id, endnote.book_id
+              end
+            end
+          end
+        end
+      end
+    end
+
+    it "skips validation of the associations if requested" do
+      assert_difference "Chapter.count", +num_chapters do
+        Topic.import new_topics_with_invalid_chapter, validate: false, recursive: true
+      end
+    end
+
+    it 'imports has_one associations' do
+      assert_difference 'Rule.count' do
+        Question.import [new_question_with_rule], recursive: true
+      end
+    end
+
+    # These models dont validate associated.  So we expect that books and topics get inserted, but not chapters
+    # Putting a transaction around everything wouldn't work, so if you want your chapters to prevent topics from
+    # being created, you would need to have validates_associated in your models and insert with validation
+    describe "all_or_none" do
+      [Book, Topic, EndNote].each do |type|
+        it "creates #{type}" do
+          assert_difference "#{type}.count", send("num_#{type.to_s.downcase}s") do
+            Topic.import new_topics_with_invalid_chapter, all_or_none: true, recursive: true
+          end
+        end
+      end
+      it "doesn't create chapters" do
+        assert_difference "Chapter.count", 0 do
+          Topic.import new_topics_with_invalid_chapter, all_or_none: true, recursive: true
+        end
+      end
+    end
+
+    # If adapter supports on_duplicate_key_update, it is only applied to top level models so that SQL with invalid
+    # columns, keys, etc isn't generated for child associations when doing recursive import
+    describe "on_duplicate_key_update" do
+      let(:new_topics) { Build(1, :topic_with_book) }
+
+      it "imports objects with associations" do
+        assert_difference "Topic.count", +1 do
+          Topic.import new_topics, recursive: true, on_duplicate_key_update: [:updated_at], validate: false
+          new_topics.each do |topic|
+            assert_not_nil topic.id
+          end
+        end
+      end
+    end
+  end
+end

data/test/travis/database.yml

@@ -5,6 +5,16 @@ common: &common
   host:     localhost
   database: activerecord_import_test
 
+jdbcpostgresql: &postgresql
+  <<: *common
+  username: postgres
+  adapter: jdbcpostgresql
+  min_messages: warning
+
+jdbcmysql: &mysql2
+  <<: *common
+  adapter: jdbcmysql
+
 mysql2: &mysql2
   <<: *common
   adapter: mysql2
@@ -12,12 +22,13 @@ mysql2: &mysql2
 mysql2spatial:
   <<: *mysql2
 
-seamless_database_pool:
+mysql2_makara:
+  <<: *mysql2
+
+oracle:
   <<: *common
-  adapter: seamless_database_pool
-  pool_adapter: mysql2
-  master:
-    host: localhost
+  adapter: oracle
+  min_messages: debug
 
 postgresql: &postgresql
   <<: *common
@@ -25,13 +36,19 @@ postgresql: &postgresql
   adapter: postgresql
   min_messages: warning
 
+postresql_makara:
+  <<: *postgresql
+
 postgis:
   <<: *postgresql
 
-oracle:
+seamless_database_pool:
   <<: *common
-  adapter: oracle
-  min_messages: debug
+  adapter: seamless_database_pool
+  pool_adapter: mysql2
+  prepared_statements: false
+  master:
+    host: localhost
 
 sqlite:
   adapter: sqlite

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -69,7 +69,6 @@ files:
 - benchmarks/models/test_memory.rb
 - benchmarks/models/test_myisam.rb
 - benchmarks/schema/mysql_schema.rb
-- gemfiles/3.1.gemfile
 - gemfiles/3.2.gemfile
 - gemfiles/4.0.gemfile
 - gemfiles/4.1.gemfile
@@ -100,9 +99,11 @@ files:
 - test/adapters/jdbcmysql.rb
 - test/adapters/jdbcpostgresql.rb
 - test/adapters/mysql2.rb
+- test/adapters/mysql2_makara.rb
 - test/adapters/mysql2spatial.rb
 - test/adapters/postgis.rb
 - test/adapters/postgresql.rb
+- test/adapters/postgresql_makara.rb
 - test/adapters/seamless_database_pool.rb
 - test/adapters/spatialite.rb
 - test/adapters/sqlite3.rb
@@ -121,6 +122,7 @@ files:
 - test/models/topic.rb
 - test/models/widget.rb
 - test/mysql2/import_test.rb
+- test/mysql2_makara/import_test.rb
 - test/mysqlspatial2/import_test.rb
 - test/postgis/import_test.rb
 - test/postgresql/import_test.rb
@@ -135,6 +137,7 @@ files:
 - test/support/mysql/import_examples.rb
 - test/support/postgresql/import_examples.rb
 - test/support/shared_examples/on_duplicate_key_update.rb
+- test/support/shared_examples/recursive_import.rb
 - test/synchronize_test.rb
 - test/test_helper.rb
 - test/travis/database.yml
@@ -160,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Bulk-loading extension for ActiveRecord
@@ -168,9 +171,11 @@ test_files:
 - test/adapters/jdbcmysql.rb
 - test/adapters/jdbcpostgresql.rb
 - test/adapters/mysql2.rb
+- test/adapters/mysql2_makara.rb
 - test/adapters/mysql2spatial.rb
 - test/adapters/postgis.rb
 - test/adapters/postgresql.rb
+- test/adapters/postgresql_makara.rb
 - test/adapters/seamless_database_pool.rb
 - test/adapters/spatialite.rb
 - test/adapters/sqlite3.rb
@@ -189,6 +194,7 @@ test_files:
 - test/models/topic.rb
 - test/models/widget.rb
 - test/mysql2/import_test.rb
+- test/mysql2_makara/import_test.rb
 - test/mysqlspatial2/import_test.rb
 - test/postgis/import_test.rb
 - test/postgresql/import_test.rb
@@ -203,6 +209,7 @@ test_files:
 - test/support/mysql/import_examples.rb
 - test/support/postgresql/import_examples.rb
 - test/support/shared_examples/on_duplicate_key_update.rb
+- test/support/shared_examples/recursive_import.rb
 - test/synchronize_test.rb
 - test/test_helper.rb
 - test/travis/database.yml

data/gemfiles/3.1.gemfile

@@ -1,3 +0,0 @@
-platforms :ruby do
-  gem 'activerecord', '~> 3.1.0'
-end