pg 0.18.3 → 1.4.3

data/ext/pg.h

@@ -9,95 +9,28 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
+#if !defined(_WIN32)
+#	include <sys/time.h>
+#	include <sys/socket.h>
+#endif
 #if defined(HAVE_UNISTD_H) && !defined(_WIN32)
 #	include <unistd.h>
 #endif /* HAVE_UNISTD_H */
 
 /* Ruby headers */
 #include "ruby.h"
-#ifdef HAVE_RUBY_ST_H
-#	include "ruby/st.h"
-#elif HAVE_ST_H
-#	include "st.h"
-#endif
+#include "ruby/st.h"
+#include "ruby/encoding.h"
 
-#if defined(HAVE_RUBY_ENCODING_H) && HAVE_RUBY_ENCODING_H
-#	include "ruby/encoding.h"
-#	define M17N_SUPPORTED
-#	ifdef HAVE_RB_ENCDB_ALIAS
-		extern int rb_encdb_alias(const char *, const char *);
-#		define ENC_ALIAS(name, orig) rb_encdb_alias((name), (orig))
-#	elif HAVE_RB_ENC_ALIAS
-		extern int rb_enc_alias(const char *, const char *);
-#		define ENC_ALIAS(name, orig) rb_enc_alias((name), (orig))
-#	else
-		extern int rb_enc_alias(const char *alias, const char *orig); /* declaration missing in Ruby 1.9.1 */
-#		define ENC_ALIAS(name, orig) rb_enc_alias((name), (orig))
-#	endif
-
-
-# if !defined(ENCODING_SET_INLINED)
-/* Rubinius doesn't define ENCODING_SET_INLINED, so we fall back to the more
- * portable version.
- */
-#  define PG_ENCODING_SET_NOCHECK(obj,i) \
-	do { \
-		rb_enc_set_index((obj), (i)); \
-	} while(0)
-# else
-#  define PG_ENCODING_SET_NOCHECK(obj,i) \
+#define PG_ENCODING_SET_NOCHECK(obj,i) \
 	do { \
 		if ((i) < ENCODING_INLINE_MAX) \
 			ENCODING_SET_INLINED((obj), (i)); \
 		else \
 			rb_enc_set_index((obj), (i)); \
 	} while(0)
-# endif
-
-#else
-#	define PG_ENCODING_SET_NOCHECK(obj,i) /* nothing */
-#endif
-
-#if RUBY_VM != 1
-#	define RUBY_18_COMPAT
-#endif
-
-#ifndef RARRAY_LEN
-#	define RARRAY_LEN(x) RARRAY((x))->len
-#endif /* RARRAY_LEN */
-
-#ifndef RSTRING_LEN
-#	define RSTRING_LEN(x) RSTRING((x))->len
-#endif /* RSTRING_LEN */
 
-#ifndef RSTRING_PTR
-#	define RSTRING_PTR(x) RSTRING((x))->ptr
-#endif /* RSTRING_PTR */
-
-#ifndef StringValuePtr
-#	define StringValuePtr(x) STR2CSTR(x)
-#endif /* StringValuePtr */
-
-#ifdef RUBY_18_COMPAT
-#	define rb_io_stdio_file GetWriteFile
-#	include "rubyio.h"
-#else
-#	include "ruby/io.h"
-#endif
-
-#ifdef RUBINIUS
-	/* Workaround for wrong FIXNUM_MAX definition */
-	typedef intptr_t native_int;
-#endif
-
-#ifndef RETURN_SIZED_ENUMERATOR
-	#define RETURN_SIZED_ENUMERATOR(obj, argc, argv, size_fn) RETURN_ENUMERATOR((obj), (argc), (argv))
-#endif
-
-#ifndef HAVE_RB_HASH_DUP
-	/* Rubinius doesn't define rb_hash_dup() */
-	#define rb_hash_dup(tuple) rb_funcall((tuple), rb_intern("dup"), 0)
-#endif
+#include "ruby/io.h"
 
 #ifndef timeradd
 #define timeradd(a, b, result) \
