pg 1.6.0.rc1 → 1.6.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79b95ddd7cf2f41c4295570df7472993c734fa4f562631f4d8a2dd57f959a2e2
-  data.tar.gz: 14c732693af768e0ee2b071e9bbd2a7def69ca3e3e2140b8c55406634ab7272c
+  metadata.gz: 956a534d3545f2d25ab922f903042bf6ae160f97c2b0e67a535d70559ce78cde
+  data.tar.gz: facd2045b9f51620fd66f407202d4b5d4f1ad31f991eef7b5eb4c2f4606416ef
 SHA512:
-  metadata.gz: 89d7479a9c132c1ff8844b1346d083ce3b7d37a275fcc8e4d56523a3a49f79e44f4620fa1b4ad8b53d0e71ebdb36f278a48b9aa792169492395a2e412142b161
-  data.tar.gz: ac4ad88528e83ab1fb7132ae9b8f6b0c685a747ea46c802c4f16fda4d9c26b01e01fe207a31525293eb3e68d74044850a754598a4ba61640b24762b6b39eb542
+  metadata.gz: bfbeb91b593698fbce35d3d7eb54b1c918ab741f96568faedcc045ddf0fe9917735d411df339f4fc2b7ced6d5fb4e9fb4845c56ee17d8b5880b30620741650c1
+  data.tar.gz: 71524df43d1c3891d9ecd052153f93e8e563b0ab5f4324292fe176bc8c93ace60be175fe275fb7546420d996b8cc7eecf27a254729029d566bcbe67c34ad67bc

data/{History.md → CHANGELOG.md}

@@ -1,3 +1,31 @@
+## v1.6.0.rc2 [2025-07-16] Lars Kanis <lars@greiz-reinsdorf.de>
+
+Added:
+
+- Add binary gems for Ruby 3.4.
+- Add fat binary gem for platform `aarch64-mingw-ucrt` aka Windows on ARM [#626](https://github.com/ged/ruby-pg/pull/626), for platform Macos on Intel and ARM [#643](https://github.com/ged/ruby-pg/pull/643) and for platform `aarch64-linux` [#646](https://github.com/ged/ruby-pg/pull/646).
+- Update fat binary gem to OpenSSL-3.5.1 and PostgreSQL-17.5.
+- Add a patch to libpq to avoid starvation on bigger SSL records, which some database engines other than vanilla PostgreSQL use.
+  This patch applies to platform specific binary gems only.
+  [#616](https://github.com/ged/ruby-pg/pull/616)
+- Fix missing array input verification in PG::TypeMapByColumn.
+  This could cause a segfault.
+  [#620](https://github.com/ged/ruby-pg/pull/620)
+- Add possibility to define the number of array dimensions to be encoded.
+  Setting dimensions is especially useful, when a Record shall be encoded into an Array, since the Array encoder can not distinguish if the array shall be encoded as a higher dimension or as a record otherwise.
+  [#622](https://github.com/ged/ruby-pg/pull/622)
+- Add MINGW package dependency which is resolved by RubyInstaller.
+  [#617](https://github.com/ged/ruby-pg/pull/617)
+- Change `conn.server_version` and `conn.protocol_version` to raise instead of return 0 on error.
+  [#632](https://github.com/ged/ruby-pg/pull/632)
+- Fix making PG::BasicTypeMapForQueries shareable for Ractor in ruby-3.5.
+  [#636](https://github.com/ged/ruby-pg/pull/636)
+- Rename `History.md` to `CHANGELOG.md`, which is more common.
+  [#642](https://github.com/ged/ruby-pg/pull/642)
+- Fix connecting to multiple hosts after `connnect_timeout`.
+  [#637](https://github.com/ged/ruby-pg/pull/637)
+
+
 ## v1.6.0.rc1 [2024-11-28] Lars Kanis <lars@greiz-reinsdorf.de>
 
 Added:

data/Gemfile

@@ -13,7 +13,7 @@ end
 group :test do
   gem "bundler", ">= 1.16", "< 3.0"
   gem "rake-compiler", "~> 1.0"
-  gem "rake-compiler-dock", "~> 1.5"
+  gem "rake-compiler-dock", "~> 1.9.1"
   gem "rspec", "~> 3.5"
   # "bigdecimal" is a gem on ruby-3.4+ and it's optional for ruby-pg.
   # Specs should succeed without it, but 4 examples are then excluded.

data/README.ja.md

@@ -2,7 +2,7 @@
 
 * ホーム :: https://github.com/ged/ruby-pg
 * ドキュメント :: http://deveiate.org/code/pg （英語）、 https://deveiate.org/code/pg/README_ja_md.html （日本語）
-* 変更履歴 :: link:/History.md
+* 変更履歴 :: link:/CHANGELOG.md
 
 [![https://gitter.im/ged/ruby-pg
 でチャットに参加](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ged/ruby-pg?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

data/README.md

@@ -3,7 +3,7 @@
 * home :: https://github.com/ged/ruby-pg
 * docs :: http://deveiate.org/code/pg (English) ,
           https://deveiate.org/code/pg/README_ja_md.html (Japanese)
-* clog :: link:/History.md
+* clog :: link:/CHANGELOG.md
 
 [![Join the chat at https://gitter.im/ged/ruby-pg](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ged/ruby-pg?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
@@ -175,6 +175,7 @@ The following type maps are prefilled with type mappings from the PG::BasicTypeR
 * PG::BasicTypeMapBasedOnResult - a PG::TypeMapByOid prefilled with encoders for common PostgreSQL column types
 * PG::BasicTypeMapForQueries - a PG::TypeMapByClass prefilled with encoders for common Ruby value classes
 
+Several type maps can be chained by setting PG::TypeMap::DefaultTypeMappable#default_type_map .
 
 ## Thread support
 

data/Rakefile

@@ -11,6 +11,7 @@ require 'rake/clean'
 require 'rspec/core/rake_task'
 require 'bundler'
 require 'bundler/gem_helper'
+require_relative "rakelib/pg_gem_helper"
 
 # Build directory constants
 BASEDIR = Pathname( __FILE__ ).dirname
@@ -32,9 +33,9 @@ CLEAN.include "lib/*/libpq.dll"
 CLEAN.include "lib/pg_ext.*"
 CLEAN.include "lib/pg/postgresql_lib_path.rb"
 CLEAN.include "ports/*.installed"
-CLEAN.include "ports/*mingw*", "ports/*linux*"
+CLEAN.include "ports/*mingw*", "ports/*linux*", "ports/*darwin*"
 
-Bundler::GemHelper.install_tasks
+PgGemHelper.install_tasks
 $gem_spec = Bundler.load_gemspec(GEMSPEC)
 
 desc "Turn on warnings and debugging in the build."
@@ -44,14 +45,21 @@ end
 
 CrossLibrary = Struct.new :platform, :openssl_config, :toolchain
 CrossLibraries = [
+	['aarch64-mingw-ucrt', 'mingwarm64', 'aarch64-w64-mingw32'],
 	['x64-mingw-ucrt', 'mingw64', 'x86_64-w64-mingw32'],
 	['x86-mingw32', 'mingw', 'i686-w64-mingw32'],
 	['x64-mingw32', 'mingw64', 'x86_64-w64-mingw32'],
-	['x86_64-linux', 'linux-x86_64', 'x86_64-redhat-linux-gnu'],
+	['x86_64-linux', 'linux-x86_64', 'x86_64-linux-gnu'],
+	['aarch64-linux', 'linux-aarch64', 'aarch64-linux-gnu'],
+	['x86_64-darwin', 'darwin64-x86_64', 'x86_64-apple-darwin'],
+	['arm64-darwin', 'darwin64-arm64', 'arm64-apple-darwin'],
 ].map do |platform, openssl_config, toolchain|
 	CrossLibrary.new platform, openssl_config, toolchain
 end
 
+# Register binary gems to be pushed to rubygems.org
+Bundler::GemHelper.instance.cross_platforms = CrossLibraries.map(&:platform)
+
 # Rake-compiler task
 Rake::ExtensionTask.new do |ext|
 	ext.name           = 'pg_ext'
@@ -75,6 +83,7 @@ Rake::ExtensionTask.new do |ext|
 	# Add libpq.dll/.so to fat binary gemspecs
 	ext.cross_compiling do |spec|
 		spec.files << "ports/#{spec.platform.to_s}/lib/libpq-ruby-pg.so.1" if spec.platform.to_s =~ /linux/
+		spec.files << "ports/#{spec.platform.to_s}/lib/libpq-ruby-pg.1.dylib" if spec.platform.to_s =~ /darwin/
 		spec.files << "ports/#{spec.platform.to_s}/lib/libpq.dll" if spec.platform.to_s =~ /mingw|mswin/
 	end
 end
@@ -95,18 +104,33 @@ task 'gem:native:prepare' do
 	end
 end
 
+task 'install_darwin_mig', [:arch] do |t, args|
+	sh <<~EOT
+		rm -rf bootstrap_cmds &&
+		git clone --branch=cross_platform https://github.com/markmentovai/bootstrap_cmds &&
+		cd bootstrap_cmds &&
+		autoreconf --install &&
+		sh configure &&
+		make &&
+		sed -E -i 's/^cppflags=(.*)/cppflags=(\\1 "-D#{args[:arch]}" "-I\\/opt\\/osxcross\\/target\\/SDK\\/MacOSX11.1.sdk\\/usr\\/include")/' migcom.tproj/mig.sh &&
+		sudo make install
+	EOT
+end
+
 CrossLibraries.each do |xlib|
 	platform = xlib.platform
 	desc "Build fat binary gem for platform #{platform}"
 	task "gem:native:#{platform}" => ['gem:native:prepare'] do
 		RakeCompilerDock.sh <<-EOT, platform: platform
-			#{ "sudo yum install -y perl-IPC-Cmd bison flex &&" if platform =~ /linux/ }
+			#{ "sudo apt-get update && sudo apt-get install -y bison flex &&" if platform =~ /darwin/ }
 			#{ # remove nm on Linux to suppress PostgreSQL's check for exit which raises thread_exit as a false positive:
-				"sudo mv `which nm` `which nm`.bak && sudo mv `which nm` `which nm`.bak &&" if platform =~ /linux/ }
-			#{ "sudo apt-get update && sudo apt-get install -y bison flex &&" if platform =~ /mingw/ }
+				"sudo mv `which nm` `which nm`.bak &&" if platform =~ /linux/ }
+			sudo apt-get update && sudo apt-get install -y bison flex &&
 			(cp build/gem/gem-*.pem ~/.gem/ || true) &&
 			bundle install --local &&
-			rake native:#{platform} pkg/#{$gem_spec.full_name}-#{platform}.gem MAKEOPTS=-j`nproc` RUBY_CC_VERSION=3.3.0:3.2.0:3.1.0:3.0.0:2.7.0
+			#{ "rake install_darwin_mig[__arm64__]" if platform =~ /arm64-darwin/ }
+			#{ "rake install_darwin_mig[__x86_64__]" if platform =~ /x86_64-darwin/ }
+			rake native:#{platform} pkg/#{$gem_spec.full_name}-#{platform}.gem MAKEOPTS=-j`nproc` RUBY_CC_VERSION=#{RakeCompilerDock.ruby_cc_version("~>2.7", "~>3.0")}
 		EOT
 	end
 	desc "Build the native binary gems"

data/ext/extconf.rb

@@ -27,13 +27,13 @@ if gem_platform=with_config("cross-build")
 	gem 'mini_portile2', '~>2.1'
 	require 'mini_portile2'
 
-	OPENSSL_VERSION = ENV['OPENSSL_VERSION'] || '3.4.0'
+	OPENSSL_VERSION = ENV['OPENSSL_VERSION'] || '3.5.1'
 	OPENSSL_SOURCE_URI = "http://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"
 
 	KRB5_VERSION = ENV['KRB5_VERSION'] || '1.21.3'
 	KRB5_SOURCE_URI = "http://kerberos.org/dist/krb5/#{KRB5_VERSION[/^(\d+\.\d+)/]}/krb5-#{KRB5_VERSION}.tar.gz"
 
-	POSTGRESQL_VERSION = ENV['POSTGRESQL_VERSION'] || '17.2'
+	POSTGRESQL_VERSION = ENV['POSTGRESQL_VERSION'] || '17.5'
 	POSTGRESQL_SOURCE_URI = "http://ftp.postgresql.org/pub/source/v#{POSTGRESQL_VERSION}/postgresql-#{POSTGRESQL_VERSION}.tar.bz2"
 
 	class BuildRecipe < MiniPortile
@@ -69,7 +69,7 @@ if gem_platform=with_config("cross-build")
 			def configure
 				envs = []
 				envs << "CFLAGS=-DDSO_WIN32 -DOPENSSL_THREADS" if RUBY_PLATFORM =~ /mingw|mswin/
-				envs << "CFLAGS=-fPIC -DOPENSSL_THREADS" if RUBY_PLATFORM =~ /linux/
+				envs << "CFLAGS=-fPIC -DOPENSSL_THREADS" if RUBY_PLATFORM =~ /linux|darwin/
 				execute('configure', ['env', *envs, "./Configure", openssl_platform, "threads", "-static", "CROSS_COMPILE=#{host}-", configure_prefix], altlog: "config.log")
 			end
 			def compile
@@ -85,22 +85,56 @@ if gem_platform=with_config("cross-build")
 		recipe.cook_and_activate
 	end
 
-	if RUBY_PLATFORM =~ /linux/
+	if RUBY_PLATFORM =~ /linux|darwin/
 		krb5_recipe = BuildRecipe.new("krb5", KRB5_VERSION, [KRB5_SOURCE_URI]).tap do |recipe|
 			class << recipe
 				def work_path
 					File.join(super, "src")
 				end
+				def configure
+					if RUBY_PLATFORM=~/darwin/
+						ENV["CC"] = host[/^.*[^\.\d]/] + "-clang"
+						ENV["CXX"] = host[/^.*[^\.\d]/] + "-c++"
+
+						# Manually set the correct values for configure checks that libkrb5 won't be
+						# able to perform because we're cross-compiling.
+						ENV["krb5_cv_attr_constructor_destructor"] = "yes"
+						ENV["ac_cv_func_regcomp"] = "yes"
+						ENV["ac_cv_printf_positional"] = "yes"
+					end
+					super
+				end
 			end
 			# We specify -fcommon to get around duplicate definition errors in recent gcc.
 			# See https://github.com/cockroachdb/cockroach/issues/49734
 			recipe.configure_options << "CFLAGS=-fcommon#{" -fPIC" if RUBY_PLATFORM =~ /linux/}"
+			recipe.configure_options << "LDFLAGS=-framework Kerberos" if RUBY_PLATFORM =~ /darwin/
 			recipe.configure_options << "--without-keyutils"
+			recipe.configure_options << "--disable-nls"
+			recipe.configure_options << "--disable-silent-rules"
+			recipe.configure_options << "--without-system-verto"
+			recipe.configure_options << "krb5_cv_attr_constructor_destructor=yes"
+			recipe.configure_options << "ac_cv_func_regcomp=yes"
+			recipe.configure_options << "ac_cv_printf_positional=yes"
 			recipe.host = toolchain
 			recipe.cook_and_activate
 		end
 	end
 
+	# We build a libpq library file which static links OpenSSL and krb5.
+	# Our builtin libpq is referenced in different ways depending on the OS:
+	# - Window: Add the ports directory at runtime per RubyInstaller::Runtime.add_dll_directory
+	#     The file is called "libpq.dll"
+	# - Linux: Add a rpath to pg_ext.so which references the ports directory.
+	#     The file is called "libpq-ruby-pg.so.1" to avoid loading of system libpq by accident.
+	# - Macos: Add a reference with relative path in pg_ext.so to the ports directory.
+	#     The file is called "libpq-ruby-pg.1.dylib" to avoid loading of other libpq by accident.
+	libpq_orig, libpq_rubypg = case RUBY_PLATFORM
+	when /linux/ then ["libpq.so.5", "libpq-ruby-pg.so.1"]
+	when /darwin/ then ["libpq.5.dylib", "libpq-ruby-pg.1.dylib"]
+	# when /mingw/ then ["libpq.dll", "libpq.dll"] # renaming not needed
+	end
+
 	postgresql_recipe = BuildRecipe.new("postgresql", POSTGRESQL_VERSION, [POSTGRESQL_SOURCE_URI]).tap do |recipe|
 		class << recipe
 			def configure_defaults
@@ -108,9 +142,11 @@ if gem_platform=with_config("cross-build")
 					"--target=#{host}",
 					"--host=#{host}",
 					'--with-openssl',
-					*(RUBY_PLATFORM=~/linux/ ? ['--with-gssapi'] : []),
+					*(RUBY_PLATFORM=~/linux|darwin/ ? ['--with-gssapi'] : []),
 					'--without-zlib',
 					'--without-icu',
+					'--without-readline',
+					'ac_cv_search_gss_store_cred_into=',
 				]
 			end
 			def compile
@@ -121,23 +157,25 @@ if gem_platform=with_config("cross-build")
 			end
 		end
 
-		recipe.configure_options << "CFLAGS=#{" -fPIC" if RUBY_PLATFORM =~ /linux/}"
-		recipe.configure_options << "LDFLAGS=-L#{openssl_recipe.path}/lib -L#{openssl_recipe.path}/lib64 #{"-Wl,-soname,libpq-ruby-pg.so.1 -lgssapi_krb5 -lkrb5 -lk5crypto -lkrb5support" if RUBY_PLATFORM =~ /linux/}"
+		recipe.host = toolchain
+		recipe.configure_options << "CFLAGS=#{" -fPIC" if RUBY_PLATFORM =~ /linux|darwin/}"
+		recipe.configure_options << "LDFLAGS=-L#{openssl_recipe.path}/lib -L#{openssl_recipe.path}/lib64 -L#{openssl_recipe.path}/lib-arm64 #{"-Wl,-soname,#{libpq_rubypg} -lgssapi_krb5 -lkrb5 -lk5crypto -lkrb5support -ldl" if RUBY_PLATFORM =~ /linux/} #{"-Wl,-install_name,@loader_path/../../ports/#{gem_platform}/lib/#{libpq_rubypg} -lgssapi_krb5 -lkrb5 -lk5crypto -lkrb5support -lresolv -framework Kerberos" if RUBY_PLATFORM =~ /darwin/}"
 		recipe.configure_options << "LIBS=-lkrb5 -lcom_err -lk5crypto -lkrb5support -lresolv" if RUBY_PLATFORM =~ /linux/
 		recipe.configure_options << "LIBS=-lssl -lwsock32 -lgdi32 -lws2_32 -lcrypt32" if RUBY_PLATFORM =~ /mingw|mswin/
 		recipe.configure_options << "CPPFLAGS=-I#{openssl_recipe.path}/include"
-		recipe.host = toolchain
 		recipe.cook_and_activate
 	end
 
 	# Use our own library name for libpq to avoid loading of system libpq by accident.
-	FileUtils.ln_sf File.join(postgresql_recipe.port_path, "lib/libpq.so.5"),
-			File.join(postgresql_recipe.port_path, "lib/libpq-ruby-pg.so.1")
+	FileUtils.ln_sf File.join(postgresql_recipe.port_path, "lib/#{libpq_orig}"),
+			File.join(postgresql_recipe.port_path, "lib/#{libpq_rubypg}")
 	# Avoid dependency to external libgcc.dll on x86-mingw32
-	$LDFLAGS << " -static-libgcc"
-	# Find libpq in the ports directory coming from lib/3.3
+	$LDFLAGS << " -static-libgcc" if RUBY_PLATFORM =~ /mingw|mswin/
+	# Avoid: "libpq.so: undefined reference to `dlopen'" in cross-ruby-2.7.8
+	$LDFLAGS << " -Wl,--no-as-needed" if RUBY_PLATFORM !~ /aarch64|arm64|darwin/
+	# Find libpq in the ports directory coming from lib/3.x
 	# It is shared between all compiled ruby versions.
-	$LDFLAGS << " '-Wl,-rpath=$$ORIGIN/../../ports/#{gem_platform}/lib'"
+	$LDFLAGS << " '-Wl,-rpath=$$ORIGIN/../../ports/#{gem_platform}/lib'" if RUBY_PLATFORM =~ /linux/
 	# Don't use pg_config for cross build, but --with-pg-* path options
 	dir_config('pg', "#{postgresql_recipe.path}/include", "#{postgresql_recipe.path}/lib")
 

data/ext/pg.h

@@ -206,6 +206,7 @@ typedef struct {
 	t_pg_coder comp;
 	t_pg_coder *elem;
 	int needs_quotation;
+	int dimensions;
 	char delimiter;
 } t_pg_composite_coder;
 

data/ext/pg_binary_encoder.c

@@ -320,6 +320,9 @@ pg_bin_enc_date(t_pg_coder *this, VALUE value, char *out, VALUE *intermediate, i
  * This encoder expects an Array of values or sub-arrays as input.
  * Other values are passed through as byte string without interpretation.
  *
+ * It is possible to enforce a number of dimensions to be encoded by #dimensions= .
+ * Deeper nested arrays are then passed to the elements encoder and less nested arrays raise an ArgumentError.
+ *
  * The accessors needs_quotation and delimiter are ignored for binary encoding.
  *
  */
@@ -346,7 +349,8 @@ pg_bin_enc_array(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate,
 				dim_sizes[ndim-1] = RARRAY_LENINT(el1);
 				nitems *= dim_sizes[ndim-1];
 				el2 = rb_ary_entry(el1, 0);
-				if (TYPE(el2) == T_ARRAY) {
+				if ( (this->dimensions < 0 || ndim < this->dimensions) &&
+						TYPE(el2) == T_ARRAY) {
 					ndim++;
 					if (ndim > MAXDIM)
 						rb_raise( rb_eArgError, "unsupported number of array dimensions: >%d", ndim );
@@ -356,6 +360,9 @@ pg_bin_enc_array(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate,
 				el1 = el2;
 			}
 		}
+		if( this->dimensions >= 0 && (ndim==0 ? 1 : ndim) != this->dimensions ){
+			rb_raise(rb_eArgError, "less array dimensions to encode (%d) than expected (%d)", ndim, this->dimensions);
+		}
 
 		if(out){
 			/* Second encoder pass -> write data to `out` */

data/ext/pg_coder.c

@@ -135,6 +135,7 @@ pg_composite_encoder_allocate( VALUE klass )
 	this->elem = NULL;
 	this->needs_quotation = 1;
 	this->delimiter = ',';
+	this->dimensions = -1;
 	rb_iv_set( self, "@elements_type", Qnil );
 	return self;
 }
@@ -157,6 +158,7 @@ pg_composite_decoder_allocate( VALUE klass )
 	this->elem = NULL;
 	this->needs_quotation = 1;
 	this->delimiter = ',';
+	this->dimensions = -1;
 	rb_iv_set( self, "@elements_type", Qnil );
 	return self;
 }
@@ -421,6 +423,49 @@ pg_coder_delimiter_get(VALUE self)
 	return rb_str_new(&this->delimiter, 1);
 }
 
+/*
+ * call-seq:
+ *    coder.dimensions = Integer
+ *    coder.dimensions = nil
+ *
+ * Set number of array dimensions to be encoded.
+ *
+ * This property ensures, that this number of dimensions is always encoded.
+ * If less dimensions than this number are in the given value, an ArgumentError is raised.
+ * If more dimensions than this number are in the value, the Array value is passed to the next encoder.
+ *
+ * Setting dimensions is especially useful, when a Record shall be encoded into an Array, since the Array encoder can not distinguish if the array shall be encoded as a higher dimension or as a record otherwise.
+ *
+ * The default is +nil+.
+ *
+ * See #dimensions
+ */
+static VALUE
+pg_coder_dimensions_set(VALUE self, VALUE dimensions)
+{
+	t_pg_composite_coder *this = RTYPEDDATA_DATA(self);
+	rb_check_frozen(self);
+	if(!NIL_P(dimensions) && NUM2INT(dimensions) < 0)
+		rb_raise( rb_eArgError, "dimensions must be nil or >= 0");
+	this->dimensions = NIL_P(dimensions) ? -1 : NUM2INT(dimensions);
+	return dimensions;
+}
+
+/*
+ * call-seq:
+ *    coder.dimensions -> Integer | nil
+ *
+ * Get number of enforced array dimensions or +nil+ if not set.
+ *
+ * See #dimensions=
+ */
+static VALUE
+pg_coder_dimensions_get(VALUE self)
+{
+	t_pg_composite_coder *this = RTYPEDDATA_DATA(self);
+	return this->dimensions < 0 ? Qnil : INT2NUM(this->dimensions);
+}
+
 /*
  * call-seq:
  *    coder.elements_type = coder
@@ -602,6 +647,8 @@ init_pg_coder(void)
 	 *
 	 * This is the base class for all type cast classes of PostgreSQL types,
 	 * that are made up of some sub type.
+	 *
+	 * See PG::TextEncoder::Array, PG::TextDecoder::Array, PG::BinaryEncoder::Array, PG::BinaryDecoder::Array, etc.
 	 */
 	rb_cPG_CompositeCoder = rb_define_class_under( rb_mPG, "CompositeCoder", rb_cPG_Coder );
 	rb_define_method( rb_cPG_CompositeCoder, "elements_type=", pg_coder_elements_type_set, 1 );
@@ -610,6 +657,8 @@ init_pg_coder(void)
 	rb_define_method( rb_cPG_CompositeCoder, "needs_quotation?", pg_coder_needs_quotation_get, 0 );
 	rb_define_method( rb_cPG_CompositeCoder, "delimiter=", pg_coder_delimiter_set, 1 );
 	rb_define_method( rb_cPG_CompositeCoder, "delimiter", pg_coder_delimiter_get, 0 );
+	rb_define_method( rb_cPG_CompositeCoder, "dimensions=", pg_coder_dimensions_set, 1 );
+	rb_define_method( rb_cPG_CompositeCoder, "dimensions", pg_coder_dimensions_get, 0 );
 
 	/* Document-class: PG::CompositeEncoder < PG::CompositeCoder */
 	rb_cPG_CompositeEncoder = rb_define_class_under( rb_mPG, "CompositeEncoder", rb_cPG_CompositeCoder );

data/ext/pg_connection.c

@@ -845,31 +845,52 @@ pgconn_parameter_status(VALUE self, VALUE param_name)
  * call-seq:
  *   conn.protocol_version -> Integer
  *
- * The 3.0 protocol will normally be used when communicating with PostgreSQL 7.4
- * or later servers; pre-7.4 servers support only protocol 2.0. (Protocol 1.0 is
- * obsolete and not supported by libpq.)
+ * Interrogates the frontend/backend protocol being used.
+ *
+ * Applications might wish to use this function to determine whether certain features are supported.
+ * Currently, the only value is 3 (3.0 protocol).
+ * The protocol version will not change after connection startup is complete, but it could theoretically change during a connection reset.
+ * The 3.0 protocol is supported by PostgreSQL server versions 7.4 and above.
+ *
+ * PG::ConnectionBad is raised if the connection is bad.
  */
 static VALUE
 pgconn_protocol_version(VALUE self)
 {
-	return INT2NUM(PQprotocolVersion(pg_get_pgconn(self)));
+	int protocol_version = PQprotocolVersion(pg_get_pgconn(self));
+	if (protocol_version == 0) {
+		pg_raise_conn_error( rb_eConnectionBad, self, "PQprotocolVersion() can't get protocol version");
+	}
+	return INT2NUM(protocol_version);
 }
 
 /*
  * call-seq:
  *   conn.server_version -> Integer
  *
- * The number is formed by converting the major, minor, and revision
- * numbers into two-decimal-digit numbers and appending them together.
- * For example, version 7.4.2 will be returned as 70402, and version
- * 8.1 will be returned as 80100 (leading zeroes are not shown). Zero
- * is returned if the connection is bad.
+ * Returns an integer representing the server version.
+ *
+ * Applications might use this function to determine the version of the database server they are connected to.
+ * The result is formed by multiplying the server's major version number by 10000 and adding the minor version number.
+ * For example, version 10.1 will be returned as 100001, and version 11.0 will be returned as 110000.
+ *
+ * PG::ConnectionBad is raised if the connection is bad.
+ *
+ * Prior to major version 10, PostgreSQL used three-part version numbers in which the first two parts together represented the major version.
+ * For those versions, PQserverVersion uses two digits for each part; for example version 9.1.5 will be returned as 90105, and version 9.2.0 will be returned as 90200.
+ *
+ * Therefore, for purposes of determining feature compatibility, applications should divide the result of PQserverVersion by 100 not 10000 to determine a logical major version number.
+ * In all release series, only the last two digits differ between minor releases (bug-fix releases).
  *
  */
 static VALUE
 pgconn_server_version(VALUE self)
 {
-	return INT2NUM(PQserverVersion(pg_get_pgconn(self)));
+	int server_version = PQserverVersion(pg_get_pgconn(self));
+	if (server_version == 0) {
+		pg_raise_conn_error( rb_eConnectionBad, self, "PQserverVersion() can't get server version");
+	}
+	return INT2NUM(server_version);
 }
 
 /*

data/ext/pg_text_encoder.c

@@ -537,7 +537,7 @@ quote_string(t_pg_coder *this, VALUE value, VALUE string, char *current_out, int
 }
 
 static char *
-write_array(t_pg_composite_coder *this, VALUE value, char *current_out, VALUE string, int quote, int enc_idx)
+write_array(t_pg_composite_coder *this, VALUE value, char *current_out, VALUE string, int quote, int enc_idx, int dimension)
 {
 	int i;
 
@@ -545,6 +545,10 @@ write_array(t_pg_composite_coder *this, VALUE value, char *current_out, VALUE st
 	current_out = pg_rb_str_ensure_capa( string, 2, current_out, NULL );
 	*current_out++ = '{';
 
+	if( RARRAY_LEN(value) == 0 && this->dimensions >= 0 && dimension != this->dimensions ){
+		rb_raise(rb_eArgError, "less array dimensions to encode (%d) than expected (%d)", dimension, this->dimensions);
+	}
+
 	for( i=0; i<RARRAY_LEN(value); i++){
 		VALUE entry = rb_ary_entry(value, i);
 
@@ -554,17 +558,26 @@ write_array(t_pg_composite_coder *this, VALUE value, char *current_out, VALUE st
 		}
 
 		switch(TYPE(entry)){
-			case T_ARRAY:
-				current_out = write_array(this, entry, current_out, string, quote, enc_idx);
-			break;
 			case T_NIL:
+				if( this->dimensions >= 0 && dimension != this->dimensions ){
+					rb_raise(rb_eArgError, "less array dimensions to encode (%d) than expected (%d)", dimension, this->dimensions);
+				}
 				current_out = pg_rb_str_ensure_capa( string, 4, current_out, NULL );
 				*current_out++ = 'N';
 				*current_out++ = 'U';
 				*current_out++ = 'L';
 				*current_out++ = 'L';
 				break;
+			case T_ARRAY:
+				if( this->dimensions < 0 || dimension < this->dimensions ){
+					current_out = write_array(this, entry, current_out, string, quote, enc_idx, dimension+1);
+					break;
+				}
+				/* Number of dimensions reached -> handle array as normal value */
 			default:
+				if( this->dimensions >= 0 && dimension != this->dimensions ){
+					rb_raise(rb_eArgError, "less array dimensions to encode (%d) than expected (%d)", dimension, this->dimensions);
+				}
 				current_out = quote_string( this->elem, entry, string, current_out, quote, quote_array_buffer, this, enc_idx );
 		}
 	}
@@ -596,7 +609,7 @@ pg_text_enc_array(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate,
 		VALUE out_str = rb_str_new(NULL, 0);
 		PG_ENCODING_SET_NOCHECK(out_str, enc_idx);
 
-		end_ptr = write_array(this, value, RSTRING_PTR(out_str), out_str, this->needs_quotation, enc_idx);
+		end_ptr = write_array(this, value, RSTRING_PTR(out_str), out_str, this->needs_quotation, enc_idx, 1);
 
 		rb_str_set_len( out_str, end_ptr - RSTRING_PTR(out_str) );
 		*intermediate = out_str;

data/ext/pg_type_map_by_column.c

@@ -54,6 +54,7 @@ pg_tmbc_fit_to_query( VALUE self, VALUE params )
 	t_tmbc *this = RTYPEDDATA_DATA( self );
 	t_typemap *default_tm;
 
+	Check_Type(params, T_ARRAY);
 	nfields = (int)RARRAY_LEN( params );
 	if ( this->nfields != nfields ) {
 		rb_raise( rb_eArgError, "number of result fields (%d) does not match number of mapped columns (%d)",

data/ext/pg_type_map_by_oid.c

@@ -315,6 +315,8 @@ pg_tmbo_coders( VALUE self )
  * The type map will do Hash lookups for each result value, if the number of rows
  * is below or equal +number+.
  *
+ * Default is 10.
+ *
  */
 static VALUE
 pg_tmbo_max_rows_for_online_lookup_set( VALUE self, VALUE value )

data/lib/pg/basic_type_map_for_queries.rb

@@ -53,14 +53,18 @@ class PG::BasicTypeMapForQueries < PG::TypeMapByClass
 		@coder_maps = build_coder_maps(connection_or_coder_maps, registry: registry)
 		@array_encoders_by_klass = array_encoders_by_klass
 		@encode_array_as = :array
-		@if_undefined = if_undefined || method(:raise_undefined_type).to_proc
+		@if_undefined = if_undefined || UndefinedDefault
 		init_encoders
 	end
 
-	private def raise_undefined_type(oid_name, format)
-		raise UndefinedEncoder, "no encoder defined for type #{oid_name.inspect} format #{format}"
+	class UndefinedDefault
+		def self.call(oid_name, format)
+			raise UndefinedEncoder, "no encoder defined for type #{oid_name.inspect} format #{format}"
+		end
 	end
 
+	private_constant :UndefinedDefault
+
 	# Change the mechanism that is used to encode ruby array values
 	#
 	# Possible values:

data/lib/pg/cancel_connection.rb

@@ -7,8 +7,24 @@ if defined?(PG::CancelConnection)
 	class PG::CancelConnection
 		include PG::Connection::Pollable
 
-		# The timeout used by #cancel and async_cancel to establish the cancel connection.
-		attr_accessor :async_connect_timeout
+		alias c_initialize initialize
+
+		def initialize(conn)
+			c_initialize(conn)
+
+			# A cancel connection is always to one destination server only.
+			# Prepare conninfo_hash with just enough information to allow a shared polling_loop.
+			@host = conn.host
+			@hostaddr = conn.hostaddr
+			@port = conn.port
+
+			@conninfo_hash = {
+				host: @host,
+				hostaddr: @hostaddr,
+				port: @port.to_s,
+				connect_timeout: conn.conninfo_hash[:connect_timeout],
+			}
+		end
 
 		# call-seq:
 		#    conn.cancel
@@ -23,8 +39,15 @@ if defined?(PG::CancelConnection)
 		#
 		def cancel
 			start
-			polling_loop(:poll, async_connect_timeout)
+			polling_loop(:poll)
 		end
 		alias async_cancel cancel
+
+		# These private methods are there to allow a shared polling_loop.
+		private
+		attr_reader :host
+		attr_reader :hostaddr
+		attr_reader :port
+		attr_reader :conninfo_hash
 	end
 end

data/lib/pg/coder.rb

@@ -76,12 +76,13 @@ module PG
 				elements_type: elements_type,
 				needs_quotation: needs_quotation?,
 				delimiter: delimiter,
+				dimensions: dimensions,
 			}
 		end
 
 		def inspect
 			str = super
-			str[-1,0] = " elements_type=#{elements_type.inspect} #{needs_quotation? ? 'needs' : 'no'} quotation"
+			str[-1,0] = " elements_type=#{elements_type.inspect} #{needs_quotation? ? 'needs' : 'no'} quotation#{dimensions && " #{dimensions} dimensions"}"
 			str
 		end
 	end