activerecord-import 1.3.0 → 1.4.1

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord::Import::PostgreSQLAdapter
   include ActiveRecord::Import::ImportSupport
   include ActiveRecord::Import::OnDuplicateKeyUpdateSupport
@@ -6,7 +8,7 @@ module ActiveRecord::Import::PostgreSQLAdapter
 
   def insert_many( sql, values, options = {}, *args ) # :nodoc:
     number_of_inserts = 1
-    returned_values = []
+    returned_values = {}
     ids = []
     results = []
 
@@ -18,47 +20,53 @@ module ActiveRecord::Import::PostgreSQLAdapter
 
     sql2insert = base_sql + values.join( ',' ) + post_sql
 
-    columns = returning_columns(options)
-    if columns.blank? || (options[:no_returning] && !options[:recursive])
+    selections = returning_selections(options)
+    if selections.blank? || (options[:no_returning] && !options[:recursive])
       insert( sql2insert, *args )
     else
-      returned_values = if columns.size > 1
+      returned_values = if selections.size > 1
         # Select composite columns
-        select_rows( sql2insert, *args )
+        db_result = select_all( sql2insert, *args )
+        { values: db_result.rows, columns: db_result.columns }
       else
-        select_values( sql2insert, *args )
+        { values: select_values( sql2insert, *args ) }
       end
       clear_query_cache if query_cache_enabled
     end
 
     if options[:returning].blank?
-      ids = returned_values
+      ids = Array(returned_values[:values])
     elsif options[:primary_key].blank?
-      results = returned_values
+      options[:returning_columns] ||= returned_values[:columns]
+      results = Array(returned_values[:values])
     else
       # split primary key and returning columns
-      ids, results = split_ids_and_results(returned_values, columns, options)
+      ids, results, options[:returning_columns] = split_ids_and_results(returned_values, options)
     end
 
     ActiveRecord::Import::Result.new([], number_of_inserts, ids, results)
   end
 
-  def split_ids_and_results(values, columns, options)
+  def split_ids_and_results( selections, options )
     ids = []
-    results = []
+    returning_values = []
+
+    columns = Array(selections[:columns])
+    values = Array(selections[:values])
     id_indexes = Array(options[:primary_key]).map { |key| columns.index(key) }
-    returning_indexes = Array(options[:returning]).map { |key| columns.index(key) }
+    returning_columns = columns.reject.with_index { |_, index| id_indexes.include?(index) }
+    returning_indexes = returning_columns.map { |column| columns.index(column) }
 
     values.each do |value|
       value_array = Array(value)
-      ids << id_indexes.map { |i| value_array[i] }
-      results << returning_indexes.map { |i| value_array[i] }
+      ids << id_indexes.map { |index| value_array[index] }
+      returning_values << returning_indexes.map { |index| value_array[index] }
     end
 
     ids.map!(&:first) if id_indexes.size == 1
-    results.map!(&:first) if returning_indexes.size == 1
+    returning_values.map!(&:first) if returning_columns.size == 1
 
-    [ids, results]
+    [ids, returning_values, returning_columns]
   end
 
   def next_value_for_sequence(sequence_name)
@@ -79,19 +87,24 @@ module ActiveRecord::Import::PostgreSQLAdapter
 
     sql += super(table_name, options)
 
-    columns = returning_columns(options)
-    unless columns.blank? || (options[:no_returning] && !options[:recursive])
-      sql << " RETURNING \"#{columns.join('", "')}\""
+    selections = returning_selections(options)
+    unless selections.blank? || (options[:no_returning] && !options[:recursive])
+      sql << " RETURNING #{selections.join(', ')}"
     end
 
     sql
   end
 
-  def returning_columns(options)
-    columns = []
-    columns += Array(options[:primary_key]) if options[:primary_key].present?
-    columns |= Array(options[:returning]) if options[:returning].present?
-    columns
+  def returning_selections(options)
+    selections = []
+    column_names = Array(options[:model].column_names)
+
+    selections += Array(options[:primary_key]) if options[:primary_key].present?
+    selections += Array(options[:returning]) if options[:returning].present?
+
+    selections.map do |selection|
+      column_names.include?(selection.to_s) ? "\"#{selection}\"" : selection
+    end
   end
 
   # Add a column to be updated on duplicate key update
@@ -123,7 +136,7 @@ module ActiveRecord::Import::PostgreSQLAdapter
     arg = { columns: arg } if arg.is_a?( Array ) || arg.is_a?( String )
     return unless arg.is_a?( Hash )
 
-    sql = ' ON CONFLICT '
+    sql = ' ON CONFLICT '.dup
     conflict_target = sql_for_conflict_target( arg )
 
     columns = arg.fetch( :columns, [] )
@@ -179,9 +192,9 @@ module ActiveRecord::Import::PostgreSQLAdapter
     if constraint_name.present?
       "ON CONSTRAINT #{constraint_name} "
     elsif conflict_target.present?
-      '(' << Array( conflict_target ).reject( &:blank? ).join( ', ' ) << ') '.tap do |sql|
-        sql << "WHERE #{index_predicate} " if index_predicate
-      end
+      sql = '(' + Array( conflict_target ).reject( &:blank? ).join( ', ' ) + ') '
+      sql += "WHERE #{index_predicate} " if index_predicate
+      sql
     end
   end
 

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module ActiveRecord::Import::SQLite3Adapter
   include ActiveRecord::Import::ImportSupport
   include ActiveRecord::Import::OnDuplicateKeyUpdateSupport
 
-  MIN_VERSION_FOR_IMPORT = "3.7.11".freeze
-  MIN_VERSION_FOR_UPSERT = "3.24.0".freeze
+  MIN_VERSION_FOR_IMPORT = "3.7.11"
+  MIN_VERSION_FOR_UPSERT = "3.24.0"
   SQLITE_LIMIT_COMPOUND_SELECT = 500
 
   # Override our conformance to ActiveRecord::Import::ImportSupport interface
