activerecord-import 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a9d274345964888ca0c5b9242a689d3953271c7
-  data.tar.gz: 59dcdf278fec2582d2e44a7fb416d355026856a5
+  metadata.gz: d3e8c2443ad40d5d2a2b22c304ebc88780834b0b
+  data.tar.gz: f55f0a5b40c6ba2dee599c13a2c2de83eeeefc6b
 SHA512:
-  metadata.gz: 96f341704f5a40797d626039985e52813d01087e9d41427ef375b5c383c1ce7f22cfac0120939e52ea037b86d84c8ae491ea098f82c2bcc6a94fea34a823dd02
-  data.tar.gz: 4d0f4890f4b97ea9c3d36bf8971d6334ab880d235eda6c14a2af7a8395900562fdb09fd2127c55d3283f48a8734e543671eb2ce0734b1f91689faa95a7bbff56
+  metadata.gz: 967eb0e53dd4bb1c8267263788d9dea872f8c4f431dfc5516d819fad1cbc5c6bae20000bf0bb29c6c045012c8f61cdfd93232e5f46a34ef78216247a179ae811
+  data.tar.gz: 73f3dd915a1ad43f22d0d0cc03dc7ccc717191180e05cbce8d35ddbe91ea3a747730f655443cfac34a8aae036a2117bf54bd347c6fbb3998193169fc9175dcdf

data/.travis.yml

@@ -18,6 +18,10 @@ matrix:
   include:
     - rvm: jruby-9.0.5.0
       env: AR_VERSION=4.2
+      before_install:
+        - gem uninstall -i /home/travis/.rvm/gems/jruby-9.0.5.0@global bundler
+        - gem install bundler -v 1.13.7 --no-rdoc --no-ri --no-document
+
       script:
         - bundle exec rake test:jdbcsqlite3
         - bundle exec rake test:jdbcmysql

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Changes in 0.17.1
+
+### Fixes
+
+* Along with setting id on models for adapters that support it,
+  add created_at and updated_at timestamps. Thanks to @jacob-carlborg
+  via \#364.
+* Properly set returned ids when using composite_primary_keys.
+  Thanks to @guigs, @jkowens via \#371.
+
 ## Changes in 0.17.0
 
 ### New Features

data/Gemfile

@@ -4,6 +4,7 @@ gemspec
 
 group :development, :test do
   gem 'rubocop', '~> 0.38.0'
+  gem 'rake'
 end
 
 # Database Adapters
@@ -30,10 +31,6 @@ gem "mocha"
 
 # Debugging
 platforms :jruby do
-  gem "ruby-debug-base", "= 0.10.4"
-end
-
-platforms :jruby, :mri_18 do
   gem "ruby-debug", "= 0.10.4"
 end
 

data/README.markdown

@@ -41,7 +41,7 @@ Use the latest in the activerecord-import 0.3.x series.
 
 Use activerecord-import 0.2.11. As of activerecord-import 0.3.0 we are relying on functionality that was introduced in Rails 3.1. Since Rails 3.0.x is no longer a supported version of Rails we have decided to drop support as well.
 
-### For More Information
+### More Information : Usage and Examples in Wiki
 
 For more information on activerecord-import please see its wiki: https://github.com/zdennis/activerecord-import/wiki
 

data/activerecord-import.gemspec

