pg 1.6.1 → 1.6.3

data/lib/pg.rb

@@ -5,140 +5,161 @@
 # The top-level PG namespace.
 module PG
 
-	# Is this file part of a fat binary gem with bundled libpq?
-	# This path must be enabled by add_dll_directory on Windows.
-	gplat = Gem::Platform.local
-	bundled_libpq_path = Dir[File.expand_path("../ports/#{gplat.cpu}-#{gplat.os}*/lib", __dir__)].first
-	if bundled_libpq_path
-		POSTGRESQL_LIB_PATH = bundled_libpq_path
-	else
-		# Try to load libpq path as found by extconf.rb
-		begin
-			require "pg/postgresql_lib_path"
-		rescue LoadError
-			# rake-compiler doesn't use regular "make install", but uses it's own install tasks.
-			# It therefore doesn't copy pg/postgresql_lib_path.rb in case of "rake compile".
-			POSTGRESQL_LIB_PATH = false
-		end
-	end
-
-	add_dll_path = proc do |path, &block|
-		if RUBY_PLATFORM =~/(mswin|mingw)/i && path
-			BUNDLED_LIBPQ_WITH_UNIXSOCKET = false
-			begin
-				require 'ruby_installer/runtime'
-				RubyInstaller::Runtime.add_dll_directory(path, &block)
-			rescue LoadError
-				old_path = ENV['PATH']
-				ENV['PATH'] = "#{path};#{old_path}"
-				block.call
-				ENV['PATH'] = old_path
-			end
-		else
-			# libpq is found by a relative rpath in the cross compiled extension dll
-			# or by the system library loader
-			block.call
-			BUNDLED_LIBPQ_WITH_UNIXSOCKET = RUBY_PLATFORM=~/linux/i && PG::IS_BINARY_GEM
-		end
-	end
-
-	# Add a load path to the one retrieved from pg_config
-	add_dll_path.call(POSTGRESQL_LIB_PATH) do
-		begin
-			# Try the <major>.<minor> subdirectory for fat binary gems
-			major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
-				raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
-			require "#{major_minor}/pg_ext"
-		rescue LoadError
-			require 'pg_ext'
-		end
-	end
-
-	# 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 )
-		"%s %s" % [ self.name, VERSION ]
-	end
-
-
-	### Convenience alias for PG::Connection.new.
-	def self.connect( *args, &block )
-		Connection.new( *args, &block )
-	end
-
-	if defined?(Ractor.make_shareable)
-		def self.make_shareable(obj)
-			Ractor.make_shareable(obj)
-		end
-	else
-		def self.make_shareable(obj)
-			obj.freeze
-		end
-	end
-
-	module BinaryDecoder
-		%i[ TimestampUtc TimestampUtcToLocal TimestampLocal ].each do |klass|
-			autoload klass, 'pg/binary_decoder/timestamp'
-		end
-		autoload :Date, 'pg/binary_decoder/date'
-	end
-	module BinaryEncoder
-		%i[ TimestampUtc TimestampLocal ].each do |klass|
-			autoload klass, 'pg/binary_encoder/timestamp'
-		end
-	end
-	module TextDecoder
-		%i[ TimestampUtc TimestampUtcToLocal TimestampLocal TimestampWithoutTimeZone TimestampWithTimeZone ].each do |klass|
-			autoload klass, 'pg/text_decoder/timestamp'
-		end
-		autoload :Date, 'pg/text_decoder/date'
-		autoload :Inet, 'pg/text_decoder/inet'
-		autoload :JSON, 'pg/text_decoder/json'
-		autoload :Numeric, 'pg/text_decoder/numeric'
-	end
-	module TextEncoder
-		%i[ TimestampUtc TimestampWithoutTimeZone TimestampWithTimeZone ].each do |klass|
-			autoload klass, 'pg/text_encoder/timestamp'
-		end
-		autoload :Date, 'pg/text_encoder/date'
-		autoload :Inet, 'pg/text_encoder/inet'
-		autoload :JSON, 'pg/text_encoder/json'
-		autoload :Numeric, 'pg/text_encoder/numeric'
-	end
-
-	autoload :BasicTypeMapBasedOnResult, 'pg/basic_type_map_based_on_result'
-	autoload :BasicTypeMapForQueries, 'pg/basic_type_map_for_queries'
-	autoload :BasicTypeMapForResults, 'pg/basic_type_map_for_results'
-	autoload :BasicTypeRegistry, 'pg/basic_type_registry'
-	require 'pg/exceptions'
-	require 'pg/coder'
-	require 'pg/type_map_by_column'
-	require 'pg/connection'
-	require 'pg/cancel_connection'
-	require 'pg/result'
-	require 'pg/tuple'
-	autoload :VERSION, 'pg/version'
-
-
-	# Avoid "uninitialized constant Truffle::WarningOperations" on Truffleruby up to 22.3.1
-	if RUBY_ENGINE=="truffleruby" && !defined?(Truffle::WarningOperations)
-		module TruffleFixWarn
-			def warn(str, category=nil)
-				super(str)
-			end
-		end
-		Warning.extend(TruffleFixWarn)
-	end
-
-	# Ruby-3.4+ prints a warning, if bigdecimal is required but not in the Gemfile.
-	# But it's a false positive, since we enable bigdecimal depending features only if it's available.
-	# And most people don't need these features.
-	def self.require_bigdecimal_without_warning
-		oldverb, $VERBOSE = $VERBOSE, nil
-		require "bigdecimal"
-	ensure
-		$VERBOSE = oldverb
-	end
+  # Is this file part of a fat binary gem with bundled libpq?
+  # This path must be enabled by add_dll_directory on Windows.
+  gplat = Gem::Platform.local
+  bundled_libpq_path = Dir[File.expand_path("../ports/#{gplat.cpu}-#{gplat.os}*/lib", __dir__)].first
+  if bundled_libpq_path
+    POSTGRESQL_LIB_PATH = bundled_libpq_path
+  else
+    # Try to load libpq path as found by extconf.rb
+    begin
+      require "pg/postgresql_lib_path"
+    rescue LoadError
+      # rake-compiler doesn't use regular "make install", but uses it's own install tasks.
+      # It therefore doesn't copy pg/postgresql_lib_path.rb in case of "rake compile".
+      POSTGRESQL_LIB_PATH = false
+    end
+  end
+  POSTGRESQL_LIB_PATH.freeze
+
+  add_dll_path = proc do |path, &block|
+    if RUBY_PLATFORM =~/(mswin|mingw)/i && path
+      BUNDLED_LIBPQ_WITH_UNIXSOCKET = false
+      begin
+        require 'ruby_installer/runtime'
+        RubyInstaller::Runtime.add_dll_directory(path, &block)
+      rescue LoadError
+        old_path = ENV['PATH']
+        ENV['PATH'] = "#{path};#{old_path}"
+        block.call
+        ENV['PATH'] = old_path
+      end
+    else
+      # libpq is found by a relative rpath in the cross compiled extension dll
+      # or by the system library loader
+      block.call
+      BUNDLED_LIBPQ_WITH_UNIXSOCKET = RUBY_PLATFORM=~/linux/i && PG::IS_BINARY_GEM
+    end
+  end
+
+  # Add a load path to the one retrieved from pg_config
+  add_dll_path.call(POSTGRESQL_LIB_PATH) do
+    begin
+      # Try the <major>.<minor> subdirectory for fat binary gems
+      major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
+        raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
+      require "#{major_minor}/pg_ext"
+    rescue LoadError => error1
+      begin
+        require 'pg_ext'
+      rescue LoadError => error2
+        msg = <<~EOT
+          pg's C extension failed to load:
+            #{error1}
+            #{error2}
+        EOT
+        if msg =~ /GLIBC/
+          msg += <<~EOT
+
+            The GLIBC version of this system seems too old. Please use the source version of pg:
+                gem uninstall pg --all
+                gem install pg --platform ruby
+            or in your Gemfile:
+                gem "pg", force_ruby_platform: true
+            See also: https://deveiate.org/code/pg/README_md.html#label-Source+gem
+          EOT
+        end
+        raise error2, msg
+      end
+    end
+  end
+
+  # 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 )
+    "%s %s" % [ self.name, VERSION ]
+  end
+
+
+  ### Convenience alias for PG::Connection.new.
+  def self.connect( *args, &block )
+    Connection.new( *args, &block )
+  end
+
+  if defined?(Ractor.make_shareable)
+    def self.make_shareable(obj)
+      Ractor.make_shareable(obj)
+    end
+  else
+    def self.make_shareable(obj)
+      obj.freeze
+    end
+  end
+
+  module BinaryDecoder
+    %i[ TimestampUtc TimestampUtcToLocal TimestampLocal ].each do |klass|
+      autoload klass, 'pg/binary_decoder/timestamp'
+    end
+    autoload :Date, 'pg/binary_decoder/date'
+  end
+  module BinaryEncoder
+    %i[ TimestampUtc TimestampLocal ].each do |klass|
+      autoload klass, 'pg/binary_encoder/timestamp'
+    end
+  end
+  module TextDecoder
+    %i[ TimestampUtc TimestampUtcToLocal TimestampLocal TimestampWithoutTimeZone TimestampWithTimeZone ].each do |klass|
+      autoload klass, 'pg/text_decoder/timestamp'
+    end
+    autoload :Date, 'pg/text_decoder/date'
+    autoload :Inet, 'pg/text_decoder/inet'
+    autoload :JSON, 'pg/text_decoder/json'
+    autoload :Numeric, 'pg/text_decoder/numeric'
+  end
+  module TextEncoder
+    %i[ TimestampUtc TimestampWithoutTimeZone TimestampWithTimeZone ].each do |klass|
+      autoload klass, 'pg/text_encoder/timestamp'
+    end
+    autoload :Date, 'pg/text_encoder/date'
+    autoload :Inet, 'pg/text_encoder/inet'
+    autoload :JSON, 'pg/text_encoder/json'
+    autoload :Numeric, 'pg/text_encoder/numeric'
+  end
+
+  autoload :BasicTypeMapBasedOnResult, 'pg/basic_type_map_based_on_result'
+  autoload :BasicTypeMapForQueries, 'pg/basic_type_map_for_queries'
+  autoload :BasicTypeMapForResults, 'pg/basic_type_map_for_results'
+  autoload :BasicTypeRegistry, 'pg/basic_type_registry'
+  require 'pg/exceptions'
+  require 'pg/coder'
+  require 'pg/type_map_by_column'
+  require 'pg/connection'
+  require 'pg/cancel_connection'
+  require 'pg/result'
+  require 'pg/tuple'
+  autoload :VERSION, 'pg/version'
+
+
+  # Avoid "uninitialized constant Truffle::WarningOperations" on Truffleruby up to 22.3.1
+  if RUBY_ENGINE=="truffleruby" && !defined?(Truffle::WarningOperations)
+    module TruffleFixWarn
+      def warn(str, category=nil)
+        super(str)
+      end
+    end
+    Warning.extend(TruffleFixWarn)
+  end
+
+  # Ruby-3.4+ prints a warning, if bigdecimal is required but not in the Gemfile.
+  # But it's a false positive, since we enable bigdecimal depending features only if it's available.
+  # And most people don't need these features.
+  def self.require_bigdecimal_without_warning
+    oldverb, $VERBOSE = $VERBOSE, nil
+    require "bigdecimal"
+  ensure
+    $VERBOSE = oldverb
+  end
 
 end # module PG

data/misc/glibc/Dockerfile

@@ -0,0 +1,20 @@
+FROM debian:10.13
+
+WORKDIR /pg
+
+# Debian 10.13 is EOL now:
+RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list
+
+RUN apt-get update && apt-get install ruby git wget gcc make libz-dev libffi-dev libreadline-dev libyaml-dev libssl-dev -y
+
+ENV RBENV_ROOT=/usr/local/rbenv
+
+RUN git clone https://github.com/rbenv/rbenv.git      ${RBENV_ROOT} && \
+    git clone https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build && \
+    $RBENV_ROOT/bin/rbenv init
+
+RUN $RBENV_ROOT/bin/rbenv install 3.3.9 -- --disable-install-doc
+RUN /usr/local/rbenv/versions/3.3.9/bin/gem inst rspec
+
+CMD /usr/local/rbenv/versions/3.3.9/bin/gem inst --local pg-*.gem && \
+    /usr/local/rbenv/versions/3.3.9/bin/rspec glibc_spec.rb

data/misc/glibc/docker-compose.yml

@@ -0,0 +1,9 @@
+services:
+  pg:
+    build:
+      context: .
+      args:
+        - http_proxy
+        - https_proxy
+    volumes:
+      - .:/pg

data/misc/glibc/glibc_spec.rb

@@ -0,0 +1,5 @@
+RSpec.describe "require 'pg'" do
+  it "gives a descriptive error message when GLIBC is too old" do
+    expect { require "pg" }.to raise_error(/GLIBC.*gem install pg --platform ruby/m)
+  end
+end

data/ports/patches/krb5/1.22.1/0002-unknown-command-line-option-on-clang.patch

@@ -0,0 +1,12 @@
+diff --git a/src/lib/krb5/krb/deltat.c b/src/lib/krb5/krb/deltat.c
+index 03145c854..34cdf969e 100644
+--- a/lib/krb5/krb/deltat.c
++++ b/lib/krb5/krb/deltat.c
+@@ -44,7 +44,6 @@
+ #ifdef __GNUC__
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wuninitialized"
+-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+ #endif
+
+ #include "k5-int.h"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.3
 platform: ruby
 authors:
 - Michael Granger
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEBDCCAmygAwIBAgIBAzANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1sYXJz
-  L0RDPWdyZWl6LXJlaW5zZG9yZi9EQz1kZTAeFw0yNDEyMjkxOTU2NTZaFw0yNTEy
-  MjkxOTU2NTZaMCgxJjAkBgNVBAMMHWxhcnMvREM9Z3JlaXotcmVpbnNkb3JmL0RD
+  MIIEBDCCAmygAwIBAgIBBDANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1sYXJz
+  L0RDPWdyZWl6LXJlaW5zZG9yZi9EQz1kZTAeFw0yNTEyMjkyMDMyMzFaFw0yNjEy
+  MjkyMDMyMzFaMCgxJjAkBgNVBAMMHWxhcnMvREM9Z3JlaXotcmVpbnNkb3JmL0RD
   PWRlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAwum6Y1KznfpzXOT/
   mZgJTBbxZuuZF49Fq3K0WA67YBzNlDv95qzSp7V/7Ek3NCcnT7G+2kSuhNo1FhdN
   eSDO/moYebZNAcu3iqLsuzuULXPLuoU0GsMnVMqV9DZPh7cQHE5EBZ7hlzDBK7k/
@@ -23,15 +23,15 @@ cert_chain:
   chQPnWX+N3Gj+jjYxqTFdwT7Mj3pv1VHa+aNUbqSPpvJeDyxRIuo9hvzDaBHb/Cg
   9qRVcm8a96n4t7y2lrX1oookY6bkBaxWOMtWlqIprq8JZXM9AgMBAAGjOTA3MAkG
   A1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQ4h1tIyvdUWtMI739xMzTR
-  7EfMFzANBgkqhkiG9w0BAQsFAAOCAYEAoZZWzNV2XXaoSmvyamSSN+Wt/Ia+DNrU
-  2pc3kMEqykH6l1WiVPszr6HavQ//2I2UcSRSS5AGDdiSXcfyFmHtMBdtJHhTPcn7
-  4DLliB0szpvwG+ltGD8PI8eWkLaTQeFzs+0QCTavgKV+Zw56Q0J5zZvHHUMrLkUD
-  qhwKjdTdkrRTn9Sqi0BrIRRZGTUDdrt8qoWm35aES5arKZzytgrRD/kXfFW2LCg0
-  FzgTKibR4/3g8ph94kQLg/D2SMlVPkQ3ECi036mZxDC2n8V6u3rDkG5923wmrRZB
-  J6cqz475Q8HYORQCB68OPzkWMfC7mBo3vpSsIqRoNs1FE4FJu4FGwZG8fBSrDC4H
-  bZe+GtyS3e2SMjgT65zp35gLO9I7MquzYN9P6V2u1iBpTycchk5z9R1ghxzZSBT8
-  DrkJ9tVlPQtJB0LqT0tvBap4upnwT1xYq721b5dwH6AF4Pi6iz/dc5vnq1/MH8bV
-  8VbbBzzeE7MsvgkP3sHlLmY8PtuyViJ8
+  7EfMFzANBgkqhkiG9w0BAQsFAAOCAYEAUVIier9xybHmXNsj801xD+Q7Jz7wpRsf
+  fMHpV2sAzvYcAa7pn+mbu9nf7RUhe5hiaUv88Usk9nRUYYrjBOO5RuD+wYNowpcE
+  kxUiTAP/fgUBdW6hYUJy57CH3xUD6tj1Cg9hxdKy7jItZXbfhX+qPq2BwGaXz7gn
+  nhrALITRmpuPnlsccM94dgSArCInSo2SEc12h2oB6FAnFG1Lre3dmQamI5q1EKp0
+  Yafb2+cPbFcVYUdE50wf+cdeGDOsCGlAmo2OGqXWxTP2hIfyhsFoamD6UGufLoPG
+  Dh6tAEZIuEvLjq93qoNceUQn+xxiiIszjY5mkTu9rVY+/gh5PJzu9IHvyIqBpb2o
+  fdWDISWK+KSLCrqkFtKoliLDTZau73GcYCVOkjca+3cxqABKZ+M8r42Sq8JPxPiv
+  KyLQBzqPeLN9qRDD1bEFHIcgwdY/zQTs4mWRBSmBWa7w+k8nP8aSV1dN/fvhYwY3
+  HCQwtPaMYOznIOcc8shL4zLJpcl8uCqE
   -----END CERTIFICATE-----
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
@@ -176,6 +176,9 @@ files:
 - lib/pg/tuple.rb
 - lib/pg/type_map_by_column.rb
 - lib/pg/version.rb
+- misc/glibc/Dockerfile
+- misc/glibc/docker-compose.yml
+- misc/glibc/glibc_spec.rb
 - misc/openssl-pg-segfault.rb
 - misc/postgres/History.txt
 - misc/postgres/Manifest.txt
@@ -191,10 +194,11 @@ files:
 - misc/yugabyte/docker-compose.yml
 - misc/yugabyte/pg-test.rb
 - pg.gemspec
-- ports/patches/krb5/1.21.3/0001-Allow-static-linking-krb5-library.patch
-- ports/patches/openssl/3.5.1/0001-aarch64-mingw.patch
-- ports/patches/postgresql/17.5/0001-Use-workaround-of-__builtin_setjmp-only-on-MINGW-on-.patch
-- ports/patches/postgresql/17.5/0001-libpq-Process-buffered-SSL-read-bytes-to-support-rec.patch
+- ports/patches/krb5/1.22.1/0001-Allow-static-linking-krb5-library.patch
+- ports/patches/krb5/1.22.1/0002-unknown-command-line-option-on-clang.patch
+- ports/patches/openssl/3.5.2/0001-aarch64-mingw.patch
+- ports/patches/postgresql/18.1/0001-Use-workaround-of-__builtin_setjmp-only-on-MINGW-on-.patch
+- ports/patches/postgresql/18.1/0001-libpq-Process-buffered-SSL-read-bytes-to-support-rec.patch
 - rakelib/pg_gem_helper.rb
 - rakelib/task_extension.rb
 - sample/array_insert.rb
@@ -243,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Pg is the Ruby interface to the PostgreSQL RDBMS
 test_files: []