pg 1.3.0-x86-mingw32 → 1.3.2-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4732ecf33214fa123ade5c9cd465e9511371ce366abb09ac93cd64a64276576
-  data.tar.gz: dbdf516938ec978e241d8053c34b2a903be00d67f6a476a1b513177b23d8876c
+  metadata.gz: 3b2d524251b3c5c9dc707282858b33d6a58af1343e665022b215a44779416ff9
+  data.tar.gz: 76ca33a83b6eb375fa8929c5043685db3a67cbdf90bb944e70be2b9a81e56fe6
 SHA512:
-  metadata.gz: b59d82e69760a9e89179a15fc2b9d07d008748f2a5363746acfa0c60d451b167653b52b00718b4d5112ffc1631124184473024b8d72df29a63b863010635496d
-  data.tar.gz: 8b8c84d4b286ad0afec7ec3edca5b469f6bb6110c822094ae32636c052dd27e081e003fd2bbbaff6af6d3a9ac2dd168beb599dd4a18848d2ec435b198a49f240
+  metadata.gz: 85993b177e54786984bbe8ab450dabb187526511ecc9667514692bbb037f562a31b3366931aa5a9c6f46630975c380de23a0413214c46dd19e16d4ff21cd326a
+  data.tar.gz: 1ec89aad7c3823abf649501dd9ad66748bdff8826a04163d5ce9c74b60999be747acdd60aa9a334cdad20f484d210544594f2ed4dcfee549d754a5bd4b622ba0

data/.appveyor.yml

@@ -29,7 +29,7 @@ environment:
   matrix:
     - ruby_version: "head"
       RUBYDOWNLOAD: x86
-      PGVERSION: 10.16-1-windows
+      PGVERSION: 10.20-1-windows
       PGVER: 10
     - ruby_version: "25"
       PGVERSION: 9.3.25-1-windows

data/.github/workflows/binary-gems.yml

@@ -45,10 +45,10 @@ jobs:
         include:
           - ruby: "3.1"
             platform: "x64-mingw-ucrt"
-            PGVERSION: 14.0-1-windows-x64
+            PGVERSION: 14.2-1-windows-x64
           - ruby: "2.5"
             platform: "x64-mingw32"
-            PGVERSION: 10.16-1-windows
+            PGVERSION: 10.20-1-windows
 
     runs-on: windows-latest
     env:

data/.github/workflows/source-gem.yml

@@ -31,7 +31,7 @@ jobs:
         include:
           - os: windows
             ruby: "head"
-            PGVERSION: 14.1-1-windows-x64
+            PGVERSION: 14.2-1-windows-x64
             PGVER: "14"
           - os: windows
             ruby: "2.5"
@@ -54,7 +54,7 @@ jobs:
             PGVER: "14"
           - os: macos
             ruby: "head"
-            PGVERSION: 14.1-1-osx
+            PGVERSION: 14.2-1-osx
             PGVER: "14"
 
     runs-on: ${{ matrix.os }}-latest

data/History.rdoc

@@ -1,3 +1,32 @@
+== v1.3.2 [2022-02-14] Lars Kanis <lars@greiz-reinsdorf.de>
+
+Bugfixes:
+
+- Cancel only active query after failing transaction. #430
+  This avoids an incompatibility with pgbouncer since pg-1.3.0.
+- Fix String objects with non-applied encoding when using COPY or record decoders. #427
+- Update Windows fat binary gem to PostgreSQL-14.2.
+
+Enhancements:
+
+- Improve extconf.rb checks to reduces the number of compiler calls.
+- Add a check for PGRES_PIPELINE_SYNC, to make sure the library version and the header files are PostgreSQL-14+. #429
+
+
+== v1.3.1 [2022-02-01] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+
+- Fix wrong handling of socket writability on Windows introduced in #417.
+  This caused starvation in conn.put_copy_data.
+- Fix error in PG.version_string(true). #419
+- Fix a regression in pg 1.3.0 where Ruby 2.x busy-looping any fractional seconds for every wait. #420
+
+Enhancements:
+
+- Raise an error when conn.copy_data is used in nonblocking mode.
+
+
 == v1.3.0 [2022-01-20] Michael Granger <ged@FaerieMUD.org>
 
 Install Enhancements:
@@ -65,6 +94,7 @@ Deprecated:
 Removed:
 - Remove support of ruby-2.2, 2.3 and 2.4. Minimum is ruby-2.5 now.
 - Remove support for PostgreSQL-9.2. Minimum is PostgreSQL-9.3 now.
+- Remove constant PG::REVISION, which was broken since pg-1.1.4.
 
 Repository:
 - Replace Hoe by Bundler for gem packaging

data/Rakefile.cross

@@ -30,7 +30,7 @@ class CrossLibrary < OpenStruct
 
 		# Cross-compilation constants
 		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.1.1m'
-		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '14.1'
+		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '14.2'
 
 		# Check if symlinks work in the current working directory.
 		# This fails, if rake-compiler-dock is running on a Windows box.

data/certs/larskanis-2022.pem

@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIETTCCArWgAwIBAgIBATANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1sYXJz
+L0RDPWdyZWl6LXJlaW5zZG9yZi9EQz1kZTAeFw0yMjAyMTQxMzMwNTZaFw0yMzAy
+MTQxMzMwNTZaMCgxJjAkBgNVBAMMHWxhcnMvREM9Z3JlaXotcmVpbnNkb3JmL0RD
+PWRlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAwum6Y1KznfpzXOT/
+mZgJTBbxZuuZF49Fq3K0WA67YBzNlDv95qzSp7V/7Ek3NCcnT7G+2kSuhNo1FhdN
+eSDO/moYebZNAcu3iqLsuzuULXPLuoU0GsMnVMqV9DZPh7cQHE5EBZ7hlzDBK7k/
+8nBMvR0mHo77kIkapHc26UzVq/G0nKLfDsIHXVylto3PjzOumjG6GhmFN4r3cP6e
+SDfl1FSeRYVpt4kmQULz/zdSaOH3AjAq7PM2Z91iGwQvoUXMANH2v89OWjQO/NHe
+JMNDFsmHK/6Ji4Kk48Z3TyscHQnipAID5GhS1oD21/WePdj7GhmbF5gBzkV5uepd
+eJQPgWGwrQW/Z2oPjRuJrRofzWfrMWqbOahj9uth6WSxhNexUtbjk6P8emmXOJi5
+chQPnWX+N3Gj+jjYxqTFdwT7Mj3pv1VHa+aNUbqSPpvJeDyxRIuo9hvzDaBHb/Cg
+9qRVcm8a96n4t7y2lrX1oookY6bkBaxWOMtWlqIprq8JZXM9AgMBAAGjgYEwfzAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUOIdbSMr3VFrTCO9/cTM0
+0exHzBcwIgYDVR0RBBswGYEXbGFyc0BncmVpei1yZWluc2RvcmYuZGUwIgYDVR0S
+BBswGYEXbGFyc0BncmVpei1yZWluc2RvcmYuZGUwDQYJKoZIhvcNAQELBQADggGB
+AFWP7F/y3Oq3NgrqUOnjKOeDaBa7AqNhHS+PZg+C90lnJzMgOs4KKgZYxqSQVSab
+SCEmzIO/StkXY4NpJ4fYLrHemf/fJy1wPyu+fNdp5SEEUwEo+2toRFlzTe4u4LdS
+QC636nPPTMt8H3xz2wf/lUIUeo2Qc95Qt2BQM465ibbG9kmA3c7Sopx6yOabYOAl
+KPRbOSEPiWYcF9Suuz8Gdf8jxEtPlnZiwRvnYJ+IHMq3XQCJWPpMzdDMbtlgHbXE
+vq1zOTLMSYAS0UB3uionR4yo1hLz60odwkCm7qf0o2Ci/5OjtB0a89VuyqRU2vUJ
+QH95WBjDJ6lCCW7J0mrMPnJQSUFTmufsU6jOChvPaCeAzW1YwrsP/YKnvwueG7ip
+VOdW6RitjtFxhS7evRL0201+KUvLz12zZWWjOcujlQs64QprxOtiv/MiisKb1Ng+
+oL1mUdzB8KrZL4/WbG5YNX6UTtJbIOu9qEFbBAy4/jtIkJX+dlNoFwd4GXQW1YNO
+nA==
+-----END CERTIFICATE-----

data/ext/extconf.rb

@@ -138,15 +138,18 @@ if /mingw/ =~ RUBY_PLATFORM && RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc/
 	end
 end
 
-have_func 'PQconninfo' or
+have_func 'PQconninfo', 'libpq-fe.h' or
 	abort "Your PostgreSQL is too old. Either install an older version " +
 	      "of this gem or upgrade your database to at least PostgreSQL-9.3."
 # optional headers/functions
