pg 0.17.1-x64-mingw32 → 0.18.0.pre20141017160319-x64-mingw32

data/ext/pg.h

@@ -24,7 +24,6 @@
 #if defined(HAVE_RUBY_ENCODING_H) && HAVE_RUBY_ENCODING_H
 #	include "ruby/encoding.h"
 #	define M17N_SUPPORTED
-#	define ASSOCIATE_INDEX( obj, index_holder ) rb_enc_associate_index((obj), pg_enc_get_index((index_holder)))
 #	ifdef HAVE_RB_ENCDB_ALIAS
 		extern int rb_encdb_alias(const char *, const char *);
 #		define ENC_ALIAS(name, orig) rb_encdb_alias((name), (orig))
@@ -35,8 +34,28 @@
 		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) \
+	do { \
+		if ((i) < ENCODING_INLINE_MAX) \
+			ENCODING_SET_INLINED((obj), (i)); \
+		else \
+			rb_enc_set_index((obj), (i)); \
+	} while(0)
+# endif
+
 #else
-#	define ASSOCIATE_INDEX( obj, index_holder ) /* nothing */
+#	define PG_ENCODING_SET_NOCHECK(obj,i) /* nothing */
 #endif
 
 #if RUBY_VM != 1
@@ -66,6 +85,11 @@
 #	include "ruby/io.h"
 #endif
 
+#ifdef RUBINIUS
+	/* Workaround for wrong FIXNUM_MAX definition */
+	typedef intptr_t native_int;
+#endif
+
 #ifndef timeradd
 #define timeradd(a, b, result) \
 	do { \
@@ -97,10 +121,101 @@
 
 #if defined(_WIN32)
 #	include <fcntl.h>
-__declspec(dllexport)
 typedef long suseconds_t;
 #endif
 
+/* The data behind each PG::Connection object */
+typedef struct {
+	PGconn *pgconn;
+
+	/* Cached IO object for the socket descriptor */
+	VALUE socket_io;
+	/* Proc object that receives notices as PG::Result objects */
+	VALUE notice_receiver;
+	/* Proc object that receives notices as String objects */
+	VALUE notice_processor;
+	/* Kind of PG::TypeMap object for casting query params */
+	VALUE type_map_for_queries;
+	/* Kind of PG::TypeMap object for casting result values */
+	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;
+
+} t_pg_connection;
+
+typedef struct pg_coder t_pg_coder;
+typedef struct pg_typemap t_typemap;
+
+/* The data behind each PG::Result object */
+typedef struct {
+	PGresult *pgresult;
+
+	/* The connection object used to build this result */
+	VALUE connection;
+
+	/* The TypeMap used to type cast result values */
+	VALUE typemap;
+
+	/* Pointer to the typemap object data. This is assumed to be
+	 * always valid.
+	 */
+	t_typemap *p_typemap;
+
+	/* 0 = PGresult is cleared by PG::Result#clear or by the GC
+	 * 1 = PGresult is cleared internally by libpq
+	 */
+	int autoclear;
+} 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 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);
+typedef VALUE (* t_pg_typecast_result)(VALUE, int, int);
+typedef t_pg_coder *(* t_pg_typecast_query_param)(VALUE, VALUE, int);
+typedef VALUE (* t_pg_typecast_copy_get)( t_typemap *, VALUE, int, int, int );
+
+struct pg_coder {
+	t_pg_coder_enc_func enc_func;
+	t_pg_coder_dec_func dec_func;
+	VALUE coder_obj;
+	Oid oid;
+	int format;
+};
+
+typedef struct {
+	t_pg_coder comp;
+	t_pg_coder *elem;
+	int needs_quotation;
+	char delimiter;
+} t_pg_composite_coder;
+
+struct pg_typemap {
+	t_pg_fit_to_result fit_to_result;
+	t_pg_fit_to_query fit_to_query;
+	t_pg_fit_to_copy_get fit_to_copy_get;
+	t_pg_typecast_result typecast_result_value;
+	t_pg_typecast_query_param typecast_query_param;
+	t_pg_typecast_copy_get typecast_copy_get;
+};
+
+typedef struct {
+	t_typemap typemap;
+	int nfields;
+	struct pg_tmbc_converter {
+		t_pg_coder *cconv;
+	} convs[0];
+} t_tmbc;
+
+
 #include "gvl_wrappers.h"
 
 /***************************************************************************
@@ -116,7 +231,23 @@ extern VALUE rb_mPGconstants;
 extern VALUE rb_cPGconn;
 extern VALUE rb_cPGresult;
 extern VALUE rb_hErrors;
+extern VALUE rb_cTypeMap;
+extern VALUE rb_cTypeMapAllStrings;
+extern VALUE rb_cPG_Coder;
+extern VALUE rb_cPG_SimpleEncoder;
+extern VALUE rb_cPG_SimpleDecoder;
+extern VALUE rb_cPG_CompositeEncoder;
+extern VALUE rb_cPG_CompositeDecoder;
+extern VALUE rb_cPG_CopyCoder;
+extern VALUE rb_cPG_CopyEncoder;
+extern VALUE rb_cPG_CopyDecoder;
+extern VALUE rb_mPG_TextEncoder;
+extern VALUE rb_mPG_TextDecoder;
+extern VALUE rb_mPG_BinaryEncoder;
+extern VALUE rb_mPG_BinaryDecoder;
+extern const t_typemap pg_tmbc_default_typemap;
 
+extern VALUE pg_default_typemap;
 
 /***************************************************************************
  * MACROS
@@ -134,19 +265,76 @@ void Init_pg_ext                                       _(( void ));
 void init_pg_connection                                _(( void ));
 void init_pg_result                                    _(( void ));
 void init_pg_errors                                    _(( void ));
-VALUE lookup_error_class                               _(( const char *sqlstate ));
+void init_pg_type_map                                  _(( void ));
+void init_pg_type_map_all_strings                      _(( void ));
+void init_pg_type_map_by_column                        _(( void ));
+void init_pg_type_map_by_mri_type                      _(( void ));
+void init_pg_type_map_by_oid                           _(( void ));
+void init_pg_coder                                     _(( void ));
+void init_pg_copycoder                                 _(( 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 ));
+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 *));
+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 ));
+VALUE pg_obj_to_i                                      _(( VALUE ));
+VALUE pg_tmbc_allocate                                 _(( void ));
+void pg_coder_init_encoder                             _(( VALUE ));
+void pg_coder_init_decoder                             _(( VALUE ));
+char *pg_rb_str_ensure_capa                            _(( VALUE, long, char *, char ** ));
 
-PGconn *pg_get_pgconn	                               _(( VALUE ));
+#define PG_RB_STR_ENSURE_CAPA( str, expand_len, curr_ptr, end_ptr ) \
+	do { \
+		if( (curr_ptr) + (expand_len) >= (end_ptr) ) \
+			(curr_ptr) = pg_rb_str_ensure_capa( (str), (expand_len), (curr_ptr), &(end_ptr) ); \
+	} while(0);
+
+#define PG_RB_STR_NEW( str, curr_ptr, end_ptr ) ( \
+		(str) = rb_str_new( NULL, 0 ), \
+		(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                          _(( VALUE, int, int ));
+t_pg_coder *pg_typemap_typecast_query_param            _(( VALUE, VALUE, int ));
+VALUE pg_typemap_typecast_copy_get                     _(( t_typemap *, VALUE, int, int, int ));
+
+PGconn *pg_get_pgconn                                  _(( VALUE ));
+t_pg_connection *pg_get_connection                     _(( 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 ));
 
+/*
+ * Fetch the data pointer for the result object
+ */
+static inline t_pg_result *
+pgresult_get_this( VALUE self )
+{
+	return DATA_PTR(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 * ));
-int pg_enc_get_index                                   _(( VALUE ));
 rb_encoding *pg_conn_enc_get                           _(( PGconn * ));
 #endif /* M17N_SUPPORTED */
 

data/ext/pg_binary_decoder.c

