pg 1.3.2-x64-mingw-ucrt → 1.3.3-x64-mingw-ucrt

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20ccac8e62fcc42cdbc3f690bb543269d3e6e067293909eed8899f51fc7afe58
-  data.tar.gz: b813a5c565bafdfdc439e15ac519bd546cd9cf9e4466060d5455d7c381c11a9c
+  metadata.gz: a586adae8f2aad6f8adcfe66e6b67d4aec1bcb790cde7a922ef813471d38a461
+  data.tar.gz: cd028787accfeb7db805a02e55fd395562bf8ef15a0e11ab418d293dd69134b8
 SHA512:
-  metadata.gz: 0f14ec9f08bed5d6c3831696f950f6b9a6c70f4060cc05bfcc0382d5dc32a0558b5e16014ae806c75577586f54dc2145d15b515eb6b467485a0dd79e726859b0
-  data.tar.gz: ab87fb314c48f5f36491d60ae1f8f8e152d883d9c772e9d1de38473e34a35e41d58eca5e38e087270e5e481532bbc63c376c62f2193845e54eb2d8432999b0b8
+  metadata.gz: eb5efe02893299d3af8a33604afe6c29638f482eb447bfb71654df3fab3fad749761a6545124ff4ad5d08f967489a9a5a3e56add3763a128ce31abc895d72796
+  data.tar.gz: 4d0eb4dac631e59254eb3f6743e3907cb0ff030a4651952fb2d35933634082e33e9e0405d20cc299b4db7aa464e15a8617016c69f33f0956edb733f38cb7be9a

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

@@ -56,7 +56,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby
-        uses: MSP-Greg/ruby-setup-ruby@win-ucrt-1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
 

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

@@ -35,8 +35,8 @@ jobs:
             PGVER: "14"
           - os: windows
             ruby: "2.5"
-            PGVERSION: 9.3.25-1-windows-x64
-            PGVER: "9.3"
+            PGVERSION: 9.4.26-1-windows-x64
+            PGVER: "9.4"
           - os: ubuntu
             ruby: "head"
             PGVER: "14"
@@ -65,7 +65,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby
-        uses: MSP-Greg/ruby-setup-ruby@win-ucrt-1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
 
@@ -116,7 +116,6 @@ jobs:
       - run: gem install --local *.gem --verbose
 
       - name: Run specs
-        continue-on-error: ${{ matrix.ruby == 'truffleruby-head' }}
         env:
           PG_DEBUG: 0
         run: ruby -rpg -S rspec spec/**/*_spec.rb -cfdoc

data/History.rdoc

@@ -1,3 +1,11 @@
+== v1.3.3 [2022-02-22] Lars Kanis <lars@greiz-reinsdorf.de>
+
+Bugfixes:
+
+- Fix omission of the third digit of IPv4 addresses in connection URI. #435
+- Fix wrong permission of certs/larskanis-2022.pem in the pg-1.3.2.gem. #432
+
+
 == v1.3.2 [2022-02-14] Lars Kanis <lars@greiz-reinsdorf.de>
 
 Bugfixes:
@@ -55,7 +63,7 @@ API Enhancements:
   - Run Connection.ping in a second thread.
   - 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.
+  - Avoid PG.connect blocking while address resolution by automatically providing the +hostaddr+ parameter and resolving in Ruby instead of libpq.
   - 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

data/Rakefile.cross

@@ -7,6 +7,7 @@ require 'rake/clean'
 require 'rake/extensiontask'
 require 'rake/extensioncompiler'
 require 'ostruct'
+require_relative 'rakelib/task_extension'
 
 MISCDIR = BASEDIR + 'misc'
 
@@ -20,6 +21,7 @@ end
 
 class CrossLibrary < OpenStruct
 	include Rake::DSL
+	prepend TaskExtension
 
 	def initialize(for_platform, openssl_config, toolchain)
 		super()

data/ext/extconf.rb

@@ -37,12 +37,12 @@ else
 
 	if pgconfig && pgconfig != 'ignore'
 		$stderr.puts "Using config values from %s" % [ pgconfig ]
-		incdir = `"#{pgconfig}" --includedir`.chomp
-		libdir = `"#{pgconfig}" --libdir`.chomp
+		incdir = IO.popen([pgconfig, "--includedir"], &:read).chomp
+		libdir = IO.popen([pgconfig, "--libdir"], &:read).chomp
 		dir_config 'pg', incdir, libdir
 
 		# Windows traditionally stores DLLs beside executables, not in libdir
-		dlldir = RUBY_PLATFORM=~/mingw|mswin/ ? `"#{pgconfig}" --bindir`.chomp : libdir
+		dlldir = RUBY_PLATFORM=~/mingw|mswin/ ? IO.popen([pgconfig, "--bindir"], &:read).chomp : libdir
 
 	elsif checking_for "libpq per pkg-config" do
 			_cflags, ldflags, _libs = pkg_config("libpq")
@@ -87,7 +87,7 @@ begin
 		have_library( 'libpq', 'PQconnectdb', ['libpq-fe.h'] ) ||
 		have_library( 'ms/libpq', 'PQconnectdb', ['libpq-fe.h'] )
 
-rescue SystemExit => err
+rescue SystemExit
 	install_text = case RUBY_PLATFORM
 	when /linux/
 	<<-EOT

data/lib/pg/connection.rb

@@ -105,7 +105,7 @@ class PG::Connection
 				end
 				# extract "host1,host2" from "host1:5432,host2:5432"
 				iopts[:host] = uri_match['hostports'].split(',', -1).map do |hostport|
-					hostmatch = HOST_AND_PORT.match(hostport)
+					hostmatch = /\A#{HOST_AND_PORT}\z/.match(hostport)
 					hostmatch['IPv6address'] || hostmatch['IPv4address'] || hostmatch['reg-name']&.gsub(/%(\h\h)/){ $1.hex.chr }
 				end.join(',')
 				oopts = {}

data/lib/pg/version.rb

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

data/rakelib/task_extension.rb

@@ -0,0 +1,46 @@
+# This source code is borrowed from:
+# https://github.com/oneclick/rubyinstaller2/blob/b3dcbf69f131e44c78ea3a1c5e0041c223f266ce/lib/ruby_installer/build/utils.rb#L104-L144
+
+module TaskExtension
+  # Extend rake's file task to be defined only once and to check the expected file is indeed generated
+  #
+  # The same as #task, but for #file.
+  # In addition this file task raises an error, if the file that is expected to be generated is not present after the block was executed.
+  def file(name, *args, &block)
+    task_once(name, block) do
+      super(name, *args) do |ta|
+        block.call(ta).tap do
+          raise "file #{ta.name} is missing after task executed" unless File.exist?(ta.name)
+        end
+      end
+    end
+  end
+
+  # Extend rake's task definition to be defined only once, even if called several times
+  #
+  # This allows to define common tasks next to specific tasks.
+  # It is expected that any variation of the task's block is reflected in the task name or namespace.
+  # If the task name is identical, the task block is executed only once, even if the file task definition is executed twice.
+  def task(name, *args, &block)
+    task_once(name, block) do
+      super
+    end
+  end
+
+  private def task_once(name, block)
+    name = name.keys.first if name.is_a?(Hash)
+    if block &&
+        Rake::Task.task_defined?(name) &&
+        Rake::Task[name].instance_variable_get('@task_block_location') == block.source_location
+      # task is already defined for this target and the same block
+      # So skip double definition of the same action
+      Rake::Task[name]
+    elsif block
+      yield.tap do
+        Rake::Task[name].instance_variable_set('@task_block_location', block.source_location)
+      end
+    else
+      yield
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: x64-mingw-ucrt
 authors:
 - Michael Granger
@@ -36,7 +36,7 @@ cert_chain:
   oL1mUdzB8KrZL4/WbG5YNX6UTtJbIOu9qEFbBAy4/jtIkJX+dlNoFwd4GXQW1YNO
   nA==
   -----END CERTIFICATE-----
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies: []
 description: Pg is the Ruby interface to the PostgreSQL RDBMS. It works with PostgreSQL
   9.3 and later.
@@ -135,6 +135,7 @@ files:
 - misc/ruby-pg/Rakefile
 - misc/ruby-pg/lib/ruby/pg.rb
 - pg.gemspec
+- rakelib/task_extension.rb
 - sample/array_insert.rb
 - sample/async_api.rb
 - sample/async_copyto.rb