pg 0.17.1 → 0.18.4

data/ext/pg_result.c

@@ -1,6 +1,6 @@
 /*
  * pg_result.c - PG::Result class extension
- * $Id: pg_result.c,v 8255d4f73334 2013/08/18 20:40:08 lars $
+ * $Id: pg_result.c,v 1269b8ad77b8 2015/02/06 16:38:23 lars $
  *
  */
 
@@ -9,8 +9,12 @@
 
 VALUE rb_cPGresult;
 
-static void pgresult_gc_free( PGresult * );
-static PGresult* pgresult_get( VALUE );
+static void pgresult_gc_free( t_pg_result * );
+static VALUE pgresult_type_map_set( VALUE, VALUE );
+static VALUE pgresult_s_allocate( VALUE );
+static t_pg_result *pgresult_get_this( VALUE );
+static t_pg_result *pgresult_get_this_safe( VALUE );
+
 
 
 /*
@@ -23,16 +27,44 @@ static PGresult* pgresult_get( VALUE );
 VALUE
 pg_new_result(PGresult *result, VALUE rb_pgconn)
 {
-	PGconn *conn = pg_get_pgconn( rb_pgconn );
-	VALUE val = Data_Wrap_Struct(rb_cPGresult, NULL, pgresult_gc_free, result);
-#ifdef M17N_SUPPORTED
-	rb_encoding *enc = pg_conn_enc_get( conn );
-	ENCODING_SET( val, rb_enc_to_index(enc) );
-#endif
+	int nfields = result ? PQnfields(result) : 0;
+	VALUE self = pgresult_s_allocate( rb_cPGresult );
+	t_pg_result *this;
+
+	this = (t_pg_result *)xmalloc(sizeof(*this) +  sizeof(*this->fnames) * nfields);
+	DATA_PTR(self) = this;
+
+	this->pgresult = result;
+	this->connection = rb_pgconn;
+	this->typemap = pg_typemap_all_strings;
+	this->p_typemap = DATA_PTR( this->typemap );
+	this->autoclear = 0;
+	this->nfields = -1;
+	this->tuple_hash = Qnil;
 
-	rb_iv_set( val, "@connection", rb_pgconn );
+	PG_ENCODING_SET_NOCHECK(self, ENCODING_GET(rb_pgconn));
 
-	return val;
+	if( result ){
+		t_pg_connection *p_conn = pg_get_connection(rb_pgconn);
+		VALUE typemap = p_conn->type_map_for_results;
+
+		/* Type check is done when assigned to PG::Connection. */
+		t_typemap *p_typemap = DATA_PTR(typemap);
+
+		this->typemap = p_typemap->funcs.fit_to_result( typemap, self );
+		this->p_typemap = DATA_PTR( this->typemap );
+	}
+
+	return self;
+}
+
+VALUE
+pg_new_result_autoclear(PGresult *result, VALUE rb_pgconn)
+{
+	VALUE self = pg_new_result(result, rb_pgconn);
+	t_pg_result *this = pgresult_get_this(self);
+	this->autoclear = 1;
+	return self;
 }
 
 /*
@@ -44,24 +76,18 @@ pg_new_result(PGresult *result, VALUE rb_pgconn)
 VALUE
 pg_result_check( VALUE self )
 {
+	t_pg_result *this = pgresult_get_this(self);
 	VALUE error, exception, klass;
-	VALUE rb_pgconn = rb_iv_get( self, "@connection" );
-	PGconn *conn = pg_get_pgconn(rb_pgconn);
-	PGresult *result;
-#ifdef M17N_SUPPORTED
-	rb_encoding *enc = pg_conn_enc_get( conn );
-#endif
 	char * sqlstate;
 
-	Data_Get_Struct(self, PGresult, result);
-
-	if(result == NULL)
+	if(this->pgresult == NULL)
 	{
+		PGconn *conn = pg_get_pgconn(this->connection);
 		error = rb_str_new2( PQerrorMessage(conn) );
 	}
 	else
 	{
-		switch (PQresultStatus(result))
+		switch (PQresultStatus(this->pgresult))
 		{
 		case PGRES_TUPLES_OK:
 		case PGRES_COPY_OUT:
@@ -78,22 +104,20 @@ pg_result_check( VALUE self )
 		case PGRES_BAD_RESPONSE:
 		case PGRES_FATAL_ERROR:
 		case PGRES_NONFATAL_ERROR:
-			error = rb_str_new2( PQresultErrorMessage(result) );
+			error = rb_str_new2( PQresultErrorMessage(this->pgresult) );
 			break;
 		default:
 			error = rb_str_new2( "internal error : unknown result status." );
 		}
 	}
 
-#ifdef M17N_SUPPORTED
-	rb_enc_set_index( error, rb_enc_to_index(enc) );
-#endif
+	PG_ENCODING_SET_NOCHECK( error, ENCODING_GET(self) );
 
-	sqlstate = PQresultErrorField( result, PG_DIAG_SQLSTATE );
+	sqlstate = PQresultErrorField( this->pgresult, PG_DIAG_SQLSTATE );
 	klass = lookup_error_class( sqlstate );
 	exception = rb_exc_new3( klass, error );
-	rb_iv_set( exception, "@connection", rb_pgconn );
-	rb_iv_set( exception, "@result", result ? self : Qnil );
+	rb_iv_set( exception, "@connection", this->connection );
+	rb_iv_set( exception, "@result", this->pgresult ? self : Qnil );
 	rb_exc_raise( exception );
 
 	/* Not reached */