@@ -0,0 +1,160 @@
+/*
+ * pg_column_map.c - PG::ColumnMap class extension
+ * $Id$
+ *
+ */
+
+#include "pg.h"
+#include "util.h"
+#include <inttypes.h>
+
+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.
+ *
+ */
+static VALUE
+pg_bin_dec_boolean(t_pg_coder *conv, 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);
+	}
+	return *val == 0 ? Qfalse : Qtrue;
+}
+
+/*
+ * Document-class: PG::BinaryDecoder::Integer < PG::SimpleDecoder
+ *
+ * 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)
+{
+	switch( len ){
+		case 2:
+			return INT2NUM(read_nbo16(val));
+		case 4:
+			return LONG2NUM(read_nbo32(val));
+		case 8:
+			return LL2NUM(read_nbo64(val));
+		default:
+			rb_raise( rb_eTypeError, "wrong data for binary integer converter in tuple %d field %d length %d", tuple, field, len);
+	}
+}
+
+/*
+ * Document-class: PG::BinaryDecoder::Float < PG::SimpleDecoder
+ *
+ * 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)
+{
+	union {
+		float f;
+		int32_t i;
+	} swap4;
+	union {
+		double f;
+		int64_t i;
+	} swap8;
+
+	switch( len ){
+		case 4:
+			swap4.i = read_nbo32(val);
+			return rb_float_new(swap4.f);
+		case 8:
+			swap8.i = read_nbo64(val);
+			return rb_float_new(swap8.f);
+		default:
+			rb_raise( rb_eTypeError, "wrong data for BinaryFloat converter in tuple %d field %d length %d", tuple, field, len);
+	}
+}
+
+/*
+ * Document-class: PG::BinaryDecoder::Bytea < PG::SimpleDecoder
+ *
+ * This is a decoder class for conversion of PostgreSQL binary data (bytea)
+ * to binary Ruby String objects or some other Ruby object, if a #elements_type
+ * decoder was defined.
+ *
+ */
+VALUE
+pg_bin_dec_bytea(t_pg_coder *conv, char *val, int len, int tuple, int field, int enc_idx)
+{
+	VALUE ret;
+	ret = rb_tainted_str_new( val, len );
+	PG_ENCODING_SET_NOCHECK( ret, rb_ascii8bit_encindex() );
+	return ret;
+}
+
+/*
+ * Document-class: PG::BinaryDecoder::ToBase64 < PG::CompositeDecoder
+ *
+ * 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)
+{
+	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);
+
+	base64_encode( RSTRING_PTR(out_value), val, len );
+
+	/* Is it a pure String conversion? Then we can directly send out_value to the user. */
+	if( this->comp.format == 0 && dec_func == pg_text_dec_string ){
+		PG_ENCODING_SET_NOCHECK( out_value, enc_idx );
+		return out_value;
+	}
+	if( this->comp.format == 1 && dec_func == pg_bin_dec_bytea ){
+		PG_ENCODING_SET_NOCHECK( out_value, rb_ascii8bit_encindex() );
+		return out_value;
+	}
+	out_value = dec_func(this->elem, RSTRING_PTR(out_value), encoded_len, tuple, field, enc_idx);
+
+	return out_value;
+}
+
+/*
+ * Document-class: PG::BinaryDecoder::String < PG::SimpleDecoder
+ *
+ * This is a decoder class for conversion of PostgreSQL text output to
+ * to Ruby String object. The output value will have the character encoding
+ * set with PG::Connection#internal_encoding= .
+ *
+ */
+
+void
+init_pg_binary_decoder()
+{
+	/* This module encapsulates all decoder classes with binary input format */
+	rb_mPG_BinaryDecoder = rb_define_module_under( rb_mPG, "BinaryDecoder" );
+
+	/* Make RDoc aware of the decoder classes... */
+	/* dummy = rb_define_class_under( rb_mPG_BinaryDecoder, "Boolean", rb_cPG_SimpleDecoder ); */
+	pg_define_coder( "Boolean", pg_bin_dec_boolean, rb_cPG_SimpleDecoder, rb_mPG_BinaryDecoder );
+	/* dummy = rb_define_class_under( rb_mPG_BinaryDecoder, "Integer", rb_cPG_SimpleDecoder ); */
+	pg_define_coder( "Integer", pg_bin_dec_integer, rb_cPG_SimpleDecoder, rb_mPG_BinaryDecoder );
+	/* dummy = rb_define_class_under( rb_mPG_BinaryDecoder, "Float", rb_cPG_SimpleDecoder ); */
+	pg_define_coder( "Float", pg_bin_dec_float, rb_cPG_SimpleDecoder, rb_mPG_BinaryDecoder );
+	/* dummy = rb_define_class_under( rb_mPG_BinaryDecoder, "String", rb_cPG_SimpleDecoder ); */
+	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, "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

@@ -0,0 +1,160 @@
+/*
+ * pg_column_map.c - PG::ColumnMap class extension
+ * $Id$
+ *
+ */
+
+#include "pg.h"
+#include "util.h"
+#include <inttypes.h>
+
+VALUE rb_mPG_BinaryEncoder;
+
+
+/*
+ * Document-class: PG::BinaryEncoder::Boolean < PG::SimpleEncoder
+ *
+ * This is the encoder class for the PostgreSQL boolean type.
+ *
+ * It accepts true and false. Other values will raise an exception.
+ *
+ */
+static int
+pg_bin_enc_boolean(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
+{
+	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" );
+	}
+	if(out) *out = bool;
+	return 1;
+}
+
+/*
+ * Document-class: PG::BinaryEncoder::Int2 < PG::SimpleEncoder
+ *
+ * This is the encoder class for the PostgreSQL int2 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)
+{
+	if(out){
+		write_nbo16(NUM2INT(*intermediate), out);
+	}else{
+		*intermediate = pg_obj_to_i(value);
+	}
+	return 2;
+}
+
+/*
+ * Document-class: PG::BinaryEncoder::Int2 < PG::SimpleEncoder
+ *
+ * This is the encoder class for the PostgreSQL int4 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)
+{
+	if(out){
+		write_nbo32(NUM2LONG(*intermediate), out);
+	}else{
+		*intermediate = pg_obj_to_i(value);
+	}
+	return 4;
+}
+
+/*
+ * Document-class: PG::BinaryEncoder::Int2 < PG::SimpleEncoder
+ *
+ * This is the encoder class for the PostgreSQL int8 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)
+{
+	if(out){
+		write_nbo64(NUM2LL(*intermediate), out);
+	}else{
+		*intermediate = pg_obj_to_i(value);
+	}
+	return 8;
+}
+
+/*
+ * Document-class: PG::BinaryEncoder::FromBase64 < PG::CompositeEncoder
+ *
+ * This is an encoder class for conversion of base64 encoded data
+ * to it's binary representation.
+ *
+ */
+static int
+pg_bin_enc_from_base64(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
+{
+	int strlen;
+	VALUE subint;
+	t_pg_composite_coder *this = (t_pg_composite_coder *)conv;
+	t_pg_coder_enc_func enc_func = pg_coder_enc_func(this->elem);
+
+	if(out){
+		/* Second encoder pass, if required */
+		strlen = enc_func(this->elem, value, out, intermediate);
+		strlen = base64_decode( out, out, strlen );
+
+		return strlen;
+	} else {
+		/* First encoder pass */
+		strlen = enc_func(this->elem, value, NULL, &subint);
+
+		if( strlen == -1 ){
+			/* Encoded string is returned in subint */
+			VALUE out_str;
+
+			strlen = RSTRING_LENINT(subint);
+			out_str = rb_str_new(NULL, BASE64_DECODED_SIZE(strlen));
+
+			strlen = base64_decode( RSTRING_PTR(out_str), RSTRING_PTR(subint), strlen);
+			rb_str_set_len( out_str, strlen );
+			*intermediate = out_str;
+
+			return -1;
+		} else {
+			*intermediate = subint;
+
+			return BASE64_DECODED_SIZE(strlen);
+		}
+	}
+}
+
+void
+init_pg_binary_encoder()
+{
+	/* This module encapsulates all encoder classes with binary output format */
+	rb_mPG_BinaryEncoder = rb_define_module_under( rb_mPG, "BinaryEncoder" );
+
+	/* Make RDoc aware of the encoder classes... */
+	/* dummy = rb_define_class_under( rb_mPG_BinaryEncoder, "Boolean", rb_cPG_SimpleEncoder ); */
+	pg_define_coder( "Boolean", pg_bin_enc_boolean, rb_cPG_SimpleEncoder, rb_mPG_BinaryEncoder );
+	/* dummy = rb_define_class_under( rb_mPG_BinaryEncoder, "Int2", rb_cPG_SimpleEncoder ); */
+	pg_define_coder( "Int2", pg_bin_enc_int2, rb_cPG_SimpleEncoder, rb_mPG_BinaryEncoder );
+	/* dummy = rb_define_class_under( rb_mPG_BinaryEncoder, "Int4", rb_cPG_SimpleEncoder ); */
+	pg_define_coder( "Int4", pg_bin_enc_int4, rb_cPG_SimpleEncoder, rb_mPG_BinaryEncoder );
+	/* dummy = rb_define_class_under( rb_mPG_BinaryEncoder, "Int8", rb_cPG_SimpleEncoder ); */
+	pg_define_coder( "Int8", pg_bin_enc_int8, rb_cPG_SimpleEncoder, rb_mPG_BinaryEncoder );
+	/* dummy = rb_define_class_under( rb_mPG_BinaryEncoder, "String", rb_cPG_SimpleEncoder ); */
+	pg_define_coder( "String", pg_coder_enc_to_s, rb_cPG_SimpleEncoder, rb_mPG_BinaryEncoder );
+	/* dummy = rb_define_class_under( rb_mPG_BinaryEncoder, "Bytea", rb_cPG_SimpleEncoder ); */
+	pg_define_coder( "Bytea", pg_coder_enc_to_s, rb_cPG_SimpleEncoder, rb_mPG_BinaryEncoder );
+
+	/* dummy = rb_define_class_under( rb_mPG_BinaryEncoder, "FromBase64", rb_cPG_CompositeEncoder ); */
+	pg_define_coder( "FromBase64", pg_bin_enc_from_base64, rb_cPG_CompositeEncoder, rb_mPG_BinaryEncoder );
+}