pg 0.18.3 → 1.4.3

data/ext/pg_text_encoder.c

@@ -1,6 +1,6 @@
 /*
  * pg_text_encoder.c - PG::TextEncoder module
- * $Id: pg_text_encoder.c,v b859963462b2 2015/03/13 17:39:35 lars $
+ * $Id$
  *
  */
 
@@ -28,6 +28,7 @@
  *   intermediate - Pointer to a VALUE that might be set by the encoding function to some
  *           value in the first call that can be retrieved later in the second call.
  *           This VALUE is not yet initialized by the caller.
+ *   enc_idx  - Index of the output Encoding that strings should be converted to.
  *
  * Returns:
  *   >= 0  - If out==NULL the encoder function must return the expected output buffer size.
@@ -40,15 +41,20 @@
 
 
 #include "pg.h"
-#include "util.h"
+#include "pg_util.h"
+#ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
+#endif
 #include <math.h>
 
 VALUE rb_mPG_TextEncoder;
 static ID s_id_encode;
 static ID s_id_to_i;
+static ID s_id_to_s;
+static ID s_cBigDecimal;
+static VALUE s_str_F;
 
-static int pg_text_enc_integer(t_pg_coder *this, VALUE value, char *out, VALUE *intermediate);
+static int pg_text_enc_integer(t_pg_coder *this, VALUE value, char *out, VALUE *intermediate, int enc_idx);
 
 VALUE
 pg_obj_to_i( VALUE value )
@@ -74,7 +80,7 @@ pg_obj_to_i( VALUE value )
  *
  */
 static int
