postgres 0.7.9.2007.12.12 → 0.7.9.2007.12.22

data/ext/compat.c

@@ -14,6 +14,21 @@
 
 #include "compat.h"
 
+#ifndef HAVE_PQDESCRIBEPREPARED
+PGresult *
+PQdescribePrepared(PGconn *conn, const char *stmtName)
+{
+	rb_raise(rb_eStandardError, "PQdescribePrepared not supported by this client version.");
+}
+#endif /* HAVE_PQDESCRIBEPREPARED */
+
+#ifndef HAVE_PQDESCRIBEPORTAL
+PGresult *
+PQdescribePortal(PGconn *conn, const char *portalName)
+{
+	rb_raise(rb_eStandardError, "PQdescribePortal not supported by this client version.");
+}
+#endif /* HAVE_PQDESCRIBEPORTAL */
 
 #ifndef HAVE_PQESCAPESTRINGCONN
 size_t

data/ext/compat.h

@@ -6,7 +6,6 @@
 
 #include "ruby.h"
 #include "rubyio.h"
-#include "st.h"
 #include "libpq-fe.h"
 #include "libpq/libpq-fs.h"              /* large-object interface */
 
@@ -14,6 +13,14 @@
 #define rb_check_string_type(x) rb_check_convert_type(x, T_STRING, "String", "to_str")
 #endif /* RUBY_VERSION_CODE < 180 */
 
+#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 */
@@ -56,6 +63,14 @@ PGresult *PQprepare(PGconn *conn, const char *stmtName, const char *query,
 	int nParams, const Oid *paramTypes);
 #endif /* HAVE_PQPREPARE */
 
+#ifndef HAVE_PQDESCRIBEPREPARED
+PGresult * PQdescribePrepared(PGconn *conn, const char *stmtName);
+#endif /* HAVE_PQDESCRIBEPREPARED */
+
+#ifndef HAVE_PQDESCRIBEPORTAL
+PGresult * PQdescribePortal(PGconn *conn, const char *portalName);
+#endif /* HAVE_PQDESCRIBEPORTAL */
+
 #ifndef HAVE_PQCONNECTIONUSEDPASSWORD
 int PQconnectionUsedPassword(PGconn *conn);
 #endif /* HAVE_PQCONNECTIONUSEDPASSWORD */

data/ext/extconf.rb

@@ -33,6 +33,8 @@ desired_functions = %w(
 	PQsendDescribePrepared
 	PQsendDescribePortal
 	PQencryptPassword
+	PQdescribePrepared
+	PQdescribePortal
 	lo_create
 	lo_truncate
 	pg_encoding_to_char 

data/ext/pg.c

@@ -9,7 +9,7 @@
   modified at: Wed Jan 20 16:41:51 1999
 
   $Author: jdavis $
-  $Date: 2007-12-12 15:46:33 -0800 (Wed, 12 Dec 2007) $
+  $Date: 2007-12-13 18:58:32 -0800 (Thu, 13 Dec 2007) $
 ************************************************/
 
 #include "pg.h"
@@ -25,9 +25,9 @@
 
 #define rb_define_singleton_alias(klass,new,old) rb_define_alias(rb_singleton_class(klass),new,old)
 
-#define Data_Set_Struct(obj,ptr) do { \
-    Check_Type(obj, T_DATA); \
-    DATA_PTR(obj) = ptr; \
+#define Data_Set_Struct(self,ptr) do { \
+    Check_Type(self, T_DATA); \
+    DATA_PTR(self) = ptr; \
 } while (0)
 
 static VALUE rb_cPGconn;
@@ -38,18 +38,14 @@ static VALUE rb_ePGError;
  * UTILITY FUNCTIONS
  **************************************************************************/
 
-static VALUE pgresult_fields _((VALUE));
-static VALUE pgresult_clear _((VALUE));
-static VALUE pgresult_new _((PGresult*));
-
 static void free_pgconn(PGconn *);
 static void pgresult_check(VALUE, VALUE);
 
 static int build_key_value_string_i(VALUE key, VALUE value, VALUE result);
-static PGconn *get_pgconn(VALUE obj);
+static PGconn *get_pgconn(VALUE self);
 static VALUE pgconn_finish(VALUE self);
 
-static VALUE pg_escape_regex;
+//static VALUE pg_escape_regex;
 static VALUE pg_escape_str;
 static ID    pg_gsub_bang_id;
 
@@ -63,8 +59,8 @@ pgconn_s_quote_connstr(string)
 
     Check_Type(string, T_STRING);
     
-	ptr = RSTRING(string)->ptr;
-	len = RSTRING(string)->len;
+	ptr = RSTRING_PTR(string);
+	len = RSTRING_LEN(string);
     str = ALLOCA_N(char, len * 2 + 2 + 1);
 	str[j++] = '\'';
 	for(i = 0; i < len; i++) {
@@ -78,17 +74,19 @@ pgconn_s_quote_connstr(string)
     return result;
 }
 
+//TODO broken
 static int
 build_key_value_string_i(key, value, result)
     VALUE key, value, result;
 {
     VALUE key_value;
-    if (key == Qundef) return ST_CONTINUE;
+    //if (key == Qundef) return ST_CONTINUE;
     key_value = (TYPE(key) == T_STRING ? rb_str_dup(key) : rb_obj_as_string(key));
     rb_str_cat(key_value, "=", 1);
     rb_str_concat(key_value, pgconn_s_quote_connstr(value));
     rb_ary_push(result, key_value);
-    return ST_CONTINUE;
+    //return ST_CONTINUE;
+	return 0;
 }
 
 static void
@@ -105,6 +103,7 @@ pgconn_alloc(klass)
     return Data_Wrap_Struct(klass, 0, free_pgconn, NULL);
 }
 
+//TODO broken on 1.9
 static PGconn *
 try_connectdb(arg)
     VALUE arg;
@@ -114,11 +113,11 @@ try_connectdb(arg)
     if (!NIL_P(conninfo = rb_check_string_type(arg))) {
         /* do nothing */
     }
-    else if (!NIL_P(conninfo = rb_check_hash_type(arg))) {
-        VALUE key_values = rb_ary_new2(RHASH(conninfo)->tbl->num_entries);
-        rb_hash_foreach(conninfo, build_key_value_string_i, key_values);
-        conninfo = rb_ary_join(key_values, rb_str_new2(" "));
-    }
+    //else if (!NIL_P(conninfo = rb_check_hash_type(arg))) {
+    //    VALUE key_values = rb_ary_new2(RHASH(conninfo)->tbl->num_entries);
+    //    rb_hash_foreach(conninfo, build_key_value_string_i, key_values);
+    //    conninfo = rb_ary_join(key_values, rb_str_new2(" "));
+    //}
     else {
         return NULL;
     }
@@ -151,22 +150,22 @@ try_setdbLogin(args)
 }
 
 static PGconn*
-get_pgconn(obj)
-    VALUE obj;
+get_pgconn(self)
+    VALUE self;
 {
     PGconn *conn;
 
-    Data_Get_Struct(obj, PGconn, conn);
+    Data_Get_Struct(self, PGconn, conn);
     if (conn == NULL) rb_raise(rb_ePGError, "closed connection");
     return conn;
 }
 
 static PGresult*
-get_pgresult(obj)
-    VALUE obj;
+get_pgresult(self)
+    VALUE self;
 {
     PGresult *result;
-    Data_Get_Struct(obj, PGresult, result);
+    Data_Get_Struct(self, PGresult, result);
     if (result == NULL) rb_raise(rb_ePGError, "query not performed");
     return result;
 }
@@ -269,8 +268,6 @@ pgresult_check(VALUE rb_pgconn, VALUE rb_pgresult)
  *    #exec
  *    #query
  *    
- *    #async_exec
- *    #async_query
  *    
  *    #get_notify
  *    #on_notice
@@ -316,9 +313,9 @@ pgconn_s_new(argc, argv, klass)
     VALUE *argv;
     VALUE klass;
 {
-    VALUE obj = rb_obj_alloc(klass);
-    rb_obj_call_init(obj, argc, argv);
-    return obj;
+    VALUE self = rb_obj_alloc(klass);
+    rb_obj_call_init(self, argc, argv);
+    return self;
 }
 #endif
 
@@ -376,8 +373,8 @@ pgconn_init(argc, argv, self)
  * Return value is the encrypted password.
  */
 static VALUE