@@ -142,6 +75,21 @@ typedef long suseconds_t;
 	#define PG_MAX_COLUMNS 4000
 #endif
 
+#ifndef RARRAY_AREF
+#define RARRAY_AREF(a, i) (RARRAY_PTR(a)[i])
+#endif
+
+#ifdef HAVE_RB_GC_MARK_MOVABLE
+#define pg_compact_callback(x) (x)
+#define pg_gc_location(x) x = rb_gc_location(x)
+#else
+#define rb_gc_mark_movable(x) rb_gc_mark(x)
+#define pg_compact_callback(x) {(x)}
+#define pg_gc_location(x) UNUSED(x)
+#endif
+
+#define PG_ENC_IDX_BITS 28
+
 /* The data behind each PG::Connection object */
 typedef struct {
 	PGconn *pgconn;
@@ -158,13 +106,21 @@ typedef struct {
 	VALUE type_map_for_results;
 	/* IO object internally used for the trace stream */
 	VALUE trace_stream;
-	/* Cached Encoding object */
-	VALUE external_encoding;
 	/* Kind of PG::Coder object for casting ruby values to COPY rows */
 	VALUE encoder_for_put_copy_data;
 	/* Kind of PG::Coder object for casting COPY rows to ruby values */
 	VALUE decoder_for_get_copy_data;
+	/* Ruby encoding index of the client/internal encoding */
+	int enc_idx : PG_ENC_IDX_BITS;
+	/* flags controlling Symbol/String field names */
+	unsigned int flags : 2;
+	/* enable automatic flushing of send data at the end of send_query calls */
+	unsigned int flush_data : 1;
 
+#if defined(_WIN32)
+	/* File descriptor to be used for rb_w32_unwrap_io_handle() */
+	int ruby_sd;
+#endif
 } t_pg_connection;
 
 typedef struct pg_coder t_pg_coder;
@@ -185,28 +141,40 @@ typedef struct {
 	 */
 	t_typemap *p_typemap;
 
+	/* Ruby encoding index of the client/internal encoding */
+	int enc_idx : PG_ENC_IDX_BITS;
+
 	/* 0 = PGresult is cleared by PG::Result#clear or by the GC
 	 * 1 = PGresult is cleared internally by libpq
 	 */
-	int autoclear;
+	unsigned int autoclear : 1;
+
+	/* flags controlling Symbol/String field names */
+	unsigned int flags : 2;
 
 	/* Number of fields in fnames[] .
 	 * Set to -1 if fnames[] is not yet initialized.
 	 */
 	int nfields;
 
+	/* Size of PGresult as published to ruby memory management. */
+	ssize_t result_size;
+
 	/* Prefilled tuple Hash with fnames[] as keys. */
 	VALUE tuple_hash;
 
-	/* List of field names as frozen String objects.
+	/* Hash with fnames[] to field number mapping. */
+	VALUE field_map;
+
+	/* List of field names as frozen String or Symbol objects.
 	 * Only valid if nfields != -1
 	 */
 	VALUE fnames[0];
 } t_pg_result;
 
 
-typedef int (* t_pg_coder_enc_func)(t_pg_coder *, VALUE, char *, VALUE *);
-typedef VALUE (* t_pg_coder_dec_func)(t_pg_coder *, char *, int, int, int, int);
+typedef int (* t_pg_coder_enc_func)(t_pg_coder *, VALUE, char *, VALUE *, int);
+typedef VALUE (* t_pg_coder_dec_func)(t_pg_coder *, const char *, int, int, int, int);
 typedef VALUE (* t_pg_fit_to_result)(VALUE, VALUE);
 typedef VALUE (* t_pg_fit_to_query)(VALUE, VALUE);
 typedef int (* t_pg_fit_to_copy_get)(VALUE);
@@ -214,12 +182,27 @@ typedef VALUE (* t_pg_typecast_result)(t_typemap *, VALUE, int, int);
 typedef t_pg_coder *(* t_pg_typecast_query_param)(t_typemap *, VALUE, int);
 typedef VALUE (* t_pg_typecast_copy_get)( t_typemap *, VALUE, int, int, int );
 
+#define PG_RESULT_FIELD_NAMES_MASK 0x03
+#define PG_RESULT_FIELD_NAMES_SYMBOL 0x01
+#define PG_RESULT_FIELD_NAMES_STATIC_SYMBOL 0x02
+
+#define PG_CODER_TIMESTAMP_DB_UTC 0x0
+#define PG_CODER_TIMESTAMP_DB_LOCAL 0x1
+#define PG_CODER_TIMESTAMP_APP_UTC 0x0
+#define PG_CODER_TIMESTAMP_APP_LOCAL 0x2
+#define PG_CODER_FORMAT_ERROR_MASK 0xc
+#define PG_CODER_FORMAT_ERROR_TO_RAISE 0x4
+#define PG_CODER_FORMAT_ERROR_TO_STRING 0x8
+#define PG_CODER_FORMAT_ERROR_TO_PARTIAL 0xc
+
 struct pg_coder {
 	t_pg_coder_enc_func enc_func;
 	t_pg_coder_dec_func dec_func;
 	VALUE coder_obj;
 	Oid oid;
 	int format;
+	/* OR-ed values out of PG_CODER_* */
+	int flags;
 };
 
 typedef struct {
@@ -249,6 +232,8 @@ typedef struct {
 	} convs[0];
 } t_tmbc;
 
+extern const rb_data_type_t pg_typemap_type;
+extern const rb_data_type_t pg_coder_type;
 
 #include "gvl_wrappers.h"
 
@@ -256,6 +241,7 @@ typedef struct {
  * Globals
  **************************************************************************/
 
+extern int pg_skip_deprecation_warning;
 extern VALUE rb_mPG;
 extern VALUE rb_ePGerror;
 extern VALUE rb_eServerError;
@@ -314,15 +300,17 @@ void init_pg_type_map_by_oid                           _(( void ));
 void init_pg_type_map_in_ruby                          _(( void ));
 void init_pg_coder                                     _(( void ));
 void init_pg_copycoder                                 _(( void ));
+void init_pg_recordcoder                               _(( void ));
 void init_pg_text_encoder                              _(( void ));
 void init_pg_text_decoder                              _(( void ));
 void init_pg_binary_encoder                            _(( void ));
 void init_pg_binary_decoder                            _(( void ));
+void init_pg_tuple                                     _(( 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 *));
+VALUE pg_bin_dec_bytea                                 _(( t_pg_coder*, const char *, int, int, int, int ));
+VALUE pg_text_dec_string                               _(( t_pg_coder*, const char *, int, int, int, int ));
+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 ));
@@ -330,6 +318,7 @@ VALUE pg_obj_to_i                                      _(( VALUE ));
 VALUE pg_tmbc_allocate                                 _(( void ));
 void pg_coder_init_encoder                             _(( VALUE ));
 void pg_coder_init_decoder                             _(( VALUE ));