-have_func 'PQsslAttribute' # since PostgreSQL-9.5
-have_func 'PQresultVerboseErrorMessage' # since PostgreSQL-9.6
-have_func 'PQencryptPasswordConn' # since PostgreSQL-10
-have_func 'PQresultMemorySize' # since PostgreSQL-12
-have_func 'PQenterPipelineMode' # since PostgreSQL-14
+have_func 'PQsslAttribute', 'libpq-fe.h' # since PostgreSQL-9.5
+have_func 'PQresultVerboseErrorMessage', 'libpq-fe.h' # since PostgreSQL-9.6
+have_func 'PQencryptPasswordConn', 'libpq-fe.h' # since PostgreSQL-10
+have_func 'PQresultMemorySize', 'libpq-fe.h' # since PostgreSQL-12
+have_func 'PQenterPipelineMode', 'libpq-fe.h' do |src| # since PostgreSQL-14
+  # Ensure header files fit as well
+  src + " int con(){ return PGRES_PIPELINE_SYNC; }"
+end
 have_func 'timegm'
 have_func 'rb_gc_adjust_memory_usage' # since ruby-2.4
 have_func 'rb_gc_mark_movable' # since ruby-2.7

data/ext/pg_connection.c

@@ -2241,19 +2241,15 @@ pg_rb_thread_io_wait(VALUE io, VALUE events, VALUE timeout) {
 	GetOpenFile((io), fptr);
 	if( !NIL_P(timeout) ){
 		ptimeout.tv_sec = (time_t)(NUM2DBL(timeout));
-		ptimeout.tv_usec = (time_t)(NUM2DBL(timeout) - (double)ptimeout.tv_sec);
+		ptimeout.tv_usec = (time_t)((NUM2DBL(timeout) - (double)ptimeout.tv_sec) * 1e6);
 
 		gettimeofday(&currtime, NULL);
 		timeradd(&currtime, &ptimeout, &aborttime);
 	}
 
-	if(rb_events & PG_RUBY_IO_READABLE) {
-		w32_events |= FD_READ | FD_ACCEPT | FD_CLOSE;
-	} else if(rb_events & PG_RUBY_IO_WRITABLE) {
-		w32_events |= FD_WRITE | FD_CONNECT;
-	} else if(rb_events & PG_RUBY_IO_PRIORITY) {
-		w32_events |= FD_OOB;
-	}
+	if(rb_events & PG_RUBY_IO_READABLE) w32_events |= FD_READ | FD_ACCEPT | FD_CLOSE;
+	if(rb_events & PG_RUBY_IO_WRITABLE) w32_events |= FD_WRITE | FD_CONNECT;
+	if(rb_events & PG_RUBY_IO_PRIORITY) w32_events |= FD_OOB;
 
 	for(;;) {
 		if ( WSAEventSelect(_get_osfhandle(fptr->fd), hEvent, w32_events) == SOCKET_ERROR ) {
@@ -2336,7 +2332,7 @@ pg_rb_io_wait(VALUE io, VALUE events, VALUE timeout) {
 	GetOpenFile((io), fptr);
 	if( !NIL_P(timeout) ){
 		waittime.tv_sec = (time_t)(NUM2DBL(timeout));
-		waittime.tv_usec = (time_t)(NUM2DBL(timeout) - (double)waittime.tv_sec);
+		waittime.tv_usec = (time_t)((NUM2DBL(timeout) - (double)waittime.tv_sec) * 1e6);
 	}
 	res = rb_wait_for_single_fd(fptr->fd, NUM2UINT(events), NIL_P(timeout) ? NULL : &waittime);
 

data/ext/pg_type_map_all_strings.c

@@ -76,6 +76,7 @@ pg_tmas_fit_to_copy_get( VALUE self )
 static VALUE
 pg_tmas_typecast_copy_get( t_typemap *p_typemap, VALUE field_str, int fieldno, int format, int enc_idx )
 {
+	rb_str_modify(field_str);
 	if( format == 0 ){
 		PG_ENCODING_SET_NOCHECK( field_str, enc_idx );
 	} else {

data/ext/pg_type_map_by_column.c

@@ -150,10 +150,12 @@ pg_tmbc_typecast_copy_get( t_typemap *p_typemap, VALUE field_str, int fieldno, i
 
 	/* Is it a pure String conversion? Then we can directly send field_str to the user. */
 	if( dec_func == pg_text_dec_string ){
+		rb_str_modify(field_str);
 		PG_ENCODING_SET_NOCHECK( field_str, enc_idx );
 		return field_str;
 	}
 	if( dec_func == pg_bin_dec_bytea ){
+		rb_str_modify(field_str);
 		PG_ENCODING_SET_NOCHECK( field_str, rb_ascii8bit_encindex() );
 		return field_str;
 	}

data/lib/pg/connection.rb

@@ -241,6 +241,7 @@ class PG::Connection
 	#   ["more", "data", "to", "copy"]
 
 	def copy_data( sql, coder=nil )
+		raise PG::NotInBlockingMode, "copy_data can not be used in nonblocking mode" if nonblocking?
 		res = exec( sql )
 
 		case res.result_status
@@ -312,7 +313,7 @@ class PG::Connection
 		exec "BEGIN"
 		res = yield(self)
 	rescue Exception
-		cancel if transaction_status != PG::PQTRANS_IDLE
+		cancel if transaction_status == PG::PQTRANS_ACTIVE
 		block
 		exec "ROLLBACK"
 		raise
@@ -385,7 +386,7 @@ class PG::Connection
 	# If the optional code block is given, it will be passed <i>result</i> as an argument,
 	# and the PG::Result object will  automatically be cleared when the block terminates.
 	# In this instance, <code>conn.exec</code> returns the value of the block.
-	def get_result(*args)
+	def get_result
 		block
 		sync_get_result
 	end

data/lib/pg/version.rb

@@ -1,4 +1,4 @@
 module PG
 	# Library version
-	VERSION = '1.3.0'
+	VERSION = '1.3.2'
 end

data/lib/pg.rb

@@ -53,12 +53,14 @@ module PG
 
 	class NotAllCopyDataRetrieved < PG::Error
 	end
+	class NotInBlockingMode < PG::Error
+	end
 
-	### Get the PG library version. If +include_buildnum+ is +true+, include the build ID.
-	def self::version_string( include_buildnum=false )
-		vstring = "%s %s" % [ self.name, VERSION ]
-		vstring << " (build %s)" % [ REVISION[/: ([[:xdigit:]]+)/, 1] || '0' ] if include_buildnum
-		return vstring
+	# Get the PG library version.
+	#
+	# +include_buildnum+ is no longer used and any value passed will be ignored.
+	def self::version_string( include_buildnum=nil )
+		return "%s %s" % [ self.name, VERSION ]
 	end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: x86-mingw32
 authors:
 - Michael Granger
@@ -11,30 +11,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIID+DCCAmCgAwIBAgIBBDANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
-  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0yMjAxMDcyMzU4MTRaFw0yMzAxMDcyMzU4
-  MTRaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
-  hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAvyVhkRzvlEs0fe7145BYLfN6njX9ih5H
-  L60U0p0euIurpv84op9CNKF9tx+1WKwyQvQP7qFGuZxkSUuWcP/sFhDXL1lWUuIl
-  M4uHbGCRmOshDrF4dgnBeOvkHr1fIhPlJm5FO+Vew8tSQmlDsosxLUx+VB7DrVFO
-  5PU2AEbf04GGSrmqADGWXeaslaoRdb1fu/0M5qfPTRn5V39sWD9umuDAF9qqil/x
-  Sl6phTvgBrG8GExHbNZpLARd3xrBYLEFsX7RvBn2UPfgsrtvpdXjsHGfpT3IPN+B
-  vQ66lts4alKC69TE5cuKasWBm+16A4aEe3XdZBRNmtOu/g81gvwA7fkJHKllJuaI
-  dXzdHqq+zbGZVSQ7pRYHYomD0IiDe1DbIouFnPWmagaBnGHwXkDT2bKKP+s2v21m
-  ozilJg4aar2okb/RA6VS87o+d7g6LpDDMMQjH4G9OPnJENLdhu8KnPw/ivSVvQw7
-  N2I4L/ZOIe2DIVuYH7aLHfjZDQv/mNgpAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYD
-  VR0PBAQDAgSwMB0GA1UdDgQWBBRyjf55EbrHagiRLqt5YAd3yb8k4DANBgkqhkiG
-  9w0BAQsFAAOCAYEASrm1AbEoxACZ9WXJH3R5axV3U0CA4xaETlL2YT+2nOfVBMQ9
-  0ZlkPx6j4ghKJgAIi1TMfDM2JyPJsppQh8tiNccDjWc62UZRY/dq26cMqf/lcI+a
-  6YBuEYvzZfearwVs8tHnXtwYV3WSCoCOQaB+nq2lA1O+nkKNl41WOsVbNama5jx3
-  8cQtVSEEmZy6jIDJ8c5TmBJ7BQUDEUEWA/A3V42Xyctoj7DvUXWE0lP+X6ypAVSr
-  lFh3TS64D7NTvxkmg7natUoCvobl6kGl4yMaqE4YRTlfuzhpf91TSOntClqrAOsS
-  K1s56WndQj3IoBocdY9mQhDZLtLHofSkymoP8btBlj5SsN24TiF0VMSZlctSCYZg
-  GKyHim/MMlIfGOWsgfioq5jzwmql7W4CDubbb8Lkg70v+hN2E/MnNVAcNE3gyaGc
-  P5YP5BAbNW+gvd3QHRiWTTuhgHrdDnGdXg93N2M5KHn1ug8BtPLQwlcFwEpKnlLn
-  btEP+7EplFuoiMfd
+  MIIETTCCArWgAwIBAgIBATANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1sYXJz
+  L0RDPWdyZWl6LXJlaW5zZG9yZi9EQz1kZTAeFw0yMjAyMTQxMzMwNTZaFw0yMzAy
+  MTQxMzMwNTZaMCgxJjAkBgNVBAMMHWxhcnMvREM9Z3JlaXotcmVpbnNkb3JmL0RD
+  PWRlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAwum6Y1KznfpzXOT/
+  mZgJTBbxZuuZF49Fq3K0WA67YBzNlDv95qzSp7V/7Ek3NCcnT7G+2kSuhNo1FhdN
+  eSDO/moYebZNAcu3iqLsuzuULXPLuoU0GsMnVMqV9DZPh7cQHE5EBZ7hlzDBK7k/
+  8nBMvR0mHo77kIkapHc26UzVq/G0nKLfDsIHXVylto3PjzOumjG6GhmFN4r3cP6e
+  SDfl1FSeRYVpt4kmQULz/zdSaOH3AjAq7PM2Z91iGwQvoUXMANH2v89OWjQO/NHe
+  JMNDFsmHK/6Ji4Kk48Z3TyscHQnipAID5GhS1oD21/WePdj7GhmbF5gBzkV5uepd
+  eJQPgWGwrQW/Z2oPjRuJrRofzWfrMWqbOahj9uth6WSxhNexUtbjk6P8emmXOJi5
+  chQPnWX+N3Gj+jjYxqTFdwT7Mj3pv1VHa+aNUbqSPpvJeDyxRIuo9hvzDaBHb/Cg
+  9qRVcm8a96n4t7y2lrX1oookY6bkBaxWOMtWlqIprq8JZXM9AgMBAAGjgYEwfzAJ
+  BgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUOIdbSMr3VFrTCO9/cTM0
+  0exHzBcwIgYDVR0RBBswGYEXbGFyc0BncmVpei1yZWluc2RvcmYuZGUwIgYDVR0S
+  BBswGYEXbGFyc0BncmVpei1yZWluc2RvcmYuZGUwDQYJKoZIhvcNAQELBQADggGB
+  AFWP7F/y3Oq3NgrqUOnjKOeDaBa7AqNhHS+PZg+C90lnJzMgOs4KKgZYxqSQVSab
+  SCEmzIO/StkXY4NpJ4fYLrHemf/fJy1wPyu+fNdp5SEEUwEo+2toRFlzTe4u4LdS
+  QC636nPPTMt8H3xz2wf/lUIUeo2Qc95Qt2BQM465ibbG9kmA3c7Sopx6yOabYOAl
+  KPRbOSEPiWYcF9Suuz8Gdf8jxEtPlnZiwRvnYJ+IHMq3XQCJWPpMzdDMbtlgHbXE
+  vq1zOTLMSYAS0UB3uionR4yo1hLz60odwkCm7qf0o2Ci/5OjtB0a89VuyqRU2vUJ
+  QH95WBjDJ6lCCW7J0mrMPnJQSUFTmufsU6jOChvPaCeAzW1YwrsP/YKnvwueG7ip
+  VOdW6RitjtFxhS7evRL0201+KUvLz12zZWWjOcujlQs64QprxOtiv/MiisKb1Ng+
+  oL1mUdzB8KrZL4/WbG5YNX6UTtJbIOu9qEFbBAy4/jtIkJX+dlNoFwd4GXQW1YNO
+  nA==
   -----END CERTIFICATE-----
-date: 2022-01-23 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies: []
 description: Pg is the Ruby interface to the PostgreSQL RDBMS. It works with PostgreSQL
   9.3 and later.
@@ -71,6 +73,7 @@ files:
 - Rakefile
 - Rakefile.cross
 - certs/ged.pem
+- certs/larskanis-2022.pem
 - ext/errorcodes.def
 - ext/errorcodes.rb
 - ext/errorcodes.txt