multi_insert 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a666e28505f82ffc01e2a87001af574ae537018d
-  data.tar.gz: 11057d49e4b30e3b062c9c1454c04beea5a88192
+  metadata.gz: 4c1738f3565a4700e34dfe07e7a2e098f4ab386b
+  data.tar.gz: 7d25684fecb7dab48f5aae411c70704bdd57b162
 SHA512:
-  metadata.gz: d41a9df50a203f9391d6c2328948760f6710bca115930a34ea7e72797557803864cf1aec4b616b9f2f5d095906c734db436325c6005b2fae980dff4b753129c8
-  data.tar.gz: f35ab401b6eb3c61d8e0afd4c37429d0f1eb292c175c9cf9552882f915eba7c3e5f7226f45685afd84d39f917e72b5ae4f2fbabd60353926fc08d55ebb68b5c4
+  metadata.gz: d80094973356a6050dc32d3140a1793a1831e3e789b3dc7eff6da3041d885271cd639666d705e04f032846e142e6315f5474d4a6204ab44b527b4602b234e994
+  data.tar.gz: f4b75bc774a3d4dcbec95e9a99f754df15d8f9b4f37437a033effe0a007ad3cb95b41f6fafe8ee3ee9b84b2d274ec4659ec96d2a27a5eca1af18217e2cc1c232

data/lib/multi_insert/query.rb

@@ -14,10 +14,10 @@ module MultiInsert
       # Create an ON CONFLICT clause
       #
       # @param query [Query] the query.
-      # @param column [String | Symbol] the column to watch for conflicts.
+      # @param column [String | Symbol | nil] the column to watch for conflicts.
       def initialize(query, column)
         @query = query
-        @column = column.to_sym
+        @column = column.nil? ? nil : column.to_sym
       end
 
       # Ignore conflicting rows.
@@ -83,7 +83,7 @@ module MultiInsert
     #
     # @param column [String | Symbol] The column to watch for conflicts.
     # @return [Query::OnConflict] A conflict clause.
-    def on_conflict(column)
+    def on_conflict(column = nil)
       ::MultiInsert::Query::OnConflict.new(self, column)
     end
 

data/lib/multi_insert/query_builder.rb

@@ -34,8 +34,12 @@ module MultiInsert
     end
 
     def self.on_conflict(column)
-      column = ActiveRecord::Base.connection.quote_column_name(column.to_s)
-      "ON CONFLICT (#{column})"
+      if column.nil?
+        "ON CONFLICT"
+      else
+        column = ActiveRecord::Base.connection.quote_column_name(column.to_s)
+        "ON CONFLICT (#{column})"
+      end
     end
 
     def self.on_conflict_do_nothing(column)

data/lib/multi_insert/version.rb

@@ -1,4 +1,4 @@
 module MultiInsert
   # The version number for MultiInsert.
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_insert
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Nax
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler