activerecord-insert_many 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b964bc47e346c37dad57ee0fe9dc63debbde2d5b
-  data.tar.gz: 9fe757469418793c921362934e6d2e8ac6c77618
+  metadata.gz: ccd2651adecf544c3a1114e179191335e72f9b66
+  data.tar.gz: 26019103155000fc02819745814b203512f4c19c
 SHA512:
-  metadata.gz: e83c08c41aa468b73bbf350515917a26a3832e5b700ae0813d37c4c494b8ffe2e3d5959057d9f99928d561af8b81f3164941f752ac92f864a96d16c2d1128475
-  data.tar.gz: 6deb7761afd858ded5d48bb245d9e46c98a430b9fcbab1730c22bf54308855187119597783ce87cb3b88699a9ac6426b3fc73382c52130ea82cc2c72118fc470
+  metadata.gz: a63e7b85373bc4833138af076a2246ccbf8758544b40aa8b82e534706c595500550c5753ff976584590c782ff37052520de6d9c92293700ecf417d276e5b35a9
+  data.tar.gz: 6cc7d788ca3b631f9a73ffe479624ac1b06873885b3609afba3c367df94ce0c715e88c7903b3b5330712d56bb3b4199242ef5ff775a8038fcceaff7180432387

data/.travis.yml

@@ -1,4 +1,17 @@
 language: ruby
 rvm:
-  - 2.1.2
-before_install: gem install bundler -v 1.10.6
+  - 2.3.1
+
+# Use Postgres 9.5
+# https://www.brandur.org/fragments/postgres-95-travis
+dist: trusty
+sudo: required
+addons:
+  postgresql: "9.5"
+
+before_install: gem update bundler
+script: bundle exec rake test
+
+# To stop Travis from running tests for a new commit,
+# add the following to your commit message: [ci skip]
+# You should add this when you edit documentation or comments, etc.

data/README.md

@@ -1,8 +1,11 @@
 # Activerecord::InsertMany
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/activerecord/insert_many`. To experiment with that code, run `bin/console` for an interactive prompt.
 
-TODO: Delete this and the text above, and describe your gem
+[![Gem Version](https://badge.fury.io/rb/activerecord-insert_many.svg)](https://rubygems.org/gems/activerecord-insert_many)
+[![Code Climate](https://codeclimate.com/github/cph/activerecord-insert_many.svg)](https://codeclimate.com/github/cph/activerecord-insert_many)
+[![Build Status](https://travis-ci.org/cph/activerecord-insert_many.svg)](https://travis-ci.org/cph/activerecord-insert_many)
+
+ActiveRecord::InsertMany adds the class method `insert_many` to ActiveRecord objects allowing you to bulk-insert records.
 
 ## Installation
 
@@ -32,5 +35,4 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/activerecord-insert_many.
-
+Bug reports and pull requests are welcome on GitHub at https://github.com/cph/activerecord-insert_many.

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
+end

data/activerecord-insert_many.gemspec

@@ -21,4 +21,10 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "minitest-reporters"
+  spec.add_development_dependency "minitest-reporters-turn_reporter"
+  spec.add_development_dependency "pg"
+  spec.add_development_dependency "database_cleaner"
+  spec.add_development_dependency "shoulda-context"
+  spec.add_development_dependency "pry"
 end

data/lib/activerecord/insert_many/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module InsertMany
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

data/lib/activerecord/insert_many.rb

@@ -5,19 +5,27 @@ require "active_record/fixtures"
 
 module ActiveRecord
   module InsertMany
-    def insert_many(fixtures)
-      connection.insert_many(fixtures, table_name)
+    def insert_many(fixtures, options={})
+      connection.insert_many(fixtures, table_name, options)
     end
   end
 
   module InsertManyStatement
-    def insert_many(fixtures, table_name=self.table_name)
-      return if fixtures.empty?
+    def insert_many(fixtures, table_name=self.table_name, options={})
+      returning = options[:returning]
+      if returning
+        raise ArgumentError, "To use :returning, you must be using Postgres" unless supports_returning?
+      elsif supports_returning?
+        primary_keys = schema_cache.primary_keys(table_name)
+        returning = Array(primary_keys) if primary_keys
+      end
+      return returning && [] if fixtures.empty?
 
       columns = schema_cache.columns_hash(table_name)
 
       sample = fixtures.first
       key_list = sample.map { |name, value| quote_column_name(name) }
+      returning = returning.map { |name| quote_column_name(name) } if returning
 
       value_lists = fixtures.map do |fixture|
 
@@ -40,10 +48,34 @@ module ActiveRecord
         end
       end
 
-      primary_key_column = schema_cache.primary_keys(table_name)
-      returning = supports_returning? && primary_key_column.present? ? " RETURNING #{primary_key_column}" : ""
+      sql = "INSERT INTO #{quote_table_name(table_name)} (#{key_list.join(', ')}) VALUES #{value_lists.map { |value| "(#{value.join(', ')})" }.join(",")}"
+
+      if conflict = options[:on_conflict]
+        raise ArgumentError, "To use the :on_conflict option, you must be using Postgres >= 9.5" unless supports_on_conflict?
+
+        conflict_column = conflict.fetch(:column, schema_cache.primary_keys(table_name))
+        raise ArgumentError, "To use the :on_conflict option, you must specify :column" unless conflict_column
+
+        conflict_column = quote_column_name(conflict_column)
+        case conflict_do = conflict.fetch(:do)
+        when :nothing
+          sql << " ON CONFLICT(#{conflict_column}) DO NOTHING"
+        when :update
+          sql << " ON CONFLICT(#{conflict_column}) DO UPDATE SET #{(key_list - [conflict_column]).map { |key| "#{key} = excluded.#{key}" }.join(", ")}"
+        else
+          raise ArgumentError, "#{conflict_do.inspect} is an unknown value for conflict[:do]; must be :nothing or :update"
+        end
+      end
+
+      sql << " RETURNING #{returning.join(",")}" if returning
+
+      result = execute sql, "Fixture Insert"
+
+      returning ? result.to_a : result
+    end
 
-      execute "INSERT INTO #{quote_table_name(table_name)} (#{key_list.join(', ')}) VALUES #{value_lists.map { |value| "(#{value.join(', ')})" }.join(",")}#{returning}", "Fixture Insert"
+    def supports_on_conflict?
+      self.class.name == "ActiveRecord::ConnectionAdapters::PostgreSQLAdapter" && postgresql_version >= 90500
     end
 
     def supports_returning?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-insert_many
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Luke Booth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -53,6 +53,90 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  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: minitest-reporters-turn_reporter
+  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: pg
+  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: database_cleaner
+  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: shoulda-context
+  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: pry
+  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: 
 email:
 - luke.booth@cph.org