activerecord_mass_insert 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa01ff53a01bb14c0926a26f816905205ffeffc2
-  data.tar.gz: bc10dde065d7f8782dd3b7e04bfe72c67a619d24
+  metadata.gz: dc7e1b88f199bb60fa96b966661a69e2fed064ff
+  data.tar.gz: a43ed568b5b504dfa47c82ae23a0ba64d4da8287
 SHA512:
-  metadata.gz: 7464ccd801d7c378e710c2fa3cfb6a92074512e9c0268c4af828e3e93b6601222000e4dc6479aa89da39a47f3a1a240b383a7592f0f66e1504bc1c57c4d1815d
-  data.tar.gz: aa77057469cfc75cd67370239134422b568ff0176782e10d7f9f92d53690ee04044ff95484917cc4e882e71f1d7314da6fcf76c8b8f0cf981c45573b4fbb4fda
+  metadata.gz: d1f4c728c521a1c5932f794e5c87a29068175a0268dccf473801364391cbc2cf3ebc7f41c9d6d56e7498852fed3bbd8de2b7692bb71370eac9e820bbd52eba08
+  data.tar.gz: 01d447056198709f89b102c2957f8a41887337c12b828188f8c08f90ebcac9631e2ebea6b688cb8fb86b9c1edd746a102fb0ad541d6e838bde52fa890e8a167a

data/README.md

@@ -31,12 +31,14 @@ end
 
 payload = '[{"name":"Madison","breed":"Golden","meta":{"rescue":false,"age":null}},{"name":"Daisy","meta":{"rescue":true,"age":18}},{"name":"Gracey","meta":{"rescue":false,"nickname":"Scoogie","age":11}},{"name":"Sadie","meta":{"rescue":true,"dingo_blood":true,"age":11}},{"name":"Raymond","meta":{"rescue":null,"nickname":"Radar","tail":false,"age":11}},{"name":"Nemo","meta":{"rescue":true,"number_of_ears":1,"age":2}}]'
 
-dog_ids = Dog.mass_insert(payload, :name, created_at: 'NOW()', updated_at: 'NOW()')
+dog_ids = Dog.mass_insert(payload)
 
 dogs = Dog.find(dog_ids)
 
 puts dogs.count # => 6
 puts dogs.first.name # => Madison
+puts dogs.first.breed # => Golden
+puts dogs.first.meta # => { "rescue" => false, "age" => null }
 ```
 
 For a payload you can pass a JSON objects by itself, in a JSON array, or a ruby array. You can also

data/activerecord_mass_insert.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.0.0'
+
   spec.add_runtime_dependency 'activerecord', '>= 4.2.0'
   spec.add_runtime_dependency 'pg', '>= 0.20.0'
 

data/lib/activerecord/mass_insert/inserter.rb

@@ -8,8 +8,6 @@ module ActiveRecord
     class Inserter < Statement
       extend Forwardable
 
-      def_delegators :model, :primary_key, :arel_table, :connection
-
       def self.insert(*args)
         new(*args).insert
       end
@@ -18,6 +16,10 @@ module ActiveRecord
         connection.execute(sql)
       end
 
+      private
+
+      def_delegators :model, :primary_key, :arel_table, :connection
+
       def sql
         [
           model.send(:sanitize_sql_array, [statement.to_sql, payload]),

data/lib/activerecord/mass_insert/projection.rb

@@ -9,8 +9,6 @@ module ActiveRecord
     class Projection < Statement
       extend Forwardable
 
-      def_delegators :model, :column_for_attribute
-
       def statement
         init_args = []
         init_args << arel_table.engine if arel_table.respond_to?(:engine)
@@ -21,6 +19,10 @@ module ActiveRecord
         end
       end
 
+      private
+
+      def_delegators :model, :column_for_attribute
+
       def select
         [
           *matching_columns.map { |column| arel_table[column] },

data/lib/activerecord/mass_insert/statement.rb

@@ -4,17 +4,36 @@ module ActiveRecord
   module MassInsert
     # Common structure for all SQL statement builders
     class Statement
-      attr_reader :model, :payload, :matching_columns, :mapped_columns
-
       def initialize(model, payload, *matching_columns, **mapped_columns)
         @model = model
         @payload = payload_to_json_array(payload)
-        @matching_columns = matching_columns
-        @mapped_columns = mapped_columns
+        if matching_columns.empty? && mapped_columns.empty?
+          @matching_columns = fallback_matching_columns(model)
+          @mapped_columns = fallback_mapped_columns(model)
+        else
+          @matching_columns = matching_columns
+          @mapped_columns = mapped_columns
+        end
       end
 
       private
 
+      attr_reader :model, :payload, :matching_columns, :mapped_columns
+
+      def fallback_matching_columns(new_model)
+        new_model.columns.map(&:name) - [new_model.primary_key, 'created_at', 'updated_at']
+      end
+
+      def fallback_mapped_columns(new_model)
+        {}.tap do |result|
+          %w[created_at updated_at].each do |column|
+            if new_model.columns_hash.keys.include?(column)
+              result[column.to_sym] = Arel::Nodes::NamedFunction.new('NOW', [])
+            end
+          end
+        end
+      end
+
       def payload_to_json_array(new_payload)
         if new_payload.nil?
           new_payload = new_payload.to_s

data/lib/activerecord/mass_insert/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module MassInsert
-    VERSION = [0, 1, 0].freeze
+    VERSION = [0, 2, 0].freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_mass_insert
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Rove
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="