activerecord-import 0.27.0 → 1.4.1

data/test/support/postgresql/import_examples.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 def should_support_postgresql_import_functionality
   should_support_recursive_import
 
@@ -37,6 +38,12 @@ def should_support_postgresql_import_functionality
         assert !topic.changed?
       end
 
+      if ENV['AR_VERSION'].to_f > 4.1
+        it "moves the dirty changes to previous_changes" do
+          assert topic.previous_changes.present?
+        end
+      end
+
       it "marks models as persisted" do
         assert !topic.new_record?
         assert topic.persisted?
@@ -96,6 +103,8 @@ def should_support_postgresql_import_functionality
           books.first.id.to_s
         end
       end
+      let(:true_returning_value) { ENV['AR_VERSION'].to_f >= 5.0 ? true : 't' }
+      let(:false_returning_value) { ENV['AR_VERSION'].to_f >= 5.0 ? false : 'f' }
 
       it "creates records" do
         assert_difference("Book.count", +1) { result }
@@ -110,6 +119,26 @@ def should_support_postgresql_import_functionality
         assert_equal [%w(King It)], result.results
       end
 
+      context "when given an empty array" do
+        let(:result) { Book.import([], returning: %w(title)) }
+
+        setup { result }
+
+        it "returns empty arrays for ids and results" do
+          assert_equal [], result.ids
+          assert_equal [], result.results
+        end
+      end
+
+      context "when a returning column is a serialized attribute" do
+        let(:vendor) { Vendor.new(hours: { monday: '8-5' }) }
+        let(:result) { Vendor.import([vendor], returning: %w(hours)) }
+
+        it "creates records" do
+          assert_difference("Vendor.count", +1) { result }
+        end
+      end
+
       context "when primary key and returning overlap" do
         let(:result) { Book.import(books, returning: %w(id title)) }
 
@@ -124,6 +153,34 @@ def should_support_postgresql_import_functionality
         end
       end
 
+      context "when returning is raw sql" do
+        let(:result) { Book.import(books, returning: "title, (xmax = '0') AS inserted") }
+
+        setup { result }
+
+        it "returns ids" do
+          assert_equal [book_id], result.ids
+        end
+
+        it "returns specified columns" do
+          assert_equal [['It', true_returning_value]], result.results
+        end
+      end
+
+      context "when returning contains raw sql" do
+        let(:result) { Book.import(books, returning: [:title, "id, (xmax = '0') AS inserted"]) }
+
+        setup { result }
+
+        it "returns ids" do
+          assert_equal [book_id], result.ids
+        end
+
+        it "returns specified columns" do
+          assert_equal [['It', book_id, true_returning_value]], result.results
+        end
+      end
+
       context "setting model attributes" do
         let(:code) { 'abc' }
         let(:discount) { 0.10 }
@@ -153,6 +210,14 @@ def should_support_postgresql_import_functionality
             assert_equal updated_promotion.discount, discount
           end
         end
+
+        context 'returning raw sql' do
+          let(:returning_columns) { [:discount, "(xmax = '0') AS inserted"] }
+
+          it "sets custom model attributes" do
+            assert_equal updated_promotion.inserted, false_returning_value
+          end
+        end
       end
     end
   end
@@ -228,10 +293,34 @@ def should_support_postgresql_import_functionality
         assert_equal({}, Vendor.first.json_data)
       end
     end
+
+    %w(json jsonb).each do |json_type|
+      describe "with pure #{json_type} fields" do
+        let(:data) { { a: :b } }
+        let(:json_field_name) { "pure_#{json_type}_data" }
+        it "imports the values from saved records" do
+          vendor = Vendor.create!(name: 'Vendor 1', json_field_name => data)
+
+          Vendor.import [vendor], on_duplicate_key_update: [json_field_name]
+          assert_equal(data.as_json, vendor.reload[json_field_name])
+        end
+      end
+    end
+  end
+
+  describe "with enum field" do
+    let(:vendor_type) { "retailer" }
+    it "imports the correct values for enum fields" do
+      vendor = Vendor.new(name: 'Vendor 1', vendor_type: vendor_type)
+      assert_difference "Vendor.count", +1 do
+        Vendor.import [vendor]
+      end
+      assert_equal(vendor_type, Vendor.first.vendor_type)
+    end
   end
 
   describe "with binary field" do
-    let(:binary_value) { "\xE0'c\xB2\xB0\xB3Bh\\\xC2M\xB1m\\I\xC4r".force_encoding('ASCII-8BIT') }
+    let(:binary_value) { "\xE0'c\xB2\xB0\xB3Bh\\\xC2M\xB1m\\I\xC4r".dup.force_encoding('ASCII-8BIT') }
     it "imports the correct values for binary fields" do
       alarms = [Alarm.new(device_id: 1, alarm_type: 1, status: 1, secret_key: binary_value)]
       assert_difference "Alarm.count", +1 do
@@ -240,6 +329,30 @@ def should_support_postgresql_import_functionality
       assert_equal(binary_value, Alarm.first.secret_key)
     end
   end
+
+  unless ENV["SKIP_COMPOSITE_PK"]
+    describe "with composite foreign keys" do
+      let(:account_id) { 555 }
+      let(:customer) { Customer.new(account_id: account_id, name: "foo") }
+      let(:order) { Order.new(account_id: account_id, amount: 100, customer: customer) }
+
+      it "imports and correctly maps foreign keys" do
+        assert_difference "Customer.count", +1 do
+          Customer.import [customer]
+        end
+
+        assert_difference "Order.count", +1 do
+          Order.import [order]
+        end
+
+        db_customer = Customer.last
+        db_order = Order.last
+
+        assert_equal db_customer.orders.last, db_order
+        assert_not_equal db_order.customer_id, nil
+      end
+    end
+  end
 end
 
 def should_support_postgresql_upsert_functionality

data/test/support/shared_examples/on_duplicate_key_ignore.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 def should_support_on_duplicate_key_ignore
   describe "#import" do
     extend ActiveSupport::TestCase::ImportAssertions

data/test/support/shared_examples/on_duplicate_key_update.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 def should_support_basic_on_duplicate_key_update
   describe "#import" do
     extend ActiveSupport::TestCase::ImportAssertions
@@ -73,6 +75,16 @@ def should_support_basic_on_duplicate_key_update
             assert_equal user.name, users[i].name + ' Rothschild'
             assert_equal 1, user.lock_version
           end
+          updated_values2 = User.all.map do |user|
+            user.name += ' jr.'
+            { id: user.id, name: user.name }
+          end
+          User.import(updated_values2, on_duplicate_key_update: [:name])
+          assert User.count == updated_values2.length
+          User.all.each_with_index do |user, i|
+            assert_equal user.name, users[i].name + ' Rothschild jr.'
+            assert_equal 2, user.lock_version
+          end
         end
 
         it 'upsert optimistic lock columns other than lock_version by model' do
@@ -246,6 +258,26 @@ def should_support_basic_on_duplicate_key_update
         end
       end
 
+      context "with timestamps enabled" do
+        let(:time) { Chronic.parse("5 minutes from now") }
+
+        it 'should not overwrite changed updated_at with current timestamp' do
+          topic = Topic.create(author_name: "Jane Doe", title: "Book")
+          timestamp = Time.now.utc
+          topic.updated_at = timestamp
+          Topic.import [topic], on_duplicate_key_update: :all, validate: false
+          assert_equal timestamp.to_s, Topic.last.updated_at.to_s
+        end
+
+        it 'should update updated_at with current timestamp' do
+          topic = Topic.create(author_name: "Jane Doe", title: "Book")
+          Timecop.freeze(time) do
+            Topic.import [topic], on_duplicate_key_update: [:updated_at], validate: false
+            assert_in_delta time.to_i, topic.reload.updated_at.to_i, 1.second
+          end
+        end
+      end
+
       context "with validation checks turned off" do
         asssertion_group(:should_support_on_duplicate_key_update) do
           should_not_update_fields_not_mentioned

data/test/support/shared_examples/recursive_import.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 def should_support_recursive_import
   describe "importing objects with associations" do
     let(:new_topics) { Build(num_topics, :topic_with_book) }
@@ -138,6 +140,15 @@ def should_support_recursive_import
       books.each do |book|
         assert_equal book.topic_id, second_new_topic.id
       end
+
+      books.each { |book| book.topic_id = nil }
+      assert_no_difference "Book.count", books.size do
+        Book.import books, validate: false, on_duplicate_key_update: [:topic_id]
+      end
+
+      books.each do |book|
+        assert_equal book.topic_id, nil
+      end
     end
 
     unless ENV["SKIP_COMPOSITE_PK"]
@@ -167,7 +178,7 @@ def should_support_recursive_import
       end
     end
 
-    # If adapter supports on_duplicate_key_update, it is only applied to top level models so that SQL with invalid
+    # If adapter supports on_duplicate_key_update and specific columns are specified, 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
     if ActiveRecord::Base.connection.supports_on_duplicate_key_update?
       describe "on_duplicate_key_update" do
@@ -181,6 +192,55 @@ def should_support_recursive_import
             end
           end
         end
+
+        context "when :all fields are updated" do
+          setup do
+            Topic.import new_topics, recursive: true
+          end
+
+          it "updates associated objects" do
+            new_author_name = 'Richard Bachman'
+            topic = new_topics.first
+            topic.books.each do |book|
+              book.author_name = new_author_name
+            end
+            assert_nothing_raised do
+              Topic.import new_topics, recursive: true, on_duplicate_key_update: :all
+            end
+            Topic.find(topic.id).books.each do |book|
+              assert_equal new_author_name, book.author_name
+            end
+          end
+        end
+      end
+    end
+
+    # If returning option is provided, 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 "returning" 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, returning: [:content], validate: false
+          new_topics.each do |topic|
+            assert_not_nil topic.id
+          end
+        end
+      end
+    end
+
+    # If no returning option is provided, it is ignored
+    describe "no returning" do
+      let(:new_topics) { Build(1, :topic_with_book) }
+
+      it "is ignored and imports objects with associations" do
+        assert_difference "Topic.count", +1 do
+          Topic.import new_topics, recursive: true, no_returning: true, validate: false
+          new_topics.each do |topic|
+            assert_not_nil topic.id
+          end
+        end
       end
     end
   end

data/test/support/sqlite3/import_examples.rb

@@ -1,25 +1,13 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 def should_support_sqlite3_import_functionality
   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
 

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__))
@@ -48,8 +51,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

data/test/value_sets_bytes_parser_test.rb

@@ -1,3 +1,5 @@
+# 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,3 +1,5 @@
+# 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.27.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2022-10-07 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,10 +45,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yaml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - Brewfile
 - CHANGELOG.md
 - Gemfile
@@ -67,14 +67,14 @@ 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
 - 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
 - lib/activerecord-import.rb
 - lib/activerecord-import/active_record/adapters/abstract_adapter.rb
 - lib/activerecord-import/active_record/adapters/jdbcmysql_adapter.rb
@@ -112,6 +112,7 @@ files:
 - test/adapters/spatialite.rb
 - test/adapters/sqlite3.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 +120,25 @@ files:
 - test/makara_postgis/import_test.rb
 - test/models/account.rb
 - test/models/alarm.rb
+- test/models/animal.rb
 - test/models/bike_maker.rb
 - test/models/book.rb
 - test/models/car.rb
+- test/models/card.rb
 - test/models/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
@@ -161,12 +169,11 @@ files:
 - test/support/sqlite3/import_examples.rb
 - test/synchronize_test.rb
 - test/test_helper.rb
-- test/travis/database.yml
 - 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: []
@@ -176,15 +183,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.11
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Bulk insert extension for ActiveRecord
@@ -203,6 +209,7 @@ test_files:
 - test/adapters/spatialite.rb
 - test/adapters/sqlite3.rb
 - test/database.yml.sample
+- test/github/database.yml
 - test/import_test.rb
 - test/jdbcmysql/import_test.rb
 - test/jdbcpostgresql/import_test.rb
@@ -210,18 +217,25 @@ test_files:
 - test/makara_postgis/import_test.rb
 - test/models/account.rb
 - test/models/alarm.rb
+- test/models/animal.rb
 - test/models/bike_maker.rb
 - test/models/book.rb
 - test/models/car.rb
+- test/models/card.rb
 - test/models/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
@@ -252,6 +266,5 @@ test_files:
 - test/support/sqlite3/import_examples.rb
 - test/synchronize_test.rb
 - test/test_helper.rb
-- test/travis/database.yml
 - 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'