@@ -4,8 +4,8 @@ require File.expand_path('../lib/activerecord-import/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Zach Dennis"]
   gem.email         = ["zach.dennis@gmail.com"]
-  gem.summary       = "Bulk-loading extension for ActiveRecord"
-  gem.description   = "Extraction of the ActiveRecord::Base#import functionality from ar-extensions for Rails 3 and beyond"
+  gem.summary       = "Bulk insert extension for ActiveRecord"
+  gem.description   = "A library for bulk inserting data using ActiveRecord."
   gem.homepage      = "http://github.com/zdennis/activerecord-import"
   gem.license       = "Ruby"
 

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

@@ -4,7 +4,7 @@ module ActiveRecord::Import::AbstractAdapter
       %(#{sequence_name}.nextval)
     end
 
-    def insert_many( sql, values, *args ) # :nodoc:
+    def insert_many( sql, values, _options = {}, *args ) # :nodoc:
       number_of_inserts = 1
 
       base_sql, post_sql = if sql.is_a?( String )
@@ -45,7 +45,7 @@ module ActiveRecord::Import::AbstractAdapter
       post_sql_statements = []
 
       if supports_on_duplicate_key_update? && options[:on_duplicate_key_update]
-        post_sql_statements << sql_for_on_duplicate_key_update( table_name, options[:on_duplicate_key_update] )
+        post_sql_statements << sql_for_on_duplicate_key_update( table_name, options[:on_duplicate_key_update], options[:primary_key] )
       elsif options[:on_duplicate_key_update]
         logger.warn "Ignoring on_duplicate_key_update because it is not supported by the database."
       end

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

@@ -7,7 +7,7 @@ module ActiveRecord::Import::MysqlAdapter
 
   # +sql+ can be a single string or an array. If it is an array all
   # elements that are in position >= 1 will be appended to the final SQL.
-  def insert_many( sql, values, *args ) # :nodoc:
+  def insert_many( sql, values, _options = {}, *args ) # :nodoc:
     # the number of inserts default
     number_of_inserts = 0
 

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

@@ -4,7 +4,8 @@ module ActiveRecord::Import::PostgreSQLAdapter
 
   MIN_VERSION_FOR_UPSERT = 90_500
 
-  def insert_many( sql, values, *args ) # :nodoc:
+  def insert_many( sql, values, options = {}, *args ) # :nodoc:
+    primary_key = options[:primary_key]
     number_of_inserts = 1
     ids = []
 
@@ -15,11 +16,17 @@ module ActiveRecord::Import::PostgreSQLAdapter
     end
 
     sql2insert = base_sql + values.join( ',' ) + post_sql
-    if post_sql =~ /RETURNING\s/
-      ids = select_values( sql2insert, *args )
-      query_cache.clear if query_cache_enabled
-    else
+
+    if primary_key.blank? || options[:no_returning]
       insert( sql2insert, *args )
+    else
+      ids = if primary_key.is_a?( Array )
+        # Select composite primary keys
+        select_rows( sql2insert, *args )
+      else
+        select_values( sql2insert, *args )
+      end
+      query_cache.clear if query_cache_enabled
     end
 
     [number_of_inserts, ids]
@@ -45,7 +52,7 @@ module ActiveRecord::Import::PostgreSQLAdapter
 
     unless options[:no_returning] || options[:primary_key].blank?
       primary_key = Array(options[:primary_key])
-      sql << " RETURNING (#{primary_key.join(', ')})"
+      sql << " RETURNING #{primary_key.join(', ')}"
     end
 
     sql
@@ -76,7 +83,7 @@ module ActiveRecord::Import::PostgreSQLAdapter
   # Returns a generated ON CONFLICT DO UPDATE statement given the passed
   # in +args+.
   def sql_for_on_duplicate_key_update( table_name, *args ) # :nodoc:
-    arg = args.first
+    arg, primary_key = args
     arg = { columns: arg } if arg.is_a?( Array ) || arg.is_a?( String )
     return unless arg.is_a?( Hash )
 
@@ -88,7 +95,7 @@ module ActiveRecord::Import::PostgreSQLAdapter
       return sql << "#{conflict_target}DO NOTHING"
     end
 
-    conflict_target ||= sql_for_default_conflict_target( table_name )
+    conflict_target ||= sql_for_default_conflict_target( table_name, primary_key )
     unless conflict_target
       raise ArgumentError, 'Expected :conflict_target or :constraint_name to be specified'
     end
@@ -136,20 +143,8 @@ module ActiveRecord::Import::PostgreSQLAdapter
     end
   end
 
-  def sql_for_default_conflict_target( table_name )
-    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(', ')
+  def sql_for_default_conflict_target( table_name, primary_key )
+    conflict_target = Array(primary_key).join(', ')
     "(#{conflict_target}) " if conflict_target.present?
   end
 

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

@@ -17,7 +17,7 @@ module ActiveRecord::Import::SQLite3Adapter
 
   # +sql+ can be a single string or an array. If it is an array all
   # elements that are in position >= 1 will be appended to the final SQL.
-  def insert_many(sql, values, *args) # :nodoc:
+  def insert_many( sql, values, _options = {}, *args ) # :nodoc:
     number_of_inserts = 0
 
     base_sql, post_sql = if sql.is_a?( String )

data/lib/activerecord-import/import.rb

@@ -442,9 +442,11 @@ class ActiveRecord::Base
         array_of_attributes.each { |a| a.concat(new_fields) }
       end
 
+      timestamps = {}
+
       # record timestamps unless disabled in ActiveRecord::Base
       if record_timestamps && options.delete( :timestamps )
-        add_special_rails_stamps column_names, array_of_attributes, options
+        timestamps = add_special_rails_stamps column_names, array_of_attributes, options
       end
 
       return_obj = if is_validating
@@ -474,7 +476,7 @@ class ActiveRecord::Base
 
       # if we have ids, then set the id on the models and mark the models as clean.
       if models && support_setting_primary_key_of_imported_objects?
-        set_ids_and_mark_clean(models, return_obj)
+        set_attributes_and_mark_clean(models, return_obj, timestamps)
 
         # if there are auto-save associations on the models we imported that are new, import them as well
         import_associations(models, options.dup) if options[:recursive]
@@ -575,6 +577,7 @@ class ActiveRecord::Base
           # perform the inserts
           result = connection.insert_many( [insert_sql, post_sql_statements].flatten,
             batch_values,
+            options,
             "#{self.class.name} Create Many Without Validations Or Callbacks" )
           number_inserted += result[0]
           ids += result[1]
@@ -592,7 +595,7 @@ class ActiveRecord::Base
 
     private
 
-    def set_ids_and_mark_clean(models, import_result)
+    def set_attributes_and_mark_clean(models, import_result, timestamps)
       return if models.nil?
       models -= import_result.failed_instances
       import_result.ids.each_with_index do |id, index|
@@ -604,6 +607,10 @@ class ActiveRecord::Base
           model.instance_variable_get(:@changed_attributes).clear
         end
         model.instance_variable_set(:@new_record, false)
+
+        timestamps.each do |attr, value|
+          model.send(attr + "=", value)
+        end
       end
     end
 
@@ -689,9 +696,13 @@ class ActiveRecord::Base
     end
 
     def add_special_rails_stamps( column_names, array_of_attributes, options )
+      timestamps = {}
+
       AREXT_RAILS_COLUMNS[:create].each_pair do |key, blk|
         next unless self.column_names.include?(key)
         value = blk.call
+        timestamps[key] = value
+
         index = column_names.index(key) || column_names.index(key.to_sym)
         if index
           # replace every instance of the array of attributes with our value
@@ -705,6 +716,8 @@ class ActiveRecord::Base
       AREXT_RAILS_COLUMNS[:update].each_pair do |key, blk|
         next unless self.column_names.include?(key)
         value = blk.call
+        timestamps[key] = value
+
         index = column_names.index(key) || column_names.index(key.to_sym)
         if index
           # replace every instance of the array of attributes with our value
@@ -718,6 +731,8 @@ class ActiveRecord::Base
           connection.add_column_for_on_duplicate_key_update(key, options)
         end
       end
+
+      timestamps
     end
 
     # Returns an Array of Hashes for the passed in +column_names+ and +array_of_attributes+.

data/lib/activerecord-import/version.rb

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

data/test/import_test.rb

@@ -183,6 +183,24 @@ describe "#import" do
         end
       end
 
+      it "should set ActiveRecord timestamps in valid models if adapter supports setting primary key of imported objects" do
+        if ActiveRecord::Base.support_setting_primary_key_of_imported_objects?
+          Timecop.freeze(Time.at(0)) do
+            Topic.import (invalid_models + valid_models), validate: true
+          end
+
+          assert_nil invalid_models[0].created_at
+          assert_nil invalid_models[0].updated_at
+          assert_nil invalid_models[1].created_at
+          assert_nil invalid_models[1].updated_at
+
+          assert_equal valid_models[0].created_at, Topic.all[0].created_at
+          assert_equal valid_models[0].updated_at, Topic.all[0].updated_at
+          assert_equal valid_models[1].created_at, Topic.all[1].created_at
+          assert_equal valid_models[1].updated_at, Topic.all[1].updated_at
+        end
+      end
+
       it "should import valid data when mixed with invalid data" do
         assert_difference "Topic.count", +2 do
           Topic.import columns, valid_values + invalid_values, validate: true
@@ -463,12 +481,12 @@ describe "#import" do
 
   context "importing through an association scope" do
     { has_many: :chapters, polymorphic: :discounts }.each do |association_type, association|
-      let(:book)   { FactoryGirl.create :book }
-      let(:scope)  { book.public_send association }
-      let(:klass)  { { chapters: Chapter, discounts: Discount }[association] }
-      let(:column) { { chapters: :title,  discounts: :amount  }[association] }
-      let(:val1)   { { chapters: 'A',     discounts: 5        }[association] }
-      let(:val2)   { { chapters: 'B',     discounts: 6        }[association] }
+      book   = FactoryGirl.create :book
+      scope  = book.public_send association
+      klass  = { chapters: Chapter, discounts: Discount }[association]
+      column = { chapters: :title,  discounts: :amount  }[association]
+      val1   = { chapters: 'A',     discounts: 5        }[association]
+      val2   = { chapters: 'B',     discounts: 6        }[association]
 
       context "for #{association_type}" do
         it "works importing models" do

data/test/schema/generic_schema.rb

@@ -114,7 +114,7 @@ ActiveRecord::Schema.define do
   add_index :animals, [:name], unique: true, name: 'uk_animals'
 
   create_table :widgets, id: false, force: :cascade do |t|
-    t.integer :w_id
+    t.integer :w_id, primary_key: true
     t.boolean :active, default: false
     t.text :data
     t.text :json_data

data/test/support/active_support/test_case_extensions.rb

@@ -1,6 +1,11 @@
 class ActiveSupport::TestCase
   include ActiveRecord::TestFixtures
-  self.use_transactional_fixtures = true
+
+  if ENV['AR_VERSION'].to_f >= 5.0
+    self.use_transactional_tests = true
+  else
+    self.use_transactional_fixtures = true
+  end
 
   class << self
     def requires_active_record_version(version_string, &blk)

data/test/support/postgresql/import_examples.rb

@@ -323,7 +323,7 @@ def should_support_postgresql_upsert_functionality
           context "with no primary key" do
             it "raises ArgumentError" do
               error = assert_raises ArgumentError do
-                Widget.import Build(1, :widgets), on_duplicate_key_update: [:data], validate: false
+                Rule.import Build(3, :rules), on_duplicate_key_update: [:condition_text], validate: false
               end
               assert_match(/Expected :conflict_target or :constraint_name to be specified/, error.message)
             end

data/test/support/shared_examples/recursive_import.rb

@@ -102,6 +102,21 @@ def should_support_recursive_import
       end
     end
 
+    describe "with composite primary keys" do
+      it "should import models and set id" do
+        tags = []
+        tags << Tag.new(tag_id: 1, publisher_id: 1, tag: 'Mystery')
+        tags << Tag.new(tag_id: 2, publisher_id: 1, tag: 'Science')
+
+        assert_difference "Tag.count", +2 do
+          Tag.import tags
+        end
+
+        assert_equal 1, tags[0].tag_id
+        assert_equal 2, tags[1].tag_id
+      end
+    end
+
     # These models dont validate associated.  So we expect that books and topics get inserted, but not chapters
     # Putting a transaction around everything wouldn't work, so if you want your chapters to prevent topics from
     # being created, you would need to have validates_associated in your models and insert with validation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,8 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Extraction of the ActiveRecord::Base#import functionality from ar-extensions
-  for Rails 3 and beyond
+description: A library for bulk inserting data using ActiveRecord.
 email:
 - zach.dennis@gmail.com
 executables: []
@@ -178,7 +177,7 @@ rubyforge_project:
 rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
-summary: Bulk-loading extension for ActiveRecord
+summary: Bulk insert extension for ActiveRecord
 test_files:
 - test/adapters/jdbcmysql.rb
 - test/adapters/jdbcpostgresql.rb