em-pg-client-helper 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54910da339d3b8be844ddddb6b373dbec7ca04b5
-  data.tar.gz: efb8474eb8d13f6020116b4923dfea5f4793059c
+  metadata.gz: f805f782a78651db5a93dbcba7516e3e1b0abe4f
+  data.tar.gz: 72132229cb096de84eb4c823e2d49b1d5691cc40
 SHA512:
-  metadata.gz: c39f44d77f9238e333d22fd9ed3a6970f46c45a783d3414f733baa61a912479524032c962fdacd0e085e56f38c0615d3dba3e30fcbe66198168ab657a1c113ba
-  data.tar.gz: 012405e9483038a357080c994b20ce3ce0793379e557b28f04331a34d70a07a2871afeadc98f1c6303d5d3397073fb61db0ff7b4a4c8826f8fff2cb7aee82055
+  metadata.gz: 3a8390c30559d4986d5a9704ea4c118b5948cb87811c6208e6399bd874ee2a5979c1b3690b78684be69c3f6e77b28fa93f06c2bb6e9de6cffe52b0756b1b0bd5
+  data.tar.gz: b6efc7278ca5a06be0930cfa7a0a5125e5345f6215d27fa724e2d59fd2897700cf0e2bd679fd1d8eebc7fb30287722b5f285179941996361354757747df1de9a

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

@@ -238,32 +238,32 @@ class PG::EM::Client::Helper::Transaction
 	# @since 2.0.0
 	#
 	def bulk_insert(tbl, columns, rows, &blk)
-		db = Sequel.connect("mock://postgres")
-
-		# Guh hand-hacked SQL is fugly... but what I'm doing is so utterly
-		# niche that Sequel doesn't support it.
-		q_tbl = db.literal(tbl.to_sym)
-		q_cols = columns.map { |c| db.literal(c.to_sym) }
+		if rows.length > 1000
+			bulk_insert(tbl, columns, rows[0..999]) do |count1|
+				bulk_insert(tbl, columns, rows[1000..-1]) do |count2|
+					blk.call(count1 + count2)
+				end
+			end
+		else
+			# Guh hand-hacked SQL is fugly... but what I'm doing is so utterly
+			# niche that Sequel doesn't support it.
+			q_tbl = mock_db.literal(tbl.to_sym)
+			q_cols = columns.map { |c| mock_db.literal(c.to_sym) }
 
-		subselect = "SELECT 1 FROM #{q_tbl} AS dst WHERE " +
-		            q_cols.map { |c| "src.#{c}=dst.#{c}" }.join(" AND ")
+			subselect = "SELECT 1 FROM #{q_tbl} AS dst WHERE " +
+							q_cols.map { |c| "src.#{c}=dst.#{c}" }.join(" AND ")
 
-		total_rows_inserted = 0
-		DeferrableGroup.new.tap do |dg|
-			rows.each_slice(100) do |slice|
-				vals = slice.map do |row|
-				         "(" + row.map { |v| db.literal(v) }.join(", ") + ")"
-				       end.join(", ")
-				q = "INSERT INTO #{q_tbl} (SELECT * FROM (VALUES #{vals}) " +
-				    "AS src (#{q_cols.join(", ")}) WHERE NOT EXISTS (#{subselect}))"
-				df = exec(q) do |res|
-					total_rows_inserted += res.cmd_tuples
+			vals = rows.map do |row|
+				"(" + row.map { |v| mock_db.literal(v) }.join(", ") + ")"
+			end.join(", ")
+			q = "INSERT INTO #{q_tbl} (SELECT * FROM (VALUES #{vals}) " +
+				 "AS src (#{q_cols.join(", ")}) WHERE NOT EXISTS (#{subselect}))"
+			exec(q).tap do |df|
+				df.callback do |res|
+					df.succeed(res.cmd_tuples)
 				end
-				dg.add(df)
+				df.callback(&blk) if blk
 			end
-			dg.callback { dg.succeed(total_rows_inserted) }
-			dg.callback(&blk) if blk
-			dg.close
 		end
 	end
 
@@ -315,4 +315,8 @@ class PG::EM::Client::Helper::Transaction
 	def trace_query(q, v=nil)
 		$stderr.puts "#{@conn.inspect}: #{q} #{v.inspect}" if ENV['EM_PG_TXN_TRACE']
 	end
+
+	def mock_db
+		@mock_db ||= Sequel.connect("mock://postgres")
+	end
 end

metadata

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