@@ -97,7 +99,7 @@ module ActiveRecord::Import::SQLite3Adapter
     arg = { columns: arg } if arg.is_a?( Array ) || arg.is_a?( String )
     return unless arg.is_a?( Hash )
 
-    sql = ' ON CONFLICT '
+    sql = ' ON CONFLICT '.dup
     conflict_target = sql_for_conflict_target( arg )
 
     columns = arg.fetch( :columns, [] )
@@ -150,9 +152,9 @@ module ActiveRecord::Import::SQLite3Adapter
     conflict_target = args[:conflict_target]
     index_predicate = args[:index_predicate]
     if conflict_target.present?
-      '(' << Array( conflict_target ).reject( &:blank? ).join( ', ' ) << ') '.tap do |sql|
-        sql << "WHERE #{index_predicate} " if index_predicate
-      end
+      sql = '(' + Array( conflict_target ).reject( &:blank? ).join( ', ' ) + ') '
+      sql += "WHERE #{index_predicate} " if index_predicate
+      sql
     end
   end
 

data/lib/activerecord-import/base.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require "pathname"
 require "active_record"
 require "active_record/version"
 
 module ActiveRecord::Import
-  ADAPTER_PATH = "activerecord-import/active_record/adapters".freeze
+  ADAPTER_PATH = "activerecord-import/active_record/adapters"
 
   def self.base_adapter(adapter)
     case adapter

data/lib/activerecord-import/import.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "ostruct"
 
 module ActiveRecord::Import::ConnectionAdapters; end
@@ -55,7 +57,7 @@ module ActiveRecord::Import #:nodoc:
           end
         end
 
-        filter.instance_variable_set(:@attributes, attrs)
+        filter.instance_variable_set(:@attributes, attrs.flatten)
 
         if @validate_callbacks.respond_to?(:chain, true)
           @validate_callbacks.send(:chain).tap do |chain|
@@ -547,7 +549,7 @@ class ActiveRecord::Base
     alias import! bulk_import! unless ActiveRecord::Base.respond_to? :import!
 
     def import_helper( *args )
-      options = { validate: true, timestamps: true, track_validation_failures: false }
+      options = { model: self, validate: true, timestamps: true, track_validation_failures: false }
       options.merge!( args.pop ) if args.last.is_a? Hash
       # making sure that current model's primary key is used
       options[:primary_key] = primary_key
@@ -875,19 +877,28 @@ class ActiveRecord::Base
         end
       end
 
-      if models.size == import_result.results.size
-        columns = Array(options[:returning])
-        single_column = "#{columns.first}=" if columns.size == 1
-        import_result.results.each_with_index do |result, index|
+      set_value = lambda do |model, column, value|
+        val = deserialize_value.call(column, value)
+        if model.attribute_names.include?(column)
+          model.send("#{column}=", val)
+        else
+          attributes = attributes_builder.build_from_database(model.attributes.merge(column => val))
+          model.instance_variable_set(:@attributes, attributes)
+        end
+      end
+
+      columns = Array(options[:returning_columns])
+      results = Array(import_result.results)
+      if models.size == results.size
+        single_column = columns.first if columns.size == 1
+        results.each_with_index do |result, index|
           model = models[index]
 
           if single_column
-            val = deserialize_value.call(columns.first, result)
-            model.send(single_column, val)
+            set_value.call(model, single_column, result)
           else
             columns.each_with_index do |column, col_index|
-              val = deserialize_value.call(column, result[col_index])
-              model.send("#{column}=", val)
+              set_value.call(model, column, result[col_index])
             end
           end
         end

data/lib/activerecord-import/mysql2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 warn <<-MSG
 [DEPRECATION] loading activerecord-import via 'require "activerecord-import/<adapter-name>"'
   is deprecated. Update to autorequire using 'require "activerecord-import"'. See

data/lib/activerecord-import/postgresql.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 warn <<-MSG
 [DEPRECATION] loading activerecord-import via 'require "activerecord-import/<adapter-name>"'
   is deprecated. Update to autorequire using 'require "activerecord-import"'. See

data/lib/activerecord-import/sqlite3.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 warn <<-MSG
 [DEPRECATION] loading activerecord-import via 'require "activerecord-import/<adapter-name>"'
   is deprecated. Update to autorequire using 'require "activerecord-import"'. See

data/lib/activerecord-import/synchronize.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord # :nodoc:
   class Base # :nodoc:
     # Synchronizes the passed in ActiveRecord instances with data

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.3.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
 
@@ -555,7 +576,11 @@ describe "#import" do
     context "when the timestamps columns are present" do
       setup do
         @existing_book = Book.create(title: "Fell", author_name: "Curry", publisher: "Bayer", created_at: 2.years.ago.utc, created_on: 2.years.ago.utc, updated_at: 2.years.ago.utc, updated_on: 2.years.ago.utc)
-        ActiveRecord::Base.default_timezone = :utc
+        if ActiveRecord.respond_to?(:default_timezone)
+          ActiveRecord.default_timezone = :utc
+        else
+          ActiveRecord::Base.default_timezone = :utc
+        end
         Timecop.freeze(time) do
           assert_difference "Book.count", +2 do
             Book.import %w(title author_name publisher created_at created_on updated_at updated_on), [["LDAP", "Big Bird", "Del Rey", nil, nil, nil, nil], [@existing_book.title, @existing_book.author_name, @existing_book.publisher, @existing_book.created_at, @existing_book.created_on, @existing_book.updated_at, @existing_book.updated_on]]

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