activerecord-import 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 90f09939f85ac5eea9961edb723ad60f0f44d4a8
-  data.tar.gz: d50f35bc63818c96ffa772d157189d96a738784b
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzExZGVjNzkyYjBhNmZiMDE4MmQ4NTBmMTNiMGFlOTg3M2ZjMjcyOA==
+  data.tar.gz: !binary |-
+    MDRjY2QxYTc1NmViOGI5MDM1Yjg5ODY1YmY3ZjU0ZGJkMGRiOTFhZA==
 SHA512:
-  metadata.gz: 4f4cf1a65474d658e5091b60b12756f70c6fe1af84d0b2477777f27cc76d137eb1bc7064ab8d33d548c0c8de01df494ec0fdddf73d7e55416fc772750bb9899a
-  data.tar.gz: 0b3a592bdbe01be8dd244f52643875825b2c52d8a8ec283f9825cf17012feddb394f131aa9a0722cdf89d9a8a6835ddff0a219b86e4d4049b70f8aca1f808b50
+  metadata.gz: !binary |-
+    YmUyZGIyZWQ1MjI1MGZkN2VkZTk0NGZlZmUyZWFmZDY0OTc3NjU3OTQzZWI5
+    ZTk2NGFkNjc1MjVkOGE2MGQyNTM2OTc1N2YzYjQyYmFlNjA0M2FhNjRiMDEz
+    YTgyNTk4MjIxOTUwYzYwOWM1ZmE5ZGQ0NDcyODkzNGNkNGYwMWU=
+  data.tar.gz: !binary |-
+    ZmRlNTc0NjhhNmYxZmNiNDFjNzZlNTM1ODcxNTNiNzE3NmUyYjhjMjliYjU4
+    MGY5NmYyN2JhY2FjMmQ3ZWFiODE3ZTY3OTgxMDA5M2Y5MTkwZjIyNWU2Y2Ni
+    MWUyYTRlODNiMzg1YzYyNDEzMmFjZTBhZTEwMzFkZGU0MDI5ZTE=

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## Changes in 0.16.2
+
+### Fixes
+
+* Fixes issue clearing query cache on wrong connection when using
+  multiple databases. Thanks to @KentoMoriwaki via \#337
+* Raises an ArgumentError on incorrect usage of nested arrays. Thanks
+  to @Nitrodist via \#340
+* Fixes issue that prevented uuid primary keys from being set manually.
+  Thanks to @Dclusin-og, @jkowens via \#342
+
 ## Changes in 0.16.1
 
 ### Fixes

data/README.markdown

@@ -29,7 +29,11 @@ Use activerecord-import 0.11.0 or higher.
 
 Use activerecord-import 0.4.0 or higher.
 
-### Rails 3.1.x up to, but not including 4.0
+### Rails 3.2.x up to, but not including 4.0
+
+Use activerecord-import 0.3.0 or higher.
+
+### Rails 3.1.x up to, but not including 3.2
 
 Use the latest in the activerecord-import 0.3.x series.
 
@@ -60,7 +64,7 @@ To understand how rubygems loads code you can reference the following:
 And an example of how active_record dynamically load adapters:
   https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/connection_specification.rb
 
-In summary, when a gem is loaded rubygems adds the `lib` folder of the gem to the global load path `$LOAD_PATH` so that all `require` lookups will not propegate through all of the folders on the load path. When a `require` is issued each folder on the `$LOAD_PATH` is checked for the file and/or folder referenced. This allows a gem (like activerecord-import) to define push the activerecord-import folder (or namespace) on the `$LOAD_PATH` and any adapters provided by activerecord-import will be found by rubygems when the require is issued.
+In summary, when a gem is loaded rubygems adds the `lib` folder of the gem to the global load path `$LOAD_PATH` so that all `require` lookups will not propagate through all of the folders on the load path. When a `require` is issued each folder on the `$LOAD_PATH` is checked for the file and/or folder referenced. This allows a gem (like activerecord-import) to define push the activerecord-import folder (or namespace) on the `$LOAD_PATH` and any adapters provided by activerecord-import will be found by rubygems when the require is issued.
 
 If `fake_name` adapter is needed by a gem (potentially called `activerecord-import-fake_name`) then the folder structure should look as follows:
 

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

@@ -17,12 +17,11 @@ module ActiveRecord::Import::PostgreSQLAdapter
     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
       insert( sql2insert, *args )
     end
 
-    ActiveRecord::Base.connection.query_cache.clear
-
     [number_of_inserts, ids]
   end
 

data/lib/activerecord-import/import.rb

@@ -367,15 +367,13 @@ class ActiveRecord::Base
           column_names = self.column_names.dup
         end
 
-        if column_names.include?(primary_key) && columns_hash[primary_key].type == :uuid
+        if models.first.id.nil? && column_names.include?(primary_key) && columns_hash[primary_key].type == :uuid
           column_names.delete(primary_key)
         end
 
         stored_attrs = respond_to?(:stored_attributes) ? stored_attributes : {}
 
         array_of_attributes = models.map do |model|
-          # this next line breaks sqlite.so with a segmentation fault
-          # if model.new_record? || options[:on_duplicate_key_update]
           column_names.map do |name|
             if stored_attrs.any? && stored_attrs.key?(name.to_sym)
               model.read_attribute(name.to_s)
@@ -383,13 +381,17 @@ class ActiveRecord::Base
               model.read_attribute_before_type_cast(name.to_s)
             end
           end
-          # end
         end
         # supports empty array
       elsif args.last.is_a?( Array ) && args.last.empty?
         return ActiveRecord::Import::Result.new([], 0, [])
         # supports 2-element array and array
       elsif args.size == 2 && args.first.is_a?( Array ) && args.last.is_a?( Array )
+
+        unless args.last.first.is_a?(Array)
+          raise ArgumentError, "Last argument should be a two dimensional array '[[]]'. First element in array was a #{args.last.first.class}"
+        end
+
         column_names, array_of_attributes = args
 
         # dup the passed args so we don't modify unintentionally

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.16.1".freeze
+    VERSION = "0.16.2".freeze
   end
 end

data/test/import_test.rb

@@ -12,6 +12,11 @@ describe "#import" do
     end
   end
 
+  it "warns you that you're using the library wrong" do
+    error = assert_raise(ArgumentError) { Topic.import %w(title author_name), ['Author #1', 'Book #1', 0] }
+    assert_equal error.message, "Last argument should be a two dimensional array '[[]]'. First element in array was a String"
+  end
+
   it "should not produce an error when importing empty arrays" do
     assert_nothing_raised do
       Topic.import []

data/test/support/postgresql/import_examples.rb

@@ -59,19 +59,34 @@ def should_support_postgresql_import_functionality
     end
   end
 
-  describe "with a uuid primary key" do
-    let(:vendor) { Vendor.new(name: "foo") }
-    let(:vendors) { [vendor] }
+  if ENV['AR_VERSION'].to_f >= 4.0
+    describe "with a uuid primary key" do
+      let(:vendor) { Vendor.new(name: "foo") }
+      let(:vendors) { [vendor] }
 
-    it "creates records" do
-      assert_difference "Vendor.count", +1 do
+      it "creates records" do
+        assert_difference "Vendor.count", +1 do
+          Vendor.import vendors
+        end
+      end
+
+      it "assigns an id to the model objects" do
         Vendor.import vendors
+        assert_not_nil vendor.id
       end
     end
 
-    it "assigns an id to the model objects" do
-      Vendor.import vendors
-      assert_not_nil vendor.id
+    describe "with an assigned uuid primary key" do
+      let(:id) { SecureRandom.uuid }
+      let(:vendor) { Vendor.new(id: id, name: "foo") }
+      let(:vendors) { [vendor] }
+
+      it "creates records with correct id" do
+        assert_difference "Vendor.count", +1 do
+          Vendor.import vendors
+        end
+        assert_equal id, vendor.id
+      end
     end
   end
 

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Extraction of the ActiveRecord::Base#import functionality from ar-extensions
@@ -46,10 +46,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
+- .gitignore
+- .rubocop.yml
+- .rubocop_todo.yml
+- .travis.yml
 - Brewfile
 - CHANGELOG.md
 - Gemfile
@@ -160,12 +160,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []