pg 1.3.0.rc1-x86-mingw32 → 1.3.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49763e0db47d44589822e73cdae4872837d89e73e3ba4b1389141f9dc9807525
-  data.tar.gz: be1a3c7c5a97dad436143c098476a74582b3645c1b74396d9e4b30b4117d2cf6
+  metadata.gz: f4732ecf33214fa123ade5c9cd465e9511371ce366abb09ac93cd64a64276576
+  data.tar.gz: dbdf516938ec978e241d8053c34b2a903be00d67f6a476a1b513177b23d8876c
 SHA512:
-  metadata.gz: 9303ff9fa7e83b79076286e1f1ea26dd91378259c4f4ab158945090cc195316d3e4eabbd922121809c5dc209361c5ff7bbf05d49d9aadc81720210530696e0b6
-  data.tar.gz: 1621d3a45be7ea0c1ae941a7017587ab1804be4b2661832040536a03480d858933171008677376edc5cc278483c0b961902d19342c24314cfea9e360ce4a3946
+  metadata.gz: b59d82e69760a9e89179a15fc2b9d07d008748f2a5363746acfa0c60d451b167653b52b00718b4d5112ffc1631124184473024b8d72df29a63b863010635496d
+  data.tar.gz: 8b8c84d4b286ad0afec7ec3edca5b469f6bb6110c822094ae32636c052dd27e081e003fd2bbbaff6af6d3a9ac2dd168beb599dd4a18848d2ec435b198a49f240

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

@@ -1,4 +1,4 @@
-name: Build and test binary gems
+name: Binary gems
 
 on: [push, pull_request]
 
@@ -6,12 +6,18 @@ jobs:
   job_build_x64:
     name: build
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: "x64-mingw-ucrt"
+          - platform: "x64-mingw32"
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.1"
       - run: bundle install
 
       - name: Create a dummy cert to satisfy the build
@@ -22,7 +28,7 @@ jobs:
           cp gem-public_cert.pem ~/.gem/gem-public_cert.pem
 
       - name: Build binary gem
-        run: bundle exec rake gem:windows:x64-mingw32
+        run: bundle exec rake gem:windows:${{ matrix.platform }}
 
       - name: Upload binary gem
         uses: actions/upload-artifact@v2
@@ -37,21 +43,20 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: "3.0"
+          - ruby: "3.1"
+            platform: "x64-mingw-ucrt"
             PGVERSION: 14.0-1-windows-x64
-            PGVER: "14"
           - ruby: "2.5"
+            platform: "x64-mingw32"
             PGVERSION: 10.16-1-windows
-            PGVER: "10"
 
     runs-on: windows-latest
     env:
       PGVERSION: ${{ matrix.PGVERSION }}
-      PGVER: ${{ matrix.PGVER }}
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
+        uses: MSP-Greg/ruby-setup-ruby@win-ucrt-1
         with:
           ruby-version: ${{ matrix.ruby }}
 
@@ -74,7 +79,8 @@ jobs:
           echo "PGUSER=$env:USERNAME"  | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           echo "PGPASSWORD="  | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
+      - run: gem update --system
       - run: bundle install
-      - run: gem install --local *.gem --verbose
+      - run: gem install --local pg-*${{ matrix.platform }}.gem --verbose
       - name: Run specs
         run: ruby -rpg -S rspec spec/**/*_spec.rb

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

@@ -1,4 +1,4 @@
-name: Build and test source gem
+name: Source gem
 
 on: [push, pull_request]
 
@@ -11,7 +11,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.1"
 
       - name: Build source gem
         run: gem build pg.gemspec
@@ -31,7 +31,7 @@ jobs:
         include:
           - os: windows
             ruby: "head"
-            PGVERSION: 14.0-1-windows-x64
+            PGVERSION: 14.1-1-windows-x64
             PGVER: "14"
           - os: windows
             ruby: "2.5"
@@ -41,7 +41,7 @@ jobs:
             ruby: "head"
             PGVER: "14"
           - os: ubuntu
-            ruby: "3.0"
+            ruby: "3.1"
             PGVER: "12"
           - os: ubuntu
             ruby: "2.5"
@@ -54,8 +54,8 @@ jobs:
             PGVER: "14"
           - os: macos
             ruby: "head"
-            PGVERSION: 13.2-1-osx
-            PGVER: "13"
+            PGVERSION: 14.1-1-osx
+            PGVER: "14"
 
     runs-on: ${{ matrix.os }}-latest
     env:
