em-pg-client-helper 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54a166e4a003830acb87084c9ce7e3e89247adc0
-  data.tar.gz: 6fd87c473b76cb510cbee6d46e5c161c08c1b783
+  metadata.gz: 00dae568e9a3fbcee2f9f9d02f1567c29d3b407d
+  data.tar.gz: b9baf2122794e3f7b9b820f7e452d0538574b64a
 SHA512:
-  metadata.gz: 542c67c1cc93d7bcdd2c871edfd553ced9aa2de42906822b31931662344521c6a7e6697f56d7c70aa3fc84431410991ac08f9b0d135c6d0fdf97ef85193b8c58
-  data.tar.gz: 15c39dd9ba382f9ee0a267e2406f63c6171fb4438a5b205128406a3203facd2e9197066d79b26a9fe0a002c63df8b87dd0404f020b27006e34d5a5ad9acf979c
+  metadata.gz: f4e0290bba50452b458df0ad181c5b6010c19934a420c132c00625580c7430aa9aea093ef6d9df790104cdad03be27988c1c7603c6f24aaee498482a83992281
+  data.tar.gz: c4dc5ba9b3d490e51dfd4a246f910d042778626db74895468759ddfba58c6b21af7fbe9bb940c2ce3e4628eb19d66a884f965550bf9d8547e2de2734263d989c

data/lib/em-pg-client-helper/transaction.rb

@@ -240,6 +240,13 @@ class PG::EM::Client::Helper::Transaction
 	def bulk_insert(tbl, columns, rows, &blk)
 		columns.map!(&:to_sym)
 
+		if rows.empty?
+			return EM::Completion.new.tap do |df|
+				df.callback(&blk) if blk
+				df.succeed(0)
+			end
+		end
+
 		EM::Completion.new.tap do |df|
 			@dg.add(df)
 			df.callback(&blk) if blk

data/spec/db_bulk_insert_spec.rb

@@ -2,15 +2,6 @@ require_relative './spec_helper'
 
 describe "PG::EM::Client::Helper#db_bulk_insert" do
 	let(:mock_conn) { double(PG::EM::Client) }
-	let(:fast_query) do
-		'INSERT INTO "foo" ("bar", "baz") ' +
-		'(SELECT * FROM (VALUES (1, \'x\'), (3, \'y\')) ' +
-		'AS src ("bar", "baz") ' +
-		'WHERE NOT EXISTS ' +
-		'(SELECT 1 FROM "foo" AS dst ' +
-		'WHERE (src."bar"=dst."bar" AND src."baz"=dst."baz")))'
-	end
-
 	def expect_unique_indexes_query(indexes)
 		indexes.map! do |i|
 			idxid = rand(1000000).to_s
@@ -27,12 +18,17 @@ describe "PG::EM::Client::Helper#db_bulk_insert" do
 		expect(dbl = double).to receive(:results).with(2)
 		expect(dbl).to_not receive(:errback)
 
+		query = 'INSERT INTO "foo" ("bar", "baz") ' +
+			'(SELECT * FROM (VALUES (1, \'x\'), (3, \'y\')) ' +
+			'AS src ("bar", "baz") ' +
+			'WHERE NOT EXISTS ' +
+			'(SELECT 1 FROM "foo" AS dst ' +
+			'WHERE (src."bar"=dst."bar" AND src."baz"=dst."baz")))'
+
 		in_em do
 			expect_query("BEGIN")
 			expect_unique_indexes_query([[:bar, :baz]])
-			expect_query(fast_query,
-			             [], 0.001, :succeed, Struct.new(:cmd_tuples).new(2)
-			            )
+			expect_query(query, [], 0.001, :succeed, Struct.new(:cmd_tuples).new(2))
 			expect_query("COMMIT")
 
 			db_bulk_insert(mock_conn, "foo", [:bar, :baz], [[1, "x"], [3, "y"]]) do |count|
@@ -60,4 +56,18 @@ describe "PG::EM::Client::Helper#db_bulk_insert" do
 			end.errback { dbl.errback; EM.stop }
 		end
 	end
+
+	it "does nothing with an empty set of data" do
+		expect(dbl = double).to receive(:results).with(0)
+		expect(dbl).to_not receive(:errback)
+
+		in_em do
+			expect_query("BEGIN")
+			expect_query("COMMIT")
+			db_bulk_insert(mock_conn, "foo", [:bar, :baz], []) do |count|
+				dbl.results(count)
+				EM.stop
+			end.errback { dbl.errback; EM.stop }
+		end
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-pg-client-helper
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-pg-client