+void pg_coder_compact                                  _(( void * ));
 char *pg_rb_str_ensure_capa                            _(( VALUE, long, char *, char ** ));
 
 #define PG_RB_STR_ENSURE_CAPA( str, expand_len, curr_ptr, end_ptr ) \
@@ -343,26 +332,26 @@ char *pg_rb_str_ensure_capa                            _(( VALUE, long, char *,
 		(curr_ptr) = (end_ptr) = RSTRING_PTR(str) \
 	)
 
-#define PG_RB_TAINTED_STR_NEW( str, curr_ptr, end_ptr ) ( \
-		(str) = rb_tainted_str_new( NULL, 0 ), \
-		(curr_ptr) = (end_ptr) = RSTRING_PTR(str) \
-	)
-
 VALUE pg_typemap_fit_to_result                         _(( VALUE, VALUE ));
 VALUE pg_typemap_fit_to_query                          _(( VALUE, VALUE ));
 int pg_typemap_fit_to_copy_get                         _(( VALUE ));
 VALUE pg_typemap_result_value                          _(( t_typemap *, VALUE, int, int ));
 t_pg_coder *pg_typemap_typecast_query_param            _(( t_typemap *, VALUE, int ));
 VALUE pg_typemap_typecast_copy_get                     _(( t_typemap *, VALUE, int, int, int ));
