activerecord-import 0.16.2 → 0.17.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzExZGVjNzkyYjBhNmZiMDE4MmQ4NTBmMTNiMGFlOTg3M2ZjMjcyOA==
-  data.tar.gz: !binary |-
-    MDRjY2QxYTc1NmViOGI5MDM1Yjg5ODY1YmY3ZjU0ZGJkMGRiOTFhZA==
+SHA1:
+  metadata.gz: 8a9d274345964888ca0c5b9242a689d3953271c7
+  data.tar.gz: 59dcdf278fec2582d2e44a7fb416d355026856a5
 SHA512:
-  metadata.gz: !binary |-
-    YmUyZGIyZWQ1MjI1MGZkN2VkZTk0NGZlZmUyZWFmZDY0OTc3NjU3OTQzZWI5
-    ZTk2NGFkNjc1MjVkOGE2MGQyNTM2OTc1N2YzYjQyYmFlNjA0M2FhNjRiMDEz
-    YTgyNTk4MjIxOTUwYzYwOWM1ZmE5ZGQ0NDcyODkzNGNkNGYwMWU=
-  data.tar.gz: !binary |-
-    ZmRlNTc0NjhhNmYxZmNiNDFjNzZlNTM1ODcxNTNiNzE3NmUyYjhjMjliYjU4
-    MGY5NmYyN2JhY2FjMmQ3ZWFiODE3ZTY3OTgxMDA5M2Y5MTkwZjIyNWU2Y2Ni
-    MWUyYTRlODNiMzg1YzYyNDEzMmFjZTBhZTEwMzFkZGU0MDI5ZTE=
+  metadata.gz: 96f341704f5a40797d626039985e52813d01087e9d41427ef375b5c383c1ce7f22cfac0120939e52ea037b86d84c8ae491ea098f82c2bcc6a94fea34a823dd02
+  data.tar.gz: 4d0f4890f4b97ea9c3d36bf8971d6334ab880d235eda6c14a2af7a8395900562fdb09fd2127c55d3283f48a8734e543671eb2ce0734b1f91689faa95a7bbff56

data/.travis.yml

@@ -19,6 +19,7 @@ matrix:
     - rvm: jruby-9.0.5.0
       env: AR_VERSION=4.2
       script:
+        - bundle exec rake test:jdbcsqlite3
         - bundle exec rake test:jdbcmysql
         - bundle exec rake test:jdbcpostgresql
 

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## Changes in 0.17.0
+
+### New Features
+
+* Add support for composite_primary_keys gem. Thanks to @jkowens
+  via \#350.
+* Add support for importing an array of hashes. Thanks to @jkowens
+  via \#352.
+* Add JDBC SQLite3 support. Thanks to @jkowens via \#356.
+
+### Fixes
+
+* Remove support for SQLite recursive imports. See \#351.
+* Improve import speed for Rails 5. Thanks to @ranchodeluxe, @jkowens
+  via \#359.
+
 ## Changes in 0.16.2
 
 ### Fixes
@@ -28,7 +44,7 @@
 * Add store accessor support for JSON, JSON, and HSTORE data types.
   Thanks to @jkowens via \#322
 * Log warning if database does not support :on_duplicate_key_update.
-  Thanks to @jkowens vi \#324
+  Thanks to @jkowens via \#324
 * Add option :on_duplicate_key_ignore for MySQL and SQLite. Thanks to
   @jkowens via \#326
 

data/Gemfile

@@ -17,6 +17,7 @@ end
 platforms :jruby do
   gem "jdbc-mysql"
   gem "jdbc-postgres"
+  gem "activerecord-jdbcsqlite3-adapter"
   gem "activerecord-jdbcmysql-adapter"
   gem "activerecord-jdbcpostgresql-adapter"
 end

data/Rakefile

@@ -18,6 +18,7 @@ ADAPTERS = %w(
   mysql2_makara
   mysql2spatial
   jdbcmysql
+  jdbcsqlite3
   jdbcpostgresql
   postgresql
   postgresql_makara

data/benchmarks/benchmark.rb

@@ -1,6 +1,7 @@
 require 'pathname'
 require "fileutils"
 require "active_record"
+require "active_record/base"
 
 benchmark_dir = File.dirname(__FILE__)
 

data/gemfiles/3.2.gemfile

@@ -1,3 +1,2 @@
-platforms :ruby do
-  gem 'activerecord', '~> 3.2.0'
-end
+gem 'activerecord', '~> 3.2.0'
+gem 'composite_primary_keys', '~> 5.0'

data/gemfiles/4.0.gemfile

@@ -1,3 +1,2 @@
-platforms :ruby do
-  gem 'activerecord', '~> 4.0.0'
-end
+gem 'activerecord', '~> 4.0.0'
+gem 'composite_primary_keys', '~> 6.0'

data/gemfiles/4.1.gemfile

@@ -1,3 +1,2 @@
-platforms :ruby do
-  gem 'activerecord', '~> 4.1.0'
-end
+gem 'activerecord', '~> 4.1.0'
+gem 'composite_primary_keys', '~> 7.0'

data/gemfiles/4.2.gemfile

@@ -1,7 +1,2 @@
-platforms :ruby do
-  gem 'activerecord', '~> 4.2.0'
-end
-
-platforms :jruby do
-  gem 'activerecord', '~> 4.2.0'
-end
+gem 'activerecord', '~> 4.2.0'
+gem 'composite_primary_keys', '~> 8.0'

data/gemfiles/5.0.gemfile

@@ -1,3 +1,2 @@
-platforms :ruby do
-  gem 'activerecord', '~> 5.0.0'
-end
+gem 'activerecord', '~> 5.0.0'
+gem 'composite_primary_keys', '~> 9.0'

data/lib/activerecord-import/active_record/adapters/jdbcsqlite3_adapter.rb

@@ -0,0 +1,6 @@
+require "active_record/connection_adapters/sqlite3_adapter"
+require "activerecord-import/adapters/sqlite3_adapter"
+
+class ActiveRecord::ConnectionAdapters::SQLite3Adapter
+  include ActiveRecord::Import::SQLite3Adapter
+end

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

@@ -31,7 +31,7 @@ module ActiveRecord::Import::MysqlAdapter
     max = max_allowed_packet
 
     # if we can insert it all as one statement
-    if NO_MAX_PACKET == max || total_bytes < max
+    if NO_MAX_PACKET == max || total_bytes <= max
       number_of_inserts += 1
       sql2insert = base_sql + values.join( ',' ) + post_sql
       insert( sql2insert, *args )

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

@@ -44,7 +44,8 @@ module ActiveRecord::Import::PostgreSQLAdapter
     sql += super(table_name, options)
 
     unless options[:no_returning] || options[:primary_key].blank?
-      sql << "RETURNING #{options[:primary_key]}"
+      primary_key = Array(options[:primary_key])
+      sql << " RETURNING (#{primary_key.join(', ')})"
     end
 
     sql
@@ -136,8 +137,20 @@ module ActiveRecord::Import::PostgreSQLAdapter
   end
 
   def sql_for_default_conflict_target( table_name )
-    conflict_target = primary_key( table_name )
-    "(#{conflict_target}) " if conflict_target
+    pks = select_values(<<-SQL.strip_heredoc, "SCHEMA")
+      WITH pk_constraint AS (
+        SELECT conrelid, unnest(conkey) AS connum FROM pg_constraint
+        WHERE contype = 'p'
+          AND conrelid = #{quote(quote_table_name(table_name))}::regclass
+      ), cons AS (
+        SELECT conrelid, connum, row_number() OVER() AS rownum FROM pk_constraint
+      )
+      SELECT attr.attname FROM pg_attribute attr
+      INNER JOIN cons ON attr.attrelid = cons.conrelid AND attr.attnum = cons.connum
+      ORDER BY cons.rownum
+    SQL
+    conflict_target = pks.join(', ')
+    "(#{conflict_target}) " if conflict_target.present?
   end
 
   # Return true if the statement is a duplicate key record error

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

@@ -19,7 +19,6 @@ 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, '']
@@ -34,15 +33,11 @@ module ActiveRecord::Import::SQLite3Adapter
       value_sets.each do |value_set|
         number_of_inserts += 1
         sql2insert = base_sql + value_set.join( ',' ) + post_sql
-        last_insert_id = insert( sql2insert, *args )
-        if last_insert_id > 0
-          first_insert_id = last_insert_id - affected_rows + 1
-          ids.concat((first_insert_id..last_insert_id).to_a)
-        end
+        insert( sql2insert, *args )
       end
     end
 
-    [number_of_inserts, ids]
+    [number_of_inserts, []]
   end
 
   def pre_sql_statements( options)
@@ -57,13 +52,4 @@ module ActiveRecord::Import::SQLite3Adapter
   def next_value_for_sequence(sequence_name)
     %{nextval('#{sequence_name}')}
   end
-
-  def affected_rows
-    result = execute('SELECT changes();')
-    result.first[0]
-  end
-
-  def support_setting_primary_key_of_imported_objects?
-    true
-  end
 end

data/lib/activerecord-import/import.rb

@@ -144,6 +144,9 @@ class ActiveRecord::Base
     #
     # == Usage
     #  Model.import array_of_models
+    #  Model.import column_names, array_of_models
+    #  Model.import array_of_hash_objects
+    #  Model.import column_names, array_of_hash_objects
     #  Model.import column_names, array_of_values
     #  Model.import column_names, array_of_values, options
     #
@@ -187,7 +190,7 @@ class ActiveRecord::Base
     #   (if false) even if record timestamps is disabled in ActiveRecord::Base
     # * +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.
+    #   newly imported objects. PostgreSQL only.
     # * +batch_size+ - an integer value to specify the max number of records to
     #   include per insert. Defaults to the total number of records to import.
     #
@@ -200,6 +203,15 @@ class ActiveRecord::Base
     #            BlogPost.new author_name: 'Zach Dennis', title: 'AREXT3' ]
     #  BlogPost.import posts
     #
+    #  # Example using array_of_hash_objects
+    #  values = [ {author_name: 'zdennis', title: 'test post'} ], [ {author_name: 'jdoe', title: 'another test post'} ] ]
+    #  BlogPost.import values
+    #
+    #  # Example using column_names and array_of_hash_objects
+    #  columns = [ :author_name, :title ]
+    #  values = [ {author_name: 'zdennis', title: 'test post'} ], [ {author_name: 'jdoe', title: 'another test post'} ] ]
+    #  BlogPost.import columns, values
+    #
     #  # Example using column_names and array_of_values
     #  columns = [ :author_name, :title ]
     #  values = [ [ 'zdennis', 'test post' ], [ 'jdoe', 'another test post' ] ]
@@ -382,6 +394,21 @@ class ActiveRecord::Base
             end
           end
         end
+        # supports array of hash objects
+      elsif args.last.is_a?( Array ) && args.last.first.is_a?(Hash)
+        if args.length == 2
+          array_of_hashes = args.last
+          column_names = args.first.dup
+        else
+          array_of_hashes = args.first
+          column_names = array_of_hashes.first.keys
+        end
+
+        array_of_attributes = array_of_hashes.map do |h|
+          column_names.map do |key|
+            h[key]
+          end
+        end
         # supports empty array
       elsif args.last.is_a?( Array ) && args.last.empty?
         return ActiveRecord::Import::Result.new([], 0, [])
@@ -404,9 +431,15 @@ class ActiveRecord::Base
       # Force the primary key col into the insert if it's not
       # on the list and we are using a sequence and stuff a nil
       # value for it into each row so the sequencer will fire later
-      if !column_names.include?(primary_key) && connection.prefetch_primary_key? && sequence_name
-        column_names << primary_key
-        array_of_attributes.each { |a| a << nil }
+      symbolized_column_names = Array(column_names).map(&:to_sym)
+      symbolized_primary_key = Array(primary_key).map(&:to_sym)
+
+      if !symbolized_primary_key.to_set.subset?(symbolized_column_names.to_set) && connection.prefetch_primary_key? && sequence_name
+        column_count = column_names.size
+        column_names.concat(primary_key).uniq!
+        columns_added = column_names.size - column_count
+        new_fields = Array.new(columns_added)
+        array_of_attributes.each { |a| a.concat(new_fields) }
       end
 
       # record timestamps unless disabled in ActiveRecord::Base
@@ -626,9 +659,11 @@ class ActiveRecord::Base
     # Returns SQL the VALUES for an INSERT statement given the passed in +columns+
     # and +array_of_attributes+.
     def values_sql_for_columns_and_attributes(columns, array_of_attributes) # :nodoc:
-      # connection gets called a *lot* in this high intensity loop.
-      # Reuse the same one w/in the loop, otherwise it would keep being re-retreived (= lots of time for large imports)
+      # connection and type_caster get called a *lot* in this high intensity loop.
+      # Reuse the same ones w/in the loop, otherwise they would keep being re-retreived (= lots of time for large imports)
       connection_memo = connection
+      type_caster_memo = type_caster if respond_to?(:type_caster)
+
       array_of_attributes.map do |arr|
         my_values = arr.each_with_index.map do |val, j|
           column = columns[j]
@@ -637,8 +672,8 @@ class ActiveRecord::Base
           if val.nil? && column.name == primary_key && !sequence_name.blank?
             connection_memo.next_value_for_sequence(sequence_name)
           elsif column
