pg 0.18.4 → 0.21.0

data/History.rdoc

@@ -1,3 +1,59 @@
+== v0.21.0 [2017-06-12] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+- Move add_dll_directory to the Runtime namespace for newest versions
+  of RubyInstaller.
+- Deprecate PGconn, PGresult, and PGError top-level constants; a warning
+  will be output the first time one of them is used. They will be
+  removed in the upcoming 1.0 release.
+
+Documentation fixes:
+- Update the docs for PG::Result#cmd_tuples
+
+
+== v0.20.0 [2017-03-10] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+- Update error codes to PostgreSQL-9.6
+- Update Windows binary gems to Ruby-2.4, PostgreSQL 9.6.1 and
+  OpenSSL 1.0.2j.
+- Add support for RubyInstaller2 to Windows binary gems.
+
+Bugfixes:
+- Use secure JSON methods for JSON (de)serialisation. #248
+- Fix Result#inspect on a cleared result.
+- Fix test case that failed on Ruby-2.4. #255
+
+Documentation fixes:
+- Talk about Integer instead of Fixnum.
+- Fix method signature of Coder#encode.
+
+
+== v0.19.0 [2016-09-21] Michael Granger <ged@FaerieMUD.org>
+
+- Deprecate Ruby 1.9
+
+Enhancements:
+- Respect and convert character encoding of all strings sent
+  to the server. #231
+- Add PostgreSQL-9.5 functions PQsslInUse(), PQsslAttribute()
+  and PQsslAttributeNames().
+- Various documentation fixes and improvements.
+- Add mechanism to build without pg_config:
+    gem install pg -- --with-pg-config=ignore
+- Update Windows binary gems to Ruby-2.3, PostgreSQL 9.5.4 and
+  OpenSSL 1.0.2f.
+- Add JSON coders and add them to BasicTypeMapForResults and
+  BasicTypeMapBasedOnResult
+- Allow build from git per bundler.
+
+Bugfixes:
+- Release GVL while calling PQsetClientEncoding(). #245
+- Add __EXTENSIONS__ to Solaris/SmartOS for Ruby >= 2.3.x. #236
+- Fix wrong exception when running SQL while in Connection#copy_data
+  block for output
+
+
 == v0.18.4 [2015-11-13] Michael Granger <ged@FaerieMUD.org>
 
 Enhancements:

data/Manifest.txt

@@ -46,29 +46,12 @@ lib/pg/basic_type_mapping.rb
 lib/pg/coder.rb
 lib/pg/connection.rb
 lib/pg/constants.rb
+lib/pg/deprecated_constants.rb
 lib/pg/exceptions.rb
 lib/pg/result.rb
 lib/pg/text_decoder.rb
 lib/pg/text_encoder.rb
 lib/pg/type_map_by_column.rb
-sample/array_insert.rb
-sample/async_api.rb
-sample/async_copyto.rb
-sample/async_mixed.rb
-sample/check_conn.rb
-sample/copyfrom.rb
-sample/copyto.rb
-sample/cursor.rb
-sample/disk_usage_report.rb
-sample/issue-119.rb
-sample/losample.rb
-sample/minimal-testcase.rb
-sample/notify_wait.rb
-sample/pg_statistics.rb
-sample/replication_monitor.rb
-sample/test_binary_values.rb
-sample/wal_shipper.rb
-sample/warehouse_partitions.rb
 spec/data/expected_trace.out
 spec/data/random_binary_data
 spec/helpers.rb

data/README.rdoc

@@ -11,7 +11,7 @@ docs :: http://deveiate.org/code/pg
 
 Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/].
 
-It works with {PostgreSQL 8.4 and later}[http://www.postgresql.org/support/versioning/].
+It works with {PostgreSQL 9.1 and later}[http://www.postgresql.org/support/versioning/].
 
 A small example usage:
 
@@ -23,7 +23,7 @@ A small example usage:
   conn = PG.connect( dbname: 'sales' )
   conn.exec( "SELECT * FROM pg_stat_activity" ) do |result|
     puts "     PID | User             | Query"
-  result.each do |row|
+    result.each do |row|
       puts " %7d | %-16s | %s " %
         row.values_at('procpid', 'usename', 'current_query')
     end
@@ -31,16 +31,16 @@ A small example usage:
 
 == Build Status
 
-{<img src="https://travis-ci.org/ged/ruby-pg.png?branch=master" alt="Build Status Travis-CI" />}[https://travis-ci.org/ged/ruby-pg]
+{<img src="https://travis-ci.org/ged/ruby-pg.svg?branch=master" alt="Build Status Travis-CI" />}[https://travis-ci.org/ged/ruby-pg]
 {<img src="https://ci.appveyor.com/api/projects/status/at4g4swb2cd4xji7/branch/master?svg=true" alt="Build Status Appveyor" />}[https://ci.appveyor.com/project/ged/ruby-pg]
 
 
 == Requirements
 
-* Ruby 1.9.3-p392, or 2.0.0-p0.
-* PostgreSQL 8.4.x or later (with headers, -dev packages, etc).
+* Ruby 2.2
+* PostgreSQL 9.1.x or later (with headers, -dev packages, etc).
 
-It may work with earlier versions of Ruby/PostgreSQL as well, but those are
+It usually work with earlier versions of Ruby/PostgreSQL as well, but those are
 not regularly tested.
 
 
@@ -66,6 +66,10 @@ There's also {a Google+ group}[http://goo.gl/TFy1U] and a
 {mailing list}[http://groups.google.com/group/ruby-pg] if you get stuck, or just
 want to chat about something.
 
+If you want to install as a signed gem, the public certs of the gem signers
+can be found in {the `certs` directory}[https://bitbucket.org/ged/ruby-pg/src/tip/certs/]
+of the repository.
+
 
 == Type Casts
 
@@ -112,7 +116,7 @@ needs for type casting. The default type map is PG::TypeMapAllStrings.
 
 A type map can be assigned per connection or per query respectively per
 result set. Type maps can also be used for COPY in and out data streaming.
-
+See PG::Connection#copy_data .
 
 == Contributing
 
@@ -133,7 +137,7 @@ Lars Kanis <lars@greiz-reinsdorf.de>.
 
 == Copying
 
-Copyright (c) 1997-2015 by the authors.
+Copyright (c) 1997-2016 by the authors.
 
 * Jeff Davis <ruby-pg@j-davis.com>
 * Guy Decoux (ts) <decoux@moulon.inra.fr>
@@ -145,7 +149,7 @@ Copyright (c) 1997-2015 by the authors.
 * Noboru Saitou <noborus@netlab.jp>
 
 You may redistribute this software under the same terms as Ruby itself; see
-http://www.ruby-lang.org/en/LICENSE.txt or the LICENSE file in the source
+https://www.ruby-lang.org/en/about/license.txt or the BSDL file in the source
 for details.
 
 Portions of the code are from the PostgreSQL project, and are distributed

data/Rakefile

@@ -55,22 +55,21 @@ $hoespec = Hoe.spec 'pg' do
 	self.extra_rdoc_files = Rake::FileList[ '*.rdoc' ]
 	self.extra_rdoc_files.include( 'POSTGRES', 'LICENSE' )
 	self.extra_rdoc_files.include( 'ext/*.c' )
-	self.license :BSD
+	self.license 'BSD-3-Clause'
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 	self.developer 'Lars Kanis', 'lars@greiz-reinsdorf.de'
 
-	self.dependency 'rake-compiler', '~> 0.9', :developer
-	self.dependency 'rake-compiler-dock', '~> 0.3', :developer
-	self.dependency 'hoe', '~> 3.12', :developer
-	self.dependency 'hoe-deveiate', '~> 0.6', :developer
+	self.dependency 'rake-compiler', '~> 1.0', :developer
+	self.dependency 'rake-compiler-dock', '~> 0.6', :developer
+	self.dependency 'hoe-deveiate', '~> 0.9', :developer
 	self.dependency 'hoe-bundler', '~> 1.0', :developer
-	self.dependency 'rspec', '~> 3.0', :developer
+	self.dependency 'rspec', '~> 3.5', :developer
+	self.dependency 'rdoc', '~> 5.1', :developer
 
-	self.spec_extras[:licenses] = ['BSD', 'Ruby', 'GPL']
 	self.spec_extras[:extensions] = [ 'ext/extconf.rb' ]
 
-	self.require_ruby_version( '>= 1.9.3' )
+	self.require_ruby_version( '>= 2.0.0' )
 
 	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= )
 	self.check_history_on_release = true if self.respond_to?( :check_history_on_release= )
@@ -81,7 +80,7 @@ end
 ENV['VERSION'] ||= $hoespec.spec.version.to_s
 
 # Tests should pass before checking in
-task 'hg:precheckin' => [ :check_history, :check_manifest, :spec ]
+task 'hg:precheckin' => [ :check_history, :check_manifest, :spec, :gemspec ]
 
 # Support for 'rvm specs'
 task :specs => :spec
@@ -97,7 +96,7 @@ task :test do
 	# the installed gem dir. So we clear the task rake-compiler set up
 	# to break the dependency between :spec and :compile when running under
 	# rubygems-test, and then run :spec.
-	Rake::Task[ EXT.to_s ].clear
+	Rake::Task[ EXT.to_s ].clear if File.exist?(EXT.to_s)
 	Rake::Task[ :spec ].execute
 end
 
@@ -132,8 +131,7 @@ Rake::ExtensionTask.new do |ext|
 
 	# Add libpq.dll to windows binary gemspec
 	ext.cross_compiling do |spec|
-		# mingw32-platform strings differ (RUBY_PLATFORM=i386-mingw32 vs. x86-mingw32 for rubygems)
-		spec.files << "lib/#{spec.platform.to_s.gsub(/^x86-/, "i386-")}/libpq.dll"
+		spec.files << "lib/libpq.dll"
 	end
 end
 
@@ -187,13 +185,11 @@ end
 
 desc "Update list of server error codes"
 task :update_error_codes do
-	URL_ERRORCODES_TXT = "http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;f=src/backend/utils/errcodes.txt;hb=HEAD"
+	URL_ERRORCODES_TXT = "http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;f=src/backend/utils/errcodes.txt;hb=refs/tags/REL9_6_1"
 
 	ERRORCODES_TXT = "ext/errorcodes.txt"
 	sh "wget #{URL_ERRORCODES_TXT.inspect} -O #{ERRORCODES_TXT.inspect} || curl #{URL_ERRORCODES_TXT.inspect} -o #{ERRORCODES_TXT.inspect}"
-end
 
-file 'ext/errorcodes.def' => ['ext/errorcodes.rb', 'ext/errorcodes.txt'] do
 	ruby 'ext/errorcodes.rb', 'ext/errorcodes.txt', 'ext/errorcodes.def'
 end
 
@@ -207,12 +203,14 @@ file GEMSPEC => __FILE__
 task GEMSPEC do |task|
 	spec = $hoespec.spec
 	spec.files.delete( '.gemtest' )
-	spec.version = "#{spec.version}.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"
+	spec.signing_key = nil
+	spec.version = "#{spec.version.bump}.0.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"
+	spec.cert_chain = [ 'certs/ged.pem' ]
 	File.open( task.name, 'w' ) do |fh|
 		fh.write( spec.to_ruby )
 	end
 end
 
-CLOBBER.include( GEMSPEC.to_s )
+CLOBBER.include( '*.gemspec' )
 task :default => :gemspec
 

data/Rakefile.cross

@@ -29,8 +29,8 @@ class CrossLibrary < OpenStruct
 		self.host_platform              = toolchain
 
 		# Cross-compilation constants
-		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.0.2d'
-		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '9.4.4'
+		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.0.2j'
+		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '9.6.2'
 
 		# Check if symlinks work in the current working directory.
 		# This fails, if rake-compiler-dock is running on a Windows box.
@@ -235,7 +235,7 @@ class CrossLibrary < OpenStruct
 		task :libpq => postgresql_lib
 
 		# copy libpq.dll to lib dir
-		dest_libpq = "lib/#{for_platform}/#{postgresql_lib.basename}"
+		dest_libpq = "lib/#{postgresql_lib.basename}"
 		directory File.dirname(dest_libpq)
 		file dest_libpq => [postgresql_lib, File.dirname(dest_libpq)] do
 			cp postgresql_lib, dest_libpq
@@ -290,12 +290,13 @@ task 'gem:windows' => ['ChangeLog'] do
 
   # Copy gem signing key and certs to be accessable from the docker container
   mkdir_p 'build/gem'
-  sh "cp ~/.gem/gem-*.pem build/gem/"
+  sh "cp ~/.gem/gem-*.pem build/gem/ || true"
+  sh "bundle package"
 
   RakeCompilerDock.sh <<-EOT
     mkdir ~/.gem &&
-    cp build/gem/gem-*.pem ~/.gem/ &&
-    bundle install &&
-    rake cross native gem RUBYOPT=--disable-rubygems RUBY_CC_VERSION=1.9.3:2.0.0:2.1.6:2.2.2
+    (cp build/gem/gem-*.pem ~/.gem/ || true) &&
+    bundle install --local &&
+    rake cross native gem RUBY_CC_VERSION=2.4.0:2.3.0:2.2.2:2.1.6:2.0.0
   EOT
 end

data/ext/errorcodes.def

@@ -198,6 +198,14 @@
   VALUE klass = define_error_class( "InvalidRowCountInResultOffsetClause", "22" );
   register_error_class( "2201X", klass );
 }
+{
+  VALUE klass = define_error_class( "InvalidTablesampleArgument", "22" );
+  register_error_class( "2202H", klass );
+}
+{
+  VALUE klass = define_error_class( "InvalidTablesampleRepeat", "22" );
+  register_error_class( "2202G", klass );
+}
 {
   VALUE klass = define_error_class( "InvalidTimeZoneDisplacementValue", "22" );
   register_error_class( "22009", klass );
@@ -365,6 +373,10 @@
   VALUE klass = define_error_class( "InFailedSqlTransaction", "25" );
   register_error_class( "25P02", klass );
 }
+{
+  VALUE klass = define_error_class( "IdleInTransactionSessionTimeout", "25" );
+  register_error_class( "25P03", klass );
+}
 {
   VALUE klass = define_error_class( "InvalidSqlStatementName", NULL );
   register_error_class( "26000", klass );
@@ -466,6 +478,10 @@
   VALUE klass = define_error_class( "ERIESrfProtocolViolated", "39" );
   register_error_class( "39P02", klass );
 }
+{
+  VALUE klass = define_error_class( "ERIEEventTriggerProtocolViolated", "39" );
+  register_error_class( "39P03", klass );
+}
 {
   VALUE klass = define_error_class( "SavepointException", NULL );
   register_error_class( "3B000", klass );
@@ -781,6 +797,11 @@
   VALUE klass = define_error_class( "DuplicateFile", "58" );
   register_error_class( "58P02", klass );
 }
+{
+  VALUE klass = define_error_class( "SnapshotTooOld", NULL );
+  register_error_class( "72000", klass );
+  register_error_class( "72", klass );
+}
 {
   VALUE klass = define_error_class( "ConfigFileError", NULL );
   register_error_class( "F0000", klass );
@@ -916,6 +937,10 @@
   VALUE klass = define_error_class( "TooManyRows", "P0" );
   register_error_class( "P0003", klass );
 }
+{
+  VALUE klass = define_error_class( "AssertFailure", "P0" );
+  register_error_class( "P0004", klass );
+}
 {
   VALUE klass = define_error_class( "InternalError", NULL );
   register_error_class( "XX000", klass );

data/ext/errorcodes.txt

@@ -2,7 +2,7 @@
 # errcodes.txt
 #      PostgreSQL error codes
 #
-# Copyright (c) 2003-2013, PostgreSQL Global Development Group
+# Copyright (c) 2003-2016, PostgreSQL Global Development Group
 #
 # This list serves as the basis for generating source files containing error
 # codes. It is kept in a common format to make sure all these source files have
@@ -15,6 +15,9 @@
 #   src/pl/plpgsql/src/plerrcodes.h
 #      a list of PL/pgSQL condition names and their SQLSTATE codes
 #
+#   src/pl/tcl/pltclerrcodes.h
+#      the same, for PL/Tcl
+#
 #   doc/src/sgml/errcodes-list.sgml
 #      a SGML table of error codes for inclusion in the documentation
 #
@@ -177,6 +180,8 @@ Section: Class 22 - Data Exception
 2201B    E    ERRCODE_INVALID_REGULAR_EXPRESSION                             invalid_regular_expression
 2201W    E    ERRCODE_INVALID_ROW_COUNT_IN_LIMIT_CLAUSE                      invalid_row_count_in_limit_clause
 2201X    E    ERRCODE_INVALID_ROW_COUNT_IN_RESULT_OFFSET_CLAUSE              invalid_row_count_in_result_offset_clause
+2202H    E    ERRCODE_INVALID_TABLESAMPLE_ARGUMENT                           invalid_tablesample_argument
+2202G    E    ERRCODE_INVALID_TABLESAMPLE_REPEAT                             invalid_tablesample_repeat
 22009    E    ERRCODE_INVALID_TIME_ZONE_DISPLACEMENT_VALUE                   invalid_time_zone_displacement_value
 2200C    E    ERRCODE_INVALID_USE_OF_ESCAPE_CHARACTER                        invalid_use_of_escape_character
 2200G    E    ERRCODE_MOST_SPECIFIC_TYPE_MISMATCH                            most_specific_type_mismatch
@@ -227,6 +232,7 @@ Section: Class 25 - Invalid Transaction State
 25007    E    ERRCODE_SCHEMA_AND_DATA_STATEMENT_MIXING_NOT_SUPPORTED         schema_and_data_statement_mixing_not_supported
 25P01    E    ERRCODE_NO_ACTIVE_SQL_TRANSACTION                              no_active_sql_transaction
 25P02    E    ERRCODE_IN_FAILED_SQL_TRANSACTION                              in_failed_sql_transaction
+25P03    E    ERRCODE_IDLE_IN_TRANSACTION_SESSION_TIMEOUT                    idle_in_transaction_session_timeout
 
 Section: Class 26 - Invalid SQL Statement Name
 
@@ -278,6 +284,7 @@ Section: Class 39 - External Routine Invocation Exception
 39004    E    ERRCODE_E_R_I_E_NULL_VALUE_NOT_ALLOWED                         null_value_not_allowed
 39P01    E    ERRCODE_E_R_I_E_TRIGGER_PROTOCOL_VIOLATED                      trigger_protocol_violated
 39P02    E    ERRCODE_E_R_I_E_SRF_PROTOCOL_VIOLATED                          srf_protocol_violated
+39P03    E    ERRCODE_E_R_I_E_EVENT_TRIGGER_PROTOCOL_VIOLATED                event_trigger_protocol_violated
 
 Section: Class 3B - Savepoint Exception
 
@@ -410,6 +417,10 @@ Section: Class 58 - System Error (errors external to PostgreSQL itself)
 58P01    E    ERRCODE_UNDEFINED_FILE                                         undefined_file
 58P02    E    ERRCODE_DUPLICATE_FILE                                         duplicate_file
 
+Section: Class 72 - Snapshot Failure
+# (class borrowed from Oracle)
+72000    E    ERRCODE_SNAPSHOT_TOO_OLD                                       snapshot_too_old
+
 Section: Class F0 - Configuration File Error
 
 # (PostgreSQL-specific error class)
@@ -454,6 +465,7 @@ P0000    E    ERRCODE_PLPGSQL_ERROR                                          plp
 P0001    E    ERRCODE_RAISE_EXCEPTION                                        raise_exception
 P0002    E    ERRCODE_NO_DATA_FOUND                                          no_data_found
 P0003    E    ERRCODE_TOO_MANY_ROWS                                          too_many_rows
+P0004    E    ERRCODE_ASSERT_FAILURE                                         assert_failure
 
 Section: Class XX - Internal Error
 

data/ext/extconf.rb

@@ -24,7 +24,11 @@ if enable_config("windows-cross")
 else
 	# Native build
 
-	if pgconfig = ( with_config('pg-config') || with_config('pg_config') || find_executable('pg_config') )
+	pgconfig = with_config('pg-config') ||
+		with_config('pg_config') ||
+		find_executable('pg_config')
+
+	if pgconfig && pgconfig != 'ignore'
 		$stderr.puts "Using config values from %s" % [ pgconfig ]
 		incdir = `"#{pgconfig}" --includedir`.chomp
 		libdir = `"#{pgconfig}" --libdir`.chomp
@@ -43,6 +47,9 @@ else
 	end
 end
 
+if RUBY_VERSION >= '2.3.0' && /solaris/ =~ RUBY_PLATFORM
+	append_cppflags( '-D__EXTENSIONS__' )
+end
 
 find_header( 'libpq-fe.h' ) or abort "Can't find the 'libpq-fe.h header"
 find_header( 'libpq/libpq-fs.h' ) or abort "Can't find the 'libpq/libpq-fs.h header"
@@ -73,6 +80,7 @@ have_func 'PQlibVersion'
 have_func 'PQping'
 have_func 'PQsetSingleRowMode'
 have_func 'PQconninfo'
+have_func 'PQsslAttribute'
 
 have_func 'rb_encdb_alias'
 have_func 'rb_enc_alias'

data/ext/gvl_wrappers.h

@@ -195,6 +195,9 @@ extern void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
 #define FOR_EACH_PARAM_OF_PQsendDescribePortal(param) \
 	param(PGconn *, conn)
 
+#define FOR_EACH_PARAM_OF_PQsetClientEncoding(param) \
+	param(PGconn *, conn)
+
 #define FOR_EACH_PARAM_OF_PQisBusy(param)
 
 #define FOR_EACH_PARAM_OF_PQcancel(param) \
@@ -226,6 +229,7 @@ extern void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
 	function(PQsendQueryPrepared, GVL_TYPE_NONVOID, int, int, resultFormat) \
 	function(PQsendDescribePrepared, GVL_TYPE_NONVOID, int, const char *, stmt) \
 	function(PQsendDescribePortal, GVL_TYPE_NONVOID, int, const char *, portal) \
+	function(PQsetClientEncoding, GVL_TYPE_NONVOID, int, const char *, encoding) \
 	function(PQisBusy, GVL_TYPE_NONVOID, int, PGconn *, conn) \
 	function(PQcancel, GVL_TYPE_NONVOID, int, int, errbufsize);
 

data/ext/pg.c

@@ -1,12 +1,13 @@
 /*
  * pg.c - Toplevel extension
- * $Id: pg.c,v b60c89ee93c8 2015/02/11 20:59:36 lars $
+ * $Id: pg.c,v c77d0997b4e4 2016/08/20 17:30:03 ged $
  *
  * Author/s:
  *
  * - Jeff Davis <ruby-pg@j-davis.com>
  * - Guy Decoux (ts) <decoux@moulon.inra.fr>
  * - Michael Granger <ged@FaerieMUD.org>
+ * - Lars Kanis <lars@greiz-reinsdorf.de>
  * - Dave Lee
  * - Eiji Matsumoto <usagi@ruby.club.or.jp>
  * - Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -15,10 +16,10 @@
  * See Contributors.rdoc for the many additional fine people that have contributed
  * to this library over the years.
  *
- * Copyright (c) 1997-2015 by the authors.
+ * Copyright (c) 1997-2016 by the authors.
  *
  * You may redistribute this software under the same terms as Ruby itself; see
- * http://www.ruby-lang.org/en/LICENSE.txt or the LICENSE file in the source
+ * https://www.ruby-lang.org/en/about/license.txt or the BSDL file in the source
  * for details.
  *
  * Portions of the code are from the PostgreSQL project, and are distributed

data/ext/pg.h

@@ -9,6 +9,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
+#if !defined(_WIN32)
+#	include <sys/time.h>
+#endif
 #if defined(HAVE_UNISTD_H) && !defined(_WIN32)
 #	include <unistd.h>
 #endif /* HAVE_UNISTD_H */
@@ -205,7 +208,7 @@ typedef struct {
 } t_pg_result;
 
 
-typedef int (* t_pg_coder_enc_func)(t_pg_coder *, VALUE, char *, VALUE *);
+typedef int (* t_pg_coder_enc_func)(t_pg_coder *, VALUE, char *, VALUE *, int);
 typedef VALUE (* t_pg_coder_dec_func)(t_pg_coder *, char *, int, int, int, int);
 typedef VALUE (* t_pg_fit_to_result)(VALUE, VALUE);
 typedef VALUE (* t_pg_fit_to_query)(VALUE, VALUE);
@@ -321,8 +324,8 @@ void init_pg_binary_decoder                            _(( void ));
 VALUE lookup_error_class                               _(( const char * ));
 VALUE pg_bin_dec_bytea                                 _(( t_pg_coder*, char *, int, int, int, int ));
 VALUE pg_text_dec_string                               _(( t_pg_coder*, char *, int, int, int, int ));
-int pg_coder_enc_to_s                                  _(( t_pg_coder*, VALUE, char *, VALUE *));
-int pg_text_enc_identifier                             _(( t_pg_coder*, VALUE, char *, VALUE *));
+int pg_coder_enc_to_s                                  _(( t_pg_coder*, VALUE, char *, VALUE *, int));
+int pg_text_enc_identifier                             _(( t_pg_coder*, VALUE, char *, VALUE *, int));
 t_pg_coder_enc_func pg_coder_enc_func                  _(( t_pg_coder* ));
 t_pg_coder_dec_func pg_coder_dec_func                  _(( t_pg_coder*, int ));
 void pg_define_coder                                   _(( const char *, void *, VALUE, VALUE ));

data/ext/pg_binary_encoder.c

@@ -1,6 +1,6 @@
 /*
  * pg_column_map.c - PG::ColumnMap class extension
- * $Id: pg_binary_encoder.c,v 72168db5fb7b 2015/11/04 16:13:42 lars $
+ * $Id: pg_binary_encoder.c,v e61a06f1f5ed 2015/12/25 21:14:21 lars $
  *
  */
 
@@ -22,7 +22,7 @@ VALUE rb_mPG_BinaryEncoder;
  *
  */
 static int
-pg_bin_enc_boolean(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
+pg_bin_enc_boolean(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate, int enc_idx)
 {
 	char mybool;
 	switch(value){
@@ -44,7 +44,7 @@ pg_bin_enc_boolean(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate
  *
  */
 static int
-pg_bin_enc_int2(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
+pg_bin_enc_int2(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate, int enc_idx)
 {
 	if(out){
 		write_nbo16(NUM2INT(*intermediate), out);
@@ -63,7 +63,7 @@ pg_bin_enc_int2(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
  *
  */
 static int
-pg_bin_enc_int4(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
+pg_bin_enc_int4(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate, int enc_idx)
 {
 	if(out){
 		write_nbo32(NUM2LONG(*intermediate), out);
@@ -82,7 +82,7 @@ pg_bin_enc_int4(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
  *
  */
 static int
-pg_bin_enc_int8(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
+pg_bin_enc_int8(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate, int enc_idx)
 {
 	if(out){
 		write_nbo64(NUM2LL(*intermediate), out);
@@ -100,7 +100,7 @@ pg_bin_enc_int8(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
  *
  */
 static int
-pg_bin_enc_from_base64(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
+pg_bin_enc_from_base64(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate, int enc_idx)
 {
 	int strlen;
 	VALUE subint;
@@ -109,13 +109,13 @@ pg_bin_enc_from_base64(t_pg_coder *conv, VALUE value, char *out, VALUE *intermed
 
 	if(out){
 		/* Second encoder pass, if required */
-		strlen = enc_func(this->elem, value, out, intermediate);
+		strlen = enc_func(this->elem, value, out, intermediate, enc_idx);
 		strlen = base64_decode( out, out, strlen );
 
 		return strlen;
 	} else {
 		/* First encoder pass */
-		strlen = enc_func(this->elem, value, NULL, &subint);
+		strlen = enc_func(this->elem, value, NULL, &subint, enc_idx);
 
 		if( strlen == -1 ){
 			/* Encoded string is returned in subint */