pg 0.18.0 → 1.0.0

data/ext/pg.h

@@ -9,95 +9,30 @@
 #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 */
 
 /* 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) \
+/* exported by ruby-1.9.3+ but not declared */
+extern int rb_encdb_alias(const char *, const char *);
+
+#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) \
@@ -133,6 +68,15 @@
 typedef long suseconds_t;
 #endif
 
+#if defined(HAVE_VARIABLE_LENGTH_ARRAYS)
+	#define PG_VARIABLE_LENGTH_ARRAY(type, name, len, maxlen) type name[(len)];
+#else
+	#define PG_VARIABLE_LENGTH_ARRAY(type, name, len, maxlen) \
+		type name[(maxlen)] = {(len)>(maxlen) ? (rb_raise(rb_eArgError, "Number of " #name " (%d) exceeds allowed maximum of " #maxlen, (len) ), (type)1) : (type)0};
+
+	#define PG_MAX_COLUMNS 4000
+#endif
+
 /* The data behind each PG::Connection object */
 typedef struct {
 	PGconn *pgconn;
@@ -196,7 +140,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);
@@ -312,7 +256,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_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 ));
@@ -369,12 +314,10 @@ pgresult_get_this( VALUE 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);

data/ext/pg_binary_decoder.c

@@ -1,12 +1,14 @@
 /*
  * pg_column_map.c - PG::ColumnMap class extension
- * $Id: pg_binary_decoder.c,v 185638b52684 2014/11/08 20:43:53 lars $
+ * $Id: pg_binary_decoder.c,v fcf731d3dff7 2015/09/08 12:25:06 jfali $
  *
  */
 
 #include "pg.h"
 #include "util.h"
+#ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
+#endif
 
 VALUE 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: pg_binary_encoder.c,v e61a06f1f5ed 2015/12/25 21:14:21 lars $
  *
  */
 
 #include "pg.h"
 #include "util.h"
+#ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
+#endif
 
 VALUE rb_mPG_BinaryEncoder;
 
@@ -20,16 +22,16 @@ 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;
+	char mybool;
 	switch(value){
-		case Qtrue : bool = 1; break;
-		case Qfalse : bool = 0; break;
+		case Qtrue : mybool = 1; break;
+		case Qfalse : mybool = 0; break;
 		default :
 			rb_raise( rb_eTypeError, "wrong data for binary boolean converter" );
 	}
-	if(out) *out = bool;
+	if(out) *out = mybool;
 	return 1;
 }
 
@@ -42,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);
@@ -61,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);
@@ -80,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);
@@ -98,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;
@@ -107,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 */

data/ext/pg_coder.c

@@ -105,7 +105,7 @@ pg_composite_decoder_allocate( VALUE klass )
 
 /*
  * call-seq:
- *    coder.encode( value )
+ *    coder.encode( value [, encoding] )
  *
  * Encodes the given Ruby object into string representation, without
  * sending data to/from the database server.
@@ -114,13 +114,24 @@ pg_composite_decoder_allocate( VALUE klass )
  *
  */
 static VALUE
-pg_coder_encode(VALUE self, VALUE value)
+pg_coder_encode(int argc, VALUE *argv, VALUE self)
 {
 	VALUE res;
 	VALUE intermediate;
+	VALUE value;
 	int len, len2;
+	int enc_idx;
 	t_pg_coder *this = DATA_PTR(self);
 
+	if(argc < 1 || argc > 2){
+		rb_raise(rb_eArgError, "wrong number of arguments (%i for 1..2)", argc);
+	}else if(argc == 1){
+		enc_idx = rb_ascii8bit_encindex();
+	}else{
+		enc_idx = rb_to_encoding_index(argv[1]);
+	}
+	value = argv[0];
+
 	if( NIL_P(value) )
 		return Qnil;
 
@@ -128,7 +139,7 @@ pg_coder_encode(VALUE self, VALUE value)
 		rb_raise(rb_eRuntimeError, "no encoder function defined");
 	}
 
-	len = this->enc_func( this, value, NULL, &intermediate );
+	len = this->enc_func( this, value, NULL, &intermediate, enc_idx );
 
 	if( len == -1 ){
 		/* The intermediate value is a String that can be used directly. */
@@ -137,7 +148,8 @@ pg_coder_encode(VALUE self, VALUE value)
 	}
 
 	res = rb_str_new(NULL, len);
-	len2 = this->enc_func( this, value, RSTRING_PTR(res), &intermediate);
+	PG_ENCODING_SET_NOCHECK(res, enc_idx);
+	len2 = this->enc_func( this, value, RSTRING_PTR(res), &intermediate, enc_idx );
 	if( len < len2 ){
 		rb_bug("%s: result length of first encoder run (%i) is less than second run (%i)",
 			rb_obj_classname( self ), len, len2 );
@@ -165,8 +177,8 @@ static VALUE
 pg_coder_decode(int argc, VALUE *argv, VALUE self)
 {
 	char *val;
-	VALUE tuple = -1;
-	VALUE field = -1;
+	int tuple = -1;
+	int field = -1;
 	VALUE res;
 	t_pg_coder *this = DATA_PTR(self);
 
@@ -359,10 +371,19 @@ pg_define_coder( const char *name, void *func, VALUE base_klass, VALUE nsp )
 
 
 static int
-pg_text_enc_in_ruby(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
+pg_text_enc_in_ruby(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate, int enc_idx)
 {
-	*intermediate = rb_funcall( conv->coder_obj, s_id_encode, 1, value );
-	StringValue( *intermediate );
+	int arity = rb_obj_method_arity(conv->coder_obj, s_id_encode);
+	if( arity == 1 ){
+		VALUE out_str = rb_funcall( conv->coder_obj, s_id_encode, 1, value );
+		StringValue( out_str );
+		*intermediate = rb_str_export_to_enc(out_str, rb_enc_from_index(enc_idx));
+	}else{
+		VALUE enc = rb_enc_from_encoding(rb_enc_from_index(enc_idx));
+		VALUE out_str = rb_funcall( conv->coder_obj, s_id_encode, 2, value, enc );
+		StringValue( out_str );
+		*intermediate = out_str;
+	}
 	return -1;
 }
 
@@ -442,7 +463,7 @@ init_pg_coder()
 	 * This accessor is only used in PG::Coder#inspect .
 	 */
 	rb_define_attr(   rb_cPG_Coder, "name", 1, 1 );
-	rb_define_method( rb_cPG_Coder, "encode", pg_coder_encode, 1 );
+	rb_define_method( rb_cPG_Coder, "encode", pg_coder_encode, -1 );
 	rb_define_method( rb_cPG_Coder, "decode", pg_coder_decode, -1 );
 
 	/* Document-class: PG::SimpleCoder < PG::Coder */