+void pg_typemap_mark                                   _(( void * ));
+size_t pg_typemap_memsize                              _(( const void * ));
+void pg_typemap_compact                                _(( void * ));
 
 PGconn *pg_get_pgconn                                  _(( VALUE ));
 t_pg_connection *pg_get_connection                     _(( VALUE ));
+VALUE pgconn_block                                     _(( int, VALUE *, VALUE ));
 
 VALUE pg_new_result                                    _(( PGresult *, VALUE ));
 VALUE pg_new_result_autoclear                          _(( PGresult *, VALUE ));
 PGresult* pgresult_get                                 _(( VALUE ));
 VALUE pg_result_check                                  _(( VALUE ));
 VALUE pg_result_clear                                  _(( VALUE ));
+VALUE pg_tuple_new                                     _(( VALUE, int ));
 
 /*
  * Fetch the data pointer for the result object
@@ -370,23 +359,28 @@ VALUE pg_result_clear                                  _(( VALUE ));
 static inline t_pg_result *
 pgresult_get_this( VALUE self )
 {
-	t_pg_result *this = DATA_PTR(self);
-
-	if( this == NULL )
-		rb_raise(rb_ePGerror, "result has been cleared");
-
-	return this;
+	return RTYPEDDATA_DATA(self);
 }
 
 
-#ifdef M17N_SUPPORTED
 rb_encoding * pg_get_pg_encoding_as_rb_encoding        _(( int ));
 rb_encoding * pg_get_pg_encname_as_rb_encoding         _(( const char * ));
 const char * pg_get_rb_encoding_as_pg_encoding         _(( rb_encoding * ));
 rb_encoding *pg_conn_enc_get                           _(( PGconn * ));
-#endif /* M17N_SUPPORTED */
 
 void notice_receiver_proxy(void *arg, const PGresult *result);
 void notice_processor_proxy(void *arg, const char *message);
 
+/* reports if `-W' specified and PG_SKIP_DEPRECATION_WARNING environment variable isn't set
+ *
+ * message_id identifies the warning, so that it's reported only once.
+ */
+#define pg_deprecated(message_id, format_args) \
+	do { \
+		if( !(pg_skip_deprecation_warning & (1 << message_id)) ){ \
+			pg_skip_deprecation_warning |= 1 << message_id; \
+			rb_warning format_args; \
+		} \
+	} while(0);
+
 #endif /* end __pg_h */

data/ext/pg_binary_decoder.c

@@ -1,12 +1,15 @@
 /*
  * pg_column_map.c - PG::ColumnMap class extension
- * $Id: pg_binary_decoder.c,v 185638b52684 2014/11/08 20:43:53 lars $
+ * $Id$
  *
  */
 
+#include "ruby/version.h"
 #include "pg.h"
-#include "util.h"
+#include "pg_util.h"
+#ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
+#endif
 
 VALUE rb_mPG_BinaryDecoder;
 
@@ -14,12 +17,12 @@ VALUE rb_mPG_BinaryDecoder;
 /*
  * Document-class: PG::BinaryDecoder::Boolean < PG::SimpleDecoder
  *
- * This is a decoder class for conversion of PostgreSQL binary bool type
- * to Ruby true or false objects.
+ * This is a decoder class for conversion of PostgreSQL binary +bool+ type
+ * to Ruby +true+ or +false+ objects.
  *
  */
 static VALUE
-pg_bin_dec_boolean(t_pg_coder *conv, char *val, int len, int tuple, int field, int enc_idx)
+pg_bin_dec_boolean(t_pg_coder *conv, const char *val, int len, int tuple, int field, int enc_idx)
 {
 	if (len < 1) {
 		rb_raise( rb_eTypeError, "wrong data for binary boolean converter in tuple %d field %d", tuple, field);
@@ -30,12 +33,12 @@ pg_bin_dec_boolean(t_pg_coder *conv, char *val, int len, int tuple, int field, i
 /*
  * Document-class: PG::BinaryDecoder::Integer < PG::SimpleDecoder
  *
- * This is a decoder class for conversion of PostgreSQL binary int2, int4 and int8 types
+ * This is a decoder class for conversion of PostgreSQL binary +int2+, +int4+ and +int8+ types
  * to Ruby Integer objects.
  *
  */
 static VALUE
-pg_bin_dec_integer(t_pg_coder *conv, char *val, int len, int tuple, int field, int enc_idx)
+pg_bin_dec_integer(t_pg_coder *conv, const char *val, int len, int tuple, int field, int enc_idx)
 {
 	switch( len ){
 		case 2:
@@ -52,12 +55,12 @@ pg_bin_dec_integer(t_pg_coder *conv, char *val, int len, int tuple, int field, i
 /*
  * Document-class: PG::BinaryDecoder::Float < PG::SimpleDecoder
  *
- * This is a decoder class for conversion of PostgreSQL binary float4 and float8 types
+ * This is a decoder class for conversion of PostgreSQL binary +float4+ and +float8+ types
  * to Ruby Float objects.
  *
  */
 static VALUE
-pg_bin_dec_float(t_pg_coder *conv, char *val, int len, int tuple, int field, int enc_idx)
+pg_bin_dec_float(t_pg_coder *conv, const char *val, int len, int tuple, int field, int enc_idx)
 {
 	union {
 		float f;
@@ -84,15 +87,15 @@ pg_bin_dec_float(t_pg_coder *conv, char *val, int len, int tuple, int field, int
  * Document-class: PG::BinaryDecoder::Bytea < PG::SimpleDecoder
  *
  * This decoder class delivers the data received from the server as binary String object.
- * It is therefore suitable for conversion of PostgreSQL bytea data as well as any other
+ * It is therefore suitable for conversion of PostgreSQL +bytea+ data as well as any other
  * data in binary format.
  *
  */
 VALUE
-pg_bin_dec_bytea(t_pg_coder *conv, char *val, int len, int tuple, int field, int enc_idx)
+pg_bin_dec_bytea(t_pg_coder *conv, const char *val, int len, int tuple, int field, int enc_idx)
 {
 	VALUE ret;
-	ret = rb_tainted_str_new( val, len );
+	ret = rb_str_new( val, len );
 	PG_ENCODING_SET_NOCHECK( ret, rb_ascii8bit_encindex() );
 	return ret;
 }
@@ -100,17 +103,17 @@ pg_bin_dec_bytea(t_pg_coder *conv, char *val, int len, int tuple, int field, int
 /*
  * Document-class: PG::BinaryDecoder::ToBase64 < PG::CompositeDecoder
  *
- * This is a decoder class for conversion of binary (bytea) to base64 data.
+ * This is a decoder class for conversion of binary +bytea+ to base64 data.
  *
  */
 static VALUE
-pg_bin_dec_to_base64(t_pg_coder *conv, char *val, int len, int tuple, int field, int enc_idx)
+pg_bin_dec_to_base64(t_pg_coder *conv, const char *val, int len, int tuple, int field, int enc_idx)
 {
 	t_pg_composite_coder *this = (t_pg_composite_coder *)conv;
 	t_pg_coder_dec_func dec_func = pg_coder_dec_func(this->elem, this->comp.format);
 	int encoded_len = BASE64_ENCODED_SIZE(len);
 	/* create a buffer of the encoded length */
-	VALUE out_value = rb_tainted_str_new(NULL, encoded_len);
+	VALUE out_value = rb_str_new(NULL, encoded_len);
 
 	base64_encode( RSTRING_PTR(out_value), val, len );
 
@@ -128,6 +131,70 @@ pg_bin_dec_to_base64(t_pg_coder *conv, char *val, int len, int tuple, int field,
 	return out_value;
 }
 
+#define PG_INT64_MIN	(-0x7FFFFFFFFFFFFFFFL - 1)
+#define PG_INT64_MAX	0x7FFFFFFFFFFFFFFFL
+
+/*
+ * Document-class: PG::BinaryDecoder::Timestamp < PG::SimpleDecoder
+ *
+ * This is a decoder class for conversion of PostgreSQL binary timestamps
+ * to Ruby Time objects.
+ *
+ * The following flags can be used to specify timezone interpretation:
+ * * +PG::Coder::TIMESTAMP_DB_UTC+ : Interpret timestamp as UTC time (default)
+ * * +PG::Coder::TIMESTAMP_DB_LOCAL+ : Interpret timestamp as local time
+ * * +PG::Coder::TIMESTAMP_APP_UTC+ : Return timestamp as UTC time (default)
+ * * +PG::Coder::TIMESTAMP_APP_LOCAL+ : Return timestamp as local time
+ *
+ * Example:
+ *   deco = PG::BinaryDecoder::Timestamp.new(flags: PG::Coder::TIMESTAMP_DB_UTC | PG::Coder::TIMESTAMP_APP_LOCAL)
+ *   deco.decode("\0"*8)  # => 2000-01-01 01:00:00 +0100
+ */
+static VALUE
+pg_bin_dec_timestamp(t_pg_coder *conv, const char *val, int len, int tuple, int field, int enc_idx)
+{
+	int64_t timestamp;
+	int64_t sec;
+	int64_t nsec;
+	VALUE t;
+
+	if( len != sizeof(timestamp) ){
+		rb_raise( rb_eTypeError, "wrong data for timestamp converter in tuple %d field %d length %d", tuple, field, len);
+	}
+
+	timestamp = read_nbo64(val);
+
+	switch(timestamp){
+		case PG_INT64_MAX:
+			return rb_str_new2("infinity");
+		case PG_INT64_MIN:
+			return rb_str_new2("-infinity");
+		default:
+			/* PostgreSQL's timestamp is based on year 2000 and Ruby's time is based on 1970.
+			 * Adjust the 30 years difference. */
+			sec = (timestamp / 1000000) + 10957L * 24L * 3600L;
+			nsec = (timestamp % 1000000) * 1000;
+
+#if (RUBY_API_VERSION_MAJOR > 2 || (RUBY_API_VERSION_MAJOR == 2 && RUBY_API_VERSION_MINOR >= 3)) && defined(NEGATIVE_TIME_T) && defined(SIZEOF_TIME_T) && SIZEOF_TIME_T >= 8
+			/* Fast path for time conversion */
+			{
+				struct timespec ts = {sec, nsec};
+				t = rb_time_timespec_new(&ts, conv->flags & PG_CODER_TIMESTAMP_APP_LOCAL ? INT_MAX : INT_MAX-1);
+			}
+#else
+			t = rb_funcall(rb_cTime, rb_intern("at"), 2, LL2NUM(sec), LL2NUM(nsec / 1000));
+			if( !(conv->flags & PG_CODER_TIMESTAMP_APP_LOCAL) ) {
+				t = rb_funcall(t, rb_intern("utc"), 0);
+			}
+#endif
+			if( conv->flags & PG_CODER_TIMESTAMP_DB_LOCAL ) {
+				/* interpret it as local time */
+				t = rb_funcall(t, rb_intern("-"), 1, rb_funcall(t, rb_intern("utc_offset"), 0));
+			}
+			return t;
+	}
+}
+
 /*
  * Document-class: PG::BinaryDecoder::String < PG::SimpleDecoder
  *
@@ -154,6 +221,8 @@ init_pg_binary_decoder()
 	pg_define_coder( "String", pg_text_dec_string, rb_cPG_SimpleDecoder, rb_mPG_BinaryDecoder );
 	/* dummy = rb_define_class_under( rb_mPG_BinaryDecoder, "Bytea", rb_cPG_SimpleDecoder ); */
 	pg_define_coder( "Bytea", pg_bin_dec_bytea, rb_cPG_SimpleDecoder, rb_mPG_BinaryDecoder );
+	/* dummy = rb_define_class_under( rb_mPG_BinaryDecoder, "Timestamp", rb_cPG_SimpleDecoder ); */
+	pg_define_coder( "Timestamp", pg_bin_dec_timestamp, rb_cPG_SimpleDecoder, rb_mPG_BinaryDecoder );
 
 	/* dummy = rb_define_class_under( rb_mPG_BinaryDecoder, "ToBase64", rb_cPG_CompositeDecoder ); */
 	pg_define_coder( "ToBase64", pg_bin_dec_to_base64, rb_cPG_CompositeDecoder, rb_mPG_BinaryDecoder );

data/ext/pg_binary_encoder.c

@@ -1,12 +1,14 @@
 /*
  * pg_column_map.c - PG::ColumnMap class extension
- * $Id: pg_binary_encoder.c,v ac23631c96d9 2014/10/14 11:50:21 lars $
+ * $Id$
  *
  */
 
 #include "pg.h"
-#include "util.h"
+#include "pg_util.h"
+#ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
+#endif
 
 VALUE rb_mPG_BinaryEncoder;
 
@@ -20,29 +22,30 @@ 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 bool;
-	switch(value){
-		case Qtrue : bool = 1; break;
-		case Qfalse : bool = 0; break;
-		default :
-			rb_raise( rb_eTypeError, "wrong data for binary boolean converter" );
+	char mybool;
+    if (value == Qtrue) {
+      mybool = 1;
+    } else if (value == Qfalse) {
+      mybool = 0;
+    } else {
+      rb_raise( rb_eTypeError, "wrong data for binary boolean converter" );
 	}
-	if(out) *out = bool;
+	if(out) *out = mybool;
 	return 1;
 }
 
 /*
  * Document-class: PG::BinaryEncoder::Int2 < PG::SimpleEncoder
  *
- * This is the encoder class for the PostgreSQL int2 type.
+ * This is the encoder class for the PostgreSQL +int2+ (alias +smallint+) type.
  *
  * Non-Number values are expected to have method +to_i+ defined.
  *
  */
 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);
@@ -53,15 +56,15 @@ pg_bin_enc_int2(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
 }
 
 /*
- * Document-class: PG::BinaryEncoder::Int2 < PG::SimpleEncoder
+ * Document-class: PG::BinaryEncoder::Int4 < PG::SimpleEncoder
  *
- * This is the encoder class for the PostgreSQL int4 type.
+ * This is the encoder class for the PostgreSQL +int4+ (alias +integer+) type.
  *
  * Non-Number values are expected to have method +to_i+ defined.
  *
  */
 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);
@@ -72,15 +75,15 @@ pg_bin_enc_int4(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
 }
 
 /*
- * Document-class: PG::BinaryEncoder::Int2 < PG::SimpleEncoder
+ * Document-class: PG::BinaryEncoder::Int8 < PG::SimpleEncoder
  *
- * This is the encoder class for the PostgreSQL int8 type.
+ * This is the encoder class for the PostgreSQL +int8+ (alias +bigint+) type.
  *
  * Non-Number values are expected to have method +to_i+ defined.
  *
  */
 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);
@@ -98,7 +101,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;
@@ -107,13 +110,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 */