@@ -65,7 +65,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby
-        uses: MSP-Greg/ruby-setup-ruby@win-ucrt
+        uses: MSP-Greg/ruby-setup-ruby@win-ucrt-1
         with:
           ruby-version: ${{ matrix.ruby }}
 
@@ -110,12 +110,13 @@ jobs:
           unzip postgresql-$PGVERSION-binaries.zip && \
           echo `pwd`/pgsql/bin >> $GITHUB_PATH
 
+      - run: gem update --system
       - run: bundle install
 
       - run: gem install --local *.gem --verbose
 
       - name: Run specs
-        continue-on-error: ${{ matrix.ruby == 'truffleruby' }}
+        continue-on-error: ${{ matrix.ruby == 'truffleruby-head' }}
         env:
           PG_DEBUG: 0
         run: ruby -rpg -S rspec spec/**/*_spec.rb -cfdoc

data/Gemfile

@@ -9,6 +9,6 @@ group :development, :test do
   gem "bundler", ">= 1.16", "< 3.0"
   gem "rake-compiler", "~> 1.0"
   gem "rake-compiler-dock", "~> 1.0"
-  gem "rdoc", "~> 5.1"
+  gem "rdoc", "~> 6.4"
   gem "rspec", "~> 3.5"
 end

data/History.rdoc

@@ -1,10 +1,10 @@
-== v1.3.0 [YYY-MM-DD] Michael Granger <ged@FaerieMUD.org>
+== v1.3.0 [2022-01-20] Michael Granger <ged@FaerieMUD.org>
 
 Install Enhancements:
 - Print some install help if libpq wasn't found. #396
   This should help to pick the necessary package without googling.
-- Update Windows fat binary gem to OpenSSL-1.1.1l and PostgreSQL-14.0.
-- Add a binary gem for Ruby 3.0.
+- Update Windows fat binary gem to OpenSSL-1.1.1m and PostgreSQL-14.1.
+- Add binary Windows gems for Ruby 3.0 and 3.1.
 - Make the library path of libpq available in ruby as PG::POSTGRESQL_LIB_PATH and add it to the search paths on Windows similar to +rpath+ on Unix systems. #373
 - Fall back to pkg-config if pg_config is not found. #380
 - Add option to extconf.rb to disable nogvl-wrapping of libpq functions.
@@ -27,6 +27,8 @@ API Enhancements:
   - Make discard_results scheduler friendly
   - Do all socket waiting through the conn.socket_io object.
   - Avoid PG.connect blocking while address resolution by automatically providing the +hostaddr+ parameter.
+  - On Windows Fiber.scheduler support requires Ruby-3.1+.
+    It is also only partly usable since may ruby IO methods are not yet scheduler aware on Windows.
 - Add support for pipeline mode of PostgreSQL-14. #401
 - Allow specification of multiple hosts in PostgreSQL URI. #387
 - Add new method conn.backend_key - used to implement our own cancel method.
@@ -43,16 +45,19 @@ Other Enhancements:
 - Support ObjectSpace.memsize_of(obj) on all classes implemented in C. #393
 - Make all PG objects implemented in C memory moveable and therefore GC.compact friendly. #349
 - Update errorcodes and error classes to PostgreSQL-14.0.
+- Add PG::CONNECTION_* constants for conn.status of newer PostgreSQL versions.
 - Add better support for logical replication. #339
 - Change conn.socket_io to read+write mode and to a BasicSocket object instead of IO.
-- Use rb_io_wait() and the conn.socket_io object if available and remove Windows specific wait functions.
-  Fall back to rb_wait_for_single_fd() on ruby < 3.0, which works on Windows as well.
+- Use rb_io_wait() and the conn.socket_io object if available for better compatibility to Fiber.scheduler .
+  Fall back to rb_wait_for_single_fd() on ruby < 3.0.
+- On Windows use a specialized wait function as a workaround for very poor performance of rb_io_wait(). #416
 
 Bugfixes:
 - Release GVL while calling PQping which is a blocking method, but it didn't release GVL so far.
 - Fix Connection#transaction to no longer block on interrupts, for instance when pressing Ctrl-C and cancel a running query. #390
 - Avoid casting of OIDs to fix compat with Redshift database. #369
 - Call conn.block before each conn.get_result call to avoid possible blocking in case of a slow network and multiple query results.
+- Sporadic Errno::ENOTSOCK when using conn.socket_io on Windows #398
 
 Deprecated:
 - Add deprecation warning to PG::BasicTypeRegistry.register_type and siblings.

data/Rakefile.cross