-pgconn_s_encrypt_password(obj, password, username)
-	VALUE obj, password, username;
+pgconn_s_encrypt_password(self, password, username)
+	VALUE self, password, username;
 {
 	Check_Type(password, T_STRING);
 	Check_Type(username, T_STRING);
@@ -393,8 +390,8 @@ pgconn_s_encrypt_password(obj, password, username)
  * Returns +true+ if libpq is thread safe, +false+ otherwise.
  */
 static VALUE
-pgconn_s_isthreadsafe(obj)
-	VALUE obj;
+pgconn_s_isthreadsafe(self)
+	VALUE self;
 {
 	return PQisthreadsafe() ? Qtrue : Qfalse;
 }
@@ -425,11 +422,11 @@ pgconn_finish(self)
  * Resets the backend connection. This method closes the backend connection and tries to re-connect.
  */
 static VALUE
-pgconn_reset(obj)
-    VALUE obj;
+pgconn_reset(self)
+    VALUE self;
 {
-    PQreset(get_pgconn(obj));
-    return obj;
+    PQreset(get_pgconn(self));
+    return self;
 }
 
 //TODO conn.reset_start
@@ -443,10 +440,10 @@ pgconn_reset(obj)
  * Returns the connected database name.
  */
 static VALUE
-pgconn_db(obj)
-    VALUE obj;
+pgconn_db(self)
+    VALUE self;
 {
-    char *db = PQdb(get_pgconn(obj));
+    char *db = PQdb(get_pgconn(self));
     if (!db) return Qnil;
     return rb_tainted_str_new2(db);
 }
@@ -458,10 +455,10 @@ pgconn_db(obj)
  * Returns the authenticated user name.
  */
 static VALUE
-pgconn_user(obj)
-    VALUE obj;
+pgconn_user(self)
+    VALUE self;
 {
-    char *user = PQuser(get_pgconn(obj));
+    char *user = PQuser(get_pgconn(self));
     if (!user) return Qnil;
     return rb_tainted_str_new2(user);
 }
@@ -473,10 +470,10 @@ pgconn_user(obj)
  * Returns the authenticated user name.
  */
 static VALUE
-pgconn_pass(obj)
-    VALUE obj;
+pgconn_pass(self)
+    VALUE self;
 {
-    char *user = PQpass(get_pgconn(obj));
+    char *user = PQpass(get_pgconn(self));
     if (!user) return Qnil;
     return rb_tainted_str_new2(user);
 }
@@ -488,10 +485,10 @@ pgconn_pass(obj)
  * Returns the connected server name.
  */
 static VALUE
-pgconn_host(obj)
-    VALUE obj;
+pgconn_host(self)
+    VALUE self;
 {
-    char *host = PQhost(get_pgconn(obj));
+    char *host = PQhost(get_pgconn(self));
     if (!host) return Qnil;
     return rb_tainted_str_new2(host);
 }
@@ -503,10 +500,10 @@ pgconn_host(obj)
  * Returns the connected server port number.
  */
 static VALUE
-pgconn_port(obj)
-    VALUE obj;
+pgconn_port(self)
+    VALUE self;
 {
-    char* port = PQport(get_pgconn(obj));
+    char* port = PQport(get_pgconn(self));
     return INT2NUM(atol(port));
 }
 
@@ -517,10 +514,10 @@ pgconn_port(obj)
  * Returns the connected pgtty.
  */
 static VALUE
-pgconn_tty(obj)
-    VALUE obj;
+pgconn_tty(self)
+    VALUE self;
 {
-    char *tty = PQtty(get_pgconn(obj));
+    char *tty = PQtty(get_pgconn(self));
     if (!tty) return Qnil;
     return rb_tainted_str_new2(tty);
 }
@@ -532,10 +529,10 @@ pgconn_tty(obj)
  * Returns backend option string.
  */
 static VALUE
-pgconn_options(obj)
-    VALUE obj;
+pgconn_options(self)
+    VALUE self;
 {
-    char *options = PQoptions(get_pgconn(obj));
+    char *options = PQoptions(get_pgconn(self));
     if (!options) return Qnil;
     return rb_tainted_str_new2(options);
 }
@@ -547,10 +544,10 @@ pgconn_options(obj)
  * Returns status of connection : CONNECTION_OK or CONNECTION_BAD
  */
 static VALUE
-pgconn_status(obj)
-    VALUE obj;
+pgconn_status(self)
+    VALUE self;
 {
-    return INT2NUM(PQstatus(get_pgconn(obj)));
+    return INT2NUM(PQstatus(get_pgconn(self)));
 }
 
 /*
@@ -565,10 +562,10 @@ pgconn_status(obj)
  *   PQTRANS_UNKNOWN = 4 (cannot determine status)
  */
 static VALUE
-pgconn_transaction_status(obj)
-    VALUE obj;
+pgconn_transaction_status(self)
+    VALUE self;
 {
-    return INT2NUM(PQtransactionStatus(get_pgconn(obj)));
+    return INT2NUM(PQtransactionStatus(get_pgconn(self)));
 }
 
 /*
@@ -590,10 +587,10 @@ pgconn_transaction_status(obj)
  * Returns nil if the value of the parameter is not known.
  */
 static VALUE
-pgconn_parameter_status(obj, param_name)
-	VALUE obj, param_name;
+pgconn_parameter_status(self, param_name)
+	VALUE self, param_name;
 {
-	const char *ret = PQparameterStatus(get_pgconn(obj), 
+	const char *ret = PQparameterStatus(get_pgconn(self), 
 			StringValuePtr(param_name));
 	if(ret == NULL)
 		return Qnil;
@@ -610,10 +607,10 @@ pgconn_parameter_status(obj, param_name)
  * obsolete and not supported by libpq.)
  */
 static VALUE
-pgconn_protocol_version(obj)
-    VALUE obj;
+pgconn_protocol_version(self)
+    VALUE self;
 {
-    return INT2NUM(PQprotocolVersion(get_pgconn(obj)));
+    return INT2NUM(PQprotocolVersion(get_pgconn(self)));
 }
 
 /*
@@ -623,10 +620,10 @@ pgconn_protocol_version(obj)
  * The number is formed by converting the major, minor, and revision numbers into two-decimal-digit numbers and appending them together. For example, version 7.4.2 will be returned as 70402, and version 8.1 will be returned as 80100 (leading zeroes are not shown). Zero is returned if the connection is bad.
  */
 static VALUE
-pgconn_server_version(obj)
-    VALUE obj;
+pgconn_server_version(self)
+    VALUE self;
 {
-    return INT2NUM(PQserverVersion(get_pgconn(obj)));
+    return INT2NUM(PQserverVersion(get_pgconn(self)));
 }
 
 /*
@@ -636,10 +633,10 @@ pgconn_server_version(obj)
  * Returns the error message about connection.
  */
 static VALUE
-pgconn_error_message(obj)
-    VALUE obj;
+pgconn_error_message(self)
+    VALUE self;
 {
-    char *error = PQerrorMessage(get_pgconn(obj));
+    char *error = PQerrorMessage(get_pgconn(self));
     if (!error) return Qnil;
     return rb_tainted_str_new2(error);
 }
@@ -663,10 +660,10 @@ pgconn_error_message(obj)
  * Note that this is a PID on database server host.
  */
 static VALUE
-pgconn_backend_pid(obj)
-	VALUE obj;
+pgconn_backend_pid(self)
+	VALUE self;
 {
-	return INT2NUM(PQbackendPID(get_pgconn(obj)));
+	return INT2NUM(PQbackendPID(get_pgconn(self)));
 }
 
 /*
@@ -677,10 +674,10 @@ pgconn_backend_pid(obj)
  * +false+ otherwise.
  */
 static VALUE
-pgconn_connection_used_password(obj)
-	VALUE obj;
+pgconn_connection_used_password(self)
+	VALUE self;
 {
-	return PQconnectionUsedPassword(get_pgconn(obj)) ? Qtrue : Qfalse;
+	return PQconnectionUsedPassword(get_pgconn(self)) ? Qtrue : Qfalse;
 }
 
 
@@ -697,10 +694,10 @@ pgconn_connection_used_password(obj)
  *
  */
 static VALUE
-pgconn_exec(obj, in_command)
-    VALUE obj, in_command;
+pgconn_exec(self, in_command)
+    VALUE self, in_command;
 {
-    PGconn *conn = get_pgconn(obj);
+    PGconn *conn = get_pgconn(self);
     PGresult *result = NULL;
 	VALUE rb_pgresult;
 	VALUE command;
@@ -714,7 +711,7 @@ pgconn_exec(obj, in_command)
 	result = PQexec(conn, StringValuePtr(command));
 
 	rb_pgresult = pgresult_new(result);
-	pgresult_check(obj, rb_pgresult);
+	pgresult_check(self, rb_pgresult);
 
 	return rb_pgresult;
 }
@@ -751,18 +748,18 @@ pgconn_exec(obj, in_command)
  * for binary.
  */
 static VALUE
-pgconn_exec_params(argc, argv, obj)
+pgconn_exec_params(argc, argv, self)
     int argc;
 	VALUE *argv;
-	VALUE obj;
+	VALUE self;
 {
-    PGconn *conn = get_pgconn(obj);
+    PGconn *conn = get_pgconn(self);
     PGresult *result = NULL;
 	VALUE rb_pgresult;
 	VALUE command, params, in_res_fmt;
 	VALUE param, param_type, param_value, param_format;
 	VALUE param_value_tmp;
-	ID sym_type, sym_value, sym_format;
+	VALUE sym_type, sym_value, sym_format;
 	int i=0;
 
 	int nParams;
@@ -792,9 +789,9 @@ pgconn_exec_params(argc, argv, obj)
 		resultFormat = NUM2INT(in_res_fmt);
 	}
 
-	sym_type = rb_to_id(rb_str_new2("type"));
-	sym_value = rb_to_id(rb_str_new2("value"));
-	sym_format = rb_to_id(rb_str_new2("format"));
+	sym_type = ID2SYM(rb_intern("type"));
+	sym_value = ID2SYM(rb_intern("value"));
+	sym_format = ID2SYM(rb_intern("format"));
 
 	nParams = RARRAY(params)->len;
 	paramTypes = ALLOC_N(Oid, nParams); 
@@ -804,13 +801,13 @@ pgconn_exec_params(argc, argv, obj)
 	for(i = 0; i < nParams; i++) {
 		param = rb_ary_entry(params, i);
 		if (TYPE(param) == T_HASH) {
-			param_type = rb_hash_aref(param, ID2SYM(sym_type));
-			param_value_tmp = rb_hash_aref(param, ID2SYM(sym_value));
+			param_type = rb_hash_aref(param, sym_type);
+			param_value_tmp = rb_hash_aref(param, sym_value);
 			if(TYPE(param_value_tmp) == T_STRING)
 				param_value = param_value_tmp;
 			else
 				param_value = rb_funcall(param_value_tmp, rb_intern("to_s"), 0);
-			param_format = rb_hash_aref(param, ID2SYM(sym_format));
+			param_format = rb_hash_aref(param, sym_format);
 		}
 		else {
 			param_type = INT2NUM(0);
@@ -822,8 +819,8 @@ pgconn_exec_params(argc, argv, obj)
 		}
 		Check_Type(param_value, T_STRING);
 		paramTypes[i] = NUM2INT(param_type);
-		paramValues[i] = RSTRING(param_value)->ptr;
-		paramLengths[i] = RSTRING(param_value)->len + 1;
+		paramValues[i] = RSTRING_PTR(param_value);
+		paramLengths[i] = RSTRING_LEN(param_value) + 1;
 		paramFormats[i] = NUM2INT(param_format);
 	}
 	
@@ -836,7 +833,7 @@ pgconn_exec_params(argc, argv, obj)
 	free(paramFormats);
 
 	rb_pgresult = pgresult_new(result);
-	pgresult_check(obj, rb_pgresult);
+	pgresult_check(self, rb_pgresult);
 
 	return rb_pgresult;
 
@@ -863,12 +860,12 @@ pgconn_exec_params(argc, argv, obj)
  * inside the SQL query.
  */
 static VALUE
-pgconn_prepare(argc, argv, obj)
+pgconn_prepare(argc, argv, self)
     int argc;
 	VALUE *argv;
-	VALUE obj;
+	VALUE self;
 {
-    PGconn *conn = get_pgconn(obj);
+    PGconn *conn = get_pgconn(self);
     PGresult *result = NULL;
 	VALUE rb_pgresult;
 	VALUE name, command, in_paramtypes;
@@ -899,7 +896,7 @@ pgconn_prepare(argc, argv, obj)
 	free(paramTypes);
 
 	rb_pgresult = pgresult_new(result);
-	pgresult_check(obj, rb_pgresult);
+	pgresult_check(self, rb_pgresult);
 
 	return rb_pgresult;
 
@@ -930,18 +927,18 @@ pgconn_prepare(argc, argv, obj)
  * for binary.
  */
 static VALUE
-pgconn_exec_prepared(argc, argv, obj)
+pgconn_exec_prepared(argc, argv, self)
     int argc;
     VALUE *argv;
-    VALUE obj;
+    VALUE self;
 {
-    PGconn *conn = get_pgconn(obj);
+    PGconn *conn = get_pgconn(self);
     PGresult *result = NULL;
 	VALUE rb_pgresult;
 	VALUE name, params, in_res_fmt;
 	VALUE param, param_value, param_format;
 	VALUE param_value_tmp;
-	ID sym_value, sym_format;
+	VALUE sym_value, sym_format;
 	int i = 0;
 
 	int nParams;
@@ -970,8 +967,8 @@ pgconn_exec_prepared(argc, argv, obj)
 		resultFormat = NUM2INT(in_res_fmt);
 	}
 
-	sym_value = rb_to_id(rb_str_new2("value"));
-	sym_format = rb_to_id(rb_str_new2("format"));
+	sym_value = ID2SYM(rb_intern("value"));
+	sym_format = ID2SYM(rb_intern("format"));
 
 	nParams = RARRAY(params)->len;
 	paramValues = ALLOC_N(char *, nParams);
@@ -980,12 +977,12 @@ pgconn_exec_prepared(argc, argv, obj)
 	for(i = 0; i < nParams; i++) {
 		param = rb_ary_entry(params, i);
 		if (TYPE(param) == T_HASH) {
-			param_value_tmp = rb_hash_aref(param, ID2SYM(sym_value));
+			param_value_tmp = rb_hash_aref(param, sym_value);
 			if(TYPE(param_value_tmp) == T_STRING)
 				param_value = param_value_tmp;
 			else
 				param_value = rb_funcall(param_value_tmp, rb_intern("to_s"), 0);
-			param_format = rb_hash_aref(param, ID2SYM(sym_format));
+			param_format = rb_hash_aref(param, sym_format);
 		}
 		else {
 			if(TYPE(param) == T_STRING)
@@ -995,8 +992,8 @@ pgconn_exec_prepared(argc, argv, obj)
 			param_format = INT2NUM(0);
 		}
 		Check_Type(param_value, T_STRING);
-		paramValues[i] = RSTRING(param_value)->ptr;
-		paramLengths[i] = RSTRING(param_value)->len + 1;
+		paramValues[i] = RSTRING_PTR(param_value);
+		paramLengths[i] = RSTRING_LEN(param_value) + 1;
 		paramFormats[i] = NUM2INT(param_format);
 	}
 	
@@ -1009,15 +1006,66 @@ pgconn_exec_prepared(argc, argv, obj)
 	free(paramFormats);
 
 	rb_pgresult = pgresult_new(result);
-	pgresult_check(obj, rb_pgresult);
+	pgresult_check(self, rb_pgresult);
 
 	return rb_pgresult;
 }
 
-// TODO describe_prepared
+/*
+ * call-seq:
+ *    conn.describe_prepared( statement_name ) -> PGresult
+ *
+ * Retrieve information about the prepared statement
+ * _statement_name_.
+ */
+static VALUE
+pgconn_describe_prepared(self, stmt_name)
+	VALUE self, stmt_name;
+{
+	PGconn *conn = get_pgconn(self);
+	PGresult *result;
+	VALUE rb_pgresult;
+	char *stmt;
+	if(stmt_name == Qnil) {
+		stmt = NULL;
+	}
+	else {
+		Check_Type(stmt_name, T_STRING);
+		stmt = StringValuePtr(stmt_name);
+	}
+	result = PQdescribePrepared(conn, stmt);
+	rb_pgresult = pgresult_new(result);
+	pgresult_check(self, rb_pgresult);
+	return rb_pgresult;
+}
 
 
-// TODO describe_portal
+/*
+ * call-seq:
+ *    conn.describe_portal( portal_name ) -> PGresult
+ *
+ * Retrieve information about the portal _portal_name_.
+ */
+static VALUE
+pgconn_describe_portal(self, stmt_name)
+	VALUE self, stmt_name;
+{
+	PGconn *conn = get_pgconn(self);
+	PGresult *result;
+	VALUE rb_pgresult;
+	char *stmt;
+	if(stmt_name == Qnil) {
+		stmt = NULL;
+	}
+	else {
+		Check_Type(stmt_name, T_STRING);
+		stmt = StringValuePtr(stmt_name);
+	}
+	result = PQdescribePortal(conn, stmt);
+	rb_pgresult = pgresult_new(result);
+	pgresult_check(self, rb_pgresult);
+	return rb_pgresult;
+}
 
 
 // TODO make_empty_pgresult
@@ -1049,16 +1097,16 @@ pgconn_s_escape(self, string)
 
     Check_Type(string, T_STRING);
     
-    escaped = ALLOCA_N(char, RSTRING(string)->len * 2 + 1);
+    escaped = ALLOCA_N(char, RSTRING_LEN(string) * 2 + 1);
     if(CLASS_OF(self) == rb_cPGconn) {
-    	size = PQescapeStringConn(get_pgconn(self),escaped, RSTRING(string)->ptr,
-			RSTRING(string)->len, &error);
+    	size = PQescapeStringConn(get_pgconn(self),escaped, RSTRING_PTR(string),
+			RSTRING_LEN(string), &error);
 		if(error) {
 			rb_raise(rb_ePGError, PQerrorMessage(get_pgconn(self)));
 		}
     } else {
-    	size = PQescapeString(escaped, RSTRING(string)->ptr,
-			RSTRING(string)->len);
+    	size = PQescapeString(escaped, RSTRING_PTR(string),
+			RSTRING_LEN(string));
     }
     result = rb_str_new(escaped, size);
     OBJ_INFECT(result, string);
@@ -1067,8 +1115,8 @@ pgconn_s_escape(self, string)
 
 /*
  * call-seq:
- *   conn.escape_bytea( obj ) -> String 
- *   PGconn.escape_bytea( obj ) -> String # DEPRECATED
+ *   conn.escape_bytea( self ) -> String 
+ *   PGconn.escape_bytea( self ) -> String # DEPRECATED
  *
  * Connection instance method for versions of 8.1 and higher of libpq
  * uses PQescapeByteaConn, which is safer. Avoid calling as a class method,
@@ -1090,17 +1138,17 @@ pgconn_s_escape(self, string)
  * SQL commands.
  */
 static VALUE
-pgconn_s_escape_bytea(self, obj)
+pgconn_s_escape_bytea(self, str)
     VALUE self;
-    VALUE obj;
+    VALUE str;
 {
     char *from, *to;
     size_t from_len, to_len;
     VALUE ret;
     
-    Check_Type(obj, T_STRING);
-    from      = RSTRING(obj)->ptr;
-    from_len  = RSTRING(obj)->len;
+    Check_Type(str, T_STRING);
+    from      = RSTRING_PTR(str);
+    from_len  = RSTRING_LEN(str);
     
     if(CLASS_OF(self) == rb_cPGconn) {
         to = (char *)PQescapeByteaConn(get_pgconn(self),(unsigned char*)from, from_len, &to_len);
@@ -1109,7 +1157,7 @@ pgconn_s_escape_bytea(self, obj)
     }
     
     ret = rb_str_new(to, to_len - 1);
-    OBJ_INFECT(ret, obj);
+    OBJ_INFECT(ret, str);
     
     PQfreemem(to);
     
@@ -1119,7 +1167,7 @@ pgconn_s_escape_bytea(self, obj)
 
 /*
  * call-seq:
- *   PGconn.unescape_bytea( obj )
+ *   PGconn.unescape_bytea( self )
  *
  * Converts an escaped string representation of binary data into binary data --- the
  * reverse of #escape_bytea. This is needed when retrieving +bytea+ data in text format,
@@ -1127,20 +1175,20 @@ pgconn_s_escape_bytea(self, obj)
  *
  */
 static VALUE
-pgconn_s_unescape_bytea(self, obj)
-    VALUE self, obj;
+pgconn_s_unescape_bytea(self, str)
+    VALUE self, str;
 {
     char *from, *to;
     size_t to_len;
     VALUE ret;
 
-    Check_Type(obj, T_STRING);
-    from = StringValuePtr(obj);
+    Check_Type(str, T_STRING);
+    from = StringValuePtr(str);
 
     to = (char *) PQunescapeBytea( (unsigned char*) from, &to_len);
 
     ret = rb_str_new(to, to_len);
-    OBJ_INFECT(ret, obj);
+    OBJ_INFECT(ret, str);
     PQfreemem(to);
 
     return ret;
@@ -1154,15 +1202,15 @@ pgconn_s_unescape_bytea(self, obj)
  * Use in combination with +conn.get_result+.
  */
 static VALUE
-pgconn_send_query(obj, command)
-	VALUE obj, command;
+pgconn_send_query(self, command)
+	VALUE self, command;
 {
 	VALUE error;
-	PGconn *conn = get_pgconn(obj);
+	PGconn *conn = get_pgconn(self);
 	/* returns 0 on failure */
 	if(PQsendQuery(conn,StringValuePtr(command)) == 0) {
 		error = rb_exc_new2(rb_ePGError, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", obj);
+		rb_iv_set(error, "@connection", self);
 		rb_raise(error, PQerrorMessage(conn));
 	}
 	return Qnil;
@@ -1179,15 +1227,15 @@ pgconn_send_query(obj, command)
  * Use in combination with +conn.get_result+.
  */
 static VALUE
-pgconn_send_prepare(obj, command)
-	VALUE obj, command;
+pgconn_send_prepare(self, command)
+	VALUE self, command;
 {
 	VALUE error;
-	PGconn *conn = get_pgconn(obj);
+	PGconn *conn = get_pgconn(self);
 	/* returns 0 on failure */
 	if(PQsendQuery(conn,StringValuePtr(command)) == 0) {
 		error = rb_exc_new2(rb_ePGError, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", obj);
+		rb_iv_set(error, "@connection", self);
 		rb_raise(error, PQerrorMessage(conn));
 	}
 	return Qnil;
@@ -1204,15 +1252,15 @@ pgconn_send_prepare(obj, command)
  * Use in combination with +conn.get_result+.
  */
 static VALUE
-pgconn_send_describe_prepared(obj, stmt_name)
-	VALUE obj, stmt_name;
+pgconn_send_describe_prepared(self, stmt_name)
+	VALUE self, stmt_name;
 {
 	VALUE error;
-	PGconn *conn = get_pgconn(obj);
+	PGconn *conn = get_pgconn(self);
 	/* returns 0 on failure */
 	if(PQsendDescribePrepared(conn,StringValuePtr(stmt_name)) == 0) {
 		error = rb_exc_new2(rb_ePGError, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", obj);
+		rb_iv_set(error, "@connection", self);
 		rb_raise(error, PQerrorMessage(conn));
 	}
 	return Qnil;
@@ -1227,15 +1275,15 @@ pgconn_send_describe_prepared(obj, stmt_name)
  * Use in combination with +conn.get_result+.
  */
 static VALUE
-pgconn_send_describe_portal(obj, portal)
-	VALUE obj, portal;
+pgconn_send_describe_portal(self, portal)
+	VALUE self, portal;
 {
 	VALUE error;
-	PGconn *conn = get_pgconn(obj);
+	PGconn *conn = get_pgconn(self);
 	/* returns 0 on failure */
 	if(PQsendDescribePortal(conn,StringValuePtr(portal)) == 0) {
 		error = rb_exc_new2(rb_ePGError, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", obj);
+		rb_iv_set(error, "@connection", self);
 		rb_raise(error, PQerrorMessage(conn));
 	}
 	return Qnil;
@@ -1250,18 +1298,18 @@ pgconn_send_describe_portal(obj, portal)
  * Use in combination with +conn.get_result+.
  */
 static VALUE
-pgconn_get_result(obj)
-	VALUE obj;
+pgconn_get_result(self)
+	VALUE self;
 {
 	PGresult *result;
 	VALUE rb_pgresult;
 
-	result = PQgetResult(get_pgconn(obj));
+	result = PQgetResult(get_pgconn(self));
 	if(result == NULL)
 		return Qnil;
 	
 	rb_pgresult = pgresult_new(result);
-	pgresult_check(obj, rb_pgresult);
+	pgresult_check(self, rb_pgresult);
 
 	return rb_pgresult;
 }
@@ -1275,15 +1323,15 @@ pgconn_get_result(obj)
  * or *notifies* to see if the state has changed.
  */
 static VALUE
-pgconn_consume_input(obj)
-	VALUE obj;
+pgconn_consume_input(self)
+	VALUE self;
 {
 	VALUE error;
-	PGconn *conn = get_pgconn(obj);
+	PGconn *conn = get_pgconn(self);
 	/* returns 0 on error */
 	if(PQconsumeInput(conn) == 0) {
 		error = rb_exc_new2(rb_ePGError, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", obj);
+		rb_iv_set(error, "@connection", self);
 		rb_raise(error, PQerrorMessage(conn));
 	}
 	return Qnil;
@@ -1297,10 +1345,10 @@ pgconn_consume_input(obj)
  * PQgetResult would block. Otherwise returns +false+.
  */
 static VALUE
-pgconn_is_busy(obj)
-	VALUE obj;
+pgconn_is_busy(self)
+	VALUE self;
 {
-	return PQisBusy(get_pgconn(obj)) ? Qtrue : Qfalse;
+	return PQisBusy(get_pgconn(self)) ? Qtrue : Qfalse;
 }
 
 /*
@@ -1311,12 +1359,12 @@ pgconn_is_busy(obj)
  * PQgetResult would block. Otherwise returns +false+.
  */
 static VALUE
-pgconn_setnonblocking(obj, state)
-	VALUE obj, state;
+pgconn_setnonblocking(self, state)
+	VALUE self, state;
 {
 	int arg;
 	VALUE error;
-	PGconn *conn = get_pgconn(obj);
+	PGconn *conn = get_pgconn(self);
 	if(state == Qtrue)
 		arg = 1;
 	else if (state == Qfalse)
@@ -1326,7 +1374,7 @@ pgconn_setnonblocking(obj, state)
 
 	if(PQsetnonblocking(conn, arg) == -1) {
 		error = rb_exc_new2(rb_ePGError, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", obj);
+		rb_iv_set(error, "@connection", self);
 		rb_raise(error, PQerrorMessage(conn));
 	}
 	return Qnil;
@@ -1341,10 +1389,10 @@ pgconn_setnonblocking(obj, state)
  * PQgetResult would block. Otherwise returns +false+.
  */
 static VALUE
-pgconn_isnonblocking(obj)
-	VALUE obj;
+pgconn_isnonblocking(self)
+	VALUE self;
 {
-	return PQisnonblocking(get_pgconn(obj)) ? Qtrue : Qfalse;
+	return PQisnonblocking(get_pgconn(self)) ? Qtrue : Qfalse;
 }
 
 /*TODO
@@ -1355,10 +1403,10 @@ pgconn_isnonblocking(obj)
  * PQgetResult would block. Otherwise returns +false+.
  */
 static VALUE
-pgconn_flush(obj)
-	VALUE obj;
+pgconn_flush(self)
+	VALUE self;
 {
-	//if(PQflush(get_pgconn(obj))) 
+	//if(PQflush(get_pgconn(self))) 
 	return Qnil;
 }
 
@@ -1370,7 +1418,49 @@ pgconn_flush(obj)
 
 //TODO fn
 
-//TODO notifies
+/*
+ * call-seq:
+ *    conn.notifies()
+ *
+ * Returns an array of the unprocessed notifiers.
+ * If there is no unprocessed notifier, it returns +nil+.
+ */
+static VALUE
+pgconn_notifies(self)
+    VALUE self;
+{
+    PGconn* conn = get_pgconn(self);
+    PGnotify *notify;
+    VALUE hash;
+	VALUE sym_relname, sym_be_pid, sym_extra;
+	VALUE relname, be_pid, extra;
+
+	sym_relname = ID2SYM(rb_intern("relname"));
+	sym_be_pid = ID2SYM(rb_intern("be_pid"));
+	sym_extra = ID2SYM(rb_intern("extra"));
+
+    /* gets notify and builds result */
+    notify = PQnotifies(conn);
+    if (notify == NULL) {
+        /* there are no unhandled notifications */
+        return Qnil;
+    }
+	
+	hash = rb_hash_new();
+	relname = rb_tainted_str_new2(notify->relname);
+	be_pid = INT2NUM(notify->be_pid);
+	extra = rb_tainted_str_new2(notify->extra);
+	
+    rb_hash_aset(hash, sym_relname, relname);
+	rb_hash_aset(hash, sym_be_pid, be_pid);
+	rb_hash_aset(hash, sym_extra, extra);
+
+    PQfreemem(notify);
+
+    /* returns result */
+    return hash;
+}
+
 
 /*
  * call-seq:
@@ -1384,27 +1474,105 @@ pgconn_flush(obj)
  * Raises an exception if an error occurs.
  */
 static VALUE
-pgconn_put_copy_data(obj, buffer)
-	VALUE obj, buffer;
+pgconn_put_copy_data(self, buffer)
+	VALUE self, buffer;
 {
 	int ret;
 	VALUE error;
-	PGconn *conn = get_pgconn(obj);
+	PGconn *conn = get_pgconn(self);
 	Check_Type(buffer, T_STRING);
 
-	ret = PQputCopyData(conn, RSTRING(buffer)->ptr,
-			RSTRING(buffer)->len);
+	ret = PQputCopyData(conn, RSTRING_PTR(buffer),
+			RSTRING_LEN(buffer));
 	if(ret == -1) {
 		error = rb_exc_new2(rb_ePGError, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", obj);
+		rb_iv_set(error, "@connection", self);
 		rb_raise(error, PQerrorMessage(conn));
 	}
 	return (ret) ? Qtrue : Qfalse;
 }
 
-//TODO put_copy_end
+/*
+ * call-seq:
+ *    conn.put_copy_end( [ error_message ] ) -> Boolean
+ *
+ * Sends end-of-data indication to the server.
+ *
+ * _error_message_ is an optional parameter, and if set,
+ * forces the COPY command to fail with the string
+ * _error_message_.
+ *
+ * Returns true if the end-of-data was sent, false if it was
+ * not sent (false is only possible if the connection
+ * is in nonblocking mode, and this command would block).
+ */ 
+static VALUE
+pgconn_put_copy_end(argc, argv, self)
+	int argc;
+	VALUE *argv;
+	VALUE self;
+{
+    VALUE str;
+	VALUE error;
+	int ret;
+	char *error_message = NULL;
+    PGconn *conn = get_pgconn(self);
+    
+    if (rb_scan_args(argc, argv, "01", &str) == 0)
+        error_message = NULL;
+    else
+        error_message = StringValuePtr(str);
+  
+  	ret = PQputCopyEnd(conn, error_message);
+	if(ret == -1) {
+		error = rb_exc_new2(rb_ePGError, PQerrorMessage(conn));
+		rb_iv_set(error, "@connection", self);
+		rb_raise(error, PQerrorMessage(conn));
+	}
+	return (ret) ? Qtrue : Qfalse;
+}
 
-//TODO get_copy_data
+/*
+ * call-seq:
+ *    conn.get_copy_data( [ async = false ] ) -> String
+ *
+ * Return a string containing one row of data, +nil+
+ * if the copy is done, or +false+ if the call would 
+ * block (only possible if _async_ is true).
+ *
+ */
+static VALUE
+pgconn_get_copy_data( argc, argv, self )
+	int argc;
+	VALUE *argv;
+	VALUE self;
+{
+    VALUE async_in;
+	VALUE error;
+	int ret;
+	int async;
+	char *buffer;
+    PGconn *conn = get_pgconn(self);
+    
+    if (rb_scan_args(argc, argv, "01", &async_in) == 0)
+        async = 0;
+    else
+		async = (async_in == Qfalse || async_in == Qnil) ? 0 : 1;
+
+  	ret = PQgetCopyData(conn, &buffer, async);
+	if(ret == -2) { // error
+		error = rb_exc_new2(rb_ePGError, PQerrorMessage(conn));
+		rb_iv_set(error, "@connection", self);
+		rb_raise(error, PQerrorMessage(conn));
+	}
+	if(ret == -1) { // No data left
+		return Qnil;
+	}
+	if(ret == 0) { // would block
+		return Qfalse;
+	}
+	return rb_str_new(buffer, ret);
+}
 
 //TODO set_error_verbosity
 
@@ -1413,21 +1581,21 @@ pgconn_put_copy_data(obj, buffer)
  *    conn.trace( port )
  * 
  * Enables tracing message passing between backend.
- * The trace message will be written to the _port_ object,
+ * The trace message will be written to the _port_ selfect,
  * which is an instance of the class +File+.
  */
 static VALUE
-pgconn_trace(obj, port)
-    VALUE obj, port;
+pgconn_trace(self, port)
+    VALUE self, port;
 {
-    OpenFile* fp;
+    //OpenFile* fp;
 
     Check_Type(port, T_FILE);
-    GetOpenFile(port, fp);
+    //GetOpenFile(port, fp);
 
-    PQtrace(get_pgconn(obj), fp->f2?fp->f2:fp->f);
+    //PQtrace(get_pgconn(self), fp->f2?fp->f2:fp->f);
 
-    return obj;
+    return self;
 }
 
 /*
@@ -1437,11 +1605,11 @@ pgconn_trace(obj, port)
  * Disables the message tracing.
  */
 static VALUE
-pgconn_untrace(obj)
-    VALUE obj;
+pgconn_untrace(self)
+    VALUE self;
 {
-    PQuntrace(get_pgconn(obj));
-    return obj;
+    PQuntrace(get_pgconn(self));
+    return self;
 }
 
 //TODO set_notice_receiver
@@ -1455,10 +1623,10 @@ pgconn_untrace(obj)
  * Returns the client encoding as a String.
  */
 static VALUE
-pgconn_client_encoding(obj)
-    VALUE obj;
+pgconn_client_encoding(self)
+    VALUE self;
 {
-    char *encoding = (char *)pg_encoding_to_char(PQclientEncoding(get_pgconn(obj)));
+    char *encoding = (char *)pg_encoding_to_char(PQclientEncoding(get_pgconn(self)));
     return rb_tainted_str_new2(encoding);
 }
 
@@ -1469,12 +1637,12 @@ pgconn_client_encoding(obj)
  * Sets the client encoding to the _encoding_ String.
  */
 static VALUE
-pgconn_set_client_encoding(obj, str)
-    VALUE obj, str;
+pgconn_set_client_encoding(self, str)
+    VALUE self, str;
 {
     Check_Type(str, T_STRING);
-    if ((PQsetClientEncoding(get_pgconn(obj), StringValuePtr(str))) == -1){
-        rb_raise(rb_ePGError, "invalid encoding name %s",str);
+    if ((PQsetClientEncoding(get_pgconn(self), StringValuePtr(str))) == -1){
+        rb_raise(rb_ePGError, "invalid encoding name %s",StringValuePtr(str));
     }
     return Qnil;
 }
@@ -1482,107 +1650,6 @@ pgconn_set_client_encoding(obj, str)
 /**** TODO ?????????? ******/
 
 
-/*
- * call-seq:
- *    conn.get_notify()
- *
- * Returns an array of the unprocessed notifiers.
- * If there is no unprocessed notifier, it returns +nil+.
- */
-static VALUE
-pgconn_get_notify(obj)
-    VALUE obj;
-{
-    PGconn* conn = get_pgconn(obj);
-    PGnotify *notify;
-    VALUE ary;
-
-    if (PQconsumeInput(conn) == 0) {
-        rb_raise(rb_ePGError, PQerrorMessage(conn));
-    }
-    /* gets notify and builds result */
-    notify = PQnotifies(conn);
-    if (notify == NULL) {
-        /* there are no unhandled notifications */
-        return Qnil;
-    }
-    ary = rb_ary_new3(2, rb_tainted_str_new2(notify->relname), INT2NUM(notify->be_pid));
-    PQfreemem(notify);
-
-    /* returns result */
-    return ary;
-}
-
-/*
- * call-seq:
- *    conn.putline()
- *
- * Sends the string to the backend server.
- * Users must send a single "." to denote the end of data transmission.
- */
-static VALUE
-pgconn_putline(obj, str)
-    VALUE obj, str;
-{
-    Check_Type(str, T_STRING);
-    PQputline(get_pgconn(obj), StringValuePtr(str));
-    return obj;
-}
-
-/*
- * call-seq:
- *    conn.getline()
- *
- * Reads a line from the backend server into internal buffer.
- * Returns +nil+ for EOF, +0+ for success, +1+ for buffer overflowed.
- * You need to ensure single "." from backend to confirm  transmission completion.
- * The sample program <tt>psql.rb</tt> (see source for postgres) treats this copy protocol right.
- */
-static VALUE
-pgconn_getline(obj)
-    VALUE obj;
-{
-    PGconn *conn = get_pgconn(obj);
-    VALUE str;
-    long size = BUFSIZ;
-    long bytes = 0;
-    int  ret;
-    
-    str = rb_tainted_str_new(0, size);
-
-    for (;;) {
-        ret = PQgetline(conn, RSTRING(str)->ptr + bytes, size - bytes);
-        switch (ret) {
-        case EOF:
-          return Qnil;
-        case 0:
-          rb_str_resize(str, strlen(StringValuePtr(str)));
-          return str;
-        }
-        bytes += BUFSIZ;
-        size += BUFSIZ;
-        rb_str_resize(str, size);
-    }
-    return Qnil;
-}
-
-/*
- * call-seq:
- *    conn.endcopy()
- *
- * Waits until the backend completes the copying.
- * You should call this method after #putline or #getline.
- * Returns +nil+ on success; raises an exception otherwise.
- */
-static VALUE
-pgconn_endcopy(obj)
-    VALUE obj;
-{
-    if (PQendcopy(get_pgconn(obj)) == 1) {
-        rb_raise(rb_ePGError, "cannot complete copying");
-    }
-    return Qnil;
-}
 
 static void
 notice_proxy(self, message)
@@ -1630,19 +1697,19 @@ pgconn_set_notice_processor(self)
  * call-seq:
  *    conn.lo_creat( [mode] ) -> Fixnum
  *
- * Creates a large object with mode _mode_. Returns a large object Oid.
+ * Creates a large selfect with mode _mode_. Returns a large selfect Oid.
  * On failure, it raises PGError exception.
  */
 static VALUE
-pgconn_locreat(argc, argv, obj)
+pgconn_locreat(argc, argv, self)
     int argc;
     VALUE *argv;
-    VALUE obj;
+    VALUE self;
 {
     Oid lo_oid;
     int mode;
     VALUE nmode;
-    PGconn *conn = get_pgconn(obj);
+    PGconn *conn = get_pgconn(self);
     
     if (rb_scan_args(argc, argv, "01", &nmode) == 0)
         mode = INV_READ;
@@ -1660,15 +1727,15 @@ pgconn_locreat(argc, argv, obj)
  * call-seq:
  *    conn.lo_create( oid ) -> Fixnum
  *
- * Creates a large object with oid _oid_. Returns the large object Oid.
+ * Creates a large selfect with oid _oid_. Returns the large selfect Oid.
  * On failure, it raises PGError exception.
  */
 static VALUE
-pgconn_locreate(obj, in_lo_oid)
-    VALUE obj, in_lo_oid;
+pgconn_locreate(self, in_lo_oid)
+    VALUE self, in_lo_oid;
 {
     Oid ret, lo_oid;
-    PGconn *conn = get_pgconn(obj);
+    PGconn *conn = get_pgconn(self);
 	lo_oid = NUM2INT(in_lo_oid);
     
     ret = lo_create(conn, in_lo_oid);
@@ -1682,17 +1749,17 @@ pgconn_locreate(obj, in_lo_oid)
  * call-seq:
  *    conn.lo_import(file) -> Fixnum
  *
- * Import a file to a large object. Returns a large object Oid.
+ * Import a file to a large selfect. Returns a large selfect Oid.
  *
  * On failure, it raises a PGError exception.
  */
 static VALUE
-pgconn_loimport(obj, filename)
-    VALUE obj, filename;
+pgconn_loimport(self, filename)
+    VALUE self, filename;
 {
     Oid lo_oid;
 
-    PGconn *conn = get_pgconn(obj);
+    PGconn *conn = get_pgconn(self);
 
     Check_Type(filename, T_STRING);
 
@@ -1707,19 +1774,19 @@ pgconn_loimport(obj, filename)
  * call-seq:
  *    conn.lo_export( oid, file ) -> nil
  *
- * Saves a large object of _oid_ to a _file_.
+ * Saves a large selfect of _oid_ to a _file_.
  */
 static VALUE
-pgconn_loexport(obj, lo_oid,filename)
-    VALUE obj, lo_oid, filename;
+pgconn_loexport(self, lo_oid,filename)
+    VALUE self, lo_oid, filename;
 {
-    PGconn *conn = get_pgconn(obj);
+    PGconn *conn = get_pgconn(self);
     int oid;
     Check_Type(filename, T_STRING);
 
     oid = NUM2INT(lo_oid);
     if (oid < 0) {
-        rb_raise(rb_ePGError, "invalid large object oid %d",oid);
+        rb_raise(rb_ePGError, "invalid large selfect oid %d",oid);
     }
 
     if (lo_export(conn, oid, StringValuePtr(filename)) < 0) {
@@ -1732,32 +1799,32 @@ pgconn_loexport(obj, lo_oid,filename)
  * call-seq:
  *    conn.lo_open( oid, [mode] ) -> Fixnum
  *
- * Open a large object of _oid_. Returns a large object descriptor 
+ * Open a large selfect of _oid_. Returns a large selfect descriptor 
  * instance on success. The _mode_ argument specifies the mode for
- * the opened large object,which is either +INV_READ+, or +INV_WRITE+.
+ * the opened large selfect,which is either +INV_READ+, or +INV_WRITE+.
  *
  * If _mode_ is omitted, the default is +INV_READ+.
  */
 static VALUE
-pgconn_loopen(argc, argv, obj)
+pgconn_loopen(argc, argv, self)
     int argc;
     VALUE *argv;
-    VALUE obj;
+    VALUE self;
 {
     Oid lo_oid;
     int fd, mode;
-    VALUE nmode, objid;
-    PGconn *conn = get_pgconn(obj);
+    VALUE nmode, selfid;
+    PGconn *conn = get_pgconn(self);
 
-    rb_scan_args(argc, argv, "11", &objid, &nmode);
-    lo_oid = NUM2INT(objid);
+    rb_scan_args(argc, argv, "11", &selfid, &nmode);
+    lo_oid = NUM2INT(selfid);
 	if(NIL_P(nmode))
     	mode = INV_READ;
     else
 		mode = NUM2INT(nmode);
 
     if((fd = lo_open(conn, lo_oid, mode)) < 0) {
-        rb_raise(rb_ePGError, "can't open large object");
+        rb_raise(rb_ePGError, "can't open large selfect");
     }
     return INT2FIX(fd);
 }
@@ -1766,42 +1833,43 @@ pgconn_loopen(argc, argv, obj)
  * call-seq:
  *    conn.lo_write( lo_desc, buffer ) -> Fixnum
  *
- * Writes the string _buffer_ to the large object _lo_desc_.
+ * Writes the string _buffer_ to the large selfect _lo_desc_.
  * Returns the number of bytes written.
  */
 static VALUE
-pgconn_lowrite(obj, in_lo_desc, buffer)
-    VALUE obj, buffer;
+pgconn_lowrite(self, in_lo_desc, buffer)
+    VALUE self, buffer;
 {
     int n;
-    PGconn *conn = get_pgconn(obj);
+    PGconn *conn = get_pgconn(self);
 	int fd = NUM2INT(in_lo_desc);
 
     Check_Type(buffer, T_STRING);
 
-    if( RSTRING(buffer)->len < 0) {
+    if( RSTRING_LEN(buffer) < 0) {
         rb_raise(rb_ePGError, "write buffer zero string");
     }
-    if((n = lo_write(conn, fd, StringValuePtr(buffer), RSTRING(buffer)->len)) < 0) {
+    if((n = lo_write(conn, fd, StringValuePtr(buffer), 
+				RSTRING_LEN(buffer))) < 0) {
         rb_raise(rb_ePGError, "lo_write failed");
     }
   
     return INT2FIX(n);
 }
 
-/*
+/*TODO broken
  * call-seq:
  *    conn.lo_read( lo_desc, len ) -> String
  *
- * Attempts to read _len_ bytes from large object _lo_desc_,
+ * Attempts to read _len_ bytes from large selfect _lo_desc_,
  * returns resulting data.
  */
 static VALUE
-pgconn_loread(obj, in_lo_desc, in_len)
-    VALUE obj, in_lo_desc, in_len;
+pgconn_loread(self, in_lo_desc, in_len)
+    VALUE self, in_lo_desc, in_len;
 {
     int ret;
-    PGconn *conn = get_pgconn(obj);
+    PGconn *conn = get_pgconn(self);
     int len = NUM2INT(in_len);
 	int lo_desc = NUM2INT(in_lo_desc);
 	VALUE str = rb_tainted_str_new(0,len);
@@ -1816,7 +1884,7 @@ pgconn_loread(obj, in_lo_desc, in_len)
     if (ret == 0)
 		return Qnil;
 
-    RSTRING(str)->len = ret;
+    //RSTRING_LEN(str) = ret;
     return str;
 }
 
@@ -1825,15 +1893,15 @@ pgconn_loread(obj, in_lo_desc, in_len)
  * call-seq:
  *    conn.lo_lseek( lo_desc, offset, whence ) -> Fixnum
  *
- * Move the large object pointer _lo_desc_ to offset _offset_.
+ * Move the large selfect pointer _lo_desc_ to offset _offset_.
  * Valid values for _whence_ are +SEEK_SET+, +SEEK_CUR+, and +SEEK_END+.
  * (Or 0, 1, or 2.)
  */
 static VALUE
-pgconn_lolseek(obj, in_lo_desc, offset, whence)
-    VALUE obj, in_lo_desc, offset, whence;
+pgconn_lolseek(self, in_lo_desc, offset, whence)
+    VALUE self, in_lo_desc, offset, whence;
 {
-    PGconn *conn = get_pgconn(obj);
+    PGconn *conn = get_pgconn(self);
 	int lo_desc = NUM2INT(in_lo_desc);
     int ret;
     
@@ -1848,14 +1916,14 @@ pgconn_lolseek(obj, in_lo_desc, offset, whence)
  * call-seq:
  *    conn.lo_tell( lo_desc ) -> Fixnum
  *
- * Returns the current position of the large object _lo_desc_.
+ * Returns the current position of the large selfect _lo_desc_.
  */
 static VALUE
-pgconn_lotell(obj,in_lo_desc)
-    VALUE obj, in_lo_desc;
+pgconn_lotell(self,in_lo_desc)
+    VALUE self, in_lo_desc;
 {
     int position;
-	PGconn *conn = get_pgconn(obj);
+	PGconn *conn = get_pgconn(self);
 	int lo_desc = NUM2INT(in_lo_desc);
 
 	if((position = lo_tell(conn, lo_desc)) < 0)
@@ -1868,13 +1936,13 @@ pgconn_lotell(obj,in_lo_desc)
  * call-seq:
  *    conn.lo_truncate( lo_desc, len ) -> nil
  *
- * Truncates the large object _lo_desc_ to size _len_.
+ * Truncates the large selfect _lo_desc_ to size _len_.
  */
 static VALUE
-pgconn_lotruncate(obj, in_lo_desc, in_len)
-    VALUE obj, in_lo_desc, in_len;
+pgconn_lotruncate(self, in_lo_desc, in_len)
+    VALUE self, in_lo_desc, in_len;
 {
-    PGconn *conn = get_pgconn(obj);
+    PGconn *conn = get_pgconn(self);
     int lo_desc = NUM2INT(in_lo_desc);
 	size_t len = NUM2INT(in_len);
     
@@ -1888,13 +1956,13 @@ pgconn_lotruncate(obj, in_lo_desc, in_len)
  * call-seq:
  *    conn.lo_close( lo_desc ) -> nil
  *
- * Closes the postgres large object of _lo_desc_.
+ * Closes the postgres large selfect of _lo_desc_.
  */
 static VALUE
-pgconn_loclose(obj, in_lo_desc)
-    VALUE obj, in_lo_desc;
+pgconn_loclose(self, in_lo_desc)
+    VALUE self, in_lo_desc;
 {
-    PGconn *conn = get_pgconn(obj);
+    PGconn *conn = get_pgconn(self);
     int lo_desc = NUM2INT(in_lo_desc);
     
     if(lo_unlink(conn,lo_desc) < 0)
@@ -1907,13 +1975,13 @@ pgconn_loclose(obj, in_lo_desc)
  * call-seq:
  *    conn.lo_unlink( oid ) -> nil
  *
- * Unlinks (deletes) the postgres large object of _oid_.
+ * Unlinks (deletes) the postgres large selfect of _oid_.
  */
 static VALUE
-pgconn_lounlink(obj, in_oid)
-    VALUE obj, in_oid;
+pgconn_lounlink(self, in_oid)
+    VALUE self, in_oid;
 {
-    PGconn *conn = get_pgconn(obj);
+    PGconn *conn = get_pgconn(self);
     int oid = NUM2INT(in_oid);
     
     if (oid < 0)
@@ -1954,10 +2022,10 @@ pgconn_lounlink(obj, in_oid)
  * * +PGRES_FATAL_ERROR+
  */
 static VALUE
-pgresult_result_status(obj)
-    VALUE obj;
+pgresult_result_status(self)
+    VALUE self;
 {
-    return INT2FIX(PQresultStatus(get_pgresult(obj)));
+    return INT2FIX(PQresultStatus(get_pgresult(self)));
 }
 
 /*
@@ -1968,8 +2036,8 @@ pgresult_result_status(obj)
  *
 */
 static VALUE
-pgresult_res_status(obj,status)
-    VALUE obj,status;
+pgresult_res_status(self,status)
+    VALUE self,status;
 {
     return rb_str_new2(PQresStatus(NUM2INT(status)));
 }
@@ -1981,10 +2049,10 @@ pgresult_res_status(obj,status)
  * Returns the error message of the command as a string. 
  */
 static VALUE
-pgresult_result_error_message(obj)
-    VALUE obj;
+pgresult_result_error_message(self)
+    VALUE self;
 {
-    return rb_str_new2(PQresultErrorMessage(get_pgresult(obj)));
+    return rb_str_new2(PQresultErrorMessage(get_pgresult(self)));
 }
 
 /*
@@ -2008,24 +2076,24 @@ pgresult_result_error_message(obj)
  * * +PG_DIAG_SOURCE_FUNCTION+
  */
 static VALUE
-pgresult_result_error_field(obj)
-    VALUE obj;
+pgresult_result_error_field(self)
+    VALUE self;
 {
-    return rb_str_new2(PQresultErrorMessage(get_pgresult(obj)));
+    return rb_str_new2(PQresultErrorMessage(get_pgresult(self)));
 }
 
 /*
  * call-seq:
  *    res.clear() -> nil
  *
- * Clears the PGresult object as the result of the query.
+ * Clears the PGresult selfect as the result of the query.
  */
 static VALUE
-pgresult_clear(obj)
-    VALUE obj;
+pgresult_clear(self)
+    VALUE self;
 {
-    PQclear(get_pgresult(obj));
-    DATA_PTR(obj) = 0;
+    PQclear(get_pgresult(self));
+    DATA_PTR(self) = 0;
 
     return Qnil;
 }
@@ -2037,10 +2105,10 @@ pgresult_clear(obj)
  * Returns the number of tuples in the query result.
  */
 static VALUE
-pgresult_ntuples(obj)
-    VALUE obj;
+pgresult_ntuples(self)
+    VALUE self;
 {
-    return INT2FIX(PQntuples(get_pgresult(obj)));
+    return INT2FIX(PQntuples(get_pgresult(self)));
 }
 
 /*
@@ -2050,10 +2118,10 @@ pgresult_ntuples(obj)
  * Returns the number of columns in the query result.
  */
 static VALUE
-pgresult_nfields(obj)
-    VALUE obj;
+pgresult_nfields(self)
+    VALUE self;
 {
-    return INT2NUM(PQnfields(get_pgresult(obj)));
+    return INT2NUM(PQnfields(get_pgresult(self)));
 }
 
 /*
@@ -2063,13 +2131,13 @@ pgresult_nfields(obj)
  * Returns the name of the column corresponding to _index_.
  */
 static VALUE
-pgresult_fname(obj, index)
-    VALUE obj, index;
+pgresult_fname(self, index)
+    VALUE self, index;
 {
     PGresult *result;
 	int i = NUM2INT(index);
 
-    result = get_pgresult(obj);
+    result = get_pgresult(self);
     if (i < 0 || i >= PQnfields(result)) {
         rb_raise(rb_eArgError,"invalid field number %d", i);
     }
@@ -2086,14 +2154,14 @@ pgresult_fname(obj, index)
  * raises a TypeError if _name_ is not a String.
  */
 static VALUE
-pgresult_fnumber(obj, name)
-    VALUE obj, name;
+pgresult_fnumber(self, name)
+    VALUE self, name;
 {
     int n;
     
     Check_Type(name, T_STRING);
     
-    n = PQfnumber(get_pgresult(obj), StringValuePtr(name));
+    n = PQfnumber(get_pgresult(self), StringValuePtr(name));
     if (n == -1) {
         rb_raise(rb_eArgError,"Unknown field: %s", StringValuePtr(name));
     }
@@ -2111,10 +2179,10 @@ pgresult_fnumber(obj, name)
  * the Oid is undefined for that column.
  */
 static VALUE
-pgresult_ftable(obj, column_number)
-    VALUE obj, column_number;
+pgresult_ftable(self, column_number)
+    VALUE self, column_number;
 {
-	Oid n = PQftable(get_pgresult(obj), NUM2INT(column_number));
+	Oid n = PQftable(get_pgresult(self), NUM2INT(column_number));
     if (n == InvalidOid) {
         rb_raise(rb_eArgError,"Oid is undefined for column: %d", 
 			NUM2INT(column_number));
@@ -2133,10 +2201,10 @@ pgresult_ftable(obj, column_number)
  * the column number from its table is undefined for that column.
  */
 static VALUE
-pgresult_ftablecol(obj, column_number)
-    VALUE obj, column_number;
+pgresult_ftablecol(self, column_number)
+    VALUE self, column_number;
 {
-	int n = PQftablecol(get_pgresult(obj), NUM2INT(column_number));
+	int n = PQftablecol(get_pgresult(self), NUM2INT(column_number));
     if (n == 0) {
         rb_raise(rb_eArgError,
 			"Column number from table is undefined for column: %d", 
@@ -2155,10 +2223,10 @@ pgresult_ftablecol(obj, column_number)
  * Raises ArgumentError if _column_number_ is out of range.
  */
 static VALUE
-pgresult_fformat(obj, column_number)
-    VALUE obj, column_number;
+pgresult_fformat(self, column_number)
+    VALUE self, column_number;
 {
-	PGresult *result = get_pgresult(obj);
+	PGresult *result = get_pgresult(self);
 	int fnumber = NUM2INT(column_number);
     if (fnumber >= PQnfields(result)) {
         rb_raise(rb_eArgError, "Column number is out of range: %d", 
@@ -2176,10 +2244,10 @@ pgresult_fformat(obj, column_number)
  * The integer returned is the internal +OID+ number (in PostgreSQL) of the type.
  */
 static VALUE
-pgresult_ftype(obj, index)
-    VALUE obj, index;
+pgresult_ftype(self, index)
+    VALUE self, index;
 {
-    PGresult* result = get_pgresult(obj);
+    PGresult* result = get_pgresult(self);
     int i = NUM2INT(index);
     if (i < 0 || i >= PQnfields(result)) {
         rb_raise(rb_eArgError, "invalid field number %d", i);
@@ -2196,10 +2264,10 @@ pgresult_ftype(obj, index)
  * Raises ArgumentError if _column_number_ is out of range.
  */
 static VALUE
-pgresult_fmod(obj, column_number)
-    VALUE obj, column_number;
+pgresult_fmod(self, column_number)
+    VALUE self, column_number;
 {
-	PGresult *result = get_pgresult(obj);
+	PGresult *result = get_pgresult(self);
 	int fnumber = NUM2INT(column_number);
 	int modifier;
     if (fnumber >= PQnfields(result)) {
@@ -2224,13 +2292,13 @@ pgresult_fmod(obj, column_number)
  *   res.size(1) => -1
  */
 static VALUE
-pgresult_fsize(obj, index)
-    VALUE obj, index;
+pgresult_fsize(self, index)
+    VALUE self, index;
 {
     PGresult *result;
     int i = NUM2INT(index);
 
-    result = get_pgresult(obj);
+    result = get_pgresult(self);
     if (i < 0 || i >= PQnfields(result)) {
         rb_raise(rb_eArgError,"invalid field number %d", i);
     }
@@ -2244,14 +2312,14 @@ pgresult_fsize(obj, index)
  * Returns the value in tuple number _tup_num_, field _field_num_. 
  */
 static VALUE
-pgresult_getvalue(obj, tup_num, field_num)
-    VALUE obj, tup_num, field_num;
+pgresult_getvalue(self, tup_num, field_num)
+    VALUE self, tup_num, field_num;
 {
     PGresult *result;
     int i = NUM2INT(tup_num);
     int j = NUM2INT(field_num);
 
-    result = get_pgresult(obj);
+    result = get_pgresult(self);
 	if(i < 0 || i >= PQntuples(result)) {
 		rb_raise(rb_eArgError,"invalid tuple number %d", i);
 	}
@@ -2268,14 +2336,14 @@ pgresult_getvalue(obj, tup_num, field_num)
  * Returns +true+ if the specified value is +nil+; +false+ otherwise.
  */
 static VALUE
-pgresult_getisnull(obj, tup_num, field_num)
-    VALUE obj, tup_num, field_num;
+pgresult_getisnull(self, tup_num, field_num)
+    VALUE self, tup_num, field_num;
 {
     PGresult *result;
     int i = NUM2INT(tup_num);
     int j = NUM2INT(field_num);
 
-    result = get_pgresult(obj);
+    result = get_pgresult(self);
     if (i < 0 || i >= PQntuples(result)) {
         rb_raise(rb_eArgError,"invalid tuple number %d", i);
     }
@@ -2294,14 +2362,14 @@ pgresult_getisnull(obj, tup_num, field_num)
  * Equivalent to <tt>res.value(<i>tup_num</i>,<i>field_num</i>).length</tt>.
  */
 static VALUE
-pgresult_getlength(obj, tup_num, field_num)
-    VALUE obj, tup_num, field_num;
+pgresult_getlength(self, tup_num, field_num)
+    VALUE self, tup_num, field_num;
 {
     PGresult *result;
     int i = NUM2INT(tup_num);
     int j = NUM2INT(field_num);
 
-    result = get_pgresult(obj);
+    result = get_pgresult(self);
     if (i < 0 || i >= PQntuples(result)) {
         rb_raise(rb_eArgError,"invalid tuple number %d", i);
     }
@@ -2319,12 +2387,12 @@ pgresult_getlength(obj, tup_num, field_num)
  * Only useful for the result returned by conn.describePrepared
  */
 static VALUE
-pgresult_nparams(obj)
-    VALUE obj;
+pgresult_nparams(self)
+    VALUE self;
 {
     PGresult *result;
 
-    result = get_pgresult(obj);
+    result = get_pgresult(self);
     return INT2FIX(PQnparams(result));
 }
 
@@ -2336,12 +2404,12 @@ pgresult_nparams(obj)
  * Only useful for the result returned by conn.describePrepared
  */
 static VALUE
-pgresult_paramtype(obj, param_number)
-    VALUE obj, param_number;
+pgresult_paramtype(self, param_number)
+    VALUE self, param_number;
 {
     PGresult *result;
 
-    result = get_pgresult(obj);
+    result = get_pgresult(self);
     return INT2FIX(PQparamtype(result,NUM2INT(param_number)));
 }
 
@@ -2352,10 +2420,10 @@ pgresult_paramtype(obj, param_number)
  * Returns the status string of the last query command.
  */
 static VALUE
-pgresult_cmd_status(obj)
-    VALUE obj;
+pgresult_cmd_status(self)
+    VALUE self;
 {
-    return rb_tainted_str_new2(PQcmdStatus(get_pgresult(obj)));
+    return rb_tainted_str_new2(PQcmdStatus(get_pgresult(self)));
 }
 
 /*
@@ -2373,11 +2441,11 @@ pgresult_cmd_status(obj)
  * or if no tuples were affected, <tt>0</tt> is returned.
  */
 static VALUE
-pgresult_cmd_tuples(obj)
-    VALUE obj;
+pgresult_cmd_tuples(self)
+    VALUE self;
 {
     long n;
-    n = strtol(PQcmdTuples(get_pgresult(obj)),NULL, 10);
+    n = strtol(PQcmdTuples(get_pgresult(self)),NULL, 10);
     return INT2NUM(n);
 }
 
@@ -2389,10 +2457,10 @@ pgresult_cmd_tuples(obj)
  * otherwise +nil+.
  */
 static VALUE
-pgresult_oid_value(obj)
-    VALUE obj;
+pgresult_oid_value(self)
+    VALUE self;
 {
-    Oid n = PQoidValue(get_pgresult(obj));
+    Oid n = PQoidValue(get_pgresult(self));
     if (n == InvalidOid)
         return Qnil;
     else
@@ -2408,10 +2476,10 @@ pgresult_oid_value(obj)
  * Returns tuple _n_ as a hash. 
  */
 static VALUE
-pgresult_aref(obj, index)
-	VALUE obj, index;
+pgresult_aref(self, index)
+	VALUE self, index;
 {
-	PGresult *result = get_pgresult(obj);
+	PGresult *result = get_pgresult(self);
 	int tuple_num = NUM2INT(index);
 	int field_num;
 	VALUE fname,val;
@@ -2438,16 +2506,16 @@ pgresult_aref(obj, index)
  * Invokes block for each tuple in the result set.
  */
 static VALUE
-pgresult_each(obj)
-	VALUE obj;
+pgresult_each(self)
+	VALUE self;
 {
-	PGresult *result = get_pgresult(obj);
+	PGresult *result = get_pgresult(self);
 	int tuple_num;
 
 	for(tuple_num = 0; tuple_num < PQntuples(result); tuple_num++) {
-		rb_yield(pgresult_aref(obj, INT2NUM(tuple_num)));
+		rb_yield(pgresult_aref(self, INT2NUM(tuple_num)));
 	}
-	return obj;
+	return self;
 }
 
 /*
@@ -2457,14 +2525,14 @@ pgresult_each(obj)
  * Returns an array of Strings representing the names of the fields in the result.
  */
 static VALUE
-pgresult_fields(obj)
-    VALUE obj;
+pgresult_fields(self)
+    VALUE self;
 {
     PGresult *result;
     VALUE ary;
     int n, i;
 
-    result = get_pgresult(obj);
+    result = get_pgresult(self);
     n = PQnfields(result);
     ary = rb_ary_new2(n);
     for (i=0;i<n;i++) {
@@ -2482,8 +2550,8 @@ void
 Init_pg()
 {
     pg_gsub_bang_id = rb_intern("gsub!");
-    pg_escape_regex = rb_reg_new("([\\t\\n\\\\])", 10, 0);
-    rb_global_variable(&pg_escape_regex);
+    //TODO pg_escape_regex = rb_reg_new("([\\t\\n\\\\])", 10, 0);
+    //rb_global_variable(&pg_escape_regex);
     pg_escape_str = rb_str_new("\\\\\\1", 4);
     rb_global_variable(&pg_escape_str);
 
@@ -2586,8 +2654,8 @@ Init_pg()
     rb_define_method(rb_cPGconn, "exec_params", pgconn_exec_params, -1);
     rb_define_method(rb_cPGconn, "prepare", pgconn_prepare, -1);
     rb_define_method(rb_cPGconn, "exec_prepared", pgconn_exec_prepared, -1);
-    rb_define_method(rb_cPGconn, "describe_prepared", pgconn_prepare, -1);
-    rb_define_method(rb_cPGconn, "describe_portal", pgconn_exec_prepared, -1);
+    rb_define_method(rb_cPGconn, "describe_prepared", pgconn_describe_prepared, 1);
+    rb_define_method(rb_cPGconn, "describe_portal", pgconn_describe_portal, 1);
     rb_define_method(rb_cPGconn, "escape_string", pgconn_s_escape, 1);
 	rb_define_alias(rb_cPGconn, "escape", "escape_string");
     rb_define_method(rb_cPGconn, "escape_bytea", pgconn_s_escape_bytea, 1);
@@ -2616,12 +2684,12 @@ Init_pg()
     //rb_define_method(rb_cPGconn, "fn", pgconn_fn, 0);
 
 	/* NOTIFY */
-    //rb_define_method(rb_cPGconn, "notifies", pgconn_notifies, 0);
+    rb_define_method(rb_cPGconn, "notifies", pgconn_notifies, 0);
 
 	/* COPY */
     rb_define_method(rb_cPGconn, "put_copy_data", pgconn_put_copy_data, 1);
-    //rb_define_method(rb_cPGconn, "put_copy_end", pgconn_put_copy_end, 1);
-    //rb_define_method(rb_cPGconn, "get_copy_data", pgconn_get_copy_data, 2);
+    rb_define_method(rb_cPGconn, "put_copy_end", pgconn_put_copy_end, -1);
+    rb_define_method(rb_cPGconn, "get_copy_data", pgconn_get_copy_data, -1);
 
 	/* Control Functions */
     //rb_define_method(rb_cPGconn, "set_error_verbosity", pgconn_set_error_verbosity, 0);