bulk-insert-active-record 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5beeb7910f5ef8e32473555c9751cac42ad66e49
-  data.tar.gz: 28c6046aea568b83c63b0aebc572b239037e6399
+  metadata.gz: 002fae46c420ba556c11d06b5dbd505de1e4ffac
+  data.tar.gz: 3564bc97c838fae38bf920b713a10f3f5ac371a7
 SHA512:
-  metadata.gz: ba855ac9007b318c731402a5351fbf1d39273b55a248262b55a863558b624096f0133a8c94b44850054934c62e3514944a83ac6501839e2f3cff65ec3a9afbe9
-  data.tar.gz: 0a3fc69b69e08671eb6b06bf01a19cf37179000bc33b0b6f3578155d14d35853cb7d4ee9a6aa3cdc5e4968562f9934383521c043d86299fa4ce2c867aca3d177
+  metadata.gz: df5dce359603164410f145d8a6b661e3b89fcb8ba49dd0ed6c47d0a096b66a7ca5f4aeb71bf92b26ee43079fc4505267c10f8d81c34a7f67ec21ea4baf322ad5
+  data.tar.gz: 0b48d16f0e2c49bca418e8a2afcc26d8d016f0ffe3648feaa0eec3b1cc77c710a27f601f21ff066863172d6906769129a1ebfe67cb4dd14d03691f7be673662b

data/.gitignore

@@ -1,17 +1,2 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+/.bundle/
+/pkg/

data/.rubocop.yml

@@ -0,0 +1,6 @@
+Metrics/AbcSize:
+  Max: 20
+Metrics/LineLength:
+  Max: 120
+Metrics/MethodLength:
+  Max: 15

data/.ruby-gemset

@@ -1 +1 @@
-bulk-insert-active-record
+bulk-insert-active-record

data/Gemfile

@@ -1,3 +1,3 @@
 source('https://rubygems.org')
 
-gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,56 @@
+PATH
+  remote: .
+  specs:
+    bulk-insert-active-record (0.0.4)
+      activerecord (>= 3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
+      builder (~> 3.1)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
+      arel (~> 6.0)
+    activesupport (4.2.6)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.3)
+    ast (2.2.0)
+    builder (3.2.2)
+    i18n (0.7.0)
+    json (1.8.3)
+    minitest (5.9.0)
+    parser (2.3.1.0)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    rainbow (2.1.0)
+    rake (11.1.2)
+    rubocop (0.40.0)
+      parser (>= 2.3.1.0, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bulk-insert-active-record!
+  bundler (~> 1.12)
+  rake
+  rubocop
+
+BUNDLED WITH
+   1.12.4

data/README.md

@@ -1,27 +1,25 @@
 # Bulk Insert Active Record (for ActiveRecord 3 or higher)
 
-This gem extends Active Record and allows you to insert multiple records in one SQL statement,
-dramatically increasing performance.
+This gem extends Active Record and allows you to insert multiple records in one SQL statement, dramatically increasing
+performance.
 
 ## Current status
 
-This gem is currently actively in development, but because it's already useful, I've decided to
-publish it in its premature state. Right now it has been manually tested with MySQL and SQL Server
-via JDBC.
+This gem is currently actively in development, but because it's already useful, I've decided to publish it in its
+premature state. Right now it has been manually tested with MySQL and SQL Server via JDBC.
 
 ## Usage
 
-Installation is done by adding the gem your *Gemfile* and running Bundler. After loading Active
-Record an extra class method is available for your models.
+Installation is done by adding the gem your *Gemfile* and running Bundler. After loading Active Record an extra class
+method is available for your models.
 
 ## Examples
 
-Suppose you want to insert multiple Post records in the database. This can be done in different
-ways:
+Suppose you want to insert multiple Post records in the database. This can be done in different ways:
 
 	# suppose it has 3 columns (`id`, `author` and `text`)
 	class Post < ActiveRecord::Base
-	end	
+	end
 
 	# create an array of arrays
 	posts = [
@@ -36,4 +34,4 @@ ways:
 
 # Copyright
 
-&copy; 2014 Walter Horstman, [IT on Rails](http://itonrails.com)
+&copy; 2016 Walter Horstman, [IT on Rails](http://itonrails.com)

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require('bundler/gem_tasks')

data/bulk-insert-active-record.gemspec

@@ -1,22 +1,23 @@
-# coding: utf-8
+# encoding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 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.2'
-  spec.required_ruby_version = '>= 1.9.2'
+  spec.name          = 'bulk-insert-active-record'
+  spec.version       = '0.0.4'
+  spec.author        = ['Walter Horstman']
+  spec.email         = ['walter.horstman@itonrails.com']
 
-  spec.author                = 'Walter Horstman'
-  spec.email                 = 'walter.horstman@itonrails.com'
-  spec.homepage              = 'https://github.com/walterhorstman/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.homepage      = 'https://github.com/walterhorstman/bulk-insert-active-record'
 
-  spec.files                 = `git ls-files -z`.split("\x0")
-  spec.executables           = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files            = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_path          = 'lib'
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
 
   spec.add_dependency('activerecord', '>= 3')
-end
+  spec.add_development_dependency('bundler', '~> 1.12')
+  spec.add_development_dependency('rake')
+  spec.add_development_dependency('rubocop')
+end

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

@@ -1,32 +1,30 @@
+# rubocop:disable Style/FileName
 require_relative('inserters')
 
+# Extends the given base class (a subclass of ActiveRecord::Base) with a bulk_insert() class method.
 module BulkInsertActiveRecord
-
+  # rubocop:disable Metrics/MethodLength
   def self.included(base)
     base.class_eval do
+      def self.bulk_insert(records, columns = column_names)
+        raise('No connection with the database') unless connection.active?
 
-      def self.bulk_insert(records, column_names = self.column_names)
-        fail('No connection with the database') unless self.connection.active?
-
-        inserter = Inserters::factory(self)
-        self.transaction do
+        inserter = Inserters.factory(self)
+        transaction do
           if inserter.nil?
-            self.insert_one_by_one(records, column_names)
+            insert_one_by_one(records, columns)
           else
-            sql = inserter.statement(records, column_names)
-            self.connection.insert(sql)
+            inserter.execute(records, columns)
           end
         end
       end
 
-      private
-
       def self.insert_one_by_one(records, column_names)
         records.each do |record|
           if record.is_a?(self)
             record.save
           else
-            item = self.new
+            item = new
             column_names.each_with_index do |column_name, index|
               item[column_name] = record[index]
             end
@@ -36,8 +34,9 @@ module BulkInsertActiveRecord
       end
     end
   end
+  # rubocop:enable Metrics/MethodLength
 end
 
 ActiveSupport.on_load(:active_record) do
   include(BulkInsertActiveRecord)
-end
+end

data/lib/inserters.rb

@@ -1,17 +1,15 @@
 Dir[File.expand_path('../inserters/*.rb', __FILE__)].each { |file_name| require(file_name) }
 
 module BulkInsertActiveRecord
+  # Inserters module
   module Inserters
-
-    def self.factory(active_record_class, options = {})
+    def self.factory(active_record_class)
       inserter_class = case active_record_class.connection.adapter_name.downcase
                        when 'mssql', 'mysql', 'sqlserver' then Base
-                       # FIXME: as soon as we know which SQL statement to use, enable the next line
-                       # when 'oracle' then Oracle
-                       else nil
+                       when 'oracle' then Oracle
                        end
 
-      inserter_class.nil? ? nil : inserter_class.new(active_record_class, options)
+      inserter_class.nil? ? nil : inserter_class.new(active_record_class)
     end
   end
-end
+end

data/lib/inserters/base.rb

@@ -1,36 +1,23 @@
-# This base implementation works for MySQL and SQLServer
 module BulkInsertActiveRecord
   module Inserters
+    # This base implementation works for MySQL and SQLServer
     class Base
-
-      def initialize(active_record_class, options = {})
+      def initialize(active_record_class)
         @connection = active_record_class.connection
         @quoted_table_name = active_record_class.quoted_table_name
-
-        # basic bulk insert statement
-        @statement = options[:statement] || 'INSERT INTO %{table_name}(%{columns_clause}) VALUES %{values_clause}'
-        # character(s) used to separate columns in the columns_clause of the statement
-        @column_separator = options[:column_separator] || ','
-        # character(s) used to separate records in the values_clause of the statement
-        @record_separator = options[:record_separator] || ','
-        # sql fragment for individual records in the values_clause of the statement
-        @record_statement = options[:record_statement] || '(%{value_clause})'
-        # character(s) used to separate values in the value_clause of the record statement
-        @value_separator = options[:value_separator] || ','
       end
 
-      # returns bulk insert statement
-      def statement(records, column_names)
-        @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|
-            @record_statement % {
-              value_clause: record.map { |value| @connection.quote(value) }.join(@value_separator)
-            }
-          end.join(@record_separator)
-        }
+      def execute(records, column_names)
+        statement = 'INSERT INTO %{table_name}(%{columns_clause}) VALUES(%{values_clause})'
+        @connection.insert(format(statement, table_name: @quoted_table_name,
+                                             columns_clause: column_names.map do |column_name|
+                                               @connection.quote_column_name(column_name)
+                                             end.join(','),
+                                             values_clause: records.map do |record|
+                                               value_clause = record.map { |value| @connection.quote(value) }.join(',')
+                                               "(#{value_clause})"
+                                             end.join(',')))
       end
     end
   end
-end
+end

data/lib/inserters/oracle.rb

@@ -1,17 +1,18 @@
-require_relative('sequenced')
-
 module BulkInsertActiveRecord
   module Inserters
-    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))
+    # Implementation specific for Oracle
+    class Oracle < Base
+      def execute(records, column_names) # override
+        statement = 'BEGIN INSERT INTO %{table_name}(%{columns_clause}) VALUES(%{values_clause}); END;'
+        @connection.execute(format(statement, table_name: @quoted_table_name,
+                                              columns_clause: column_names.map do |column_name|
+                                                @connection.quote_column_name(column_name)
+                                              end.join(','),
+                                              values_clause: records.map do |record|
+                                                value_clause = record.map { |value| @connection.quote(value) }.join(',')
+                                                "SELECT #{value_clause} FROM dual"
+                                              end.join(' UNION ')))
       end
     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.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Walter Horstman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,16 +24,61 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem allows you to insert multiple rows as once, dramatically increasing
   performance.
-email: walter.horstman@itonrails.com
+email:
+- walter.horstman@itonrails.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - bulk-insert-active-record.gemspec
@@ -41,7 +86,6 @@ 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: {}
@@ -53,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -61,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Lightweight bulk insert mechanism for ActiveRecord 3 or higher

data/lib/inserters/sequenced.rb

@@ -1,42 +0,0 @@
-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