activerecord-import 1.4.0 → 1.4.1

data/lib/activerecord-import/value_sets_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/array'
 
 module ActiveRecord::Import

data/lib/activerecord-import/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module Import
-    VERSION = "1.4.0".freeze
+    VERSION = "1.4.1"
   end
 end

data/lib/activerecord-import.rb

@@ -1,4 +1,6 @@
-# rubocop:disable Style/FileName
+# rubocop:disable Naming/FileName
+# frozen_string_literal: true
+
 require "active_support/lazy_load_hooks"
 
 ActiveSupport.on_load(:active_record) do

data/test/adapters/jdbcmysql.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 ENV["ARE_DB"] = "jdbcmysql"

data/test/adapters/jdbcpostgresql.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 ENV["ARE_DB"] = "jdbcpostgresql"

data/test/adapters/jdbcsqlite3.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 ENV["ARE_DB"] = "jdbcsqlite3"

data/test/adapters/makara_postgis.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 ENV["ARE_DB"] = "postgis"

data/test/adapters/mysql2.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 ENV["ARE_DB"] = "mysql2"

data/test/adapters/mysql2_makara.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 ENV["ARE_DB"] = "mysql2_makara"

data/test/adapters/mysql2spatial.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 ENV["ARE_DB"] = "mysql2spatial"

data/test/adapters/postgis.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 ENV["ARE_DB"] = "postgis"

data/test/adapters/postgresql.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 ENV["ARE_DB"] = "postgresql"

data/test/adapters/postgresql_makara.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 ENV["ARE_DB"] = "postgresql"

data/test/adapters/seamless_database_pool.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 ENV["ARE_DB"] = "seamless_database_pool"

data/test/adapters/spatialite.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 ENV["ARE_DB"] = "spatialite"

data/test/adapters/sqlite3.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 ENV["ARE_DB"] = "sqlite3"

data/test/import_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('../test_helper', __FILE__)
 
 describe "#import" do
@@ -159,6 +161,25 @@ describe "#import" do
           Tag.import columns, values, validate: false
         end
       end
+
+      it "should import models that are required to belong to models with composite primary keys" do
+        tag = Tag.create!(tag_id: 1, publisher_id: 1, tag: 'Mystery')
+        valid_tag_alias = TagAlias.new(tag_id: tag.tag_id, parent_id: tag.publisher_id, alias: 'Detective')
+        invalid_tag_aliases = [
+          TagAlias.new(tag_id: nil, parent_id: nil, alias: 'Detective'),
+          TagAlias.new(tag_id: tag.tag_id, parent_id: nil, alias: 'Detective'),
+          TagAlias.new(tag_id: nil, parent_id: tag.publisher_id, alias: 'Detective'),
+        ]
+
+        assert_difference "TagAlias.count", +1 do
+          TagAlias.import [valid_tag_alias]
+        end
+        invalid_tag_aliases.each do |invalid_tag_alias|
+          assert_no_difference "TagAlias.count" do
+            TagAlias.import [invalid_tag_alias]
+          end
+        end
+      end
     end
   end
 

data/test/jdbcmysql/import_test.rb

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

data/test/jdbcpostgresql/import_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../support/postgresql/import_examples')
 

data/test/jdbcsqlite3/import_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../support/sqlite3/import_examples')
 

data/test/makara_postgis/import_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../support/postgresql/import_examples')
 

data/test/models/account.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Account < ActiveRecord::Base
   self.locking_column = :lock
 end

data/test/models/alarm.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Alarm < ActiveRecord::Base
 end

data/test/models/animal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Animal < ActiveRecord::Base
   after_initialize :validate_name_presence, if: :new_record?
   def validate_name_presence

data/test/models/bike_maker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bike
   def self.table_name_prefix
     'bike_'

data/test/models/book.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Book < ActiveRecord::Base
   belongs_to :topic, inverse_of: :books
   belongs_to :tag, foreign_key: [:tag_id, :parent_id]

data/test/models/car.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Car < ActiveRecord::Base
   self.primary_key = :Name
 end

data/test/models/card.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Card < ActiveRecord::Base
   belongs_to :deck, polymorphic: true
 end

data/test/models/chapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Chapter < ActiveRecord::Base
   belongs_to :book, inverse_of: :chapters
   validates :title, presence: true

data/test/models/customer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Customer < ActiveRecord::Base
   has_many :orders,
     inverse_of: :customer,

data/test/models/deck.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Deck < ActiveRecord::Base
   has_many :cards
   def self.polymorphic_name

data/test/models/dictionary.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'book'
 
 class Dictionary < Book

data/test/models/discount.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Discount < ActiveRecord::Base
   belongs_to :discountable, polymorphic: true
 end

data/test/models/end_note.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class EndNote < ActiveRecord::Base
   belongs_to :book, inverse_of: :end_notes
   validates :note, presence: true

data/test/models/group.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Group < ActiveRecord::Base
   self.table_name = 'group'
 end

data/test/models/order.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Order < ActiveRecord::Base
   belongs_to :customer,
     inverse_of: :orders,

data/test/models/playing_card.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class PlayingCard < ActiveRecord::Base
 end

data/test/models/promotion.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Promotion < ActiveRecord::Base
   self.primary_key = :promotion_id
 end

data/test/models/question.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Question < ActiveRecord::Base
   has_one :rule
 end

data/test/models/rule.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Rule < ActiveRecord::Base
   belongs_to :question
 end

data/test/models/tag.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 class Tag < ActiveRecord::Base
   self.primary_keys = :tag_id, :publisher_id unless ENV["SKIP_COMPOSITE_PK"]
   has_many :books, inverse_of: :tag
+  has_many :tag_aliases, inverse_of: :tag
 end

data/test/models/tag_alias.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class TagAlias < ActiveRecord::Base
+  belongs_to :tag, foreign_key: [:tag_id, :parent_id], required: true
+end

data/test/models/topic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Topic < ActiveRecord::Base
   validates_presence_of :author_name
   validates :title, numericality: { only_integer: true }, on: :context_test

data/test/models/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class User < ActiveRecord::Base
   has_many :user_tokens, primary_key: :name, foreign_key: :user_name
 end

data/test/models/user_token.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class UserToken < ActiveRecord::Base
   belongs_to :user, primary_key: :name, foreign_key: :user_name
   validates :user, presence: true

data/test/models/vendor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Vendor < ActiveRecord::Base
   store :preferences, accessors: [:color], coder: JSON
 

data/test/models/widget.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CustomCoder
   def load(value)
     if value.nil?

data/test/mysql2/import_test.rb

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

data/test/mysql2_makara/import_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 require File.expand_path(File.dirname(__FILE__) + '/../support/assertions')

data/test/mysqlspatial2/import_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 require File.expand_path(File.dirname(__FILE__) + '/../support/assertions')

data/test/postgis/import_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../support/postgresql/import_examples')
 

data/test/postgresql/import_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../support/postgresql/import_examples')
 

data/test/schema/generic_schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define do
   create_table :schema_info, force: :cascade do |t|
     t.integer :version, unique: true
@@ -204,6 +206,12 @@ ActiveRecord::Schema.define do
           PRIMARY KEY (tag_id, publisher_id)
       );
     ).split.join(' ').strip
+
+    create_table :tag_aliases, force: :cascade do |t|
+      t.integer :tag_id, null: false
+      t.integer :parent_id, null: false
+      t.string :alias, null: false
+    end
   end
 
   create_table :customers, force: :cascade do |t|

data/test/schema/jdbcpostgresql_schema.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require File.expand_path(File.dirname(__FILE__) + '/postgresql_schema')

data/test/schema/mysql2_schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define do
   create_table :books, force: :cascade do |t|
     t.string :title, null: false

data/test/schema/postgis_schema.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require File.expand_path(File.dirname(__FILE__) + '/postgresql_schema')

data/test/schema/postgresql_schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define do
   execute('CREATE extension IF NOT EXISTS "hstore";')
   execute('CREATE extension IF NOT EXISTS "pgcrypto";')

data/test/schema/sqlite3_schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define do
   create_table :alarms, force: true do |t|
     t.column :device_id, :integer, null: false

data/test/schema/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SchemaInfo < ActiveRecord::Base
   if respond_to?(:table_name=)
     self.table_name = 'schema_info'

data/test/sqlite3/import_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../support/sqlite3/import_examples')
 

data/test/support/active_support/test_case_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActiveSupport::TestCase
   include ActiveRecord::TestFixtures
 

data/test/support/assertions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActiveSupport::TestCase
   module ImportAssertions
     def self.extended(klass)

data/test/support/factories.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   sequence(:book_title) { |n| "Book #{n}" }
   sequence(:chapter_title) { |n| "Chapter #{n}" }

data/test/support/generate.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class ActiveSupport::TestCase
-  def Build(*args) # rubocop:disable Style/MethodName
+  def Build(*args) # rubocop:disable Naming/MethodName
     n = args.shift if args.first.is_a?(Numeric)
     factory = args.shift
     factory_bot_args = args.shift || {}
@@ -13,7 +15,7 @@ class ActiveSupport::TestCase
     end
   end
 
-  def Generate(*args) # rubocop:disable Style/MethodName
+  def Generate(*args) # rubocop:disable Naming/MethodName
     n = args.shift if args.first.is_a?(Numeric)
     factory = args.shift
     factory_bot_args = args.shift || {}

data/test/support/mysql/import_examples.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 def should_support_mysql_import_functionality
   # Forcefully disable strict mode for this session.
   ActiveRecord::Base.connection.execute "set sql_mode='STRICT_ALL_TABLES'"

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
 
@@ -102,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 }
@@ -150,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 }
@@ -179,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

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

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) }

data/test/support/sqlite3/import_examples.rb

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

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,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'rake'
 test_dir = Pathname.new File.dirname(__FILE__)
@@ -50,6 +52,12 @@ FileUtils.mkdir_p 'log'
 ActiveRecord::Base.logger = Logger.new("log/test.log")
 ActiveRecord::Base.logger.level = Logger::DEBUG
 
+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]

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'