-            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))
+            if defined?(type_caster_memo) && type_caster_memo.respond_to?(:type_cast_for_database) # Rails 5.0 and higher
+              connection_memo.quote(type_caster_memo.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.2, 4.0 and 4.1

data/lib/activerecord-import/value_sets_parser.rb

@@ -8,8 +8,8 @@ module ActiveRecord::Import
 
     def initialize(values, options)
       @values = values
-      @reserved_bytes = options[:reserved_bytes]
-      @max_bytes = options[:max_bytes]
+      @reserved_bytes = options[:reserved_bytes] || 0
+      @max_bytes = options.fetch(:max_bytes) { default_max_bytes }
     end
 
     def parse
@@ -32,7 +32,15 @@ module ActiveRecord::Import
         value_sets << arr if i == (values.size - 1)
       end
 
-      [*value_sets]
+      value_sets
+    end
+
+    private
+
+    def default_max_bytes
+      values_in_bytes = values.sum(&:bytesize)
+      comma_separated_bytes = values.size - 1
+      reserved_bytes + values_in_bytes + comma_separated_bytes
     end
   end
 

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.16.2".freeze
+    VERSION = "0.17.0".freeze
   end
 end

data/test/adapters/jdbcsqlite3.rb

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

data/test/import_test.rb

@@ -59,6 +59,46 @@ describe "#import" do
     end
   end
 
+  describe "with an array of hashes" do
+    let(:columns) { [:title, :author_name] }
+    let(:values) { [{ title: "LDAP", author_name: "Jerry Carter", author_email_address: "jcarter@test.com" }, { title: "Rails Recipes", author_name: "Chad Fowler", author_email_address: "cfowler@test.com" }] }
+
+    it "should import hash data successfully" do
+      assert_difference "Topic.count", +2 do
+        Topic.import values, validate: false
+      end
+    end
+
+    it "should import specified hash data successfully" do
+      assert_difference "Topic.count", +2 do
+        Topic.import columns, values, validate: false
+      end
+
+      Topic.all.each do |t|
+        assert_nil t.author_email_address
+      end
+    end
+  end
+
+  describe "with composite primary keys" do
+    it "should import models successfully" do
+      tags = [Tag.new(tag_id: 1, publisher_id: 1, tag: 'Mystery')]
+
+      assert_difference "Tag.count", +1 do
+        Tag.import tags
+      end
+    end
+
+    it "should import array of values successfully" do
+      columns = [:tag_id, :publisher_id, :tag]
+      values = [[1, 1, 'Mystery'], [2, 1, 'Science']]
+
+      assert_difference "Tag.count", +2 do
+        Tag.import columns, values, validate: false
+      end
+    end
+  end
+
   describe "with STI models" do
     it "should import models successfully" do
       dictionaries = [Dictionary.new(author_name: "Noah Webster", title: "Webster's Dictionary")]

data/test/jdbcmysql/import_test.rb

@@ -1,5 +1,4 @@
 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')
 

data/test/jdbcpostgresql/import_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
-
 require File.expand_path(File.dirname(__FILE__) + '/../support/postgresql/import_examples')
 
 should_support_postgresql_import_functionality

data/test/jdbcsqlite3/import_test.rb

@@ -0,0 +1,4 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../support/sqlite3/import_examples')
+
+should_support_sqlite3_import_functionality

data/test/models/book.rb

@@ -1,5 +1,7 @@
 class Book < ActiveRecord::Base
   belongs_to :topic, inverse_of: :books
+  belongs_to :tag, foreign_key: [:tag_id, :parent_id]
+
   has_many :chapters, inverse_of: :book
   has_many :discounts, as: :discountable
   has_many :end_notes, inverse_of: :book

data/test/models/dictionary.rb

@@ -1,2 +1,4 @@
+require_relative 'book'
+
 class Dictionary < Book
 end

data/test/models/tag.rb

@@ -0,0 +1,4 @@
+class Tag < ActiveRecord::Base
+  self.primary_keys = :tag_id, :publisher_id
+  has_many :books, inverse_of: :tag
+end

data/test/postgresql/import_test.rb

@@ -2,7 +2,3 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../support/postgresql/import_examples')
 
 should_support_postgresql_import_functionality
-
-if ActiveRecord::Base.connection.supports_on_duplicate_key_update?
-  should_support_postgresql_upsert_functionality
-end

data/test/schema/generic_schema.rb

@@ -62,6 +62,8 @@ ActiveRecord::Schema.define do
     t.datetime :updated_on
     t.date :publish_date
     t.integer :topic_id
+    t.integer :tag_id
+    t.integer :publisher_id
     t.boolean :for_sale, default: true
     t.integer :status, default: 0
     t.string :type
@@ -151,4 +153,13 @@ ActiveRecord::Schema.define do
     t.text :config
     t.text :settings
   end
+
+  execute %(
+  CREATE TABLE IF NOT EXISTS tags (
+        tag_id    INT NOT NULL,
+        publisher_id INT NOT NULL,
+        tag       VARCHAR(50),
+        PRIMARY KEY (tag_id, publisher_id)
+    );
+  ).split.join(' ').strip
 end

data/test/sqlite3/import_test.rb

@@ -1,67 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../support/sqlite3/import_examples')
 
-should_support_recursive_import
-should_support_on_duplicate_key_ignore
-
-describe "#supports_imports?" do
-  context "and SQLite is 3.7.11 or higher" do
-    it "supports import" do
-      version = ActiveRecord::ConnectionAdapters::SQLite3Adapter::Version.new("3.7.11")
-      assert ActiveRecord::Base.supports_import?(version)
-
-      version = ActiveRecord::ConnectionAdapters::SQLite3Adapter::Version.new("3.7.12")
-      assert ActiveRecord::Base.supports_import?(version)
-    end
-  end
-
-  context "and SQLite less than 3.7.11" do
-    it "doesn't support import" do
-      version = ActiveRecord::ConnectionAdapters::SQLite3Adapter::Version.new("3.7.10")
-      assert !ActiveRecord::Base.supports_import?(version)
-    end
-  end
-end
-
-describe "#import" do
-  it "imports with a single insert on SQLite 3.7.11 or higher" do
-    assert_difference "Topic.count", +507 do
-      result = Topic.import Build(7, :topics)
-      assert_equal 1, result.num_inserts, "Failed to issue a single INSERT statement. Make sure you have a supported version of SQLite3 (3.7.11 or higher) installed"
-      assert_equal 7, Topic.count, "Failed to insert all records. Make sure you have a supported version of SQLite3 (3.7.11 or higher) installed"
-
-      result = Topic.import Build(500, :topics)
-      assert_equal 1, result.num_inserts, "Failed to issue a single INSERT statement. Make sure you have a supported version of SQLite3 (3.7.11 or higher) installed"
-      assert_equal 507, Topic.count, "Failed to insert all records. Make sure you have a supported version of SQLite3 (3.7.11 or higher) installed"
-    end
-  end
-
-  it "imports with a two inserts on SQLite 3.7.11 or higher" do
-    assert_difference "Topic.count", +501 do
-      result = Topic.import Build(501, :topics)
-      assert_equal 2, result.num_inserts, "Failed to issue a two INSERT statements. Make sure you have a supported version of SQLite3 (3.7.11 or higher) installed"
-      assert_equal 501, Topic.count, "Failed to insert all records. Make sure you have a supported version of SQLite3 (3.7.11 or higher) installed"
-    end
-  end
-
-  it "imports with a five inserts on SQLite 3.7.11 or higher" do
-    assert_difference "Topic.count", +2500 do
-      result = Topic.import Build(2500, :topics)
-      assert_equal 5, result.num_inserts, "Failed to issue a two INSERT statements. Make sure you have a supported version of SQLite3 (3.7.11 or higher) installed"
-      assert_equal 2500, Topic.count, "Failed to insert all records. Make sure you have a supported version of SQLite3 (3.7.11 or higher) installed"
-    end
-  end
-
-  context "with :on_duplicate_key_update" do
-    let(:topics) { Build(1, :topics) }
-
-    it "should log a warning message" do
-      log = StringIO.new
-      logger = Logger.new(log)
-      logger.level = Logger::WARN
-      ActiveRecord::Base.connection.stubs(:logger).returns(logger)
-
-      Topic.import topics, on_duplicate_key_update: true
-      assert_match(/Ignoring on_duplicate_key_update/, log.string)
-    end
-  end
-end
+should_support_sqlite3_import_functionality

data/test/support/postgresql/import_examples.rb

@@ -2,6 +2,10 @@
 def should_support_postgresql_import_functionality
   should_support_recursive_import
 
+  if ActiveRecord::Base.connection.supports_on_duplicate_key_update?
+    should_support_postgresql_upsert_functionality
+  end
+
   describe "#supports_imports?" do
     it "should support import" do
       assert ActiveRecord::Base.supports_import?

data/test/support/shared_examples/on_duplicate_key_ignore.rb

@@ -11,6 +11,18 @@ def should_support_on_duplicate_key_ignore
           Topic.import topics, on_duplicate_key_ignore: true, validate: false
         end
       end
+
+      context "with composite primary keys" do
+        it "should import array of values successfully" do
+          columns = [:tag_id, :publisher_id, :tag]
+          values = [[1, 1, 'Mystery'], [1, 1, 'Science']]
+
+          assert_difference "Tag.count", +1 do
+            Tag.import columns, values, on_duplicate_key_ignore: true, validate: false
+          end
+          assert_equal 'Mystery', Tag.first.tag
+        end
+      end
     end
 
     context "with :ignore" do

data/test/support/shared_examples/on_duplicate_key_update.rb

@@ -76,6 +76,18 @@ def should_support_basic_on_duplicate_key_update
           assert_equal 'DISCOUNT2', updated_promotion.code
         end
       end
+
+      context "with composite primary keys" do
+        it "should import array of values successfully" do
+          columns = [:tag_id, :publisher_id, :tag]
+          Tag.import columns, [[1, 1, 'Mystery']], validate: false
+
+          assert_difference "Tag.count", +0 do
+            Tag.import columns, [[1, 1, 'Science']], on_duplicate_key_update: [:tag], validate: false
+          end
+          assert_equal 'Science', Tag.first.tag
+        end
+      end
     end
 
     context "with :on_duplicate_key_update turned off" do

data/test/support/sqlite3/import_examples.rb

@@ -0,0 +1,67 @@
+# encoding: UTF-8
+def should_support_sqlite3_import_functionality
+  should_support_on_duplicate_key_ignore
+
+  describe "#supports_imports?" do
+    context "and SQLite is 3.7.11 or higher" do
+      it "supports import" do
+        version = ActiveRecord::ConnectionAdapters::SQLite3Adapter::Version.new("3.7.11")
+        assert ActiveRecord::Base.supports_import?(version)
+
+        version = ActiveRecord::ConnectionAdapters::SQLite3Adapter::Version.new("3.7.12")
+        assert ActiveRecord::Base.supports_import?(version)
+      end
+    end
+
+    context "and SQLite less than 3.7.11" do
+      it "doesn't support import" do
+        version = ActiveRecord::ConnectionAdapters::SQLite3Adapter::Version.new("3.7.10")
+        assert !ActiveRecord::Base.supports_import?(version)
+      end
+    end
+  end
+
+  describe "#import" do
+    it "imports with a single insert on SQLite 3.7.11 or higher" do
+      assert_difference "Topic.count", +507 do
+        result = Topic.import Build(7, :topics)
+        assert_equal 1, result.num_inserts, "Failed to issue a single INSERT statement. Make sure you have a supported version of SQLite3 (3.7.11 or higher) installed"
+        assert_equal 7, Topic.count, "Failed to insert all records. Make sure you have a supported version of SQLite3 (3.7.11 or higher) installed"
+
+        result = Topic.import Build(500, :topics)
+        assert_equal 1, result.num_inserts, "Failed to issue a single INSERT statement. Make sure you have a supported version of SQLite3 (3.7.11 or higher) installed"
+        assert_equal 507, Topic.count, "Failed to insert all records. Make sure you have a supported version of SQLite3 (3.7.11 or higher) installed"
+      end
+    end
+
+    it "imports with a two inserts on SQLite 3.7.11 or higher" do
+      assert_difference "Topic.count", +501 do
+        result = Topic.import Build(501, :topics)
+        assert_equal 2, result.num_inserts, "Failed to issue a two INSERT statements. Make sure you have a supported version of SQLite3 (3.7.11 or higher) installed"
+        assert_equal 501, Topic.count, "Failed to insert all records. Make sure you have a supported version of SQLite3 (3.7.11 or higher) installed"
+      end
+    end
+
+    it "imports with a five inserts on SQLite 3.7.11 or higher" do
+      assert_difference "Topic.count", +2500 do
+        result = Topic.import Build(2500, :topics)
+        assert_equal 5, result.num_inserts, "Failed to issue a two INSERT statements. Make sure you have a supported version of SQLite3 (3.7.11 or higher) installed"
+        assert_equal 2500, Topic.count, "Failed to insert all records. Make sure you have a supported version of SQLite3 (3.7.11 or higher) installed"
+      end
+    end
+
+    context "with :on_duplicate_key_update" do
+      let(:topics) { Build(1, :topics) }
+
+      it "should log a warning message" do
+        log = StringIO.new
+        logger = Logger.new(log)
+        logger.level = Logger::WARN
+        ActiveRecord::Base.connection.stubs(:logger).returns(logger)
+
+        Topic.import topics, on_duplicate_key_update: true
+        assert_match(/Ignoring on_duplicate_key_update/, log.string)
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -26,6 +26,7 @@ end
 
 require 'timecop'
 require 'chronic'
+require 'composite_primary_keys'
 
 require "ruby-debug" if RUBY_VERSION.to_f < 1.9
 

data/test/travis/database.yml

@@ -15,6 +15,10 @@ jdbcmysql: &mysql2
   <<: *common
   adapter: jdbcmysql
 
+jdbcsqlite3: &sqlite3
+  <<: *common
+  adapter: jdbcsqlite3
+
 mysql2: &mysql2
   <<: *common
   adapter: mysql2

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.17.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Extraction of the ActiveRecord::Base#import functionality from ar-extensions
@@ -46,10 +46,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .rubocop_todo.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - Brewfile
 - CHANGELOG.md
 - Gemfile
@@ -78,6 +78,7 @@ files:
 - lib/activerecord-import/active_record/adapters/abstract_adapter.rb
 - lib/activerecord-import/active_record/adapters/jdbcmysql_adapter.rb
 - lib/activerecord-import/active_record/adapters/jdbcpostgresql_adapter.rb
+- lib/activerecord-import/active_record/adapters/jdbcsqlite3_adapter.rb
 - lib/activerecord-import/active_record/adapters/mysql2_adapter.rb
 - lib/activerecord-import/active_record/adapters/postgresql_adapter.rb
 - lib/activerecord-import/active_record/adapters/seamless_database_pool_adapter.rb
@@ -98,6 +99,7 @@ files:
 - lib/activerecord-import/version.rb
 - test/adapters/jdbcmysql.rb
 - test/adapters/jdbcpostgresql.rb
+- test/adapters/jdbcsqlite3.rb
 - test/adapters/mysql2.rb
 - test/adapters/mysql2_makara.rb
 - test/adapters/mysql2spatial.rb
@@ -111,6 +113,7 @@ files:
 - test/import_test.rb
 - test/jdbcmysql/import_test.rb
 - test/jdbcpostgresql/import_test.rb
+- test/jdbcsqlite3/import_test.rb
 - test/models/alarm.rb
 - test/models/book.rb
 - test/models/chapter.rb
@@ -121,6 +124,7 @@ files:
 - test/models/promotion.rb
 - test/models/question.rb
 - test/models/rule.rb
+- test/models/tag.rb
 - test/models/topic.rb
 - test/models/vendor.rb
 - test/models/widget.rb
@@ -145,6 +149,7 @@ files:
 - test/support/shared_examples/on_duplicate_key_ignore.rb
 - test/support/shared_examples/on_duplicate_key_update.rb
 - test/support/shared_examples/recursive_import.rb
+- test/support/sqlite3/import_examples.rb
 - test/synchronize_test.rb
 - test/test_helper.rb
 - test/travis/database.yml
@@ -160,23 +165,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Bulk-loading extension for ActiveRecord
 test_files:
 - test/adapters/jdbcmysql.rb
 - test/adapters/jdbcpostgresql.rb
+- test/adapters/jdbcsqlite3.rb
 - test/adapters/mysql2.rb
 - test/adapters/mysql2_makara.rb
 - test/adapters/mysql2spatial.rb
@@ -190,6 +196,7 @@ test_files:
 - test/import_test.rb
 - test/jdbcmysql/import_test.rb
 - test/jdbcpostgresql/import_test.rb
+- test/jdbcsqlite3/import_test.rb
 - test/models/alarm.rb
 - test/models/book.rb
 - test/models/chapter.rb
@@ -200,6 +207,7 @@ test_files:
 - test/models/promotion.rb
 - test/models/question.rb
 - test/models/rule.rb
+- test/models/tag.rb
 - test/models/topic.rb
 - test/models/vendor.rb
 - test/models/widget.rb
@@ -224,6 +232,7 @@ test_files:
 - test/support/shared_examples/on_duplicate_key_ignore.rb
 - test/support/shared_examples/on_duplicate_key_update.rb
 - test/support/shared_examples/recursive_import.rb
+- test/support/sqlite3/import_examples.rb
 - test/synchronize_test.rb
 - test/test_helper.rb
 - test/travis/database.yml