activerecord-import 0.25.0 → 1.7.0

data/test/support/sqlite3/import_examples.rb

@@ -1,23 +1,13 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 def should_support_sqlite3_import_functionality
-  should_support_on_duplicate_key_ignore
+  if ActiveRecord::Base.connection.supports_on_duplicate_key_update?
+    should_support_sqlite_upsert_functionality
+  end
 
   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
+    it "should support import" do
+      assert ActiveRecord::Base.supports_import?
     end
   end
 
@@ -49,18 +39,193 @@ def should_support_sqlite3_import_functionality
         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
+  end
+end
+
+def should_support_sqlite_upsert_functionality
+  should_support_basic_on_duplicate_key_update
+  should_support_on_duplicate_key_ignore
+
+  describe "#import" do
+    extend ActiveSupport::TestCase::ImportAssertions
+
+    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_ignore and 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]] }
+      let(:updated_values) { [[99, "Book - 2nd Edition", "Author Should Not Change", "johndoe@example.com", 57]] }
+
+      setup do
+        Topic.import columns, values, validate: false
+      end
+
+      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_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
+      end
+
+      context "using a hash" do
+        context "with :columns a hash" do
+          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]] }
+
+          macro(:perform_import) do |*opts|
+            Topic.import columns, updated_values, opts.extract_options!.merge(on_duplicate_key_update: { conflict_target: :id, columns: update_columns }, validate: false)
+          end
+
+          setup do
+            Topic.import columns, values, validate: false
+            @topic = Topic.find 99
+          end
+
+          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: columns }
+            end
+          end
+
+          context "using string hash map" do
+            let(:update_columns) { { "title" => "title", "author_email_address" => "author_email_address", "parent_id" => "parent_id" } }
+            should_support_on_duplicate_key_update
+            should_update_fields_mentioned
+          end
+
+          context "using string hash map, but specifying column mismatches" do
+            let(:update_columns) { { "title" => "author_email_address", "author_email_address" => "title", "parent_id" => "parent_id" } }
+            should_support_on_duplicate_key_update
+            should_update_fields_mentioned_with_hash_mappings
+          end
+
+          context "using symbol hash map" do
+            let(:update_columns) { { title: :title, author_email_address: :author_email_address, parent_id: :parent_id } }
+            should_support_on_duplicate_key_update
+            should_update_fields_mentioned
+          end
+
+          context "using symbol hash map, but specifying column mismatches" do
+            let(:update_columns) { { title: :author_email_address, author_email_address: :title, parent_id: :parent_id } }
+            should_support_on_duplicate_key_update
+            should_update_fields_mentioned_with_hash_mappings
+          end
+        end
+
+        context 'with :index_predicate' do
+          let(:columns) { %w( id device_id alarm_type status metadata ) }
+          let(:values) { [[99, 17, 1, 1, 'foo']] }
+          let(:updated_values) { [[99, 17, 1, 2, 'bar']] }
+
+          macro(:perform_import) do |*opts|
+            Alarm.import columns, updated_values, opts.extract_options!.merge(on_duplicate_key_update: { conflict_target: [:device_id, :alarm_type], index_predicate: 'status <> 0', columns: [:status] }, validate: false)
+          end
+
+          macro(:updated_alarm) { Alarm.find(@alarm.id) }
+
+          setup do
+            Alarm.import columns, values, validate: false
+            @alarm = Alarm.find 99
+          end
+
+          context 'supports on duplicate key update for partial indexes' do
+            it 'should not update created_at timestamp columns' do
+              Timecop.freeze Chronic.parse("5 minutes from now") do
+                perform_import
+                assert_in_delta @alarm.created_at.to_i, updated_alarm.created_at.to_i, 1
+              end
+            end
+
+            it 'should update updated_at timestamp columns' do
+              time = Chronic.parse("5 minutes from now")
+              Timecop.freeze time do
+                perform_import
+                assert_in_delta time.to_i, updated_alarm.updated_at.to_i, 1
+              end
+            end
+
+            it 'should not update fields not mentioned' do
+              perform_import
+              assert_equal 'foo', updated_alarm.metadata
+            end
+
+            it 'should update fields mentioned with hash mappings' do
+              perform_import
+              assert_equal 2, updated_alarm.status
+            end
+          end
+        end
+
+        context 'with :condition' do
+          let(:columns) { %w( id device_id alarm_type status metadata) }
+          let(:values) { [[99, 17, 1, 1, 'foo']] }
+          let(:updated_values) { [[99, 17, 1, 1, 'bar']] }
+
+          macro(:perform_import) do |*opts|
+            Alarm.import(
+              columns,
+              updated_values,
+              opts.extract_options!.merge(
+                on_duplicate_key_update: {
+                  conflict_target: [:id],
+                  condition: "alarms.metadata NOT LIKE '%foo%'",
+                  columns: [:metadata]
+                },
+                validate: false
+              )
+            )
+          end
+
+          macro(:updated_alarm) { Alarm.find(@alarm.id) }
+
+          setup do
+            Alarm.import columns, values, validate: false
+            @alarm = Alarm.find 99
+          end
+
+          it 'should not update fields not matched' do
+            perform_import
+            assert_equal 'foo', updated_alarm.metadata
+          end
+        end
+
+        context "with no :conflict_target" do
+          context "with no primary key" do
+            it "raises ArgumentError" do
+              error = assert_raises ArgumentError do
+                Rule.import Build(3, :rules), on_duplicate_key_update: [:condition_text], validate: false
+              end
+              assert_match(/Expected :conflict_target to be specified/, error.message)
+            end
+          end
+        end
+
+        context "with no :columns" do
+          let(:columns) { %w( id title author_name author_email_address ) }
+          let(:values) { [[100, "Book", "John Doe", "john@doe.com"]] }
+          let(:updated_values) { [[100, "Title Should Not Change", "Author Should Not Change", "john@nogo.com"]] }
 