@@ -250,6 +250,7 @@ class CrossLibrary < OpenStruct
 end
 
 CrossLibraries = [
+	['x64-mingw-ucrt', 'mingw64', 'x86_64-w64-mingw32'],
 	['x86-mingw32', 'mingw', 'i686-w64-mingw32'],
 	['x64-mingw32', 'mingw64', 'x86_64-w64-mingw32'],
 ].map do |platform, openssl_config, toolchain|
@@ -291,7 +292,7 @@ CrossLibraries.each do |xlib|
 		RakeCompilerDock.sh <<-EOT, platform: platform
 			(cp build/gem/gem-*.pem ~/.gem/ || true) &&
 			bundle install --local &&
-			rake native:#{platform} pkg/#{$gem_spec.full_name}-#{platform}.gem MAKE="make -j`nproc`" RUBY_CC_VERSION=3.0.0:2.7.0:2.6.0:2.5.0
+			rake native:#{platform} pkg/#{$gem_spec.full_name}-#{platform}.gem MAKE="make -j`nproc`" RUBY_CC_VERSION=3.1.0:3.0.0:2.7.0:2.6.0:2.5.0
 		EOT
 	end
 	desc "Build the windows binary gems"

data/certs/ged.pem

@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIID+DCCAmCgAwIBAgIBAzANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
-REM9RmFlcmllTVVEL0RDPW9yZzAeFw0yMDEyMjQyMDU1MjlaFw0yMTEyMjQyMDU1
-MjlaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
+MIID+DCCAmCgAwIBAgIBBDANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
+REM9RmFlcmllTVVEL0RDPW9yZzAeFw0yMjAxMDcyMzU4MTRaFw0yMzAxMDcyMzU4
+MTRaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
 hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAvyVhkRzvlEs0fe7145BYLfN6njX9ih5H
 L60U0p0euIurpv84op9CNKF9tx+1WKwyQvQP7qFGuZxkSUuWcP/sFhDXL1lWUuIl
 M4uHbGCRmOshDrF4dgnBeOvkHr1fIhPlJm5FO+Vew8tSQmlDsosxLUx+VB7DrVFO
@@ -12,13 +12,13 @@ dXzdHqq+zbGZVSQ7pRYHYomD0IiDe1DbIouFnPWmagaBnGHwXkDT2bKKP+s2v21m
 ozilJg4aar2okb/RA6VS87o+d7g6LpDDMMQjH4G9OPnJENLdhu8KnPw/ivSVvQw7
 N2I4L/ZOIe2DIVuYH7aLHfjZDQv/mNgpAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYD
 VR0PBAQDAgSwMB0GA1UdDgQWBBRyjf55EbrHagiRLqt5YAd3yb8k4DANBgkqhkiG
-9w0BAQsFAAOCAYEAMYegZanJi8zq7QKPT7wqXefX4C88I5JWeBHR3PvvWK0CwyMV
-peyiu5I13w/lYX+HUZjE4qsSpJMJFXWl4WZCOo+AMprOcf0PxfuJpxCej5D4tavf
-vRfhahSw7XJrcZih/3J+/UgoH7R05MJ+8LTcy3HGrB3a0vTafjm8OY7Xpa0LJDoN
-JDqxK321VIHyTibbKeA1hWSE6ljlQDvFbTqiCj3Ulp1jTv3TOlvRl8fqcfhxUJI0
-+5Q82jJODjEN+GaWs0V+NlrbU94cXwS2PH5dXogftB5YYA5Ex8A0ikZ73xns4Hdo
-XxdLdd92F5ovxA23j/rKe/IDwqr6FpDkU3nPXH/Qp0TVGv9zZnVJc/Z6ChkuWj8z
-pW7JAyyiiHZgKKDReDrA2LA7Zs3o/7KA6UtUH0FHf8LYhcK+pfHk6RtjRe65ffw+
-MCh97sQ/Z/MOusb5+QddBmB+k8EicXyGNl4b5L4XpL7fIQu+Y96TB3JEJlShxFD9
-k9FjI4d9EP54gS/4
+9w0BAQsFAAOCAYEASrm1AbEoxACZ9WXJH3R5axV3U0CA4xaETlL2YT+2nOfVBMQ9
+0ZlkPx6j4ghKJgAIi1TMfDM2JyPJsppQh8tiNccDjWc62UZRY/dq26cMqf/lcI+a
+6YBuEYvzZfearwVs8tHnXtwYV3WSCoCOQaB+nq2lA1O+nkKNl41WOsVbNama5jx3
+8cQtVSEEmZy6jIDJ8c5TmBJ7BQUDEUEWA/A3V42Xyctoj7DvUXWE0lP+X6ypAVSr
+lFh3TS64D7NTvxkmg7natUoCvobl6kGl4yMaqE4YRTlfuzhpf91TSOntClqrAOsS
+K1s56WndQj3IoBocdY9mQhDZLtLHofSkymoP8btBlj5SsN24TiF0VMSZlctSCYZg
+GKyHim/MMlIfGOWsgfioq5jzwmql7W4CDubbb8Lkg70v+hN2E/MnNVAcNE3gyaGc
+P5YP5BAbNW+gvd3QHRiWTTuhgHrdDnGdXg93N2M5KHn1ug8BtPLQwlcFwEpKnlLn
+btEP+7EplFuoiMfd
 -----END CERTIFICATE-----

