activerecord-import-uuid 0.1 → 0.2

data/lib/activerecord-import/import.rb

@@ -347,12 +347,16 @@ class ActiveRecord::Base
       if args.last.is_a?( Array ) && args.last.first.is_a?(ActiveRecord::Base)
         if args.length == 2
           models = args.last
-          column_names = args.first
+          column_names = args.first.dup
         else
           models = args.first
           column_names = self.column_names.dup
         end
 
+        if column_names.include?(primary_key) && columns_hash[primary_key].type == :uuid
+          column_names.delete(primary_key)
+        end
+
         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]
@@ -367,14 +371,14 @@ class ActiveRecord::Base
         # supports 2-element array and array
       elsif args.size == 2 && args.first.is_a?( Array ) && args.last.is_a?( Array )
         column_names, array_of_attributes = args
+
+        # dup the passed args so we don't modify unintentionally
+        column_names = column_names.dup
         array_of_attributes = array_of_attributes.map(&:dup)
       else
         raise ArgumentError, "Invalid arguments!"
       end
 
-      # dup the passed in array so we don't modify it unintentionally
-      column_names = column_names.dup
-
       # Force the primary key col into the insert if it's not
       # on the list and we are using a sequence and stuff a nil
       # value for it into each row so the sequencer will fire later
@@ -531,7 +535,7 @@ class ActiveRecord::Base
       return if models.nil?
       import_result.ids.each_with_index do |id, index|
         model = models[index]
-        model.id = id.to_i
+        model.id = id
         if model.respond_to?(:clear_changes_information) # Rails 4.0 and higher
           model.clear_changes_information
         else # Rails 3.2

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.1"
+    VERSION = "0.2"
   end
 end

data/test/models/vendor.rb

@@ -0,0 +1,2 @@
+class Vendor < ActiveRecord::Base
+end

data/test/schema/jdbcpostgresql_schema.rb

@@ -0,0 +1 @@
+require File.expand_path(File.dirname(__FILE__) + '/postgresql_schema')

data/test/schema/postgis_schema.rb

@@ -0,0 +1 @@
+require File.expand_path(File.dirname(__FILE__) + '/postgresql_schema')

data/test/schema/postgresql_schema.rb

@@ -0,0 +1,9 @@
+ActiveRecord::Schema.define do
+  execute('CREATE extension IF NOT EXISTS "uuid-ossp";')
+
+  create_table :vendors, id: :uuid, force: :cascade do |t|
+    t.string :name, null: true
+    t.datetime :created_at
+    t.datetime :updated_at
+  end
+end

data/test/support/postgresql/import_examples.rb

@@ -58,6 +58,22 @@ def should_support_postgresql_import_functionality
       end
     end
   end
+
+  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
+        Vendor.import vendors
+      end
+    end
+
+    it "assigns an id to the model objects" do
+      Vendor.import vendors
+      assert_not_nil vendor.id
+    end
+  end
 end
 
 def should_support_postgresql_upsert_functionality

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import-uuid
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -127,6 +127,7 @@ files:
 - test/models/question.rb
 - test/models/rule.rb
 - test/models/topic.rb
+- test/models/vendor.rb
 - test/models/widget.rb
 - test/mysql2/import_test.rb
 - test/mysql2_makara/import_test.rb
@@ -134,7 +135,10 @@ files:
 - test/postgis/import_test.rb
 - test/postgresql/import_test.rb
 - test/schema/generic_schema.rb
+- test/schema/jdbcpostgresql_schema.rb
 - test/schema/mysql_schema.rb
+- test/schema/postgis_schema.rb
+- test/schema/postgresql_schema.rb
 - test/schema/version.rb
 - test/sqlite3/import_test.rb
 - test/support/active_support/test_case_extensions.rb
@@ -200,6 +204,7 @@ test_files:
 - test/models/question.rb
 - test/models/rule.rb
 - test/models/topic.rb
+- test/models/vendor.rb
 - test/models/widget.rb
 - test/mysql2/import_test.rb
 - test/mysql2_makara/import_test.rb
@@ -207,7 +212,10 @@ test_files:
 - test/postgis/import_test.rb
 - test/postgresql/import_test.rb
 - test/schema/generic_schema.rb
+- test/schema/jdbcpostgresql_schema.rb
 - test/schema/mysql_schema.rb
+- test/schema/postgis_schema.rb
+- test/schema/postgresql_schema.rb
 - test/schema/version.rb
 - test/sqlite3/import_test.rb
 - test/support/active_support/test_case_extensions.rb