-    context "with :on_duplicate_key_update" do
-      let(:topics) { Build(1, :topics) }
+          macro(:perform_import) do |*opts|
+            Topic.import columns, updated_values, opts.extract_options!.merge(on_duplicate_key_update: { conflict_target: :id }, validate: false)
+          end
 
-      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)
+          setup do
+            Topic.import columns, values, validate: false
+            @topic = Topic.find 100
+          end
 
-        Topic.import topics, on_duplicate_key_update: true
-        assert_match(/Ignoring on_duplicate_key_update/, log.string)
+          should_update_updated_at_on_timestamp_columns
+        end
       end
     end
   end

data/test/synchronize_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('../test_helper', __FILE__)
 
 describe ".synchronize" do

data/test/test_helper.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'pathname'
+require 'rake'
 test_dir = Pathname.new File.dirname(__FILE__)
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -21,7 +24,7 @@ if ActiveSupport::VERSION::STRING < "4.0"
   require 'mocha/test_unit'
 else
   require 'active_support/testing/autorun'
-  require "mocha/mini_test"
+  require "mocha/minitest"
 end
 
 require 'timecop'
@@ -30,7 +33,9 @@ require 'chronic'
 begin
   require 'composite_primary_keys'
 rescue LoadError
-  ENV["SKIP_COMPOSITE_PK"] = "true"
+  if ENV['AR_VERSION'].to_f <= 7.1
+    ENV['SKIP_COMPOSITE_PK'] = 'true'
+  end
 end
 
 # Support MySQL 5.7
@@ -48,8 +53,30 @@ adapter = ENV["ARE_DB"] || "sqlite3"
 FileUtils.mkdir_p 'log'
 ActiveRecord::Base.logger = Logger.new("log/test.log")
 ActiveRecord::Base.logger.level = Logger::DEBUG
-ActiveRecord::Base.configurations["test"] = YAML.load_file(test_dir.join("database.yml"))[adapter]
-ActiveRecord::Base.default_timezone = :utc
+
+if ActiveRecord.respond_to?(:use_yaml_unsafe_load)
+  ActiveRecord.use_yaml_unsafe_load = true
+elsif ActiveRecord::Base.respond_to?(:use_yaml_unsafe_load)
+  ActiveRecord::Base.use_yaml_unsafe_load = true
+end
+
+if ENV['AR_VERSION'].to_f >= 6.0
+  yaml_config = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.2.1')
+    YAML.safe_load_file(test_dir.join("database.yml"), aliases: true)[adapter]
+  else
+    YAML.load_file(test_dir.join("database.yml"))[adapter]
+  end
+  config = ActiveRecord::DatabaseConfigurations::HashConfig.new("test", adapter, yaml_config)
+  ActiveRecord::Base.configurations.configurations << config
+else
+  ActiveRecord::Base.configurations["test"] = YAML.load_file(test_dir.join("database.yml"))[adapter]
+end
+
+if ActiveRecord.respond_to?(:default_timezone)
+  ActiveRecord.default_timezone = :utc
+else
+  ActiveRecord::Base.default_timezone = :utc
+end
 
 require "activerecord-import"
 ActiveRecord::Base.establish_connection :test
@@ -58,8 +85,8 @@ ActiveSupport::Notifications.subscribe(/active_record.sql/) do |_, _, _, _, hsh|
   ActiveRecord::Base.logger.info hsh[:sql]
 end
 
-require "factory_girl"
-Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |file| require file }
+require "factory_bot"
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |file| require file }
 
 # Load base/generic schema
 require test_dir.join("schema/version")
@@ -67,7 +94,7 @@ require test_dir.join("schema/generic_schema")
 adapter_schema = test_dir.join("schema/#{adapter}_schema.rb")
 require adapter_schema if File.exist?(adapter_schema)
 
-Dir[File.dirname(__FILE__) + "/models/*.rb"].each { |file| require file }
+Dir["#{File.dirname(__FILE__)}/models/*.rb"].sort.each { |file| require file }
 
 # Prevent this deprecation warning from breaking the tests.
 Rake::FileList.send(:remove_method, :import)

data/test/trilogy/import_test.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+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/value_sets_bytes_parser_test.rb

@@ -1,4 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+# frozen_string_literal: true
+
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 require 'activerecord-import/value_sets_parser'
 

data/test/value_sets_records_parser_test.rb

@@ -1,4 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+# frozen_string_literal: true
+
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 require 'activerecord-import/value_sets_parser'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2024-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -45,12 +45,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yaml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - Brewfile
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - LICENSE
 - README.markdown
@@ -67,14 +68,16 @@ files:
 - benchmarks/models/test_innodb.rb
 - benchmarks/models/test_memory.rb
 - benchmarks/models/test_myisam.rb
-- benchmarks/schema/mysql_schema.rb
-- gemfiles/3.2.gemfile
-- gemfiles/4.0.gemfile
-- gemfiles/4.1.gemfile
+- benchmarks/schema/mysql2_schema.rb
+- docker-compose.yml
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
 - gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
+- gemfiles/6.0.gemfile
+- gemfiles/6.1.gemfile
+- gemfiles/7.0.gemfile
+- gemfiles/7.1.gemfile
 - lib/activerecord-import.rb
 - lib/activerecord-import/active_record/adapters/abstract_adapter.rb
 - lib/activerecord-import/active_record/adapters/jdbcmysql_adapter.rb
@@ -84,12 +87,14 @@ files:
 - lib/activerecord-import/active_record/adapters/postgresql_adapter.rb
 - lib/activerecord-import/active_record/adapters/seamless_database_pool_adapter.rb
 - lib/activerecord-import/active_record/adapters/sqlite3_adapter.rb
+- lib/activerecord-import/active_record/adapters/trilogy_adapter.rb
 - lib/activerecord-import/adapters/abstract_adapter.rb
 - lib/activerecord-import/adapters/em_mysql2_adapter.rb
 - lib/activerecord-import/adapters/mysql2_adapter.rb
 - lib/activerecord-import/adapters/mysql_adapter.rb
 - lib/activerecord-import/adapters/postgresql_adapter.rb
 - lib/activerecord-import/adapters/sqlite3_adapter.rb
+- lib/activerecord-import/adapters/trilogy_adapter.rb
 - lib/activerecord-import/base.rb
 - lib/activerecord-import/import.rb
 - lib/activerecord-import/mysql2.rb
@@ -111,7 +116,9 @@ files:
 - test/adapters/seamless_database_pool.rb
 - test/adapters/spatialite.rb
 - test/adapters/sqlite3.rb
+- test/adapters/trilogy.rb
 - test/database.yml.sample
+- test/github/database.yml
 - test/import_test.rb
 - test/jdbcmysql/import_test.rb
 - test/jdbcpostgresql/import_test.rb
@@ -119,18 +126,28 @@ files:
 - test/makara_postgis/import_test.rb
 - test/models/account.rb
 - test/models/alarm.rb
+- test/models/animal.rb
+- test/models/author.rb
 - test/models/bike_maker.rb
 - test/models/book.rb
 - test/models/car.rb
+- test/models/card.rb
 - test/models/chapter.rb
+- test/models/composite_book.rb
+- test/models/composite_chapter.rb
+- test/models/customer.rb
+- test/models/deck.rb
 - test/models/dictionary.rb
 - test/models/discount.rb
 - test/models/end_note.rb
 - test/models/group.rb
+- test/models/order.rb
+- test/models/playing_card.rb
 - test/models/promotion.rb
 - test/models/question.rb
 - test/models/rule.rb
 - test/models/tag.rb
+- test/models/tag_alias.rb
 - test/models/topic.rb
 - test/models/user.rb
 - test/models/user_token.rb
@@ -146,6 +163,7 @@ files:
 - test/schema/mysql2_schema.rb
 - test/schema/postgis_schema.rb
 - test/schema/postgresql_schema.rb
+- test/schema/sqlite3_schema.rb
 - test/schema/version.rb
 - test/sqlite3/import_test.rb
 - test/support/active_support/test_case_extensions.rb
@@ -160,12 +178,12 @@ files:
 - test/support/sqlite3/import_examples.rb
 - test/synchronize_test.rb
 - test/test_helper.rb
-- test/travis/database.yml
+- test/trilogy/import_test.rb
 - test/value_sets_bytes_parser_test.rb
 - test/value_sets_records_parser_test.rb
-homepage: http://github.com/zdennis/activerecord-import
+homepage: https://github.com/zdennis/activerecord-import
 licenses:
-- Ruby
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -175,15 +193,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Bulk insert extension for ActiveRecord
@@ -201,7 +218,9 @@ test_files:
 - test/adapters/seamless_database_pool.rb
 - test/adapters/spatialite.rb
 - test/adapters/sqlite3.rb
+- test/adapters/trilogy.rb
 - test/database.yml.sample
+- test/github/database.yml
 - test/import_test.rb
 - test/jdbcmysql/import_test.rb
 - test/jdbcpostgresql/import_test.rb
@@ -209,18 +228,28 @@ test_files:
 - test/makara_postgis/import_test.rb
 - test/models/account.rb
 - test/models/alarm.rb
+- test/models/animal.rb
+- test/models/author.rb
 - test/models/bike_maker.rb
 - test/models/book.rb
 - test/models/car.rb
+- test/models/card.rb
 - test/models/chapter.rb
+- test/models/composite_book.rb
+- test/models/composite_chapter.rb
+- test/models/customer.rb
+- test/models/deck.rb
 - test/models/dictionary.rb
 - test/models/discount.rb
 - test/models/end_note.rb
 - test/models/group.rb
+- test/models/order.rb
+- test/models/playing_card.rb
 - test/models/promotion.rb
 - test/models/question.rb
 - test/models/rule.rb
 - test/models/tag.rb
+- test/models/tag_alias.rb
 - test/models/topic.rb
 - test/models/user.rb
 - test/models/user_token.rb
@@ -236,6 +265,7 @@ test_files:
 - test/schema/mysql2_schema.rb
 - test/schema/postgis_schema.rb
 - test/schema/postgresql_schema.rb
+- test/schema/sqlite3_schema.rb
 - test/schema/version.rb
 - test/sqlite3/import_test.rb
 - test/support/active_support/test_case_extensions.rb
@@ -250,6 +280,6 @@ test_files:
 - test/support/sqlite3/import_examples.rb
 - test/synchronize_test.rb
 - test/test_helper.rb
-- test/travis/database.yml
+- test/trilogy/import_test.rb
 - test/value_sets_bytes_parser_test.rb
 - test/value_sets_records_parser_test.rb

data/.travis.yml

@@ -1,71 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.3.7
-
-env:
-  global:
-    # https://github.com/discourse/discourse/blob/master/.travis.yml
-    - RUBY_GC_MALLOC_LIMIT=50000000
-  matrix:
-    - AR_VERSION=3.2
-    - AR_VERSION=4.0
-    - AR_VERSION=4.1
-    - AR_VERSION=4.2
-    - AR_VERSION=5.0
-    - AR_VERSION=5.1
-    - AR_VERSION=5.2
-
-matrix:
-  include:
-    - rvm: jruby-9.1.14.0
-      env: AR_VERSION=4.2
-
-      script:
-        - bundle exec rake test:jdbcsqlite3
-        - bundle exec rake test:jdbcmysql
-        - bundle exec rake test:jdbcpostgresql
-
-  fast_finish: true
-
-addons:
-  postgresql: "9.5"
-  apt:
-    sources:
-      - travis-ci/sqlite3
-      - mysql-5.7-trusty
-    packages:
-      - sqlite3
-      - mysql-server
-      - mysql-client
-      - postgresql-9.5-postgis-2.3
-
-before_install:
-  - gem update --system
-  - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
-  - sudo mysql_upgrade
-  - sudo service mysql restart
-
-before_script:
-  - mysql -e 'create database activerecord_import_test;'
-  - psql -c 'create database activerecord_import_test;' -U postgres
-  - psql activerecord_import_test -c 'create extension if not exists hstore;' -U postgres
-  - psql -c 'create extension if not exists postgis;' -U postgres
-  - psql -c 'create extension if not exists "uuid-ossp";' -U postgres
-  - cp test/travis/database.yml test/database.yml
-
-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
-  - bundle exec rubocop
-
-dist: trusty
-
-sudo: required

data/gemfiles/3.2.gemfile

@@ -1,2 +0,0 @@
-gem 'activerecord', '~> 3.2.0'
-gem 'composite_primary_keys', '~> 5.0'

data/gemfiles/4.0.gemfile

@@ -1,2 +0,0 @@
-gem 'activerecord', '~> 4.0.0'
-gem 'composite_primary_keys', '~> 6.0'

data/gemfiles/4.1.gemfile

@@ -1,2 +0,0 @@
-gem 'activerecord', '~> 4.1.0'
-gem 'composite_primary_keys', '~> 7.0'