-pg_text_enc_boolean(t_pg_coder *this, VALUE value, char *out, VALUE *intermediate)
+pg_text_enc_boolean(t_pg_coder *this, VALUE value, char *out, VALUE *intermediate, int enc_idx)
 {
 	switch( TYPE(value) ){
 		case T_FALSE:
@@ -92,10 +98,10 @@ pg_text_enc_boolean(t_pg_coder *this, VALUE value, char *out, VALUE *intermediat
 				if(out) *out = '1';
 				return 1;
 			} else {
-				return pg_text_enc_integer(this, value, out, intermediate);
+				return pg_text_enc_integer(this, value, out, intermediate, enc_idx);
 			}
 		default:
-			return pg_coder_enc_to_s(this, value, out, intermediate);
+			return pg_coder_enc_to_s(this, value, out, intermediate, enc_idx);
 	}
 	/* never reached */
 	return 0;
@@ -111,45 +117,71 @@ pg_text_enc_boolean(t_pg_coder *this, VALUE value, char *out, VALUE *intermediat
  *
  */
 int
-pg_coder_enc_to_s(t_pg_coder *this, VALUE value, char *out, VALUE *intermediate)
+pg_coder_enc_to_s(t_pg_coder *this, VALUE value, char *out, VALUE *intermediate, int enc_idx)
 {
-	*intermediate = rb_obj_as_string(value);
+	VALUE str = rb_obj_as_string(value);
+	if( ENCODING_GET(str) == enc_idx ){
+		*intermediate = str;
+	}else{
+		*intermediate = rb_str_export_to_enc(str, rb_enc_from_index(enc_idx));
+	}
 	return -1;
 }
 
+static int
+count_leading_zero_bits(unsigned long long x)
+{
+#if defined(__GNUC__) || defined(__clang__)
+	return __builtin_clzll(x);
+#elif defined(_MSC_VER)
+	DWORD r = 0;
+	_BitScanForward64(&r, x);
+	return (int)r;
+#else
+	unsigned int a;
+	for(a=0; a < sizeof(unsigned long long) * 8; a++){
+		if( x & (1 << (sizeof(unsigned long long) * 8 - 1))) return a;
+		x <<= 1;
+	}
+	return a;
+#endif
+}
 
 /*
  * Document-class: PG::TextEncoder::Integer < PG::SimpleEncoder
  *
- * This is the encoder class for the PostgreSQL int types.
+ * This is the encoder class for the PostgreSQL integer types.
  *
  * Non-Integer values are expected to have method +to_i+ defined.
  *
  */
 static int
-pg_text_enc_integer(t_pg_coder *this, VALUE value, char *out, VALUE *intermediate)
+pg_text_enc_integer(t_pg_coder *this, VALUE value, char *out, VALUE *intermediate, int enc_idx)
 {
 	if(out){
 		if(TYPE(*intermediate) == T_STRING){
-			return pg_coder_enc_to_s(this, value, out, intermediate);
+			return pg_coder_enc_to_s(this, value, out, intermediate, enc_idx);
 		}else{
 			char *start = out;
 			int len;
 			int neg = 0;
-			long long ll = NUM2LL(*intermediate);
+			long long sll = NUM2LL(*intermediate);
+			unsigned long long ll;
 
-			if (ll < 0) {
-				/* We don't expect problems with the most negative integer not being representable
-				 * as a positive integer, because Fixnum is only up to 63 bits.
+			if (sll < 0) {
+				/* Avoid problems with the most negative integer not being representable
+				 * as a positive integer, by using unsigned long long for encoding.
 				 */
-				ll = -ll;
+				ll = -sll;
 				neg = 1;
+			} else {
+				ll = sll;
 			}
 
 			/* Compute the result string backwards. */
 			do {
-				long long remainder;
-				long long oldval = ll;
+				unsigned long long remainder;
+				unsigned long long oldval = ll;
 
 				ll /= 10;
 				remainder = oldval - ll * 10;
@@ -159,7 +191,7 @@ pg_text_enc_integer(t_pg_coder *this, VALUE value, char *out, VALUE *intermediat
 			if (neg)
 				*out++ = '-';
 
-			len = out - start;
+			len = (int)(out - start);
 
 			/* Reverse string. */
 			out--;
@@ -176,45 +208,17 @@ pg_text_enc_integer(t_pg_coder *this, VALUE value, char *out, VALUE *intermediat
 	}else{
 		*intermediate = pg_obj_to_i(value);
 		if(TYPE(*intermediate) == T_FIXNUM){
-			int len;
 			long long sll = NUM2LL(*intermediate);
-			long long ll = sll < 0 ? -sll : sll;
-			if( ll < 100000000 ){
-				if( ll < 10000 ){
-					if( ll < 100 ){
-						len = ll < 10 ? 1 : 2;
-					}else{
-						len = ll < 1000 ? 3 : 4;
-					}
-				}else{
-					if( ll < 1000000 ){
-						len = ll < 100000 ? 5 : 6;
-					}else{
-						len = ll < 10000000 ? 7 : 8;
-					}
-				}
-			}else{
-				if( ll < 1000000000000LL ){
-					if( ll < 10000000000LL ){
-						len = ll < 1000000000LL ? 9 : 10;
-					}else{
-						len = ll < 100000000000LL ? 11 : 12;
-					}
-				}else{
-					if( ll < 100000000000000LL ){
-						len = ll < 10000000000000LL ? 13 : 14;
-					}else{
-						return pg_coder_enc_to_s(this, *intermediate, NULL, intermediate);
-					}
-				}
-			}
-			return sll < 0 ? len+1 : len;
+			unsigned long long ll = sll < 0 ? -sll : sll;
+			int len = (sizeof(unsigned long long) * 8 - count_leading_zero_bits(ll)) / 3;
+			return sll < 0 ? len+2 : len+1;
 		}else{
-			return pg_coder_enc_to_s(this, *intermediate, NULL, intermediate);
+			return pg_coder_enc_to_s(this, *intermediate, NULL, intermediate, enc_idx);
 		}
 	}
 }
 
+#define MAX_DOUBLE_DIGITS 16
 
 /*
  * Document-class: PG::TextEncoder::Float < PG::SimpleEncoder
@@ -223,10 +227,16 @@ pg_text_enc_integer(t_pg_coder *this, VALUE value, char *out, VALUE *intermediat
  *
  */
 static int
-pg_text_enc_float(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
+pg_text_enc_float(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate, int enc_idx)
 {
 	if(out){
 		double dvalue = NUM2DBL(value);
+		int len = 0;
+		int neg = 0;
+		int exp2i, exp10i, i;
+		unsigned long long ll, remainder, oldval;
+		VALUE intermediate;
+
 		/* Cast to the same strings as value.to_s . */
 		if( isinf(dvalue) ){
 			if( dvalue < 0 ){
@@ -240,12 +250,128 @@ pg_text_enc_float(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
 			memcpy( out, "NaN", 3);
 			return 3;
 		}
-		return sprintf( out, "%.16E", dvalue);
+
+		/*
+		 * The following computation is roughly a conversion kind of
+		 *   sprintf( out, "%.16E", dvalue);
+		 */
+
+		/* write the algebraic sign */
+		if( dvalue < 0 ) {
+			dvalue = -dvalue;
+			*out++ = '-';
+			neg++;
+		}
+
+		/* retrieve the power of 2 exponent */
+		frexp(dvalue, &exp2i);
+		/* compute the power of 10 exponent */
+		exp10i = (int)floor(exp2i * 0.30102999566398114); /* Math.log(2)/Math.log(10) */
+		/* move the decimal point, so that we get an integer of MAX_DOUBLE_DIGITS decimal digits */
+		ll = (unsigned long long)(dvalue * pow(10, MAX_DOUBLE_DIGITS - 1 - exp10i) + 0.5);
+
+		/* avoid leading zeros due to inaccuracy of deriving exp10i from exp2i */
+		/* otherwise we would print "09.0" instead of "9.0" */
+		if( ll < 1000000000000000 ){ /* pow(10, MAX_DOUBLE_DIGITS-1) */
+			exp10i--;
+			ll *= 10;
+		}
+
+		if( exp10i <= -5 || exp10i >= 15 ) {
+			/* Write the float in exponent format (1.23e45) */
+
+			/* write fraction digits from right to left */
+			for( i = MAX_DOUBLE_DIGITS; i > 1; i--){
+				oldval = ll;
+				ll /= 10;
+				remainder = oldval - ll * 10;
+				/* omit trailing zeros */
+				if(remainder != 0 || len ) {
+					out[i] = '0' + remainder;
+					len++;
+				}
+			}
+
+			/* write decimal point */
+			if( len ){
+				out[1] = '.';
+				len++;
+			}
+
+			/* write remaining single digit left to the decimal point */
+			oldval = ll;
+			ll /= 10;
+			remainder = oldval - ll * 10;
+			out[0] = '0' + remainder;
+			len++;
+
+			/* write exponent */
+			out[len++] = 'e';
+			intermediate = INT2NUM(exp10i);
+
+			return neg + len + pg_text_enc_integer(conv, Qnil, out + len, &intermediate, enc_idx);
+		} else {
+			/* write the float in non exponent format (0.001234 or 123450.0) */
+
+			/* write digits from right to left */
+			int lz = exp10i < 0 ? 0 : exp10i;
+			for( i = MAX_DOUBLE_DIGITS - (exp10i < 0 ? exp10i : 0); i >= 0; i-- ){
+				oldval = ll;
+				ll /= 10;
+				remainder = oldval - ll * 10;
+				/* write decimal point */
+				if( i - 1 == lz ){
+					out[i--] = '.';
+					len++;
+				}
+				/* if possible then omit trailing zeros */
+				if(remainder != 0 || len || i - 2 == lz) {
+					out[i] = '0' + remainder;
+					len++;
+				}
+			}
+			return neg + len;
+		}
 	}else{
-		return 23;
+		return 1 /*sign*/ + MAX_DOUBLE_DIGITS + 1 /*dot*/ + 1 /*e*/ + 1 /*exp sign*/ + 3 /*exp digits*/;
 	}
 }
 
+
+/*
+ * Document-class: PG::TextEncoder::Numeric < PG::SimpleEncoder
+ *
+ * This is the encoder class for the PostgreSQL numeric types.
+ *
+ * It converts Integer, Float and BigDecimal objects.
+ * All other objects are expected to respond to +to_s+.
+ */
+static int
+pg_text_enc_numeric(t_pg_coder *this, VALUE value, char *out, VALUE *intermediate, int enc_idx)
+{
+	switch(TYPE(value)){
+		case T_FIXNUM:
+		case T_BIGNUM:
+			return pg_text_enc_integer(this, value, out, intermediate, enc_idx);
+		case T_FLOAT:
+			return pg_text_enc_float(this, value, out, intermediate, enc_idx);
+		default:
+			if(out){ /* second pass */
+				rb_bug("unexpected value type: %d", TYPE(value));
+			} else { /* first pass */
+				if( rb_obj_is_kind_of(value, s_cBigDecimal) ){
+					/* value.to_s('F') */
+					*intermediate = rb_funcall(value, s_id_to_s, 1, s_str_F);
+					return -1; /* no second pass */
+				} else {
+					return pg_coder_enc_to_s(this, value, NULL, intermediate, enc_idx);
+					/* no second pass */
+				}
+			}
+	}
+}
+
+
 static const char hextab[] = {
 	'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
 };
@@ -253,8 +379,7 @@ static const char hextab[] = {
 /*
  * Document-class: PG::TextEncoder::Bytea < PG::SimpleEncoder
  *
- * This is an encoder class for the PostgreSQL bytea type for server version 9.0
- * or newer.
+ * This is an encoder class for the PostgreSQL +bytea+ type.
  *
  * The binary String is converted to hexadecimal representation for transmission
  * in text format. For query bind parameters it is recommended to use
@@ -263,7 +388,7 @@ static const char hextab[] = {
  *
  */
 static int
-pg_text_enc_bytea(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
+pg_text_enc_bytea(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate, int enc_idx)
 {
 	if(out){
 		size_t strlen = RSTRING_LEN(*intermediate);
@@ -278,11 +403,11 @@ pg_text_enc_bytea(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
 			*optr++ = hextab[c >> 4];
 			*optr++ = hextab[c & 0xf];
 		}
-		return optr - out;
+		return (int)(optr - out);
 	}else{
 		*intermediate = rb_obj_as_string(value);
 		/* The output starts with "\x" and each character is converted to hex. */
-		return 2 + RSTRING_LEN(*intermediate) * 2;
+		return 2 + RSTRING_LENINT(*intermediate) * 2;
 	}
 }
 
@@ -342,13 +467,13 @@ quote_array_buffer( void *_this, char *p_in, int strlen, char *p_out ){
 }
 
 static char *
-quote_string(t_pg_coder *this, VALUE value, VALUE string, char *current_out, int with_quote, t_quote_func quote_buffer, void *func_data)
+quote_string(t_pg_coder *this, VALUE value, VALUE string, char *current_out, int with_quote, t_quote_func quote_buffer, void *func_data, int enc_idx)
 {
 	int strlen;
 	VALUE subint;
 	t_pg_coder_enc_func enc_func = pg_coder_enc_func(this);
 
-	strlen = enc_func(this, value, NULL, &subint);
+	strlen = enc_func(this, value, NULL, &subint, enc_idx);
 
 	if( strlen == -1 ){
 		/* we can directly use String value in subint */
@@ -374,20 +499,20 @@ quote_string(t_pg_coder *this, VALUE value, VALUE string, char *current_out, int
 			current_out = pg_rb_str_ensure_capa( string, 2 * strlen + 2, current_out, NULL );
 
 			/* Place the unescaped string at current output position. */
-			strlen = enc_func(this, value, current_out, &subint);
+			strlen = enc_func(this, value, current_out, &subint, enc_idx);
 
 			current_out += quote_buffer( func_data, current_out, strlen, current_out );
 		}else{
 			/* size of the unquoted string */
 			current_out = pg_rb_str_ensure_capa( string, strlen, current_out, NULL );
-			current_out += enc_func(this, value, current_out, &subint);
+			current_out += enc_func(this, value, current_out, &subint, enc_idx);
 		}
 	}
 	return current_out;
 }
 
 static char *
-write_array(t_pg_composite_coder *this, VALUE value, char *current_out, VALUE string, int quote)
+write_array(t_pg_composite_coder *this, VALUE value, char *current_out, VALUE string, int quote, int enc_idx)
 {
 	int i;
 
@@ -405,7 +530,7 @@ 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);
+				current_out = write_array(this, entry, current_out, string, quote, enc_idx);
 			break;
 			case T_NIL:
 				current_out = pg_rb_str_ensure_capa( string, 4, current_out, NULL );
@@ -415,7 +540,7 @@ write_array(t_pg_composite_coder *this, VALUE value, char *current_out, VALUE st
 				*current_out++ = 'L';
 				break;
 			default:
-				current_out = quote_string( this->elem, entry, string, current_out, quote, quote_array_buffer, this );
+				current_out = quote_string( this->elem, entry, string, current_out, quote, quote_array_buffer, this, enc_idx );
 		}
 	}
 	current_out = pg_rb_str_ensure_capa( string, 1, current_out, NULL );
@@ -437,41 +562,42 @@ write_array(t_pg_composite_coder *this, VALUE value, char *current_out, VALUE st
  *
  */
 static int
-pg_text_enc_array(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
+pg_text_enc_array(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate, int enc_idx)
 {
 	char *end_ptr;
 	t_pg_composite_coder *this = (t_pg_composite_coder *)conv;
 
 	if( TYPE(value) == T_ARRAY){
-		*intermediate = rb_str_new(NULL, 0);
+		VALUE out_str = rb_str_new(NULL, 0);
+		PG_ENCODING_SET_NOCHECK(out_str, enc_idx);
 
-		end_ptr = write_array(this, value, RSTRING_PTR(*intermediate), *intermediate, this->needs_quotation);
+		end_ptr = write_array(this, value, RSTRING_PTR(out_str), out_str, this->needs_quotation, enc_idx);
 
-		rb_str_set_len( *intermediate, end_ptr - RSTRING_PTR(*intermediate) );
+		rb_str_set_len( out_str, end_ptr - RSTRING_PTR(out_str) );
+		*intermediate = out_str;
 
 		return -1;
 	} else {
-		return pg_coder_enc_to_s( conv, value, out, intermediate );
+		return pg_coder_enc_to_s( conv, value, out, intermediate, enc_idx );
 	}
 }
 
 static char *
 quote_identifier( VALUE value, VALUE out_string, char *current_out ){
 	char *p_in = RSTRING_PTR(value);
-	char *ptr1;
 	size_t strlen = RSTRING_LEN(value);
+	char *p_inend = p_in + strlen;
 	char *end_capa = current_out;
 
 	PG_RB_STR_ENSURE_CAPA( out_string, strlen + 2, current_out, end_capa );
 	*current_out++ = '"';
-	for(ptr1 = p_in; ptr1 != p_in + strlen; ptr1++) {
-		char c = *ptr1;
+	for(; p_in != p_inend; p_in++) {
+		char c = *p_in;
 		if (c == '"'){
-			strlen++;
-			PG_RB_STR_ENSURE_CAPA( out_string, p_in - ptr1 + strlen + 1, current_out, end_capa );
+			PG_RB_STR_ENSURE_CAPA( out_string, p_inend - p_in + 2, current_out, end_capa );
 			*current_out++ = '"';
 		} else if (c == 0){
-			break;
+			rb_raise(rb_eArgError, "string contains null byte");
 		}
 		*current_out++ = c;
 	}
@@ -482,10 +608,10 @@ quote_identifier( VALUE value, VALUE out_string, char *current_out ){
 }
 
 static char *
-pg_text_enc_array_identifier(VALUE value, VALUE string, char *out)
+pg_text_enc_array_identifier(VALUE value, VALUE string, char *out, int enc_idx)
 {
-	int i;
-	int nr_elems;
+	long i;
+	long nr_elems;
 
 	Check_Type(value, T_ARRAY);
 	nr_elems = RARRAY_LEN(value);
@@ -493,6 +619,10 @@ pg_text_enc_array_identifier(VALUE value, VALUE string, char *out)
 	for( i=0; i<nr_elems; i++){
 		VALUE entry = rb_ary_entry(value, i);
 
+		StringValue(entry);
+		if( ENCODING_GET(entry) != enc_idx ){
+			entry = rb_str_export_to_enc(entry, rb_enc_from_index(enc_idx));
+		}
 		out = quote_identifier(entry, string, out);
 		if( i < nr_elems-1 ){
 			out = pg_rb_str_ensure_capa( string, 1, out, NULL );
@@ -507,27 +637,34 @@ pg_text_enc_array_identifier(VALUE value, VALUE string, char *out)
  *
  * This is the encoder class for PostgreSQL identifiers.
  *
- * An Array value can be used for "schema.table.column" type identifiers:
+ * An Array value can be used for identifiers of the kind "schema.table.column".
+ * This ensures that each element is properly quoted:
  *   PG::TextEncoder::Identifier.new.encode(['schema', 'table', 'column'])
  *      => '"schema"."table"."column"'
  *
  *  This encoder can also be used per PG::Connection#quote_ident .
  */
 int
-pg_text_enc_identifier(t_pg_coder *this, VALUE value, char *out, VALUE *intermediate)
+pg_text_enc_identifier(t_pg_coder *this, VALUE value, char *out, VALUE *intermediate, int enc_idx)
 {
+	VALUE out_str;
 	UNUSED( this );
 	if( TYPE(value) == T_ARRAY){
-		*intermediate = rb_str_new(NULL, 0);
-		out = RSTRING_PTR(*intermediate);
-		out = pg_text_enc_array_identifier(value, *intermediate, out);
+		out_str = rb_str_new(NULL, 0);
+		out = RSTRING_PTR(out_str);
+		out = pg_text_enc_array_identifier(value, out_str, out, enc_idx);
 	} else {
 		StringValue(value);
-		*intermediate = rb_str_new(NULL, RSTRING_LEN(value) + 2);
-		out = RSTRING_PTR(*intermediate);
-		out = quote_identifier(value, *intermediate, out);
+		if( ENCODING_GET(value) != enc_idx ){
+			value = rb_str_export_to_enc(value, rb_enc_from_index(enc_idx));
+		}
+		out_str = rb_str_new(NULL, RSTRING_LEN(value) + 2);
+		out = RSTRING_PTR(out_str);
+		out = quote_identifier(value, out_str, out);
 	}
-	rb_str_set_len( *intermediate, out - RSTRING_PTR(*intermediate) );
+	rb_str_set_len( out_str, out - RSTRING_PTR(out_str) );
+	PG_ENCODING_SET_NOCHECK(out_str, enc_idx);
+	*intermediate = out_str;
 	return -1;
 }
 
@@ -569,18 +706,26 @@ quote_literal_buffer( void *_this, char *p_in, int strlen, char *p_out ){
  *
  * This is the encoder class for PostgreSQL literals.
  *
- * A literal is quoted and escaped by the +'+ character.
+ * A literal is quoted and escaped by the <tt>'</tt> character, so that it can be inserted into SQL queries.
+ * It works equal to PG::Connection#escape_literal, but integrates into the type cast system of ruby-pg.
+ *
+ * Both expressions have the same result:
+ *   conn.escape_literal(PG::TextEncoder::Array.new.encode(["v1","v2"])) # => "'{v1,v2}'"
+ *   PG::TextEncoder::QuotedLiteral.new(elements_type: PG::TextEncoder::Array.new).encode(["v1","v2"]) # => "'{v1,v2}'"
+ * While escape_literal requires a intermediate ruby string allocation, QuotedLiteral encodes the values directly to the result string.
  *
  */
 static int
-pg_text_enc_quoted_literal(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
+pg_text_enc_quoted_literal(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate, int enc_idx)
 {
 	t_pg_composite_coder *this = (t_pg_composite_coder *)conv;
+	VALUE out_str = rb_str_new(NULL, 0);
+	PG_ENCODING_SET_NOCHECK(out_str, enc_idx);
 
-	*intermediate = rb_str_new(NULL, 0);
-	out = RSTRING_PTR(*intermediate);
-	out = quote_string(this->elem, value, *intermediate, out, this->needs_quotation, quote_literal_buffer, this);
-	rb_str_set_len( *intermediate, out - RSTRING_PTR(*intermediate) );
+	out = RSTRING_PTR(out_str);
+	out = quote_string(this->elem, value, out_str, out, this->needs_quotation, quote_literal_buffer, this, enc_idx);
+	rb_str_set_len( out_str, out - RSTRING_PTR(out_str) );
+	*intermediate = out_str;
 	return -1;
 }
 
@@ -591,7 +736,7 @@ pg_text_enc_quoted_literal(t_pg_coder *conv, VALUE value, char *out, VALUE *inte
  *
  */
 static int
-pg_text_enc_to_base64(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
+pg_text_enc_to_base64(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate, int enc_idx)
 {
 	int strlen;
 	VALUE subint;
@@ -600,13 +745,13 @@ pg_text_enc_to_base64(t_pg_coder *conv, VALUE value, char *out, VALUE *intermedi
 
 	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);
 		base64_encode( out, out, strlen );
 
 		return BASE64_ENCODED_SIZE(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 */
@@ -614,6 +759,7 @@ pg_text_enc_to_base64(t_pg_coder *conv, VALUE value, char *out, VALUE *intermedi
 
 			strlen = RSTRING_LENINT(subint);
 			out_str = rb_str_new(NULL, BASE64_ENCODED_SIZE(strlen));
+			PG_ENCODING_SET_NOCHECK(out_str, enc_idx);
 
 			base64_encode( RSTRING_PTR(out_str), RSTRING_PTR(subint), strlen);
 			*intermediate = out_str;
@@ -633,6 +779,12 @@ init_pg_text_encoder()
 {
 	s_id_encode = rb_intern("encode");
 	s_id_to_i = rb_intern("to_i");
+	s_id_to_s = rb_intern("to_s");
+	s_str_F = rb_str_freeze(rb_str_new_cstr("F"));
+	rb_global_variable(&s_str_F);
+	rb_require("bigdecimal");
+	s_cBigDecimal = rb_const_get(rb_cObject, rb_intern("BigDecimal"));
+
 
 	/* This module encapsulates all encoder classes with text output format */
 	rb_mPG_TextEncoder = rb_define_module_under( rb_mPG, "TextEncoder" );
@@ -644,6 +796,8 @@ init_pg_text_encoder()
 	pg_define_coder( "Integer", pg_text_enc_integer, rb_cPG_SimpleEncoder, rb_mPG_TextEncoder );
 	/* dummy = rb_define_class_under( rb_mPG_TextEncoder, "Float", rb_cPG_SimpleEncoder ); */
 	pg_define_coder( "Float", pg_text_enc_float, rb_cPG_SimpleEncoder, rb_mPG_TextEncoder );
+	/* dummy = rb_define_class_under( rb_mPG_TextEncoder, "Numeric", rb_cPG_SimpleEncoder ); */
+	pg_define_coder( "Numeric", pg_text_enc_numeric, rb_cPG_SimpleEncoder, rb_mPG_TextEncoder );
 	/* dummy = rb_define_class_under( rb_mPG_TextEncoder, "String", rb_cPG_SimpleEncoder ); */
 	pg_define_coder( "String", pg_coder_enc_to_s, rb_cPG_SimpleEncoder, rb_mPG_TextEncoder );
 	/* dummy = rb_define_class_under( rb_mPG_TextEncoder, "Bytea", rb_cPG_SimpleEncoder ); */