@@ -112,43 +136,146 @@ pg_result_check( VALUE self )
  *    res.clear() -> nil
  *
  * Clears the PG::Result object as the result of the query.
+ *
+ * If PG::Result#autoclear? is true then the result is marked as cleared
+ * and the underlying C struct will be cleared automatically by libpq.
+ *
  */
 VALUE
 pg_result_clear(VALUE self)
 {
-	PQclear(pgresult_get(self));
-	DATA_PTR(self) = NULL;
+	t_pg_result *this = pgresult_get_this(self);
+	if( !this->autoclear )
+		PQclear(pgresult_get(self));
+	this->pgresult = NULL;
 	return Qnil;
 }
 
+/*
+ * call-seq:
+ *    res.cleared?      -> boolean
+ *
+ * Returns +true+ if the backend result memory has been free'd.
+ */
+VALUE
+pgresult_cleared_p( VALUE self )
+{
+	t_pg_result *this = pgresult_get_this(self);
+	return this->pgresult ? Qfalse : Qtrue;
+}
 
+/*
+ * call-seq:
+ *    res.autoclear?      -> boolean
+ *
+ * Returns +true+ if the underlying C struct will be cleared automatically by libpq.
+ * Elsewise the result is cleared by PG::Result#clear or by the GC when it's no longer in use.
+ *
+ */
+VALUE
+pgresult_autoclear_p( VALUE self )
+{
+	t_pg_result *this = pgresult_get_this(self);
+	return this->autoclear ? Qtrue : Qfalse;
+}
 
 /*
  * DATA pointer functions
  */
 
+/*
+ * GC Mark function
+ */
+static void
+pgresult_gc_mark( t_pg_result *this )
+{
+	int i;
+
+	if( !this ) return;
+	rb_gc_mark( this->connection );
+	rb_gc_mark( this->typemap );
+	rb_gc_mark( this->tuple_hash );
+
+	for( i=0; i < this->nfields; i++ ){
+		rb_gc_mark( this->fnames[i] );
+	}
+}
+
 /*
  * GC Free function
  */
 static void
-pgresult_gc_free( PGresult *result )
+pgresult_gc_free( t_pg_result *this )
 {
-	if(result != NULL)
-		PQclear(result);
+	if( !this ) return;
+	if(this->pgresult != NULL && !this->autoclear)
+		PQclear(this->pgresult);
+
+	xfree(this);
 }
 
 /*
- * Fetch the data pointer for the result object
+ * Fetch the PG::Result object data pointer and check it's
+ * PGresult data pointer for sanity.
  */
-static PGresult*
+static t_pg_result *
+pgresult_get_this_safe( VALUE self )
+{
+	t_pg_result *this = pgresult_get_this(self);
+
+	if (this->pgresult == NULL) rb_raise(rb_ePGerror, "result has been cleared");
+	return this;
+}
+
+/*
+ * Fetch the PGresult pointer for the result object and check validity
+ *
+ * Note: This function is used externally by the sequel_pg gem,
+ * so do changes carefully.
+ *
+ */
+PGresult*
 pgresult_get(VALUE self)
 {
-	PGresult *result;
-	Data_Get_Struct(self, PGresult, result);
-	if (result == NULL) rb_raise(rb_ePGerror, "result has been cleared");
-	return result;
+	t_pg_result *this = pgresult_get_this(self);
+
+	if (this->pgresult == NULL) rb_raise(rb_ePGerror, "result has been cleared");
+	return this->pgresult;
 }
 
+/*
+ * Document-method: allocate
+ *
+ * call-seq:
+ *   PG::Result.allocate -> result
+ */
+static VALUE
+pgresult_s_allocate( VALUE klass )
+{
+	VALUE self = Data_Wrap_Struct( klass, pgresult_gc_mark, pgresult_gc_free, NULL );
+
+	return self;
+}
+
+static void pgresult_init_fnames(VALUE self)
+{
+	t_pg_result *this = pgresult_get_this_safe(self);
+
+	if( this->nfields == -1 ){
+		int i;
+		int nfields = PQnfields(this->pgresult);
+
+		for( i=0; i<nfields; i++ ){
+			VALUE fname = rb_tainted_str_new2(PQfname(this->pgresult, i));
+			PG_ENCODING_SET_NOCHECK(fname, ENCODING_GET(self));
+			this->fnames[i] = rb_obj_freeze(fname);
+			this->nfields = i + 1;
+
+			RB_GC_GUARD(fname);
+		}
+		this->nfields = nfields;
+	}
+}
 
 /********************************************************************
  *
@@ -205,7 +332,7 @@ static VALUE
 pgresult_res_status(VALUE self, VALUE status)
 {
 	VALUE ret = rb_tainted_str_new2(PQresStatus(NUM2INT(status)));
-	ASSOCIATE_INDEX(ret, self);
+	PG_ENCODING_SET_NOCHECK(ret, ENCODING_GET(self));
 	return ret;
 }
 
@@ -219,7 +346,7 @@ static VALUE
 pgresult_error_message(VALUE self)
 {
 	VALUE ret = rb_tainted_str_new2(PQresultErrorMessage(pgresult_get(self)));
-	ASSOCIATE_INDEX(ret, self);
+	PG_ENCODING_SET_NOCHECK(ret, ENCODING_GET(self));
 	return ret;
 }
 
@@ -279,7 +406,7 @@ pgresult_error_field(VALUE self, VALUE field)
 
 	if ( fieldstr ) {
 		ret = rb_tainted_str_new2( fieldstr );
-		ASSOCIATE_INDEX( ret, self );
+		PG_ENCODING_SET_NOCHECK( ret, ENCODING_GET(self ));
 	}
 
 	return ret;
@@ -297,9 +424,15 @@ pgresult_ntuples(VALUE self)
 	return INT2FIX(PQntuples(pgresult_get(self)));
 }
 
+static VALUE
+pgresult_ntuples_for_enum(VALUE self, VALUE args, VALUE eobj)
+{
+    return pgresult_ntuples(self);
+}
+
 /*
  * call-seq:
- *    res.nfields() -> Fixnum
+ *    res.nfields() -> Integer
  *
  * Returns the number of columns in the query result.
  */
@@ -319,16 +452,16 @@ static VALUE
 pgresult_fname(VALUE self, VALUE index)
 {
 	VALUE fname;
-	PGresult *result;
+	PGresult *result = pgresult_get(self);
 	int i = NUM2INT(index);
 
-	result = pgresult_get(self);
 	if (i < 0 || i >= PQnfields(result)) {
 		rb_raise(rb_eArgError,"invalid field number %d", i);
 	}
+
 	fname = rb_tainted_str_new2(PQfname(result, i));
-	ASSOCIATE_INDEX(fname, self);
-	return fname;
+	PG_ENCODING_SET_NOCHECK(fname, ENCODING_GET(self));
+	return rb_obj_freeze(fname);
 }
 
 /*
@@ -361,16 +494,16 @@ pgresult_fnumber(VALUE self, VALUE name)
 
 	Check_Type(name, T_STRING);
 
-	n = PQfnumber(pgresult_get(self), StringValuePtr(name));
+	n = PQfnumber(pgresult_get(self), StringValueCStr(name));
 	if (n == -1) {
-		rb_raise(rb_eArgError,"Unknown field: %s", StringValuePtr(name));
+		rb_raise(rb_eArgError,"Unknown field: %s", StringValueCStr(name));
 	}
 	return INT2FIX(n);
 }
 
 /*
  * call-seq:
- *    res.ftable( column_number ) -> Fixnum
+ *    res.ftable( column_number ) -> Integer
  *
  * Returns the Oid of the table from which the column _column_number_
  * was fetched.
@@ -389,7 +522,7 @@ pgresult_ftable(VALUE self, VALUE column_number)
 		rb_raise(rb_eArgError,"Invalid column index: %d", col_number);
 
 	n = PQftable(pgresult, col_number);
-	return INT2FIX(n);
+	return UINT2NUM(n);
 }
 
 /*
@@ -440,7 +573,7 @@ pgresult_fformat(VALUE self, VALUE column_number)
 
 /*
  * call-seq:
- *    res.ftype( column_number )
+ *    res.ftype( column_number )  -> Integer
  *
  * Returns the data type associated with _column_number_.
  *
@@ -464,7 +597,7 @@ pgresult_ftype(VALUE self, VALUE index)
 	if (i < 0 || i >= PQnfields(result)) {
 		rb_raise(rb_eArgError, "invalid field number %d", i);
 	}
-	return INT2NUM(PQftype(result, i));
+	return UINT2NUM(PQftype(result, i));
 }
 
 /*
@@ -515,30 +648,6 @@ pgresult_fsize(VALUE self, VALUE index)
 }
 
 
-static VALUE
-pgresult_value(VALUE self, PGresult *result, int tuple_num, int field_num)
-{
-    VALUE val;
-    if ( PQgetisnull(result, tuple_num, field_num) ) {
-        return Qnil;
-    }
-    else {
-        val = rb_tainted_str_new( PQgetvalue(result, tuple_num, field_num ),
-                                  PQgetlength(result, tuple_num, field_num) );
-
-#ifdef M17N_SUPPORTED
-        /* associate client encoding for text format only */
-        if ( 0 == PQfformat(result, field_num) ) {
-            ASSOCIATE_INDEX( val, self );
-        } else {
-            rb_enc_associate( val, rb_ascii8bit_encoding() );
-        }
-#endif
-
-        return val;
-    }
-}
-
 /*
  * call-seq:
  *    res.getvalue( tup_num, field_num )
@@ -549,18 +658,17 @@ pgresult_value(VALUE self, PGresult *result, int tuple_num, int field_num)
 static VALUE
 pgresult_getvalue(VALUE self, VALUE tup_num, VALUE field_num)
 {
-	PGresult *result;
+	t_pg_result *this = pgresult_get_this_safe(self);
 	int i = NUM2INT(tup_num);
 	int j = NUM2INT(field_num);
 
-	result = pgresult_get(self);
-	if(i < 0 || i >= PQntuples(result)) {
+	if(i < 0 || i >= PQntuples(this->pgresult)) {
 		rb_raise(rb_eArgError,"invalid tuple number %d", i);
 	}
-	if(j < 0 || j >= PQnfields(result)) {
+	if(j < 0 || j >= PQnfields(this->pgresult)) {
 		rb_raise(rb_eArgError,"invalid field number %d", j);
 	}
-	return pgresult_value(self, result, i, j);
+	return this->p_typemap->funcs.typecast_result_value(this->p_typemap, self, i, j);
 }
 
 /*
@@ -640,7 +748,7 @@ pgresult_paramtype(VALUE self, VALUE param_number)
 	PGresult *result;
 
 	result = pgresult_get(self);
-	return INT2FIX(PQparamtype(result,NUM2INT(param_number)));
+	return UINT2NUM(PQparamtype(result,NUM2INT(param_number)));
 }
 
 /*
@@ -653,13 +761,13 @@ static VALUE
 pgresult_cmd_status(VALUE self)
 {
 	VALUE ret = rb_tainted_str_new2(PQcmdStatus(pgresult_get(self)));
-	ASSOCIATE_INDEX(ret, self);
+	PG_ENCODING_SET_NOCHECK(ret, ENCODING_GET(self));
 	return ret;
 }
 
 /*
  * call-seq:
- *    res.cmd_tuples() -> Fixnum
+ *    res.cmd_tuples() -> Integer
  *
  * Returns the number of tuples (rows) affected by the SQL command.
  *
@@ -681,7 +789,7 @@ pgresult_cmd_tuples(VALUE self)
 
 /*
  * call-seq:
- *    res.oid_value() -> Fixnum
+ *    res.oid_value() -> Integer
  *
  * Returns the +oid+ of the inserted row if applicable,
  * otherwise +nil+.
@@ -693,7 +801,7 @@ pgresult_oid_value(VALUE self)
 	if (n == InvalidOid)
 		return Qnil;
 	else
-		return INT2FIX(n);
+		return UINT2NUM(n);
 }
 
 /* Utility methods not in libpq */
@@ -707,21 +815,29 @@ pgresult_oid_value(VALUE self)
 static VALUE
 pgresult_aref(VALUE self, VALUE index)
 {
-	PGresult *result = pgresult_get(self);
+	t_pg_result *this = pgresult_get_this_safe(self);
 	int tuple_num = NUM2INT(index);
 	int field_num;
-	VALUE fname;
+	int num_tuples = PQntuples(this->pgresult);
 	VALUE tuple;
 
-	if ( tuple_num < 0 || tuple_num >= PQntuples(result) )
+	if( this->nfields == -1 )
+		pgresult_init_fnames( self );
+
+	if ( tuple_num < 0 || tuple_num >= num_tuples )
 		rb_raise( rb_eIndexError, "Index %d is out of range", tuple_num );
 
-	tuple = rb_hash_new();
-	for ( field_num = 0; field_num < PQnfields(result); field_num++ ) {
-		fname = rb_tainted_str_new2( PQfname(result,field_num) );
-		ASSOCIATE_INDEX(fname, self);
-		rb_hash_aset( tuple, fname, pgresult_value(self, result, tuple_num, field_num) );
+	/* We reuse the Hash of the previous output for larger row counts.
+	 * This is somewhat faster than populating an empty Hash object. */
+	tuple = NIL_P(this->tuple_hash) ? rb_hash_new() : this->tuple_hash;
+	for ( field_num = 0; field_num < this->nfields; field_num++ ) {
+		VALUE val = this->p_typemap->funcs.typecast_result_value(this->p_typemap, self, tuple_num, field_num);
+		rb_hash_aset( tuple, this->fnames[field_num], val );
 	}
+	/* Store a copy of the filled hash for use at the next row. */
+	if( num_tuples > 10 )
+		this->tuple_hash = rb_hash_dup(tuple);
+
 	return tuple;
 }
 
@@ -734,25 +850,59 @@ pgresult_aref(VALUE self, VALUE index)
 static VALUE
 pgresult_each_row(VALUE self)
 {
-	PGresult* result = (PGresult*) pgresult_get(self);
+	t_pg_result *this;
 	int row;
 	int field;
-	int num_rows = PQntuples(result);
-	int num_fields = PQnfields(result);
+	int num_rows;
+	int num_fields;
+
+	RETURN_SIZED_ENUMERATOR(self, 0, NULL, pgresult_ntuples_for_enum);
+
+	this = pgresult_get_this_safe(self);
+	num_rows = PQntuples(this->pgresult);
+	num_fields = PQnfields(this->pgresult);
 
 	for ( row = 0; row < num_rows; row++ ) {
-		VALUE new_row = rb_ary_new2(num_fields);
+		PG_VARIABLE_LENGTH_ARRAY(VALUE, row_values, num_fields, PG_MAX_COLUMNS)
 
 		/* populate the row */
 		for ( field = 0; field < num_fields; field++ ) {
-		    rb_ary_store( new_row, field, pgresult_value(self, result, row, field) );
+			row_values[field] = this->p_typemap->funcs.typecast_result_value(this->p_typemap, self, row, field);
 		}
-		rb_yield( new_row );
+		rb_yield( rb_ary_new4( num_fields, row_values ));
 	}
 
 	return Qnil;
 }
 
+/*
+ * call-seq:
+ *    res.values -> Array
+ *
+ * Returns all tuples as an array of arrays.
+ */
+static VALUE
+pgresult_values(VALUE self)
+{
+	t_pg_result *this = pgresult_get_this_safe(self);
+	int row;
+	int field;
+	int num_rows = PQntuples(this->pgresult);
+	int num_fields = PQnfields(this->pgresult);
+	VALUE results = rb_ary_new2( num_rows );
+
+	for ( row = 0; row < num_rows; row++ ) {
+		PG_VARIABLE_LENGTH_ARRAY(VALUE, row_values, num_fields, PG_MAX_COLUMNS)
+
+		/* populate the row */
+		for ( field = 0; field < num_fields; field++ ) {
+			row_values[field] = this->p_typemap->funcs.typecast_result_value(this->p_typemap, self, row, field);
+		}
+		rb_ary_store( results, row, rb_ary_new4( num_fields, row_values ) );
+	}
+
+	return results;
+}
 
 /*
  * Make a Ruby array out of the encoded values from the specified
@@ -761,28 +911,16 @@ pgresult_each_row(VALUE self)
 static VALUE
 make_column_result_array( VALUE self, int col )
 {
-	PGresult *result = pgresult_get( self );
-	int rows = PQntuples( result );
+	t_pg_result *this = pgresult_get_this_safe(self);
+	int rows = PQntuples( this->pgresult );
 	int i;
-	VALUE val = Qnil;
 	VALUE results = rb_ary_new2( rows );
 
-	if ( col >= PQnfields(result) )
+	if ( col >= PQnfields(this->pgresult) )
 		rb_raise( rb_eIndexError, "no column %d in result", col );
 
 	for ( i=0; i < rows; i++ ) {
-		val = rb_tainted_str_new( PQgetvalue(result, i, col),
-		                          PQgetlength(result, i, col) );
-
-#ifdef M17N_SUPPORTED
-		/* associate client encoding for text format only */
-		if ( 0 == PQfformat(result, col) ) {
-			ASSOCIATE_INDEX( val, self );
-		} else {
-			rb_enc_associate( val, rb_ascii8bit_encoding() );
-		}
-#endif
-
+		VALUE val = this->p_typemap->funcs.typecast_result_value(this->p_typemap, self, i, col);
 		rb_ary_store( results, i, val );
 	}
 
@@ -817,7 +955,7 @@ static VALUE
 pgresult_field_values( VALUE self, VALUE field )
 {
 	PGresult *result = pgresult_get( self );
-	const char *fieldname = StringValuePtr( field );
+	const char *fieldname = StringValueCStr( field );
 	int fnum = PQfnumber( result, fieldname );
 
 	if ( fnum < 0 )
@@ -836,9 +974,13 @@ pgresult_field_values( VALUE self, VALUE field )
 static VALUE
 pgresult_each(VALUE self)
 {
-	PGresult *result = pgresult_get(self);
+	PGresult *result;
 	int tuple_num;
 
+	RETURN_SIZED_ENUMERATOR(self, 0, NULL, pgresult_ntuples_for_enum);
+
+	result = pgresult_get(self);
+
 	for(tuple_num = 0; tuple_num < PQntuples(result); tuple_num++) {
 		rb_yield(pgresult_aref(self, INT2NUM(tuple_num)));
 	}
@@ -854,25 +996,222 @@ pgresult_each(VALUE self)
 static VALUE
 pgresult_fields(VALUE self)
 {
-	PGresult *result = pgresult_get( self );
-	int n = PQnfields( result );
-	VALUE fields = rb_ary_new2( n );
-	int i;
+	t_pg_result *this = pgresult_get_this_safe(self);
+
+	if( this->nfields == -1 )
+		pgresult_init_fnames( self );
 
-	for ( i = 0; i < n; i++ ) {
-		VALUE val = rb_tainted_str_new2(PQfname(result, i));
-		ASSOCIATE_INDEX(val, self);
-		rb_ary_store( fields, i, val );
+	return rb_ary_new4( this->nfields, this->fnames );
+}
+
+/*
+ * call-seq:
+ *    res.type_map = typemap
+ *
+ * Set the TypeMap that is used for type casts of result values to ruby objects.
+ *
+ * All value retrieval methods will respect the type map and will do the
+ * type casts from PostgreSQL's wire format to Ruby objects on the fly,
+ * according to the rules and decoders defined in the given typemap.
+ *
+ * +typemap+ must be a kind of PG::TypeMap .
+ *
+ */
+static VALUE
+pgresult_type_map_set(VALUE self, VALUE typemap)
+{
+	t_pg_result *this = pgresult_get_this(self);
+	t_typemap *p_typemap;
+
+	if ( !rb_obj_is_kind_of(typemap, rb_cTypeMap) ) {
+		rb_raise( rb_eTypeError, "wrong argument type %s (expected kind of PG::TypeMap)",
+				rb_obj_classname( typemap ) );
 	}
+	Data_Get_Struct(typemap, t_typemap, p_typemap);
+
+	this->typemap = p_typemap->funcs.fit_to_result( typemap, self );
+	this->p_typemap = DATA_PTR( this->typemap );
 
-	return fields;
+	return typemap;
 }
 
+/*
+ * call-seq:
+ *    res.type_map -> value
+ *
+ * Returns the TypeMap that is currently set for type casts of result values to ruby objects.
+ *
+ */
+static VALUE
+pgresult_type_map_get(VALUE self)
+{
+	t_pg_result *this = pgresult_get_this(self);
+
+	return this->typemap;
+}
+
+#ifdef HAVE_PQSETSINGLEROWMODE
+/*
+ * call-seq:
+ *    res.stream_each{ |tuple| ... }
+ *
+ * Invokes block for each tuple in the result set in single row mode.
+ *
+ * This is a convenience method for retrieving all result tuples
+ * as they are transferred. It is an alternative to repeated calls of
+ * PG::Connection#get_result , but given that it avoids the overhead of
+ * wrapping each row into a dedicated result object, it delivers data in nearly
+ * the same speed as with ordinary results.
+ *
+ * The result must be in status PGRES_SINGLE_TUPLE.
+ * It iterates over all tuples until the status changes to PGRES_TUPLES_OK.
+ * A PG::Error is raised for any errors from the server.
+ *
+ * Row description data does not change while the iteration. All value retrieval
+ * methods refer to only the current row. Result#ntuples returns +1+ while
+ * the iteration and +0+ after all tuples were yielded.
+ *
+ * Example:
+ *   conn.send_query( "first SQL query; second SQL query" )
+ *   conn.set_single_row_mode
+ *   conn.get_result.stream_each do |row|
+ *     # do something with the received row of the first query
+ *   end
+ *   conn.get_result.stream_each do |row|
+ *     # do something with the received row of the second query
+ *   end
+ *   conn.get_result  # => nil   (no more results)
+ */
+static VALUE
+pgresult_stream_each(VALUE self)
+{
+	t_pg_result *this;
+	int nfields;
+	PGconn *pgconn;
+	PGresult *pgresult;
+
+	RETURN_ENUMERATOR(self, 0, NULL);
+
+	this = pgresult_get_this_safe(self);
+	pgconn = pg_get_pgconn(this->connection);
+	pgresult = this->pgresult;
+	nfields = PQnfields(pgresult);
+
+	for(;;){
+		int tuple_num;
+		int ntuples = PQntuples(pgresult);
+
+		switch( PQresultStatus(pgresult) ){
+			case PGRES_TUPLES_OK:
+				if( ntuples == 0 )
+					return self;
+				rb_raise( rb_eInvalidResultStatus, "PG::Result is not in single row mode");
+			case PGRES_SINGLE_TUPLE:
+				break;
+			default:
+				pg_result_check( self );
+		}
+
+		for(tuple_num = 0; tuple_num < ntuples; tuple_num++) {
+			rb_yield(pgresult_aref(self, INT2NUM(tuple_num)));
+		}
+
+		if( !this->autoclear ){
+			PQclear( pgresult );
+			this->pgresult = NULL;
+		}
+
+		pgresult = gvl_PQgetResult(pgconn);
+		if( pgresult == NULL )
+			rb_raise( rb_eNoResultError, "no result received - possibly an intersection with another result retrieval");
+
+		if( nfields != PQnfields(pgresult) )
+			rb_raise( rb_eInvalidChangeOfResultFields, "number of fields must not change in single row mode");
+
+		this->pgresult = pgresult;
+	}
+
+	/* never reached */
+	return self;
+}
+
+/*
+ * call-seq:
+ *    res.stream_each_row { |row| ... }
+ *
+ * Yields each row of the result set in single row mode.
+ * The row is a list of column values.
+ *
+ * This method works equally to #stream_each , but yields an Array of
+ * values.
+ */
+static VALUE
+pgresult_stream_each_row(VALUE self)
+{
+	t_pg_result *this;
+	int row;
+	int nfields;
+	PGconn *pgconn;
+	PGresult *pgresult;
+
+	RETURN_ENUMERATOR(self, 0, NULL);
+
+	this = pgresult_get_this_safe(self);
+	pgconn = pg_get_pgconn(this->connection);
+	pgresult = this->pgresult;
+	nfields = PQnfields(pgresult);
+
+	for(;;){
+		int ntuples = PQntuples(pgresult);
+
+		switch( PQresultStatus(pgresult) ){
+			case PGRES_TUPLES_OK:
+				if( ntuples == 0 )
+					return self;
+				rb_raise( rb_eInvalidResultStatus, "PG::Result is not in single row mode");
+			case PGRES_SINGLE_TUPLE:
+				break;
+			default:
+				pg_result_check( self );
+		}
+
+		for ( row = 0; row < ntuples; row++ ) {
+			PG_VARIABLE_LENGTH_ARRAY(VALUE, row_values, nfields, PG_MAX_COLUMNS)
+			int field;
+
+			/* populate the row */
+			for ( field = 0; field < nfields; field++ ) {
+				row_values[field] = this->p_typemap->funcs.typecast_result_value(this->p_typemap, self, row, field);
+			}
+			rb_yield( rb_ary_new4( nfields, row_values ));
+		}
+
+		if( !this->autoclear ){
+			PQclear( pgresult );
+			this->pgresult = NULL;
+		}
+
+		pgresult = gvl_PQgetResult(pgconn);
+		if( pgresult == NULL )
+			rb_raise( rb_eNoResultError, "no result received - possibly an intersection with another result retrieval");
+
+		if( nfields != PQnfields(pgresult) )
+			rb_raise( rb_eInvalidChangeOfResultFields, "number of fields must not change in single row mode");
+
+		this->pgresult = pgresult;
+	}
+
+	/* never reached */
+	return self;
+}
+#endif
+
 
 void
 init_pg_result()
 {
 	rb_cPGresult = rb_define_class_under( rb_mPG, "Result", rb_cObject );
+	rb_define_alloc_func( rb_cPGresult, pgresult_s_allocate );
 	rb_include_module(rb_cPGresult, rb_mEnumerable);
 	rb_include_module(rb_cPGresult, rb_mPGconstants);
 
@@ -913,8 +1252,20 @@ init_pg_result()
 	rb_define_method(rb_cPGresult, "each", pgresult_each, 0);
 	rb_define_method(rb_cPGresult, "fields", pgresult_fields, 0);
 	rb_define_method(rb_cPGresult, "each_row", pgresult_each_row, 0);
+	rb_define_method(rb_cPGresult, "values", pgresult_values, 0);
 	rb_define_method(rb_cPGresult, "column_values", pgresult_column_values, 1);
 	rb_define_method(rb_cPGresult, "field_values", pgresult_field_values, 1);
+	rb_define_method(rb_cPGresult, "cleared?", pgresult_cleared_p, 0);
+	rb_define_method(rb_cPGresult, "autoclear?", pgresult_autoclear_p, 0);
+
+	rb_define_method(rb_cPGresult, "type_map=", pgresult_type_map_set, 1);
+	rb_define_method(rb_cPGresult, "type_map", pgresult_type_map_get, 0);
+
+#ifdef HAVE_PQSETSINGLEROWMODE
+	/******     PG::Result INSTANCE METHODS: streaming     ******/
+	rb_define_method(rb_cPGresult, "stream_each", pgresult_stream_each, 0);
+	rb_define_method(rb_cPGresult, "stream_each_row", pgresult_stream_each_row, 0);
+#endif
 }