fast_inserter 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9a5654ca484c5f0b47bfa91c6f5e1bb52549933
-  data.tar.gz: 9d239e735b0333d3662dc663e5fb5dfb83a6bee3
+  metadata.gz: 120b53eb90d8eef25a9d1f3340b36f4256d9ddca
+  data.tar.gz: aea33ef6b99f3707b2276785cc5add4d74522020
 SHA512:
-  metadata.gz: 9c89ce208dc7b8bcfb95b4bdb8e632b8712cc47bb7348f0f88d67ec83ccf986b69d565b8f66fc880f629ae12f909b13d89beeae960c431e3ab77f1a4f67486c5
-  data.tar.gz: a65992d6071b696bbc25b523002fcb5a32d84d4b0733f07f4a91c52cc4eef96f49947225bdf0431c1443d2a738eb36375dec7b29d2981cb9ee1b95eeea550e40
+  metadata.gz: e47da657ffab5623bae32686880e916f507b49bd9a33067be2c80ee1131bf269430dc7a2a670045acd478d5a0a16f9d7c1afd971fc1aace6b96db19b89a7d102
+  data.tar.gz: b694592a8c016b52f39993cd3695316d383868f6cf267b84f50682e4eab662ab5f123a0b041ef1f3759b9d7c620593cb9fb83a98dd7e23c2cbc63bf658779780

data/README.md

@@ -99,6 +99,15 @@ The name of the column which we will be dynamically inserting records for. This
 
 The large list of values to use for the 'variable_column' value when inserting the records.
 
+## Multiple Variable Columns
+Rather than a single `variable_column`, you may pass an array of `variable_columns`, along with `values` as an array of arrays.
+
+Example:
+```
+variable_columns: %w(user_id user_email)
+values: [[1, 'foo@example.com'], [2, 'bar@example.com']]
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -113,4 +122,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/stryde
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/fast_inserter/fast_inserter_base.rb

@@ -49,13 +49,13 @@ module FastInserter
       @table_name = params[:table]
       @static_columns = params[:static_columns]
       @additional_columns = params[:additional_columns]
-      @variable_column = params[:variable_column]
+      @variable_columns = Array(params[:variable_columns] || params[:variable_column])
       @options = params[:options] || {}
 
       # We want to break up the insertions into multiple transactiosn in case there
       # is a very large amount of values. This avoids PG:OutOfMemory errors and smooths
       # out the load. The second 'false' param means don't fill in the last group with nil elements.
-      all_values = params[:values]
+      all_values = params[:values].map { |value| Array(value) }
       all_values.uniq! if @options[:unique]
       group_size = Integer(params[:group_size] || ENV['FAST_INSERTER_GROUP_SIZE'] || DEFAULT_GROUP_SIZE)
       @value_groups = all_values.in_groups_of(group_size, false)
@@ -82,7 +82,7 @@ module FastInserter
     def fast_insert_group(group)
       if @options[:check_for_existing]
         ActiveRecord::Base.transaction do
-          non_existing_values = group.map(&:to_s) - existing_values(group)
+          non_existing_values = group.map { |values| values.map(&:to_s) } - existing_values(group)
           sql_string = insertion_sql_for_group(non_existing_values)
           ActiveRecord::Base.connection.execute(sql_string) unless non_existing_values.empty?
         end
@@ -94,7 +94,7 @@ module FastInserter
 
     # Queries for the existing values for a given group of values
     def existing_values(group_of_values)
-      sql = "SELECT #{@variable_column} FROM #{@table_name} WHERE #{existing_values_static_columns}"
+      sql = "SELECT #{@variable_columns.join(', ')} FROM #{@table_name} WHERE #{existing_values_static_columns}"
 
       # NOTE: There are more elegant ways to get this field out of the resultset, but each database adaptor returns a different type
       # of result from 'execute(sql)'. Potential classes for 'result' is Array (sqlite), Mysql2::Result (mysql2), PG::Result (pg). Each
@@ -102,15 +102,15 @@ module FastInserter
       results = ActiveRecord::Base.connection.execute(sql)
       existing_values = results.to_a.map do |result|
         if result.is_a?(Hash)
-          result[@variable_column].to_s
+          @variable_columns.map { |col| result[col] }.map(&:to_s)
         elsif result.is_a?(Array)
-          result[0].to_s
+          result.map(&:to_s)
         end
       end
 
       # Rather than a giant IN query in the sql statement (which can be bad for database performance),
       # do the filtering of relevant values here in a ruby select.
-      group_of_values_strings = group_of_values.map(&:to_s)
+      group_of_values_strings = group_of_values.map { |values| values.map(&:to_s) }
       existing_values & group_of_values_strings
     end
 
@@ -130,7 +130,7 @@ module FastInserter
     end
 
     def column_names
-      "#{all_static_columns.keys.join(', ')}, #{@variable_column}"
+      "#{all_static_columns.keys.join(', ')}, #{@variable_columns.join(', ')}"
     end
 
     def all_static_columns
@@ -157,9 +157,9 @@ module FastInserter
       rv = []
       static_column_values = ActiveRecord::Base.send(:sanitize_sql_array, ["?", all_static_columns.values])
 
-      group_of_values.each do |value|
-        value = ActiveRecord::Base.send(:sanitize_sql_array, ["?", value])
-        rv << "(#{static_column_values},#{value})"
+      group_of_values.each do |values|
+        values = values.map { |value| ActiveRecord::Base.send(:sanitize_sql_array, ["?", value]) }
+        rv << "(#{static_column_values},#{values.join(',')})"
       end
 
       rv.join(', ')

data/lib/fast_inserter/version.rb

@@ -1,3 +1,3 @@
 module FastInserter
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fast_inserter
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Scott Ringwelski
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord