pg 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1618ae02150b1bed4ee83669aff1133e74d07f0a9ccdf2e3cee3a6a57ba738f
-  data.tar.gz: 5c70825cf567d526e5e11679f88806e3c1723acb301bc356992df417575b8d3a
+  metadata.gz: a07adb58b0060e91909dcffc56c527bc539ab4ccd8a208644386f9c1010a1ba1
+  data.tar.gz: f32870256474e8495feb8a8c17d9313c25e48d5d79e743d6dff99ba063aa6057
 SHA512:
-  metadata.gz: f55fc75632dc1c60b1620f83cadcc961cf601f50bb30a878159ddbca10eaaccf0ee9ff2028fbb2e74f979d570c1b809d07224fc4bd664e15ecf5fb05ec8398e2
-  data.tar.gz: d92e3c96466f13a8679c9ac68d14a01c1fd2133efc637d7e0dd4c0f3649ffbc769a1f100b8bbe705b5a4d9cdb5d8921b1a6b19ad34eee6d7a73eff31de9480c7
+  metadata.gz: d93ea73305d727ccd5d0a672b339038c19af2e7884fec45d145a5496dd310c3a161e77bc429f2c8ab93906c41b124e4eb33772bdfbb5205f3950c919f98b6876
+  data.tar.gz: 26213376d23c07bcb28192a8ec9815679f2b6409b353750b560af1c9d7d592c3ec136f16872d2e3cce5762f4a51954c643f8560923a5381da107171c9312a7fd

data/History.rdoc

@@ -1,3 +1,17 @@
+== v1.2.2 [2020-01-06] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+
+- Add a binary gem for Ruby 2.7.
+
+
+== v1.2.1 [2020-01-02] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+
+- Added internal API for sequel_pg compatibility.
+
+
 == v1.2.0 [2019-12-20] Michael Granger <ged@FaerieMUD.org>
 
 Repository:

data/README.rdoc

@@ -118,7 +118,7 @@ PG::Coder objects can be used to set up a PG::TypeMap or alternatively
 to convert single values to/from their string representation.
 
 The following PostgreSQL column types are supported by ruby-pg (TE = Text Encoder, TD = Text Decoder, BE = Binary Encoder, BD = Binary Decoder):
-* Integer: {TE}[rdoc-ref:PG::TextEncoder::Integer], {TD}[rdoc-ref:PG::TextDecoder::Integer], {BD}[rdoc-ref:PG::BinaryDecoder::Integer]
+* Integer: {TE}[rdoc-ref:PG::TextEncoder::Integer], {TD}[rdoc-ref:PG::TextDecoder::Integer], {BD}[rdoc-ref:PG::BinaryDecoder::Integer] 💡 No links? Switch to {here}[https://deveiate.org/code/pg/README_rdoc.html#label-Type+Casts] 💡
   * BE: {Int2}[rdoc-ref:PG::BinaryEncoder::Int2], {Int4}[rdoc-ref:PG::BinaryEncoder::Int4], {Int8}[rdoc-ref:PG::BinaryEncoder::Int8]
 * Float: {TE}[rdoc-ref:PG::TextEncoder::Float], {TD}[rdoc-ref:PG::TextDecoder::Float], {BD}[rdoc-ref:PG::BinaryDecoder::Float]
 * Numeric: {TE}[rdoc-ref:PG::TextEncoder::Numeric], {TD}[rdoc-ref:PG::TextDecoder::Numeric]

data/Rakefile

@@ -35,6 +35,8 @@ TEST_DIRECTORY = BASEDIR + "tmp_test_specs"
 
 CLOBBER.include( TEST_DIRECTORY.to_s )
 CLEAN.include( PKGDIR.to_s, TMPDIR.to_s )
+CLEAN.include "lib/*/libpq.dll"
+CLEAN.include "lib/pg_ext.*"
 
 # Set up Hoe plugins
 Hoe.plugin :mercurial
@@ -61,7 +63,7 @@ $hoespec = Hoe.spec 'pg' do
 	self.developer 'Lars Kanis', 'lars@greiz-reinsdorf.de'
 
 	self.dependency 'rake-compiler', '~> 1.0', :developer
-	self.dependency 'rake-compiler-dock', ['~> 0.7.0'], :developer
+	self.dependency 'rake-compiler-dock', ['~> 1.0'], :developer
 	self.dependency 'hoe-deveiate', '~> 0.9', :developer
 	self.dependency 'hoe-bundler', '~> 1.0', :developer
 	self.dependency 'rspec', '~> 3.5', :developer
@@ -129,7 +131,7 @@ Rake::ExtensionTask.new do |ext|
 
 	# Add libpq.dll to windows binary gemspec
 	ext.cross_compiling do |spec|
-		spec.files << "lib/libpq.dll"
+		spec.files << "lib/#{spec.platform}/libpq.dll"
 	end
 end
 

data/Rakefile.cross

@@ -45,6 +45,8 @@ class CrossLibrary < OpenStruct
 		end
 		self.static_sourcesdir          = compile_home + 'sources'
 		self.static_builddir            = compile_home + 'builds' + for_platform
+		CLOBBER.include( static_sourcesdir )
+		CLEAN.include( static_builddir )
 
 		# Static OpenSSL build vars
 		self.static_openssl_builddir    = static_builddir + "openssl-#{openssl_version}"
@@ -141,9 +143,9 @@ class CrossLibrary < OpenStruct
 		end
 
 		desc "compile static openssl libraries"
-		task :openssl_libs => [ libssl, libcrypto ]
+		task "openssl_libs:#{for_platform}" => [ libssl, libcrypto ]
 
-		task :compile_static_openssl => openssl_makefile do |t|
+		task "compile_static_openssl:#{for_platform}" => openssl_makefile do |t|
 			chdir( static_openssl_builddir ) do
 				cmd = cmd_prelude.dup
 				cmd << 'make' << "-j#{NUM_CPUS}" << 'build_libs'
@@ -153,12 +155,12 @@ class CrossLibrary < OpenStruct
 		end
 
 		desc "compile static #{libssl}"
-		file libssl => :compile_static_openssl do |t|
+		file libssl => "compile_static_openssl:#{for_platform}" do |t|
 			rm t.name.gsub(/\.a$/, ".dll.a")
 		end
 
 		desc "compile static #{libcrypto}"
-		file libcrypto => :compile_static_openssl do |t|
+		file libcrypto => "compile_static_openssl:#{for_platform}" do |t|
 			rm t.name.gsub(/\.a$/, ".dll.a")
 		end
 
@@ -189,7 +191,7 @@ class CrossLibrary < OpenStruct
 		end
 
 		# generate the makefile in a clean build location
-		file postgresql_global_makefile => [ static_postgresql_builddir, :openssl_libs ] do |t|
+		file postgresql_global_makefile => [ static_postgresql_builddir, "openssl_libs:#{for_platform}" ] do |t|
 			options = [
 				"--target=#{host_platform}",
 				"--host=#{host_platform}",
@@ -231,10 +233,10 @@ class CrossLibrary < OpenStruct
 
 
 		#desc 'compile libpg.a'
-		task :libpq => postgresql_lib
+		task "native:#{for_platform}" => postgresql_lib
 
 		# copy libpq.dll to lib dir
-		dest_libpq = "lib/#{postgresql_lib.basename}"
+		dest_libpq = "lib/#{for_platform}/#{postgresql_lib.basename}"
 		directory File.dirname(dest_libpq)
 		file dest_libpq => [postgresql_lib, File.dirname(dest_libpq)] do
 			cp postgresql_lib, dest_libpq
@@ -248,20 +250,15 @@ class CrossLibrary < OpenStruct
 	end
 end
 
-if File.exist?(File.expand_path("~/.rake-compiler/config.yml"))
-	CrossLibraries = [
-		['i386-mingw32', 'mingw', 'i686-w64-mingw32'],
-		['x64-mingw32', 'mingw64', 'x86_64-w64-mingw32'],
-	].map do |platform, openssl_config, toolchain|
-		CrossLibrary.new platform, openssl_config, toolchain
-	end
-else
-	$stderr.puts "Cross-compilation disabled -- rake-compiler not properly installed"
-	CrossLibraries = []
+CrossLibraries = [
+	['x86-mingw32', 'mingw', 'i686-w64-mingw32'],
+	['x64-mingw32', 'mingw64', 'x86_64-w64-mingw32'],
+].map do |platform, openssl_config, toolchain|
+	CrossLibrary.new platform, openssl_config, toolchain
 end
 
 desc 'cross compile pg for win32'
-task :cross => [ :mingw32, :libpq ]
+task :cross => [ :mingw32 ]
 
 task :mingw32 do
 	# Use Rake::ExtensionCompiler helpers to find the proper host
@@ -272,30 +269,32 @@ task :mingw32 do
 	end
 end
 
-# To reduce the gem file size strip mingw32 dlls before packaging
-ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
-  task "tmp/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pg_ext.so" do |t|
-    sh "i686-w64-mingw32-strip -S tmp/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pg_ext.so"
-  end
-
-  task "tmp/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pg_ext.so" do |t|
-    sh "x86_64-w64-mingw32-strip -S tmp/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pg_ext.so"
-  end
+task 'gem:windows:prepare' do
+	require 'io/console'
+	require 'rake_compiler_dock'
+
+	# Copy gem signing key and certs to be accessable from the docker container
+	mkdir_p 'build/gem'
+	sh "cp ~/.gem/gem-*.pem build/gem/ || true"
+	sh "bundle package"
+	begin
+		OpenSSL::PKey.read(File.read(File.expand_path("~/.gem/gem-private_key.pem")), ENV["GEM_PRIVATE_KEY_PASSPHRASE"] || "")
+	rescue OpenSSL::PKey::PKeyError
+		ENV["GEM_PRIVATE_KEY_PASSPHRASE"] = STDIN.getpass("Enter passphrase of gem signature key: ")
+		retry
+	end
 end
 
-desc "Build the windows binary gems"
-task 'gem:windows' => ['ChangeLog'] do
-  require 'rake_compiler_dock'
-
-  # Copy gem signing key and certs to be accessable from the docker container
-  mkdir_p 'build/gem'
-  sh "cp ~/.gem/gem-*.pem build/gem/ || true"
-  sh "bundle package"
-
-  RakeCompilerDock.sh <<-EOT
-    mkdir ~/.gem &&
-    (cp build/gem/gem-*.pem ~/.gem/ || true) &&
-    gem install -Ng &&
-    rake cross native gem MAKE="make -j`nproc`"
-  EOT
+CrossLibraries.each do |xlib|
+	platform = xlib.for_platform
+	desc "Build fat binary gem for platform #{platform}"
+	task "gem:windows:#{platform}" => ['ChangeLog', 'gem:windows:prepare', xlib.openssl_tarball, xlib.postgresql_tarball] do
+		RakeCompilerDock.sh <<-EOT, platform: platform
+			(cp build/gem/gem-*.pem ~/.gem/ || true) &&
+			bundle install --local &&
+			rake native:#{platform} pkg/#{$hoespec.spec.full_name}-#{platform}.gem MAKE="make -j`nproc`"
+		EOT
+	end
+	desc "Build the windows binary gems"
+	multitask 'gem:windows' => "gem:windows:#{platform}"
 end

data/ext/pg_result.c

@@ -167,6 +167,11 @@ static const rb_data_type_t pgresult_type = {
 #endif
 };
 
+/* Needed by sequel_pg gem, do not delete */
+int pg_get_result_enc_idx(VALUE self)
+{
+	return pgresult_get_this(self)->enc_idx;
+}
 
 /*
  * Global functions
@@ -333,8 +338,7 @@ pg_result_check( VALUE self )
  * Special care must be taken when PG::Tuple objects are used.
  * In this case #clear must not be called unless all PG::Tuple objects of this result are fully materialized.
  *
- * If PG::Result#autoclear? is true then the result is marked as cleared
- * and the underlying C struct will be cleared automatically by libpq.
+ * If PG::Result#autoclear? is +true+ then the result is only marked as cleared but clearing the underlying C struct will happen when the callback returns.
  *
  */
 VALUE
@@ -362,8 +366,10 @@ pgresult_cleared_p( VALUE self )
  * call-seq:
  *    res.autoclear?      -> boolean
  *
- * Returns +true+ if the underlying C struct will be cleared automatically by libpq.
- * Elsewise the result is cleared by PG::Result#clear or by the GC when it's no longer in use.
+ * Returns +true+ if the underlying C struct will be cleared at the end of a callback.
+ * This applies only to Result objects received by the block to PG::Cinnection#set_notice_receiver .
+ *
+ * All other Result objects are automatically cleared by the GC when the object is no longer in use or manually by PG::Result#clear .
  *
  */
 VALUE

data/lib/pg.rb

@@ -22,7 +22,8 @@ rescue LoadError
 		end
 
 		# Temporary add this directory for DLL search, so that libpq.dll can be found.
-		add_dll_path.call(__dir__) do
+		# mingw32-platform strings differ (RUBY_PLATFORM=i386-mingw32 vs. x86-mingw32 for rubygems)
+		add_dll_path.call(File.join(__dir__, RUBY_PLATFORM.gsub(/^i386-/, "x86-"))) do
 			require "#{major_minor}/pg_ext"
 		end
 	else
@@ -36,7 +37,7 @@ end
 module PG
 
 	# Library version
-	VERSION = '1.2.0'
+	VERSION = '1.2.2'
 
 	# VCS revision
 	REVISION = %q$Revision: 6f611e78845a $

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Michael Granger
@@ -11,9 +11,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIENDCCApygAwIBAgIBATANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
-  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0xODExMjAxODI5NTlaFw0xOTExMjAxODI5
-  NTlaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
+  MIID+DCCAmCgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
+  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0xOTEyMjQyMDE5NTFaFw0yMDEyMjMyMDE5
+  NTFaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
   hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAvyVhkRzvlEs0fe7145BYLfN6njX9ih5H
   L60U0p0euIurpv84op9CNKF9tx+1WKwyQvQP7qFGuZxkSUuWcP/sFhDXL1lWUuIl
   M4uHbGCRmOshDrF4dgnBeOvkHr1fIhPlJm5FO+Vew8tSQmlDsosxLUx+VB7DrVFO
@@ -22,20 +22,19 @@ cert_chain:
   vQ66lts4alKC69TE5cuKasWBm+16A4aEe3XdZBRNmtOu/g81gvwA7fkJHKllJuaI
   dXzdHqq+zbGZVSQ7pRYHYomD0IiDe1DbIouFnPWmagaBnGHwXkDT2bKKP+s2v21m
   ozilJg4aar2okb/RA6VS87o+d7g6LpDDMMQjH4G9OPnJENLdhu8KnPw/ivSVvQw7
-  N2I4L/ZOIe2DIVuYH7aLHfjZDQv/mNgpAgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYD
-  VR0PBAQDAgSwMB0GA1UdDgQWBBRyjf55EbrHagiRLqt5YAd3yb8k4DAcBgNVHREE
-  FTATgRFnZWRARmFlcmllTVVELm9yZzAcBgNVHRIEFTATgRFnZWRARmFlcmllTVVE
-  Lm9yZzANBgkqhkiG9w0BAQsFAAOCAYEAP9Ffkvg4e8CjIWi8SykQ8oJSS8jbmbgF
-  abke3vXWLG6V9kFiObuJd5wZRBluJANu7bEtjgc3fFaGVP2XxVdCpVjNbmMDg4Qp
-  ovvczP53X6pQP2RSZgxF6Lblvy8y11RziUTVRG/Z2aJHsElo6gI7vQznE/OSDrhC
-  gEhr8uaIUt7D+HZWRbU0+MkKPpL5uMqaFuJbqXEvSwPTuUuYkDfNfsjQO7ruWBac
-  bxHCrvpZ6Tijc0nrlyXi6gPOCLeaqhau2xFnlvKgELwsGYSoKBJyDwqtQ5kwrOlU
-  tkSyLrfZ+RZcH535Hyvif7ZxB0v5OxXXoec+N2vrUsEUMRDL9dg4/WFdN8hIOixF
-  3IPKpZ1ho0Ya5q7yhygtBK9/NBFHw+nbJjcltfPDBXleRe8u73gnQo8AZIhStYSP
-  v4qqqa27Bs468d6SoPxjSm8a2mM9HZ4OdWhq4tFsbTeXDVquCfi64OTEaTt2xQdR
-  JnC4lpJfCP6aCXa5h2XAQfPSH636cQap
+  N2I4L/ZOIe2DIVuYH7aLHfjZDQv/mNgpAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYD
+  VR0PBAQDAgSwMB0GA1UdDgQWBBRyjf55EbrHagiRLqt5YAd3yb8k4DANBgkqhkiG
+  9w0BAQsFAAOCAYEAifxlz7x0EfT3fjhM520ZEIrWa+tLMuLKNefkY18u8tZnx4EX
+  Xxwh3tna3fvNfrOrdY5leIj1dbv4FTRg+gIBnIxAySqvpGvI/Axg5EdYbwninCLL
+  LAKCmRo+5QwaPMYN2zdHIjGrp8jg1neCo5zy6tVvyTv0DMI6FLrydVJYduMMDFSy
+  gQKR1rVOcCJtnBnLCF9+kKEUKohAHOmGsE7OBZFnjMIpH5yUDUVJKByv0gIipFt0
+  1T6zff6oVU0w8WBiNKR381+6sF3wIZVnVY0XeJg6hNL+YecE8ILxLhHTmtT/BO0S
+  3xPze9uXDR+iD6HYl8KU5QEg/dXFPhfQb512vVkTJDZvMcwu6PxDUjHFChLjAji/
+  AZXjg1C5E9znTkeUR8ieU9F1MOKoiH57a5lYSTI8Ga8PpsNXTxNeXc16Ob26CqrJ
+  83uuAYSy65yXDGXXPVBeKPVnYrqp91pqpS5Nh7wfuiCrE8lgU8PATh7K4BV1UhAT
+  0MHbAT42wTYkfUj3
   -----END CERTIFICATE-----
-date: 2019-12-24 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
@@ -99,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement