activerecord-import 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3e8c2443ad40d5d2a2b22c304ebc88780834b0b
-  data.tar.gz: f55f0a5b40c6ba2dee599c13a2c2de83eeeefc6b
+  metadata.gz: 5482a79b112f9689eee0261baa906028abd8575f
+  data.tar.gz: 2f3e76132e6110a5ed17db800f173b5291ddfe8d
 SHA512:
-  metadata.gz: 967eb0e53dd4bb1c8267263788d9dea872f8c4f431dfc5516d819fad1cbc5c6bae20000bf0bb29c6c045012c8f61cdfd93232e5f46a34ef78216247a179ae811
-  data.tar.gz: 73f3dd915a1ad43f22d0d0cc03dc7ccc717191180e05cbce8d35ddbe91ea3a747730f655443cfac34a8aae036a2117bf54bd347c6fbb3998193169fc9175dcdf
+  metadata.gz: 509fe999b0343506f4b1263909d24079394d82d8d3aa16fa5210f35a88b92f40954141949ee7a5f979a81f6105838f0471c5c8cdcfa75a30a5abd38fc96cd1f8
+  data.tar.gz: 517d7de4678ddf9361647f18d08d95c2256e244ae3e6241413abde6b83992e62f4640279c42abdea8bbc710855800840fd2bf941bdca1b447693f2d82cbaa987

data/.travis.yml

@@ -16,11 +16,10 @@ env:
 
 matrix:
   include:
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.7.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
+        - gem update --system
 
       script:
         - bundle exec rake test:jdbcsqlite3

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## Changes in 0.17.2
+
+### Fixes
+
+* Fix issue where PostgreSQL cannot recognize columns if names
+  include mixed case characters. Thanks to @hugobgranja via \#379.
+* Fix an issue for ActiveRecord 5 where serialized fields with 
+  default values were not being typecast. Thanks to @whistlerbrk,
+  @jkowens via \#386.
+* Add option :force_single_insert for MySQL to make sure a single
+  insert is attempted instead of performing multiple inserts based
+  on max_allowed_packet. Thanks to @mtparet via \#387.
+
 ## Changes in 0.17.1
 
 ### Fixes

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

@@ -59,12 +59,6 @@ module ActiveRecord::Import::AbstractAdapter
       post_sql_statements
     end
 
-    # Returns the maximum number of bytes that the server will allow
-    # in a single packet
-    def max_allowed_packet
-      NO_MAX_PACKET
-    end
-
     def supports_on_duplicate_key_update?
       false
     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, _options = {}, *args ) # :nodoc:
+  def insert_many( sql, values, options = {}, *args ) # :nodoc:
     # the number of inserts default
     number_of_inserts = 0
 
@@ -31,7 +31,7 @@ module ActiveRecord::Import::MysqlAdapter
     max = max_allowed_packet
 
     # if we can insert it all as one statement
-    if NO_MAX_PACKET == max || total_bytes <= max
+    if NO_MAX_PACKET == max || total_bytes <= max || options[:force_single_insert]
       number_of_inserts += 1
       sql2insert = base_sql + values.join( ',' ) + post_sql
       insert( sql2insert, *args )

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

@@ -52,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

data/lib/activerecord-import/import.rb

@@ -384,10 +384,12 @@ class ActiveRecord::Base
         end
 
         stored_attrs = respond_to?(:stored_attributes) ? stored_attributes : {}
+        default_values = column_defaults
 
         array_of_attributes = models.map do |model|
           column_names.map do |name|
-            if stored_attrs.any? && stored_attrs.key?(name.to_sym)
+            is_stored_attr = stored_attrs.any? && stored_attrs.key?(name.to_sym)
+            if is_stored_attr || default_values[name].is_a?(Hash)
               model.read_attribute(name.to_s)
             else
               model.read_attribute_before_type_cast(name.to_s)
@@ -681,9 +683,9 @@ class ActiveRecord::Base
           elsif column
             if defined?(type_caster_memo) && type_caster_memo.respond_to?(:type_cast_for_database) # Rails 5.0 and higher
               connection_memo.quote(type_caster_memo.type_cast_for_database(column.name, val))
-            elsif column.respond_to?(:type_cast_from_user)                                   # Rails 4.2 and higher
+            elsif column.respond_to?(:type_cast_from_user)                                         # Rails 4.2 and higher
               connection_memo.quote(column.type_cast_from_user(val), column)
-            else                                                                             # Rails 3.2, 4.0 and 4.1
+            else                                                                                   # Rails 3.2, 4.0 and 4.1
               if serialized_attributes.include?(column.name)
                 val = serialized_attributes[column.name].dump(val)
               end

data/lib/activerecord-import/version.rb

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

data/test/import_test.rb

@@ -48,6 +48,14 @@ describe "#import" do
           Widget.import Build(3, :widgets)
         end
       end
+
+      context "with uppercase letters" do
+        it "should import models successfully" do
+          assert_difference "Car.count", +3 do
+            Car.import Build(3, :cars)
+          end
+        end
+      end
     end
 
     context "that have no primary key" do

data/test/models/car.rb

@@ -0,0 +1,3 @@
+class Car < ActiveRecord::Base
+  self.primary_key = :Name
+end

data/test/schema/generic_schema.rb

@@ -154,6 +154,13 @@ ActiveRecord::Schema.define do
     t.text :settings
   end
 
+  create_table :cars, id: false, force: :cascade do |t|
+    t.string :Name, null: true
+    t.string :Features
+  end
+
+  add_index :cars, :Name, unique: true
+
   execute %(
   CREATE TABLE IF NOT EXISTS tags (
         tag_id    INT NOT NULL,

data/test/schema/postgresql_schema.rb

@@ -20,8 +20,10 @@ ActiveRecord::Schema.define do
 
     if t.respond_to?(:jsonb)
       t.jsonb :settings
+      t.jsonb :json_data, null: false, default: {}
     else
       t.text :settings
+      t.text :json_data
     end
 
     t.datetime :created_at

data/test/support/factories.rb

@@ -55,4 +55,9 @@ FactoryGirl.define do
     title 'Tortilla Flat'
     author_name 'John Steinbeck'
   end
+
+  factory :car do
+    sequence(:Name) { |n| n }
+    sequence(:Features) { |n| "Feature #{n}" }
+  end
 end

data/test/support/postgresql/import_examples.rb

@@ -123,6 +123,18 @@ def should_support_postgresql_import_functionality
       end
     end
   end
+
+  if ENV['AR_VERSION'].to_f >= 4.2
+    describe "with serializable fields" do
+      it "imports default values as correct data type" do
+        vendors = [Vendor.new(name: 'Vendor 1')]
+        assert_difference "Vendor.count", +1 do
+          Vendor.import vendors
+        end
+        assert_equal({}, Vendor.first.json_data)
+      end
+    end
+  end
 end
 
 def should_support_postgresql_upsert_functionality

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.17.2
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -115,6 +115,7 @@ files:
 - test/jdbcsqlite3/import_test.rb
 - test/models/alarm.rb
 - test/models/book.rb
+- test/models/car.rb
 - test/models/chapter.rb
 - test/models/dictionary.rb
 - test/models/discount.rb
@@ -198,6 +199,7 @@ test_files:
 - test/jdbcsqlite3/import_test.rb
 - test/models/alarm.rb
 - test/models/book.rb
+- test/models/car.rb
 - test/models/chapter.rb
 - test/models/dictionary.rb
 - test/models/discount.rb