bulk-insert-active-record 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50a047ec99ae044e95e2ece35f7ed6a98f774369
-  data.tar.gz: c81b2276e7d97ba319cbfed840c28eff00b0db12
+  metadata.gz: 5beeb7910f5ef8e32473555c9751cac42ad66e49
+  data.tar.gz: 28c6046aea568b83c63b0aebc572b239037e6399
 SHA512:
-  metadata.gz: 6bf3fca5d20ee03cbc94ea6de6de28e7940074c17106ecc36eb8ebbb0a31e63d96debcb3a46456055591e768e3b5e024a84abd6a4f0f91dacedbd8cf7a39b14a
-  data.tar.gz: 72bad9ef5d4e3ca8f1990fd95ccaad3c4ea7bd2984fcc48c1a3e704a5c46b67e348426c333941a1b0c9c65ccb8cd3a00172d8d3363d193eae6dfed391a6dda2a
+  metadata.gz: ba855ac9007b318c731402a5351fbf1d39273b55a248262b55a863558b624096f0133a8c94b44850054934c62e3514944a83ac6501839e2f3cff65ec3a9afbe9
+  data.tar.gz: 0a3fc69b69e08671eb6b06bf01a19cf37179000bc33b0b6f3578155d14d35853cb7d4ee9a6aa3cdc5e4968562f9934383521c043d86299fa4ce2c867aca3d177

data/bulk-insert-active-record.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name                  = 'bulk-insert-active-record'
   spec.summary               = 'Lightweight bulk insert mechanism for ActiveRecord 3 or higher'
   spec.description           = 'This gem allows you to insert multiple rows as once, dramatically increasing performance.'
-  spec.version               = '0.0.1'
+  spec.version               = '0.0.2'
   spec.required_ruby_version = '>= 1.9.2'
 
   spec.author                = 'Walter Horstman'

data/lib/bulk-insert-active-record.rb

@@ -22,17 +22,15 @@ module BulkInsertActiveRecord
       private
 
       def self.insert_one_by_one(records, column_names)
-        self.transaction do
-          records.each do |record|
-            if record.is_a?(self)
-              record.save
-            else
-              item = self.new
-              column_names.each_with_index do |column_name, index|
-                item[column_name] = record[index]
-              end
-              item.save
+        records.each do |record|
+          if record.is_a?(self)
+            record.save
+          else
+            item = self.new
+            column_names.each_with_index do |column_name, index|
+              item[column_name] = record[index]
             end
+            item.save
           end
         end
       end

data/lib/inserters.rb

@@ -6,7 +6,8 @@ module BulkInsertActiveRecord
     def self.factory(active_record_class, options = {})
       inserter_class = case active_record_class.connection.adapter_name.downcase
                        when 'mssql', 'mysql', 'sqlserver' then Base
-                       when 'oracle' then Oracle
+                       # FIXME: as soon as we know which SQL statement to use, enable the next line
+                       # when 'oracle' then Oracle
                        else nil
                        end
 

data/lib/inserters/oracle.rb

@@ -1,13 +1,14 @@
-require_relative('base')
+require_relative('sequenced')
 
 module BulkInsertActiveRecord
   module Inserters
-    class Oracle < Base
+    class Oracle < Sequenced
 
       def initialize(active_record_class, options = {})
         super(active_record_class, {
           statement: 'INSERT INTO %{table_name}(%{columns_clause}) %{values_clause}',
           record_statement: 'SELECT %{value_clause} FROM dual',
+          sequence_statement: "#{active_record_class.sequence_name}.NEXTVAL",
           record_separator: ' UNION '
         }.merge(options))
       end

data/lib/inserters/sequenced.rb

@@ -0,0 +1,42 @@
+require_relative('base')
+
+module BulkInsertActiveRecord
+  module Inserters
+    class Sequenced < Base
+
+      def initialize(active_record_class, options = {})
+        @primary_key_name = active_record_class.primary_key
+        # SQL fragment defining how a sequenced value should be constructed
+        @sequence_statement = options[:sequence_statement]
+        super(active_record_class, options)
+      end
+
+      # returns bulk insert statement
+      def statement(records, column_names)
+        column_names.map!(&:to_s)
+        # if a primary key column wasn't specified, add it manually
+        add_primary_key = column_names.exclude?(@primary_key_name)
+        column_names << @primary_key_name if add_primary_key
+        # save position within each row array of the primary key
+        primary_key_index = column_names.index(@primary_key_name)
+
+        @statement % {
+          table_name: @quoted_table_name,
+          columns_clause: column_names.map { |column_name| @connection.quote_column_name(column_name) }.join(@column_separator),
+          values_clause: records.map do |record|
+            # if we need to manually added the primary key, add it to the end of the row array
+            if add_primary_key
+              record << @sequence_statement
+            else
+              record[primary_key_index] = (record[primary_key_index] == nil) ? @sequence_statement : @connection.quote(record[primary_key_index])
+            end
+
+            @record_statement % {
+              value_clause: record.map.with_index { |value, index| (index == primary_key_index) ? value : @connection.quote(value) }.join(@value_separator)
+            }
+          end.join(@record_separator)
+        }
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulk-insert-active-record
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Walter Horstman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -41,6 +41,7 @@ files:
 - lib/inserters.rb
 - lib/inserters/base.rb
 - lib/inserters/oracle.rb
+- lib/inserters/sequenced.rb
 homepage: https://github.com/walterhorstman/bulk-insert-active-record
 licenses: []
 metadata: {}