em-pg-client-helper 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00dae568e9a3fbcee2f9f9d02f1567c29d3b407d
-  data.tar.gz: b9baf2122794e3f7b9b820f7e452d0538574b64a
+  metadata.gz: 454ef9b154d19499a552861f4a24f395f7ce1b28
+  data.tar.gz: 31b6924e0d271d1e481594d15b9014558f780b40
 SHA512:
-  metadata.gz: f4e0290bba50452b458df0ad181c5b6010c19934a420c132c00625580c7430aa9aea093ef6d9df790104cdad03be27988c1c7603c6f24aaee498482a83992281
-  data.tar.gz: c4dc5ba9b3d490e51dfd4a246f910d042778626db74895468759ddfba58c6b21af7fbe9bb940c2ce3e4628eb19d66a884f965550bf9d8547e2de2734263d989c
+  metadata.gz: 119c158a73d677ac6a17407c0fda64fee465afb4d131a6cede0b0519206336f23cfcc54afdc5ff22020e0ca7138eb655422a45e3fa8fde55bf2f02d6adf4d6de
+  data.tar.gz: e16bd157b126e540e1e0bcf48c63342777fd1c4a9408b28fc51b0f2677e846ce11153d764428b5c46d73d40d6e1c281bde4600bfd0202e87a252bfd1e470b9fe

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

@@ -71,7 +71,7 @@ module PG::EM::Client::Helper
 	#   # ... you don't want to know.
 	#
 	def sequel_sql
-		sqldb = Sequel.connect("mock://postgres")
+		sqldb = Thread.current[:em_pg_client_sequel_db] ||= Sequel.connect("mock://postgres", :keep_reference => false)
 		ret = yield sqldb if block_given?
 		sqls = sqldb.sqls
 
@@ -197,37 +197,37 @@ module PG::EM::Client::Helper
 
 	# Efficiently perform a "bulk" insert of multiple rows.
 	#
-	# When you have a large quantity of data to insert into a table, you don't
-	# want to do it one row at a time -- that's *really* inefficient.  On the
-	# other hand, if you do one giant multi-row insert statement, the insert
-	# will fail if *any* of the rows causes a constraint failure.  What to do?
-	#
-	# Well, here's our answer: try to insert all the records at once.  If that
-	# fails with a constraint violation, then split the set of records in half
-	# and try to bulk insert each of those halves.  Recurse in this fashion until
-	# you only have one record to insert.
-	#
-	# @param db [PG::EM::Client, PG::EM::ConnectionPool] the connection against
-	#   which the insert wil be run.
-	#
-	# @param tbl [#to_sym] the name of the table into which you wish to insert
-	#   your data.
-	#
-	# @param columns [Array<#to_sym>] the columns into which each record of data
-	#   will be inserted.
-	#
-	# @param rows [Array<Array<Object>>] the values to insert.  Each entry in
-	#   the outermost array is a row of data; the elements of each of these inner
-	#   arrays corresponds to the column in the same position in the `columns`
-	#   array.  **NOTE**: we don't do any checking to make sure you're giving
-	#   us the correct list of values for each row.  Thus, if you give us a
-	#   row array that has too few, or too many, entries, the database will puke.
-	#
-	# @return [EM::Deferrable] the deferrable in which the query is being called;
-	#   once the bulk insert completes successfully, the deferrable will succeed
-	#   with the number of rows that were successfully inserted.  If the insert
-	#   could not be completed, the deferrable will fail (`#errback`) with the
-	#   exception.
+	# When you have a large quantity of data to insert into a table, you
+	# don't want to do it one row at a time -- that's *really* inefficient.
+	# On the other hand, if you do one giant multi-row insert statement, the
+	# insert will fail if *any* of the rows causes a constraint failure.
+	# What to do?
+	#
+	# Well, here's our answer: try to insert all the records at once.  If
+	# that fails with a constraint violation, then split the set of records
+	# in half and try to bulk insert each of those halves.  Recurse in this
+	# fashion until you only have one record to insert.
+	#
+	# @param db [PG::EM::Client, PG::EM::ConnectionPool] the connection
+	#   against which the insert wil be run.
+	#
+	# @param tbl [#to_sym] see
+	#   {PG::EM::Client::Helper::Transaction#bulk_insert}.
+	#
+	# @param columns [Array<#to_sym>] see
+	#   {PG::EM::Client::Helper::Transaction#bulk_insert}.
+	#
+	# @param rows [Array<Array<Object>>] see
+	#   {PG::EM::Client::Helper::Transaction#bulk_insert}.
+	#
+	# @return [EM::Deferrable] the deferrable in which the query is being
+	#   called; once the bulk insert completes successfully, the deferrable
+	#   will succeed with the number of rows that were successfully inserted.
+	#   If the insert could not be completed, the deferrable will fail
+	#   (`#errback`) with the exception.
+	#
+	# @note for details on the `tbl`, `columns`, and `rows` parameters, see
+	#   {PG::EM::Client::Helper::Transaction#bulk_insert}.
 	#
 	# @since 2.0.0
 	#

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

@@ -218,18 +218,37 @@ class PG::EM::Client::Helper::Transaction
 	# and try to bulk insert each of those halves.  Recurse in this fashion until
 	# you only have one record to insert.
 	#
-	# @param tbl [#to_sym] the name of the table into which you wish to insert
-	#   your data.
+	# @param tbl [Symbol, String] the name of the table into which you wish to insert
+	#   your data.  If provided as a Symbol, the name will be escaped,
+	#   otherwise it will be inserted into the query as-is (and may `$DEITY`
+	#   have mercy on your soul).
 	#
-	# @param columns [Array<#to_sym>] the columns into which each record of data
-	#   will be inserted.
+	#   If the symbol name has a double underscore (`__`) in it, the part to
+	#   the left of the double-underscore will be taken as a schema name, and
+	#   the part to the right will be taken as the table name.
+	#
+	# @param columns [Array<Symbol, String>] the columns into which each
+	#   record of data will be inserted.  Any element of the array which is a
+	#   symbol will be run through `Sequel::Database#literal` to escape it
+	#   into a "safe" form; elements which are Strings are inserted as-is,
+	#   and you're responsible for any escaping which may be required.
 	#
 	# @param rows [Array<Array<Object>>] the values to insert.  Each entry in
 	#   the outermost array is a row of data; the elements of each of these inner
 	#   arrays corresponds to the column in the same position in the `columns`
-	#   array.  **NOTE**: we don't do any checking to make sure you're giving
-	#   us the correct list of values for each row.  Thus, if you give us a
-	#   row array that has too few, or too many, entries, the database will puke.
+	#   array.
+	#
+	#   Due to the way the bulk insert query is constructed, some of
+	#   PostgreSQL's default casting behaviours don't work so well,
+	#   particularly around dates and times.  If you find that you're getting
+	#   errors of the form `column "foo" is of type <something> but
+	#   expression is of type text`, you'll need to explicitly cast the field
+	#   that is having problems, replacing `value` in the array with
+	#   something like `Sequel.cast(value, "timestamp without time zone")`.
+	#
+	#   **NOTE**: We don't do any checking to make sure you're providing the
+	#   correct number of elements for each row.  Thus, if you give a row
+	#   array that has too few, or too many, entries, the database will puke.
 	#
 	# @yield [Integer] Once the insert has completed, the number of rows that
 	#   were successfully inserted (that may be less than `rows.length` if
@@ -259,7 +278,7 @@ class PG::EM::Client::Helper::Transaction
 				else
 					# Guh hand-hacked SQL is fugly... but what I'm doing is so utterly
 					# niche that Sequel doesn't support it.
-					q_tbl = usdb.literal(tbl.to_sym)
+					q_tbl = usdb.literal(tbl)
 					q_cols = columns.map { |c| usdb.literal(c) }
 
 					# If there are any unique indexes which the set of columns to
@@ -362,7 +381,7 @@ class PG::EM::Client::Helper::Transaction
 	# call methods like `#literal` on, for easy quoting.
 	#
 	def usdb
-		@usdb ||= Sequel.connect("mock://postgres")
+		Thread.current[:em_pg_client_sequel_db] ||= Sequel.connect("mock://postgres", :keep_reference => false)
 	end
 
 	# Find the unique indexes for a table, and yield the columns in each.

metadata

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