data/ext/extconf.rb

@@ -155,6 +155,7 @@ have_func 'rb_io_wait' # since ruby-3.0
 # unistd.h confilicts with ruby/win32.h when cross compiling for win32 and ruby 1.9.1
 have_header 'unistd.h'
 have_header 'inttypes.h'
+have_header('ruby/fiber/scheduler.h') if RUBY_PLATFORM=~/mingw|mswin/
 
 checking_for "C99 variable length arrays" do
 	$defs.push( "-DHAVE_VARIABLE_LENGTH_ARRAYS" ) if try_compile('void test_vla(int l){ int vla[l]; }')

data/ext/pg.c

@@ -47,6 +47,7 @@
  */
 
 #include "pg.h"
+#include "pg_config.h"
 
 int pg_skip_deprecation_warning;
 VALUE rb_mPG;
@@ -415,14 +416,34 @@ Init_pg_ext()
 	rb_define_const(rb_mPGconstants, "CONNECTION_MADE", INT2FIX(CONNECTION_MADE));
 	/* Waiting for a response from the server. */
 	rb_define_const(rb_mPGconstants, "CONNECTION_AWAITING_RESPONSE", INT2FIX(CONNECTION_AWAITING_RESPONSE));
-	/* Received authentication; waiting for backend start-up to finish. */
+	/* Received authentication; waiting for backend startup. */
 	rb_define_const(rb_mPGconstants, "CONNECTION_AUTH_OK", INT2FIX(CONNECTION_AUTH_OK));
+	/* This state is no longer used. */
+	rb_define_const(rb_mPGconstants, "CONNECTION_SETENV", INT2FIX(CONNECTION_SETENV));
 	/* Negotiating SSL encryption. */
 	rb_define_const(rb_mPGconstants, "CONNECTION_SSL_STARTUP", INT2FIX(CONNECTION_SSL_STARTUP));
-	/* Negotiating environment-driven parameter settings. */
-	rb_define_const(rb_mPGconstants, "CONNECTION_SETENV", INT2FIX(CONNECTION_SETENV));
 	/* Internal state - PG.connect() needed. */
 	rb_define_const(rb_mPGconstants, "CONNECTION_NEEDED", INT2FIX(CONNECTION_NEEDED));
+#if PG_MAJORVERSION_NUM >= 10
+	/* Checking if session is read-write. Available since PostgreSQL-10. */
+	rb_define_const(rb_mPGconstants, "CONNECTION_CHECK_WRITABLE", INT2FIX(CONNECTION_CHECK_WRITABLE));
+#endif
+#if PG_MAJORVERSION_NUM >= 10
+	/* Consuming any extra messages. Available since PostgreSQL-10. */
+	rb_define_const(rb_mPGconstants, "CONNECTION_CONSUME", INT2FIX(CONNECTION_CONSUME));
+#endif
+#if PG_MAJORVERSION_NUM >= 12
+	/* Negotiating GSSAPI. Available since PostgreSQL-12. */
+	rb_define_const(rb_mPGconstants, "CONNECTION_GSS_STARTUP", INT2FIX(CONNECTION_GSS_STARTUP));
+#endif
+#if PG_MAJORVERSION_NUM >= 13
+	/* Checking target server properties. Available since PostgreSQL-13. */
+	rb_define_const(rb_mPGconstants, "CONNECTION_CHECK_TARGET", INT2FIX(CONNECTION_CHECK_TARGET));
+#endif
+#if PG_MAJORVERSION_NUM >= 14
+	/* Checking if server is in standby mode. Available since PostgreSQL-14. */
+	rb_define_const(rb_mPGconstants, "CONNECTION_CHECK_STANDBY", INT2FIX(CONNECTION_CHECK_STANDBY));
+#endif
 
 	/******     PG::Connection CLASS CONSTANTS: Nonblocking connection polling status     ******/