pg 0.7.9.2008.03.18 → 0.7.9.2008.08.17

data/ext/extconf.rb

@@ -1,6 +1,8 @@
 require 'mkmf'
 
-unless system("pg_config --bindir > /dev/null")
+begin
+	IO.popen("pg_config --version").readline.chomp
+rescue
 	$stderr.write("ERROR: can't find pg_config.\n")
 	$stderr.write("HINT: Make sure pg_config is in your PATH\n")
 	exit 1

data/ext/mkrf_config.rb

@@ -0,0 +1,131 @@
+require 'rubygems'
+require 'mkrf'
+
+unless system("pg_config --bindir > /dev/null")
+	$stderr.write("ERROR: can't find pg_config.\n")
+	$stderr.write("HINT: Make sure pg_config is in your PATH\n")
+	exit 1
+end
+
+$functions = %w[
+	lo_create
+    PQconnectionUsedPassword
+    PQisthreadsafe
+    PQprepare
+    PQexecParams
+    PQescapeString
+    PQescapeStringConn
+    lo_create
+    pg_encoding_to_char
+    PQsetClientEncoding
+]
+
+# OS X compatibility
+if(PLATFORM =~ /darwin/) then
+	# test if postgresql is probably universal
+	bindir = escape_path(IO.popen("pg_config --bindir").readline.chomp)
+	Open3.popen3('file',"#{bindir}/pg_config") do |the_in, the_out, the_err|
+		filetype = the_out.readline.chomp
+	end
+	# if it's not universal, ARCHFLAGS should be set
+	if((filetype !~ /universal binary/) && ENV['ARCHFLAGS'].nil?) then
+		arch_tmp = (IO.popen("uname -p").readline.chomp rescue nil)
+		if(arch_tmp == 'powerpc')
+			arch = 'ppc'
+		else
+			arch = 'i386'
+		end
+		$stderr.write %{
+		===========   WARNING   ===========
+		
+		You are building this extension on OS X without setting the 
+		ARCHFLAGS environment variable, and PostgreSQL does not appear 
+		to have been built as a universal binary. If you are seeing this 
+		message, that means that the build will probably fail.
+
+		Try setting the environment variable ARCHFLAGS 
+		to '-arch #{arch}' before building.
+
+		For example:
+		(in bash) $ export ARCHFLAGS='-arch #{arch}'
+		(in tcsh) % setenv ARCHFLAGS '-arch #{arch}'
+
+		Then try building again.
+
+		===================================
+		}
+		# We don't exit here. Who knows? It might build.
+	end
+end
+
+if RUBY_VERSION < '1.8'
+	puts 'This library is for ruby-1.8 or higher.'
+	exit 1
+end
+
+def escape_path(path)
+	if(PLATFORM =~ /mswin|mingw/) then
+		'"' + path + '"'
+	else
+		path.gsub(%r{([^a-zA-Z0-9/._-])}, "\\\\\\1")
+	end
+end
+
+def pg_config(type)
+	IO.popen("pg_config --#{type}dir").readline.chomp
+end
+
+def config_value(type)
+	escape_path(ENV["POSTGRES_#{type.upcase}"] || pg_config(type))
+end
+
+Mkrf::Generator.new('pg', '*.c', 
+		{
+			:includes => [config_value('include'), Config::CONFIG['includedir'], 
+					Config::CONFIG["archdir"], Config::CONFIG['sitelibdir'], "."],
+			:library_paths => [config_value('lib')],
+			# must set loaded_libs to work around a mkrf bug on some platforms
+			:loaded_libs => []
+		}
+	) do |g|
+
+	$stdout.write("checking for libpq-fe.h... ")
+	if g.include_header('libpq-fe.h') &&
+	   g.include_header('libpq/libpq-fs.h')
+	then
+		puts 'yes'
+	else
+		puts 'no'
+		puts 'Could not find PostgreSQL headers: ' +
+				'Rakefile not created'
+		exit 1
+	end
+
+	$stdout.write("checking for libpq... ")
+	# we have to check a few possible names to account
+	# for building on windows
+	if g.include_library('pq') ||
+	   g.include_library('libpq') ||
+	   g.include_library('ms/libpq')
+	then
+		puts 'yes'
+	else
+		puts 'no'
+		puts 'Could not find PostgreSQL client library: ' +
+				'Rakefile not created'
+		exit 1
+	end
+
+	$functions.each do |func|
+		$stdout.write("checking for #{func}()... ")
+		if(g.has_function?(func)) then
+			g.add_define("HAVE_#{func.upcase}")
+			puts 'yes'
+		else
+			puts 'no'
+		end
+	end
+
+	puts "creating Rakefile"
+end
+

data/ext/pg.c

@@ -9,7 +9,7 @@
   modified at: Wed Jan 20 16:41:51 1999
 
   $Author: jdavis $
-  $Date: 2008-03-18 09:44:07 -0700 (Tue, 18 Mar 2008) $
+  $Date: 2008-08-17 13:43:21 -0700 (Sun, 17 Aug 2008) $
 ************************************************/
 
 #include "pg.h"
@@ -60,8 +60,7 @@ static PQnoticeProcessor default_notice_processor = NULL;
  * when building the connection string.
  */
 static VALUE
-pgconn_s_quote_connstr(string)
-    VALUE string;
+pgconn_s_quote_connstr(VALUE string)
 {
 	char *str,*ptr;
 	int i,j=0,len;
@@ -71,7 +70,7 @@ pgconn_s_quote_connstr(string)
 
 	ptr = RSTRING_PTR(string);
 	len = RSTRING_LEN(string);
-	str = ALLOCA_N(char, len * 2 + 2 + 1);
+	str = ALLOC_N(char, len * 2 + 2 + 1);
 	str[j++] = '\'';
 	for(i = 0; i < len; i++) {
 		if(ptr[i] == '\'' || ptr[i] == '\\')
@@ -80,27 +79,10 @@ pgconn_s_quote_connstr(string)
 	}
 	str[j++] = '\'';
 	result = rb_str_new(str, j);
+	free(str);
 	return result;
 }
 
-/*
- * Appends key='hash[key]' to conninfo_rstr
- */
-static void
-build_key_value_string(hash, conninfo_rstr, key)
-	VALUE hash, conninfo_rstr;
-	char *key;
-{
-	if(rb_funcall(hash, rb_intern("has_key?"), 1, ID2SYM(rb_intern(key)))) {
-		rb_str_cat2(conninfo_rstr, " ");
-		rb_str_cat2(conninfo_rstr, key);
-		rb_str_cat2(conninfo_rstr, "=");
-		rb_str_concat(conninfo_rstr, pgconn_s_quote_connstr(rb_obj_as_string(
-			rb_hash_aref(hash, ID2SYM(rb_intern(key))))));
-	}
-	return;
-}
-
 static char *
 value_as_cstring(VALUE in_str)
 {
@@ -134,16 +116,16 @@ get_pgconn(VALUE self)
 static PGresult*
 get_pgresult(VALUE self)
 {
-    PGresult *result;
-    Data_Get_Struct(self, PGresult, result);
-    if (result == NULL) rb_raise(rb_ePGError, "result has been cleared");
-    return result;
+	PGresult *result;
+	Data_Get_Struct(self, PGresult, result);
+	if (result == NULL) rb_raise(rb_ePGError, "result has been cleared");
+	return result;
 }
 
 static VALUE
 new_pgresult(PGresult *result)
 {
-    return Data_Wrap_Struct(rb_cPGresult, NULL, free_pgresult, result);
+	return Data_Wrap_Struct(rb_cPGresult, NULL, free_pgresult, result);
 }
 
 /*
@@ -182,7 +164,8 @@ pgresult_check(VALUE rb_pgconn, VALUE rb_pgresult)
 	return;
 }
 
-static VALUE yield_pgresult(VALUE rb_pgresult)
+static VALUE
+yield_pgresult(VALUE rb_pgresult)
 {
 	int i;
 	PGresult *result = get_pgresult(rb_pgresult);
@@ -217,6 +200,89 @@ notice_processor_proxy(void *arg, const char *message)
 	return;
 }
 
+/*
+ * Appends key='val' to conninfo_rstr
+ */
+static void
+build_key_value_string(VALUE conninfo_rstr, char *key, VALUE val)
+{
+	if(val != Qnil) {
+		if(RSTRING_LEN(conninfo_rstr) > 0)
+			rb_str_cat2(conninfo_rstr, " ");
+		rb_str_cat2(conninfo_rstr, key);
+		rb_str_cat2(conninfo_rstr, "=");
+		rb_str_concat(conninfo_rstr, 
+			pgconn_s_quote_connstr(rb_obj_as_string(val)));
+	}
+	return;
+}
+
+static VALUE
+parse_connect_args(int argc, VALUE *argv, VALUE self)
+{
+	VALUE args,arg;
+	PGconn *conn = NULL;
+	VALUE conninfo_rstr = rb_str_new("",0);
+	VALUE error;
+	char *host, *port, *opt, *tty, *dbname, *login, *pwd;
+	host=port=opt=tty=dbname=login=pwd=NULL;
+
+	rb_scan_args(argc, argv, "0*", &args); 
+	if (RARRAY_LEN(args) == 1) { 
+		arg = rb_ary_entry(args,0);
+		if(TYPE(arg) == T_HASH) {
+			build_key_value_string(conninfo_rstr, "host", 
+				rb_hash_aref(arg, ID2SYM(rb_intern("host"))));
+			build_key_value_string(conninfo_rstr, "hostaddr", 
+				rb_hash_aref(arg, ID2SYM(rb_intern("hostaddr"))));
+			build_key_value_string(conninfo_rstr, "port", 
+				rb_hash_aref(arg, ID2SYM(rb_intern("port"))));
+			build_key_value_string(conninfo_rstr, "dbname", 
+				rb_hash_aref(arg, ID2SYM(rb_intern("dbname"))));
+			build_key_value_string(conninfo_rstr, "user", 
+				rb_hash_aref(arg, ID2SYM(rb_intern("user"))));
+			build_key_value_string(conninfo_rstr, "password", 
+				rb_hash_aref(arg, ID2SYM(rb_intern("password"))));
+			build_key_value_string(conninfo_rstr, "connect_timeout", 
+				rb_hash_aref(arg, ID2SYM(rb_intern("connect_timeout"))));
+			build_key_value_string(conninfo_rstr, "options", 
+				rb_hash_aref(arg, ID2SYM(rb_intern("options"))));
+			build_key_value_string(conninfo_rstr, "tty", 
+				rb_hash_aref(arg, ID2SYM(rb_intern("tty"))));
+			build_key_value_string(conninfo_rstr, "sslmode", 
+				rb_hash_aref(arg, ID2SYM(rb_intern("sslmode"))));
+			build_key_value_string(conninfo_rstr, "krbsrvname", 
+				rb_hash_aref(arg, ID2SYM(rb_intern("krbsrvname"))));
+			build_key_value_string(conninfo_rstr, "gsslib", 
+				rb_hash_aref(arg, ID2SYM(rb_intern("gsslib"))));
+			build_key_value_string(conninfo_rstr, "service", 
+				rb_hash_aref(arg, ID2SYM(rb_intern("service"))));
+		}
+		else if(TYPE(arg) == T_STRING) {
+			conninfo_rstr = arg;
+		}
+		else {
+			rb_raise(rb_eArgError, 
+				"Expecting String or Hash as single argument");
+		}
+	}
+	else if (RARRAY_LEN(args) == 7) {
+		build_key_value_string(conninfo_rstr, "host", rb_ary_entry(args,0));
+		build_key_value_string(conninfo_rstr, "port", rb_ary_entry(args,1));
+		build_key_value_string(conninfo_rstr, "opt", rb_ary_entry(args,2));
+		build_key_value_string(conninfo_rstr, "tty", rb_ary_entry(args,3));
+		build_key_value_string(conninfo_rstr, "dbname", rb_ary_entry(args,4));
+		build_key_value_string(conninfo_rstr, "user", rb_ary_entry(args,5));
+		build_key_value_string(conninfo_rstr, "password", rb_ary_entry(args,6));
+	}
+	else {
+		rb_raise(rb_eArgError, 
+			"Expected connection info string, hash, or 7 separate arguments.");
+	}
+
+	return conninfo_rstr;
+}
+
 /********************************************************************
  *
  * Document-class: PGError
@@ -249,21 +315,11 @@ notice_processor_proxy(void *arg, const char *message)
  *
  */
 
-#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE
 pgconn_alloc(VALUE klass)
 {
 	return Data_Wrap_Struct(klass, NULL, free_pgconn, NULL);
 }
-#else
-static VALUE
-pgconn_s_new(int argc, VALUE *argv, VALUE klass)
-{
-    VALUE self = rb_obj_alloc(klass);
-    rb_obj_call_init(self, argc, argv);
-    return self;
-}
-#endif
 
 /**************************************************************************
  * PGconn SINGLETON METHODS
@@ -273,9 +329,9 @@ pgconn_s_new(int argc, VALUE *argv, VALUE klass)
  * Document-method: new
  *
  * call-seq:
- *     PGconn.open(connection_hash) -> PGconn
- *     PGconn.open(connection_string) -> PGconn
- *     PGconn.open(host, port, options, tty, dbname, login, password) ->  PGconn
+ *    PGconn.new(connection_hash) -> PGconn
+ *    PGconn.new(connection_string) -> PGconn
+ *    PGconn.new(host, port, options, tty, dbname, login, password) ->  PGconn
  *
  * * +host+ - server hostname
  * * +hostaddr+ - server address (avoids hostname lookup, overrides +host+)
@@ -297,89 +353,75 @@ pgconn_s_new(int argc, VALUE *argv, VALUE klass)
  *  
  *  On failure, it raises a PGError exception.
  */
-
 static VALUE
-pgconn_init(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+pgconn_init(int argc, VALUE *argv, VALUE self)
 {
-    VALUE args,arg;
-    PGconn *conn = NULL;
-	char *conninfo = NULL;
-	VALUE conninfo_rstr;
+	PGconn *conn = NULL;
+	VALUE conninfo;
 	VALUE error;
-	char *host, *port, *opt, *tty, *dbname, *login, *pwd;
-	host=port=opt=tty=dbname=login=pwd=NULL;
 
-    rb_scan_args(argc, argv, "0*", &args); 
-    if (RARRAY_LEN(args) == 1) { 
-		arg = rb_ary_entry(args,0);
-		if(TYPE(arg) == T_HASH) {
-			conninfo_rstr = rb_str_new2("");
-			build_key_value_string(arg, conninfo_rstr, "host");
-			build_key_value_string(arg, conninfo_rstr, "hostaddr");
-			build_key_value_string(arg, conninfo_rstr, "port");
-			build_key_value_string(arg, conninfo_rstr, "dbname");
-			build_key_value_string(arg, conninfo_rstr, "user");
-			build_key_value_string(arg, conninfo_rstr, "password");
-			build_key_value_string(arg, conninfo_rstr, "opt");
-			build_key_value_string(arg, conninfo_rstr, "tty");
-			build_key_value_string(arg, conninfo_rstr, "sslmode");
-			build_key_value_string(arg, conninfo_rstr, "krbsrvname");
-			build_key_value_string(arg, conninfo_rstr, "gsslib");
-			build_key_value_string(arg, conninfo_rstr, "service");
-			conninfo = StringValuePtr(conninfo_rstr);
-		}
-		else if(TYPE(arg) == T_STRING) {
-			conninfo = StringValuePtr(arg);
-		}
-		else {
-			rb_raise(rb_eArgError, 
-				"Expecting String or Hash as single argument");
-		}
-		conn = PQconnectdb(conninfo);
-    }
-	else if (RARRAY_LEN(args) == 7) {
-		host = value_as_cstring(rb_ary_entry(args,0));
-		port = value_as_cstring(rb_ary_entry(args,1));
-		opt = value_as_cstring(rb_ary_entry(args,2));
-		tty = value_as_cstring(rb_ary_entry(args,3));
-		dbname = value_as_cstring(rb_ary_entry(args,4));
-		login = value_as_cstring(rb_ary_entry(args,5));
-		pwd = value_as_cstring(rb_ary_entry(args,6));
+	conninfo = parse_connect_args(argc, argv, self);
+	conn = PQconnectdb(StringValuePtr(conninfo));
 
-		conn = PQsetdbLogin(host, port, opt, tty, dbname, login, pwd);
-	}
-	else {
-		rb_raise(rb_eArgError, 
-			"Expected connection info string, hash, or 7 separate arguments.");
+	if(conn == NULL)
+		rb_raise(rb_ePGError, "PQconnectStart() unable to allocate structure");
+	if (PQstatus(conn) == CONNECTION_BAD) {
+		error = rb_exc_new2(rb_ePGError, PQerrorMessage(conn));
+		rb_iv_set(error, "@connection", self);
+		rb_exc_raise(error);
 	}
 
-    if (PQstatus(conn) == CONNECTION_BAD) {
-        error = rb_exc_new2(rb_ePGError, PQerrorMessage(conn));
-        rb_iv_set(error, "@connection", self);
-        rb_exc_raise(error);
-    }
-
 	Check_Type(self, T_DATA);
 	DATA_PTR(self) = conn;
 	
-    if (rb_block_given_p()) {
-        return rb_ensure(rb_yield, self, pgconn_finish, self);
-    }
-    return self;
+	if (rb_block_given_p()) {
+		return rb_ensure(rb_yield, self, pgconn_finish, self);
+	}
+	return self;
 }
 
-/*TODO
+/*
  * call-seq:
- *    PGconn.connect_start( ... ) -> PGconn
+ *    PGconn.connect_start(connection_hash) -> PGconn
+ *    PGconn.connect_start(connection_string) -> PGconn
+ *    PGconn.connect_start(host, port, options, tty, dbname, login, password) ->  PGconn
+ *
+ * This is an asynchronous version of PGconn.connect().
+ *
+ * Use PGconn#connect_poll to poll the status of the connection.
  */
 static VALUE
 pgconn_s_connect_start(int argc, VALUE *argv, VALUE self)
 {
-	rb_raise(rb_eStandardError, "PGconn.connect_start unimplemented.");
-	return Qnil;
+	PGconn *conn = NULL;
+	VALUE rb_conn;
+	VALUE conninfo;
+	VALUE error;
+
+	/*
+	 * PGconn.connect_start must act as both alloc() and initialize()
+	 * because it is not invoked by calling new().
+	 */
+	rb_conn = pgconn_alloc(rb_cPGconn);
+
+	conninfo = parse_connect_args(argc, argv, self);
+	conn = PQconnectdb(StringValuePtr(conninfo));
+
+	if(conn == NULL)
+		rb_raise(rb_ePGError, "PQconnectStart() unable to allocate structure");
+	if (PQstatus(conn) == CONNECTION_BAD) {
+		error = rb_exc_new2(rb_ePGError, PQerrorMessage(conn));
+		rb_iv_set(error, "@connection", self);
+		rb_exc_raise(error);
+	}
+
+	Check_Type(rb_conn, T_DATA);
+	DATA_PTR(rb_conn) = conn;
+
+	if (rb_block_given_p()) {
+		return rb_ensure(rb_yield, self, pgconn_finish, self);
+	}
+	return rb_conn;
 }
 
 /*
@@ -444,8 +486,7 @@ pgconn_s_conndefaults(VALUE self)
  * Return value is the encrypted password.
  */
 static VALUE
-pgconn_s_encrypt_password(self, password, username)
-	VALUE self, password, username;
+pgconn_s_encrypt_password(VALUE self, VALUE password, VALUE username)
 {
 	char *ret;
 	Check_Type(password, T_STRING);
@@ -462,8 +503,7 @@ pgconn_s_encrypt_password(self, password, username)
  * Returns +true+ if libpq is thread safe, +false+ otherwise.
  */
 static VALUE
-pgconn_s_isthreadsafe(self)
-	VALUE self;
+pgconn_s_isthreadsafe(VALUE self)
 {
 	return PQisthreadsafe() ? Qtrue : Qfalse;
 }
@@ -472,11 +512,35 @@ pgconn_s_isthreadsafe(self)
  * PGconn INSTANCE METHODS
  **************************************************************************/
 
-/*TODO
+/*
  * call-seq:
  *    conn.connect_poll() -> Fixnum
  *
- * 
+ * Returns one of:
+ * * +PGRES_POLLING_READING+ - wait until the socket is ready to read
+ * * +PGRES_POLLING_WRITING+ - wait until the socket is ready to write
+ * * +PGRES_POLLING_FAILED+ - the asynchronous connection has failed
+ * * +PGRES_POLLING_OK+ - the asynchronous connection is ready
+ *
+ * Example:
+ *   conn = PGconn.connect_start("dbname=mydatabase")
+ *   socket = IO.for_fd(conn.socket)
+ *   status = conn.connect_poll
+ *   while(status != PGconn::PGRES_POLLING_OK) do
+ *     # do some work while waiting for the connection to complete
+ *     if(status == PGconn::PGRES_POLLING_READING)
+ *       if(not select([socket], [], [], 10.0))
+ *         raise "Asynchronous connection timed out!"
+ *       end
+ *     elsif(status == PGconn::PGRES_POLLING_WRITING)
+ *       if(not select([], [socket], [], 10.0))
+ *         raise "Asynchronous connection timed out!"
+ *       end
+ *     end
+ *     status = conn.connect_poll
+ *   end
+ *   # now conn.status == CONNECTION_OK, and connection
+ *   # is ready.
  */
 static VALUE
 pgconn_connect_poll(VALUE self)
@@ -493,12 +557,11 @@ pgconn_connect_poll(VALUE self)
  * Closes the backend connection.
  */
 static VALUE
-pgconn_finish(self)
-    VALUE self;
+pgconn_finish(VALUE self)
 {
-    PQfinish(get_pgconn(self));
-    DATA_PTR(self) = NULL;
-    return Qnil;
+	PQfinish(get_pgconn(self));
+	DATA_PTR(self) = NULL;
+	return Qnil;
 }
 
 /*
@@ -509,11 +572,10 @@ pgconn_finish(self)
  * backend connection and tries to re-connect.
  */
 static VALUE
-pgconn_reset(self)
-    VALUE self;
+pgconn_reset(VALUE self)
 {
-    PQreset(get_pgconn(self));
-    return self;
+	PQreset(get_pgconn(self));
+	return self;
 }
 
 /*
@@ -557,12 +619,11 @@ pgconn_reset_poll(VALUE self)
  * Returns the connected database name.
  */
 static VALUE
-pgconn_db(self)
-    VALUE self;
+pgconn_db(VALUE self)
 {
-    char *db = PQdb(get_pgconn(self));
-    if (!db) return Qnil;
-    return rb_tainted_str_new2(db);
+	char *db = PQdb(get_pgconn(self));
+	if (!db) return Qnil;
+	return rb_tainted_str_new2(db);
 }
 
 /*
@@ -572,12 +633,11 @@ pgconn_db(self)
  * Returns the authenticated user name.
  */
 static VALUE
-pgconn_user(self)
-    VALUE self;
+pgconn_user(VALUE self)
 {
-    char *user = PQuser(get_pgconn(self));
-    if (!user) return Qnil;
-    return rb_tainted_str_new2(user);
+	char *user = PQuser(get_pgconn(self));
+	if (!user) return Qnil;
+	return rb_tainted_str_new2(user);
 }
 
 /*
@@ -587,12 +647,11 @@ pgconn_user(self)
  * Returns the authenticated user name.
  */
 static VALUE
-pgconn_pass(self)
-    VALUE self;
+pgconn_pass(VALUE self)
 {
-    char *user = PQpass(get_pgconn(self));
-    if (!user) return Qnil;
-    return rb_tainted_str_new2(user);
+	char *user = PQpass(get_pgconn(self));
+	if (!user) return Qnil;
+	return rb_tainted_str_new2(user);
 }
 
 /*
@@ -602,12 +661,11 @@ pgconn_pass(self)
  * Returns the connected server name.
  */
 static VALUE
-pgconn_host(self)
-    VALUE self;
+pgconn_host(VALUE self)
 {
-    char *host = PQhost(get_pgconn(self));
-    if (!host) return Qnil;
-    return rb_tainted_str_new2(host);
+	char *host = PQhost(get_pgconn(self));
+	if (!host) return Qnil;
+	return rb_tainted_str_new2(host);
 }
 
 /*
@@ -617,11 +675,10 @@ pgconn_host(self)
  * Returns the connected server port number.
  */
 static VALUE
-pgconn_port(self)
-    VALUE self;
+pgconn_port(VALUE self)
 {
-    char* port = PQport(get_pgconn(self));
-    return INT2NUM(atol(port));
+	char* port = PQport(get_pgconn(self));
+	return INT2NUM(atol(port));
 }
 
 /*
@@ -631,12 +688,11 @@ pgconn_port(self)
  * Returns the connected pgtty. (Obsolete)
  */
 static VALUE
-pgconn_tty(self)
-    VALUE self;
+pgconn_tty(VALUE self)
 {
-    char *tty = PQtty(get_pgconn(self));
-    if (!tty) return Qnil;
-    return rb_tainted_str_new2(tty);
+	char *tty = PQtty(get_pgconn(self));
+	if (!tty) return Qnil;
+	return rb_tainted_str_new2(tty);
 }
 
 /*
@@ -646,12 +702,11 @@ pgconn_tty(self)
  * Returns backend option string.
  */
 static VALUE
-pgconn_options(self)
-    VALUE self;
+pgconn_options(VALUE self)
 {
-    char *options = PQoptions(get_pgconn(self));
-    if (!options) return Qnil;
-    return rb_tainted_str_new2(options);
+	char *options = PQoptions(get_pgconn(self));
+	if (!options) return Qnil;
+	return rb_tainted_str_new2(options);
 }
 
 /*
@@ -661,10 +716,9 @@ pgconn_options(self)
  * Returns status of connection : CONNECTION_OK or CONNECTION_BAD
  */
 static VALUE
-pgconn_status(self)
-    VALUE self;
+pgconn_status(VALUE self)
 {
-    return INT2NUM(PQstatus(get_pgconn(self)));
+	return INT2NUM(PQstatus(get_pgconn(self)));
 }
 
 /*
@@ -679,10 +733,9 @@ pgconn_status(self)
  *   PQTRANS_UNKNOWN = 4 (cannot determine status)
  */
 static VALUE
-pgconn_transaction_status(self)
-    VALUE self;
+pgconn_transaction_status(VALUE self)
 {
-    return INT2NUM(PQtransactionStatus(get_pgconn(self)));
+	return INT2NUM(PQtransactionStatus(get_pgconn(self)));
 }
 
 /*
@@ -704,8 +757,7 @@ pgconn_transaction_status(self)
  * Returns nil if the value of the parameter is not known.
  */
 static VALUE
-pgconn_parameter_status(self, param_name)
-	VALUE self, param_name;
+pgconn_parameter_status(VALUE self, VALUE param_name)
 {
 	const char *ret = PQparameterStatus(get_pgconn(self), 
 			StringValuePtr(param_name));
@@ -724,10 +776,9 @@ pgconn_parameter_status(self, param_name)
  * obsolete and not supported by libpq.)
  */
 static VALUE
-pgconn_protocol_version(self)
-    VALUE self;
+pgconn_protocol_version(VALUE self)
 {
-    return INT2NUM(PQprotocolVersion(get_pgconn(self)));
+	return INT2NUM(PQprotocolVersion(get_pgconn(self)));
 }
 
 /*
@@ -737,10 +788,9 @@ pgconn_protocol_version(self)
  * 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(self)
-    VALUE self;
+pgconn_server_version(VALUE self)
 {
-    return INT2NUM(PQserverVersion(get_pgconn(self)));
+	return INT2NUM(PQserverVersion(get_pgconn(self)));
 }
 
 /*
@@ -750,12 +800,11 @@ pgconn_server_version(self)
  * Returns the error message about connection.
  */
 static VALUE
-pgconn_error_message(self)
-    VALUE self;
+pgconn_error_message(VALUE self)
 {
-    char *error = PQerrorMessage(get_pgconn(self));
-    if (!error) return Qnil;
-    return rb_tainted_str_new2(error);
+	char *error = PQerrorMessage(get_pgconn(self));
+	if (!error) return Qnil;
+	return rb_tainted_str_new2(error);
 }
 
 /*
@@ -783,8 +832,7 @@ pgconn_socket(VALUE self)
  * Note that this is a PID on database server host.
  */
 static VALUE
-pgconn_backend_pid(self)
-	VALUE self;
+pgconn_backend_pid(VALUE self)
 {
 	return INT2NUM(PQbackendPID(get_pgconn(self)));
 }
@@ -797,8 +845,7 @@ pgconn_backend_pid(self)
  * password, but none was available. +false+ otherwise.
  */
 static VALUE
-pgconn_connection_needs_password(self)
-	VALUE self;
+pgconn_connection_needs_password(VALUE self)
 {
 	return PQconnectionNeedsPassword(get_pgconn(self)) ? Qtrue : Qfalse;
 }
@@ -811,8 +858,7 @@ pgconn_connection_needs_password(self)
  * a caller-supplied password, +false+ otherwise.
  */
 static VALUE
-pgconn_connection_used_password(self)
-	VALUE self;
+pgconn_connection_used_password(VALUE self)
 {
 	return PQconnectionUsedPassword(get_pgconn(self)) ? Qtrue : Qfalse;
 }
@@ -853,10 +899,7 @@ pgconn_connection_used_password(self)
  * for binary.
  */
 static VALUE
-pgconn_exec(argc, argv, self)
-    int argc;
-	VALUE *argv;
-	VALUE self;
+pgconn_exec(int argc, VALUE *argv, VALUE self)
 {
 	PGconn *conn = get_pgconn(self);
 	PGresult *result = NULL;
@@ -865,6 +908,7 @@ pgconn_exec(argc, argv, self)
 	VALUE param, param_type, param_value, param_format;
 	VALUE param_value_tmp;
 	VALUE sym_type, sym_value, sym_format;
+	VALUE gc_array;
 	int i=0;
 	int nParams;
 	Oid *paramTypes;
@@ -873,19 +917,19 @@ pgconn_exec(argc, argv, self)
 	int *paramFormats;
 	int resultFormat;
 
-    rb_scan_args(argc, argv, "12", &command, &params, &in_res_fmt);
+	rb_scan_args(argc, argv, "12", &command, &params, &in_res_fmt);
 
-    Check_Type(command, T_STRING);
+	Check_Type(command, T_STRING);
 
 	/* If called with no parameters, use PQexec */
 	if(NIL_P(params)) {
 		result = PQexec(conn, StringValuePtr(command));
 		rb_pgresult = new_pgresult(result);
 		pgresult_check(self, rb_pgresult);
-    	if (rb_block_given_p()) {
-    	    return rb_ensure(yield_pgresult, rb_pgresult, 
+		if (rb_block_given_p()) {
+			return rb_ensure(yield_pgresult, rb_pgresult, 
 				pgresult_clear, rb_pgresult);
-    	}
+		}
 		return rb_pgresult;
 	}
 
@@ -901,6 +945,8 @@ pgconn_exec(argc, argv, self)
 		resultFormat = NUM2INT(in_res_fmt);
 	}
 
+	gc_array = rb_ary_new();
+	rb_gc_register_address(&gc_array);
 	sym_type = ID2SYM(rb_intern("type"));
 	sym_value = ID2SYM(rb_intern("value"));
 	sym_format = ID2SYM(rb_intern("format"));
@@ -940,6 +986,8 @@ pgconn_exec(argc, argv, self)
 		}
 		else {
 			Check_Type(param_value, T_STRING);
+			/* make sure param_value doesn't get freed by the GC */
+			rb_ary_push(gc_array, param_value);
 			paramValues[i] = StringValuePtr(param_value);
 			paramLengths[i] = RSTRING_LEN(param_value);
 		}
@@ -953,6 +1001,8 @@ pgconn_exec(argc, argv, self)
 	result = PQexecParams(conn, StringValuePtr(command), nParams, paramTypes, 
 		(const char * const *)paramValues, paramLengths, paramFormats, resultFormat);
 
+	rb_gc_unregister_address(&gc_array);
+
 	free(paramTypes);
 	free(paramValues);
 	free(paramLengths);
@@ -960,10 +1010,10 @@ pgconn_exec(argc, argv, self)
 
 	rb_pgresult = new_pgresult(result);
 	pgresult_check(self, rb_pgresult);
-    if (rb_block_given_p()) {
-        return rb_ensure(yield_pgresult, rb_pgresult, 
+	if (rb_block_given_p()) {
+		return rb_ensure(yield_pgresult, rb_pgresult, 
 			pgresult_clear, rb_pgresult);
-    }
+	}
 	return rb_pgresult;
 }
 
@@ -988,10 +1038,7 @@ pgconn_exec(argc, argv, self)
  * inside the SQL query.
  */
 static VALUE
-pgconn_prepare(argc, argv, self)
-    int argc;
-	VALUE *argv;
-	VALUE self;
+pgconn_prepare(int argc, VALUE *argv, VALUE self)
 {
 	PGconn *conn = get_pgconn(self);
 	PGresult *result = NULL;
@@ -1002,9 +1049,9 @@ pgconn_prepare(argc, argv, self)
 	int nParams = 0;
 	Oid *paramTypes = NULL;
 
-    rb_scan_args(argc, argv, "21", &name, &command, &in_paramtypes);
+	rb_scan_args(argc, argv, "21", &name, &command, &in_paramtypes);
 	Check_Type(name, T_STRING);
-    Check_Type(command, T_STRING);
+	Check_Type(command, T_STRING);
 
 	if(! NIL_P(in_paramtypes)) {
 		Check_Type(in_paramtypes, T_ARRAY);
@@ -1054,10 +1101,7 @@ pgconn_prepare(argc, argv, self)
  * for binary.
  */
 static VALUE
-pgconn_exec_prepared(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+pgconn_exec_prepared(int argc, VALUE *argv, VALUE self)
 {
 	PGconn *conn = get_pgconn(self);
 	PGresult *result = NULL;
@@ -1066,6 +1110,7 @@ pgconn_exec_prepared(argc, argv, self)
 	VALUE param, param_value, param_format;
 	VALUE param_value_tmp;
 	VALUE sym_value, sym_format;
+	VALUE gc_array;
 	int i = 0;
 	int nParams;
 	char ** paramValues;
@@ -1074,7 +1119,7 @@ pgconn_exec_prepared(argc, argv, self)
 	int resultFormat;
 
 
-    rb_scan_args(argc, argv, "12", &name, &params, &in_res_fmt);
+	rb_scan_args(argc, argv, "12", &name, &params, &in_res_fmt);
 	Check_Type(name, T_STRING);
 
 	if(NIL_P(params)) {
@@ -1092,6 +1137,8 @@ pgconn_exec_prepared(argc, argv, self)
 		resultFormat = NUM2INT(in_res_fmt);
 	}
 
+	gc_array = rb_ary_new();
+	rb_gc_register_address(&gc_array);
 	sym_value = ID2SYM(rb_intern("value"));
 	sym_format = ID2SYM(rb_intern("format"));
 	nParams = RARRAY(params)->len;
@@ -1121,6 +1168,8 @@ pgconn_exec_prepared(argc, argv, self)
 		}
 		else {
 			Check_Type(param_value, T_STRING);
+			/* make sure param_value doesn't get freed by the GC */
+			rb_ary_push(gc_array, param_value);
 			paramValues[i] = StringValuePtr(param_value);
 			paramLengths[i] = RSTRING_LEN(param_value);
 		}
@@ -1135,16 +1184,18 @@ pgconn_exec_prepared(argc, argv, self)
 		(const char * const *)paramValues, paramLengths, paramFormats, 
 		resultFormat);
 
+	rb_gc_unregister_address(&gc_array);
+
 	free(paramValues);
 	free(paramLengths);
 	free(paramFormats);
 
 	rb_pgresult = new_pgresult(result);
 	pgresult_check(self, rb_pgresult);
-    if (rb_block_given_p()) {
-        return rb_ensure(yield_pgresult, rb_pgresult, 
+	if (rb_block_given_p()) {
+		return rb_ensure(yield_pgresult, rb_pgresult, 
 			pgresult_clear, rb_pgresult);
-    }
+	}
 	return rb_pgresult;
 }
 
@@ -1156,8 +1207,7 @@ pgconn_exec_prepared(argc, argv, self)
  * _statement_name_.
  */
 static VALUE
-pgconn_describe_prepared(self, stmt_name)
-	VALUE self, stmt_name;
+pgconn_describe_prepared(VALUE self, VALUE stmt_name)
 {
 	PGresult *result;
 	VALUE rb_pgresult;
@@ -1250,30 +1300,29 @@ pgconn_make_empty_pgresult(VALUE self, VALUE status)
  * inside of SQL commands.
  */
 static VALUE
-pgconn_s_escape(self, string)
-    VALUE self;
-    VALUE string;
+pgconn_s_escape(VALUE self, VALUE string)
 {
-    char *escaped;
-    int size,error;
-    VALUE result;
+	char *escaped;
+	int size,error;
+	VALUE result;
 
-    Check_Type(string, T_STRING);
-    
-    escaped = ALLOCA_N(char, RSTRING_LEN(string) * 2 + 1);
-    if(CLASS_OF(self) == rb_cPGconn) {
-    	size = PQescapeStringConn(get_pgconn(self), escaped, 
+	Check_Type(string, T_STRING);
+
+	escaped = ALLOC_N(char, RSTRING_LEN(string) * 2 + 1);
+	if(CLASS_OF(self) == rb_cPGconn) {
+		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_PTR(string),
+	} else {
+		size = PQescapeString(escaped, RSTRING_PTR(string),
 			RSTRING_LEN(string));
-    }
-    result = rb_str_new(escaped, size);
-    OBJ_INFECT(result, string);
-    return result;
+	}
+	result = rb_str_new(escaped, size);
+	free(escaped);
+	OBJ_INFECT(result, string);
+	return result;
 }
 
 /*
@@ -1302,28 +1351,26 @@ pgconn_s_escape(self, string)
  * SQL commands.
  */
 static VALUE
-pgconn_s_escape_bytea(self, str)
-    VALUE self;
-    VALUE str;
+pgconn_s_escape_bytea(VALUE self, VALUE str)
 {
-    unsigned char *from, *to;
-    size_t from_len, to_len;
-    VALUE ret;
-    
-    Check_Type(str, T_STRING);
-    from      = (unsigned char*)RSTRING_PTR(str);
-    from_len  = RSTRING_LEN(str);
-    
-    if(CLASS_OF(self) == rb_cPGconn) {
+	unsigned char *from, *to;
+	size_t from_len, to_len;
+	VALUE ret;
+
+	Check_Type(str, T_STRING);
+	from      = (unsigned char*)RSTRING_PTR(str);
+	from_len  = RSTRING_LEN(str);
+
+	if(CLASS_OF(self) == rb_cPGconn) {
 		to = PQescapeByteaConn(get_pgconn(self), from, from_len, &to_len);
-    } else {
+	} else {
 		to = PQescapeBytea( from, from_len, &to_len);
-    }
-    
-    ret = rb_str_new((char*)to, to_len - 1);
-    OBJ_INFECT(ret, str);
-    PQfreemem(to);
-    return ret;
+	}
+
+	ret = rb_str_new((char*)to, to_len - 1);
+	OBJ_INFECT(ret, str);
+	PQfreemem(to);
+	return ret;
 }
 
 
@@ -1337,22 +1384,21 @@ pgconn_s_escape_bytea(self, str)
  *
  */
 static VALUE
-pgconn_s_unescape_bytea(self, str)
-    VALUE self, str;
+pgconn_s_unescape_bytea(VALUE self, VALUE str)
 {
-    unsigned char *from, *to;
-    size_t to_len;
-    VALUE ret;
+	unsigned char *from, *to;
+	size_t to_len;
+	VALUE ret;
 
-    Check_Type(str, T_STRING);
-    from = (unsigned char*)StringValuePtr(str);
+	Check_Type(str, T_STRING);
+	from = (unsigned char*)StringValuePtr(str);
 
-    to = PQunescapeBytea(from, &to_len);
+	to = PQunescapeBytea(from, &to_len);
 
-    ret = rb_str_new((char*)to, to_len);
-    OBJ_INFECT(ret, str);
-    PQfreemem(to);
-    return ret;
+	ret = rb_str_new((char*)to, to_len);
+	OBJ_INFECT(ret, str);
+	PQfreemem(to);
+	return ret;
 }
 
 /*
@@ -1387,17 +1433,15 @@ pgconn_s_unescape_bytea(self, str)
  * for binary.
  */
 static VALUE
-pgconn_send_query(argc, argv, self)
-    int argc;
-	VALUE *argv;
-	VALUE self;
+pgconn_send_query(int argc, VALUE *argv, VALUE self)
 {
-    PGconn *conn = get_pgconn(self);
-    int result;
+	PGconn *conn = get_pgconn(self);
+	int result;
 	VALUE command, params, in_res_fmt;
 	VALUE param, param_type, param_value, param_format;
 	VALUE param_value_tmp;
 	VALUE sym_type, sym_value, sym_format;
+	VALUE gc_array;
 	VALUE error;
 	int i=0;
 	int nParams;
@@ -1407,8 +1451,8 @@ pgconn_send_query(argc, argv, self)
 	int *paramFormats;
 	int resultFormat;
 
-    rb_scan_args(argc, argv, "12", &command, &params, &in_res_fmt);
-    Check_Type(command, T_STRING);
+	rb_scan_args(argc, argv, "12", &command, &params, &in_res_fmt);
+	Check_Type(command, T_STRING);
 
 	/* If called with no parameters, use PQsendQuery */
 	if(NIL_P(params)) {
@@ -1432,6 +1476,8 @@ pgconn_send_query(argc, argv, self)
 		resultFormat = NUM2INT(in_res_fmt);
 	}
 
+	gc_array = rb_ary_new();
+	rb_gc_register_address(&gc_array);
 	sym_type = ID2SYM(rb_intern("type"));
 	sym_value = ID2SYM(rb_intern("value"));
 	sym_format = ID2SYM(rb_intern("format"));
@@ -1471,6 +1517,8 @@ pgconn_send_query(argc, argv, self)
 		}
 		else {
 			Check_Type(param_value, T_STRING);
+			/* make sure param_value doesn't get freed by the GC */
+			rb_ary_push(gc_array, param_value);
 			paramValues[i] = StringValuePtr(param_value);
 			paramLengths[i] = RSTRING_LEN(param_value);
 		}
@@ -1484,6 +1532,8 @@ pgconn_send_query(argc, argv, self)
 	result = PQsendQueryParams(conn, StringValuePtr(command), nParams, paramTypes, 
 		(const char * const *)paramValues, paramLengths, paramFormats, resultFormat);
 
+	rb_gc_unregister_address(&gc_array);	
+
 	free(paramTypes);
 	free(paramValues);
 	free(paramLengths);
@@ -1518,12 +1568,9 @@ pgconn_send_query(argc, argv, self)
  * inside the SQL query.
  */
 static VALUE
-pgconn_send_prepare(argc, argv, self)
-    int argc;
-	VALUE *argv;
-	VALUE self;
+pgconn_send_prepare(int argc, VALUE *argv, VALUE self)
 {
-    PGconn *conn = get_pgconn(self);
+	PGconn *conn = get_pgconn(self);
 	int result;
 	VALUE name, command, in_paramtypes;
 	VALUE param;
@@ -1532,9 +1579,9 @@ pgconn_send_prepare(argc, argv, self)
 	int nParams = 0;
 	Oid *paramTypes = NULL;
 
-    rb_scan_args(argc, argv, "21", &name, &command, &in_paramtypes);
+	rb_scan_args(argc, argv, "21", &name, &command, &in_paramtypes);
 	Check_Type(name, T_STRING);
-    Check_Type(command, T_STRING);
+	Check_Type(command, T_STRING);
 
 	if(! NIL_P(in_paramtypes)) {
 		Check_Type(in_paramtypes, T_ARRAY);
@@ -1588,17 +1635,15 @@ pgconn_send_prepare(argc, argv, self)
  * for binary.
  */
 static VALUE
-pgconn_send_query_prepared(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+pgconn_send_query_prepared(int argc, VALUE *argv, VALUE self)
 {
-    PGconn *conn = get_pgconn(self);
-    int result;
+	PGconn *conn = get_pgconn(self);
+	int result;
 	VALUE name, params, in_res_fmt;
 	VALUE param, param_value, param_format;
 	VALUE param_value_tmp;
 	VALUE sym_value, sym_format;
+	VALUE gc_array;
 	VALUE error;
 	int i = 0;
 	int nParams;
@@ -1607,7 +1652,7 @@ pgconn_send_query_prepared(argc, argv, self)
 	int *paramFormats;
 	int resultFormat;
 
-    rb_scan_args(argc, argv, "12", &name, &params, &in_res_fmt);
+	rb_scan_args(argc, argv, "12", &name, &params, &in_res_fmt);
 	Check_Type(name, T_STRING);
 
 	if(NIL_P(params)) {
@@ -1625,6 +1670,8 @@ pgconn_send_query_prepared(argc, argv, self)
 		resultFormat = NUM2INT(in_res_fmt);
 	}
 
+	gc_array = rb_ary_new();
+	rb_gc_register_address(&gc_array);
 	sym_value = ID2SYM(rb_intern("value"));
 	sym_format = ID2SYM(rb_intern("format"));
 	nParams = RARRAY(params)->len;
@@ -1655,6 +1702,8 @@ pgconn_send_query_prepared(argc, argv, self)
 		}
 		else {
 			Check_Type(param_value, T_STRING);
+			/* make sure param_value doesn't get freed by the GC */
+			rb_ary_push(gc_array, param_value);
 			paramValues[i] = StringValuePtr(param_value);
 			paramLengths[i] = RSTRING_LEN(param_value);
 		}
@@ -1669,6 +1718,8 @@ pgconn_send_query_prepared(argc, argv, self)
 		(const char * const *)paramValues, paramLengths, paramFormats, 
 		resultFormat);
 
+	rb_gc_unregister_address(&gc_array);
+
 	free(paramValues);
 	free(paramLengths);
 	free(paramFormats);
@@ -1689,8 +1740,7 @@ pgconn_send_query_prepared(argc, argv, self)
  * Use in combination with +conn.get_result+.
  */
 static VALUE
-pgconn_send_describe_prepared(self, stmt_name)
-	VALUE self, stmt_name;
+pgconn_send_describe_prepared(VALUE self, VALUE stmt_name)
 {
 	VALUE error;
 	PGconn *conn = get_pgconn(self);
@@ -1712,8 +1762,7 @@ pgconn_send_describe_prepared(self, stmt_name)
  * Use in combination with +conn.get_result+.
  */
 static VALUE
-pgconn_send_describe_portal(self, portal)
-	VALUE self, portal;
+pgconn_send_describe_portal(VALUE self, VALUE portal)
 {
 	VALUE error;
 	PGconn *conn = get_pgconn(self);
@@ -1740,8 +1789,7 @@ pgconn_send_describe_portal(self, portal)
  * or else you will not be able to issue further commands.
  */
 static VALUE
-pgconn_get_result(self)
-	VALUE self;
+pgconn_get_result(VALUE self)
 {
 	PGconn *conn = get_pgconn(self);
 	PGresult *result;
@@ -1752,10 +1800,10 @@ pgconn_get_result(self)
 		return Qnil;
 	rb_pgresult = new_pgresult(result);
 	pgresult_check(self, rb_pgresult);
-    if (rb_block_given_p()) {
-        return rb_ensure(yield_pgresult, rb_pgresult, 
+	if (rb_block_given_p()) {
+		return rb_ensure(yield_pgresult, rb_pgresult, 
 			pgresult_clear, rb_pgresult);
-    }
+	}
 	return rb_pgresult;
 }
 
@@ -1798,10 +1846,19 @@ pgconn_is_busy(self)
 
 /*
  * call-seq:
- *    conn.setnonblocking() -> Boolean
+ *    conn.setnonblocking(Boolean) -> nil
  *
- * Returns +true+ if a command is busy, that is, if
- * PQgetResult would block. Otherwise returns +false+.
+ * Sets the nonblocking status of the connection. 
+ * In the blocking state, calls to PGconn#send_query
+ * will block until the message is sent to the server,
+ * but will not wait for the query results.
+ * In the nonblocking state, calls to PGconn#send_query
+ * will return an error if the socket is not ready for
+ * writing.
+ * Note: This function does not affect PGconn#exec, because
+ * that function doesn't return until the server has 
+ * processed the query and returned the results.
+ * Returns +nil+.
  */
 static VALUE
 pgconn_setnonblocking(self, state)
@@ -1866,11 +1923,37 @@ pgconn_flush(self)
 	return (ret) ? Qfalse : Qtrue;
 }
 
-//TODO get_cancel
+/*
+ * call-seq:
+ *    conn.cancel() -> String
+ *
+ * Requests cancellation of the command currently being
+ * processed.
+ *
+ * Returns +nil+ on success, or a string containing the
+ * error message if a failure occurs.
+ */
+static VALUE
+pgconn_cancel(VALUE self)
+{
+	char errbuf[256];
+	PGcancel *cancel;
+	VALUE retval;
+	int ret;
 
-//TODO free_cancel
+	cancel = PQgetCancel(get_pgconn(self));
+	if(cancel == NULL)
+		rb_raise(rb_ePGError,"Invalid connection!");
 
-//TODO cancel
+	ret = PQcancel(cancel, errbuf, 256);
+	if(ret == 1) 
+		retval = Qnil;
+	else
+		retval = rb_str_new2(errbuf);
+
+	PQfreeCancel(cancel);
+	return retval;
+}
 
 /*
  * call-seq:
@@ -1880,12 +1963,11 @@ pgconn_flush(self)
  * If there is no unprocessed notifier, it returns +nil+.
  */
 static VALUE
-pgconn_notifies(self)
-    VALUE self;
+pgconn_notifies(VALUE self)
 {
-    PGconn* conn = get_pgconn(self);
-    PGnotify *notify;
-    VALUE hash;
+	PGconn* conn = get_pgconn(self);
+	PGnotify *notify;
+	VALUE hash;
 	VALUE sym_relname, sym_be_pid, sym_extra;
 	VALUE relname, be_pid, extra;
 
@@ -1893,22 +1975,22 @@ pgconn_notifies(self)
 	sym_be_pid = ID2SYM(rb_intern("be_pid"));
 	sym_extra = ID2SYM(rb_intern("extra"));
 
-    notify = PQnotifies(conn);
-    if (notify == NULL) {
-        return Qnil;
-    }
+	notify = PQnotifies(conn);
+	if (notify == NULL) {
+		return Qnil;
+	}
 	
 	hash = rb_hash_new();
 	relname = rb_tainted_str_new2(notify->relname);
 	be_pid = INT2NUM(notify->be_pid);
 	extra = rb_tainted_str_new2(PGNOTIFY_EXTRA(notify));
 	
-    rb_hash_aset(hash, sym_relname, relname);
+	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);
-    return hash;
+	PQfreemem(notify);
+	return hash;
 }
 
 
@@ -1957,23 +2039,20 @@ pgconn_put_copy_data(self, buffer)
  * is in nonblocking mode, and this command would block).
  */ 
 static VALUE
-pgconn_put_copy_end(argc, argv, self)
-	int argc;
-	VALUE *argv;
-	VALUE self;
+pgconn_put_copy_end(int argc, VALUE *argv, VALUE self)
 {
-    VALUE str;
+	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);
+	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);
@@ -1992,25 +2071,22 @@ pgconn_put_copy_end(argc, argv, self)
  *
  */
 static VALUE
-pgconn_get_copy_data( argc, argv, self )
-	int argc;
-	VALUE *argv;
-	VALUE self;
+pgconn_get_copy_data(int argc, VALUE *argv, VALUE self )
 {
-    VALUE async_in;
+	VALUE async_in;
 	VALUE error;
 	VALUE result_str;
 	int ret;
 	int async;
 	char *buffer;
-    PGconn *conn = get_pgconn(self);
-    
-    if (rb_scan_args(argc, argv, "01", &async_in) == 0)
-        async = 0;
-    else
+	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);
+	ret = PQgetCopyData(conn, &buffer, async);
 	if(ret == -2) { // error
 		error = rb_exc_new2(rb_ePGError, PQerrorMessage(conn));
 		rb_iv_set(error, "@connection", self);
@@ -2097,8 +2173,7 @@ pgconn_trace(VALUE self, VALUE stream)
  * Disables the message tracing.
  */
 static VALUE
-pgconn_untrace(self)
-    VALUE self;
+pgconn_untrace(VALUE self)
 {
 	VALUE trace_stream;
 	PQuntrace(get_pgconn(self));
@@ -2129,8 +2204,8 @@ pgconn_untrace(self)
 static VALUE
 pgconn_set_notice_receiver(VALUE self)
 {
-    VALUE proc, old_proc;
-    PGconn *conn = get_pgconn(self);
+	VALUE proc, old_proc;
+	PGconn *conn = get_pgconn(self);
 
 	/* If default_notice_receiver is unset, assume that the current 
 	 * notice receiver is the default, and save it to a global variable. 
@@ -2175,8 +2250,8 @@ pgconn_set_notice_receiver(VALUE self)
 static VALUE
 pgconn_set_notice_processor(VALUE self)
 {
-    VALUE proc, old_proc;
-    PGconn *conn = get_pgconn(self);
+	VALUE proc, old_proc;
+	PGconn *conn = get_pgconn(self);
 
 	/* If default_notice_processor is unset, assume that the current 
 	 * notice processor is the default, and save it to a global variable. 
@@ -2206,11 +2281,10 @@ pgconn_set_notice_processor(VALUE self)
  * Returns the client encoding as a String.
  */
 static VALUE
-pgconn_get_client_encoding(self)
-    VALUE self;
+pgconn_get_client_encoding(VALUE self)
 {
-    char *encoding = (char *)pg_encoding_to_char(PQclientEncoding(get_pgconn(self)));
-    return rb_tainted_str_new2(encoding);
+	char *encoding = (char *)pg_encoding_to_char(PQclientEncoding(get_pgconn(self)));
+	return rb_tainted_str_new2(encoding);
 }
 
 /*
@@ -2220,14 +2294,13 @@ pgconn_get_client_encoding(self)
  * Sets the client encoding to the _encoding_ String.
  */
 static VALUE
-pgconn_set_client_encoding(self, str)
-    VALUE self, str;
+pgconn_set_client_encoding(VALUE self, VALUE str)
 {
-    Check_Type(str, T_STRING);
-    if ((PQsetClientEncoding(get_pgconn(self), StringValuePtr(str))) == -1){
-        rb_raise(rb_ePGError, "invalid encoding name: %s",StringValuePtr(str));
-    }
-    return Qnil;
+	Check_Type(str, T_STRING);
+	if ((PQsetClientEncoding(get_pgconn(self), StringValuePtr(str))) == -1){
+		rb_raise(rb_ePGError, "invalid encoding name: %s",StringValuePtr(str));
+	}
+	return Qnil;
 }
 
 /*
@@ -2298,7 +2371,7 @@ pgconn_s_quote_ident(VALUE self, VALUE in_str)
 	VALUE ret;
 	char *str = StringValuePtr(in_str);
 	/* result size at most NAMEDATALEN*2 plus surrounding
-     * double-quotes. */
+	 * double-quotes. */
 	char buffer[NAMEDATALEN*2+2];
 	unsigned int i=0,j=0;
 	
@@ -2422,26 +2495,23 @@ pgconn_async_exec(int argc, VALUE *argv, VALUE self)
  * On failure, it raises PGError exception.
  */
 static VALUE
-pgconn_locreat(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+pgconn_locreat(int argc, VALUE *argv, VALUE self)
 {
-    Oid lo_oid;
-    int mode;
-    VALUE nmode;
-    PGconn *conn = get_pgconn(self);
-    
-    if (rb_scan_args(argc, argv, "01", &nmode) == 0)
-        mode = INV_READ;
-    else
-        mode = NUM2INT(nmode);
-  
-    lo_oid = lo_creat(conn, mode);
-    if (lo_oid == 0)
-        rb_raise(rb_ePGError, "lo_creat failed");
+	Oid lo_oid;
+	int mode;
+	VALUE nmode;
+	PGconn *conn = get_pgconn(self);
 
-    return INT2FIX(lo_oid);
+	if (rb_scan_args(argc, argv, "01", &nmode) == 0)
+		mode = INV_READ;
+	else
+		mode = NUM2INT(nmode);
+
+	lo_oid = lo_creat(conn, mode);
+	if (lo_oid == 0)
+		rb_raise(rb_ePGError, "lo_creat failed");
+
+	return INT2FIX(lo_oid);
 }
 
 /*
@@ -2452,18 +2522,17 @@ pgconn_locreat(argc, argv, self)
  * On failure, it raises PGError exception.
  */
 static VALUE
-pgconn_locreate(self, in_lo_oid)
-    VALUE self, in_lo_oid;
+pgconn_locreate(VALUE self, VALUE in_lo_oid)
 {
-    Oid ret, lo_oid;
-    PGconn *conn = get_pgconn(self);
+	Oid ret, lo_oid;
+	PGconn *conn = get_pgconn(self);
 	lo_oid = NUM2INT(in_lo_oid);
-    
-    ret = lo_create(conn, in_lo_oid);
-    if (ret == InvalidOid)
-        rb_raise(rb_ePGError, "lo_create failed");
 
-    return INT2FIX(ret);
+	ret = lo_create(conn, in_lo_oid);
+	if (ret == InvalidOid)
+		rb_raise(rb_ePGError, "lo_create failed");
+
+	return INT2FIX(ret);
 }
 
 /*
@@ -2475,20 +2544,19 @@ pgconn_locreate(self, in_lo_oid)
  * On failure, it raises a PGError exception.
  */
 static VALUE
-pgconn_loimport(self, filename)
-    VALUE self, filename;
+pgconn_loimport(VALUE self, VALUE filename)
 {
-    Oid lo_oid;
+	Oid lo_oid;
 
-    PGconn *conn = get_pgconn(self);
+	PGconn *conn = get_pgconn(self);
 
-    Check_Type(filename, T_STRING);
+	Check_Type(filename, T_STRING);
 
-    lo_oid = lo_import(conn, StringValuePtr(filename));
-    if (lo_oid == 0) {
-        rb_raise(rb_ePGError, PQerrorMessage(conn));
-    }
-    return INT2FIX(lo_oid);
+	lo_oid = lo_import(conn, StringValuePtr(filename));
+	if (lo_oid == 0) {
+		rb_raise(rb_ePGError, PQerrorMessage(conn));
+	}
+	return INT2FIX(lo_oid);
 }
 
 /*
@@ -2498,22 +2566,21 @@ pgconn_loimport(self, filename)
  * Saves a large object of _oid_ to a _file_.
  */
 static VALUE
-pgconn_loexport(self, lo_oid,filename)
-    VALUE self, lo_oid, filename;
+pgconn_loexport(VALUE self, VALUE lo_oid, VALUE filename)
 {
-    PGconn *conn = get_pgconn(self);
-    int oid;
-    Check_Type(filename, T_STRING);
+	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);
-    }
+	oid = NUM2INT(lo_oid);
+	if (oid < 0) {
+		rb_raise(rb_ePGError, "invalid large object oid %d",oid);
+	}
 
-    if (lo_export(conn, oid, StringValuePtr(filename)) < 0) {
-        rb_raise(rb_ePGError, PQerrorMessage(conn));
-    }
-    return Qnil;
+	if (lo_export(conn, oid, StringValuePtr(filename)) < 0) {
+		rb_raise(rb_ePGError, PQerrorMessage(conn));
+	}
+	return Qnil;
 }
 
 /*
@@ -2527,27 +2594,24 @@ pgconn_loexport(self, lo_oid,filename)
  * If _mode_ is omitted, the default is +INV_READ+.
  */
 static VALUE
-pgconn_loopen(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+pgconn_loopen(int argc, VALUE *argv, VALUE self)
 {
-    Oid lo_oid;
-    int fd, mode;
-    VALUE nmode, selfid;
-    PGconn *conn = get_pgconn(self);
+	Oid lo_oid;
+	int fd, mode;
+	VALUE nmode, selfid;
+	PGconn *conn = get_pgconn(self);
 
-    rb_scan_args(argc, argv, "11", &selfid, &nmode);
-    lo_oid = NUM2INT(selfid);
+	rb_scan_args(argc, argv, "11", &selfid, &nmode);
+	lo_oid = NUM2INT(selfid);
 	if(NIL_P(nmode))
-    	mode = INV_READ;
-    else
+		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");
-    }
-    return INT2FIX(fd);
+	if((fd = lo_open(conn, lo_oid, mode)) < 0) {
+		rb_raise(rb_ePGError, "can't open large object");
+	}
+	return INT2FIX(fd);
 }
 
 /*
@@ -2558,24 +2622,23 @@ pgconn_loopen(argc, argv, self)
  * Returns the number of bytes written.
  */
 static VALUE
-pgconn_lowrite(self, in_lo_desc, buffer)
-    VALUE self, buffer;
+pgconn_lowrite(VALUE self, VALUE in_lo_desc, VALUE buffer)
 {
-    int n;
-    PGconn *conn = get_pgconn(self);
+	int n;
+	PGconn *conn = get_pgconn(self);
 	int fd = NUM2INT(in_lo_desc);
 
-    Check_Type(buffer, T_STRING);
+	Check_Type(buffer, T_STRING);
 
-    if( RSTRING_LEN(buffer) < 0) {
-        rb_raise(rb_ePGError, "write buffer zero string");
-    }
-    if((n = lo_write(conn, fd, StringValuePtr(buffer), 
+	if( RSTRING_LEN(buffer) < 0) {
+		rb_raise(rb_ePGError, "write buffer zero string");
+	}
+	if((n = lo_write(conn, fd, StringValuePtr(buffer), 
 				RSTRING_LEN(buffer))) < 0) {
-        rb_raise(rb_ePGError, "lo_write failed");
-    }
-  
-    return INT2FIX(n);
+		rb_raise(rb_ePGError, "lo_write failed");
+	}
+
+	return INT2FIX(n);
 }
 
 /*
@@ -2586,12 +2649,11 @@ pgconn_lowrite(self, in_lo_desc, buffer)
  * returns resulting data.
  */
 static VALUE
-pgconn_loread(self, in_lo_desc, in_len)
-    VALUE self, in_lo_desc, in_len;
+pgconn_loread(VALUE self, VALUE in_lo_desc, VALUE in_len)
 {
-    int ret;
-    PGconn *conn = get_pgconn(self);
-    int len = NUM2INT(in_len);
+	int ret;
+	PGconn *conn = get_pgconn(self);
+	int len = NUM2INT(in_len);
 	int lo_desc = NUM2INT(in_lo_desc);
 	VALUE str;
 	char *buffer;
@@ -2599,13 +2661,13 @@ pgconn_loread(self, in_lo_desc, in_len)
 	buffer = malloc(len);
 	if(buffer == NULL)
 		rb_raise(rb_eNoMemError, "Malloc failed!");
-    
-    if (len < 0){
-        rb_raise(rb_ePGError,"nagative length %d given", len);
-    }
 
-    if((ret = lo_read(conn, lo_desc, buffer, len)) < 0)
-        rb_raise(rb_ePGError, "lo_read failed");
+	if (len < 0){
+		rb_raise(rb_ePGError,"nagative length %d given", len);
+	}
+
+	if((ret = lo_read(conn, lo_desc, buffer, len)) < 0)
+		rb_raise(rb_ePGError, "lo_read failed");
 
 	if(ret == 0) {
 		free(buffer);
@@ -2615,7 +2677,7 @@ pgconn_loread(self, in_lo_desc, in_len)
 	str = rb_tainted_str_new(buffer, len);
 	free(buffer);
 
-    return str;
+	return str;
 }
 
 
@@ -2628,18 +2690,17 @@ pgconn_loread(self, in_lo_desc, in_len)
  * (Or 0, 1, or 2.)
  */
 static VALUE
-pgconn_lolseek(self, in_lo_desc, offset, whence)
-    VALUE self, in_lo_desc, offset, whence;
+pgconn_lolseek(VALUE self, VALUE in_lo_desc, VALUE offset, VALUE whence)
 {
-    PGconn *conn = get_pgconn(self);
+	PGconn *conn = get_pgconn(self);
 	int lo_desc = NUM2INT(in_lo_desc);
-    int ret;
-    
-    if((ret = lo_lseek(conn, lo_desc, NUM2INT(offset), NUM2INT(whence))) < 0) {
-        rb_raise(rb_ePGError, "lo_lseek failed");
-    }
+	int ret;
+
+	if((ret = lo_lseek(conn, lo_desc, NUM2INT(offset), NUM2INT(whence))) < 0) {
+		rb_raise(rb_ePGError, "lo_lseek failed");
+	}
 
-    return INT2FIX(ret);
+	return INT2FIX(ret);
 }
 
 /*
@@ -2649,17 +2710,16 @@ pgconn_lolseek(self, in_lo_desc, offset, whence)
  * Returns the current position of the large object _lo_desc_.
  */
 static VALUE
-pgconn_lotell(self,in_lo_desc)
-    VALUE self, in_lo_desc;
+pgconn_lotell(VALUE self, VALUE in_lo_desc)
 {
-    int position;
+	int position;
 	PGconn *conn = get_pgconn(self);
 	int lo_desc = NUM2INT(in_lo_desc);
 
 	if((position = lo_tell(conn, lo_desc)) < 0)
 		rb_raise(rb_ePGError,"lo_tell failed");
 
-    return INT2FIX(position);
+	return INT2FIX(position);
 }
 
 /*
@@ -2669,17 +2729,16 @@ pgconn_lotell(self,in_lo_desc)
  * Truncates the large object _lo_desc_ to size _len_.
  */
 static VALUE
-pgconn_lotruncate(self, in_lo_desc, in_len)
-    VALUE self, in_lo_desc, in_len;
+pgconn_lotruncate(VALUE self, VALUE in_lo_desc, VALUE in_len)
 {
-    PGconn *conn = get_pgconn(self);
-    int lo_desc = NUM2INT(in_lo_desc);
+	PGconn *conn = get_pgconn(self);
+	int lo_desc = NUM2INT(in_lo_desc);
 	size_t len = NUM2INT(in_len);
-    
-    if(lo_truncate(conn,lo_desc,len) < 0)
+
+	if(lo_truncate(conn,lo_desc,len) < 0)
 		rb_raise(rb_ePGError,"lo_truncate failed");
 
-    return Qnil;
+	return Qnil;
 }
 
 /*
@@ -2689,16 +2748,15 @@ pgconn_lotruncate(self, in_lo_desc, in_len)
  * Closes the postgres large object of _lo_desc_.
  */
 static VALUE
-pgconn_loclose(self, in_lo_desc)
-    VALUE self, in_lo_desc;
+pgconn_loclose(VALUE self, VALUE in_lo_desc)
 {
-    PGconn *conn = get_pgconn(self);
-    int lo_desc = NUM2INT(in_lo_desc);
-    
-    if(lo_unlink(conn,lo_desc) < 0)
+	PGconn *conn = get_pgconn(self);
+	int lo_desc = NUM2INT(in_lo_desc);
+
+	if(lo_unlink(conn,lo_desc) < 0)
 		rb_raise(rb_ePGError,"lo_close failed");
 
-    return Qnil;
+	return Qnil;
 }
 
 /*
@@ -2708,19 +2766,18 @@ pgconn_loclose(self, in_lo_desc)
  * Unlinks (deletes) the postgres large object of _oid_.
  */
 static VALUE
-pgconn_lounlink(self, in_oid)
-    VALUE self, in_oid;
+pgconn_lounlink(VALUE self, VALUE in_oid)
 {
-    PGconn *conn = get_pgconn(self);
-    int oid = NUM2INT(in_oid);
-    
-    if (oid < 0)
-        rb_raise(rb_ePGError, "invalid oid %d",oid);
+	PGconn *conn = get_pgconn(self);
+	int oid = NUM2INT(in_oid);
 
-    if(lo_unlink(conn,oid) < 0)
+	if (oid < 0)
+		rb_raise(rb_ePGError, "invalid oid %d",oid);
+
+	if(lo_unlink(conn,oid) < 0)
 		rb_raise(rb_ePGError,"lo_unlink failed");
 
-    return Qnil;
+	return Qnil;
 }
 
 /********************************************************************
@@ -2761,10 +2818,9 @@ pgconn_lounlink(self, in_oid)
  * * +PGRES_FATAL_ERROR+
  */
 static VALUE
-pgresult_result_status(self)
-    VALUE self;
+pgresult_result_status(VALUE self)
 {
-    return INT2FIX(PQresultStatus(get_pgresult(self)));
+	return INT2FIX(PQresultStatus(get_pgresult(self)));
 }
 
 /*
@@ -2775,10 +2831,9 @@ pgresult_result_status(self)
  *
 */
 static VALUE
-pgresult_res_status(self,status)
-    VALUE self,status;
+pgresult_res_status(VALUE self, VALUE status)
 {
-    return rb_tainted_str_new2(PQresStatus(NUM2INT(status)));
+	return rb_tainted_str_new2(PQresStatus(NUM2INT(status)));
 }
 
 /*
@@ -2788,10 +2843,9 @@ pgresult_res_status(self,status)
  * Returns the error message of the command as a string. 
  */
 static VALUE
-pgresult_result_error_message(self)
-    VALUE self;
+pgresult_result_error_message(VALUE self)
 {
-    return rb_tainted_str_new2(PQresultErrorMessage(get_pgresult(self)));
+	return rb_tainted_str_new2(PQresultErrorMessage(get_pgresult(self)));
 }
 
 /*
@@ -2819,7 +2873,7 @@ pgresult_result_error_field(VALUE self, VALUE field)
 {
 	PGresult *result = get_pgresult(self);
 	int fieldcode = NUM2INT(field);
-    return rb_tainted_str_new2(PQresultErrorField(result,fieldcode));
+	return rb_tainted_str_new2(PQresultErrorField(result,fieldcode));
 }
 
 /*
@@ -2829,12 +2883,11 @@ pgresult_result_error_field(VALUE self, VALUE field)
  * Clears the PGresult object as the result of the query.
  */
 static VALUE
-pgresult_clear(self)
-    VALUE self;
+pgresult_clear(VALUE self)
 {
-    PQclear(get_pgresult(self));
-    DATA_PTR(self) = NULL;
-    return Qnil;
+	PQclear(get_pgresult(self));
+	DATA_PTR(self) = NULL;
+	return Qnil;
 }
 
 /*
@@ -2844,10 +2897,9 @@ pgresult_clear(self)
  * Returns the number of tuples in the query result.
  */
 static VALUE
-pgresult_ntuples(self)
-    VALUE self;
+pgresult_ntuples(VALUE self)
 {
-    return INT2FIX(PQntuples(get_pgresult(self)));
+	return INT2FIX(PQntuples(get_pgresult(self)));
 }
 
 /*
@@ -2857,10 +2909,9 @@ pgresult_ntuples(self)
  * Returns the number of columns in the query result.
  */
 static VALUE
-pgresult_nfields(self)
-    VALUE self;
+pgresult_nfields(VALUE self)
 {
-    return INT2NUM(PQnfields(get_pgresult(self)));
+	return INT2NUM(PQnfields(get_pgresult(self)));
 }
 
 /*
@@ -2870,17 +2921,16 @@ pgresult_nfields(self)
  * Returns the name of the column corresponding to _index_.
  */
 static VALUE
-pgresult_fname(self, index)
-    VALUE self, index;
+pgresult_fname(VALUE self, VALUE index)
 {
-    PGresult *result;
+	PGresult *result;
 	int i = NUM2INT(index);
 
-    result = get_pgresult(self);
-    if (i < 0 || i >= PQnfields(result)) {
-        rb_raise(rb_eArgError,"invalid field number %d", i);
-    }
-    return rb_tainted_str_new2(PQfname(result, i));
+	result = get_pgresult(self);
+	if (i < 0 || i >= PQnfields(result)) {
+		rb_raise(rb_eArgError,"invalid field number %d", i);
+	}
+	return rb_tainted_str_new2(PQfname(result, i));
 }
 
 /*
@@ -2893,18 +2943,17 @@ pgresult_fname(self, index)
  * raises a TypeError if _name_ is not a String.
  */
 static VALUE
-pgresult_fnumber(self, name)
-    VALUE self, name;
+pgresult_fnumber(VALUE self, VALUE name)
 {
-    int n;
-    
-    Check_Type(name, T_STRING);
-    
-    n = PQfnumber(get_pgresult(self), StringValuePtr(name));
-    if (n == -1) {
-        rb_raise(rb_eArgError,"Unknown field: %s", StringValuePtr(name));
-    }
-    return INT2FIX(n);
+	int n;
+
+	Check_Type(name, T_STRING);
+
+	n = PQfnumber(get_pgresult(self), StringValuePtr(name));
+	if (n == -1) {
+		rb_raise(rb_eArgError,"Unknown field: %s", StringValuePtr(name));
+	}
+	return INT2FIX(n);
 }
 
 /*
@@ -2918,15 +2967,14 @@ pgresult_fnumber(self, name)
  * the Oid is undefined for that column.
  */
 static VALUE
-pgresult_ftable(self, column_number)
-    VALUE self, column_number;
+pgresult_ftable(VALUE self, VALUE column_number)
 {
 	Oid n = PQftable(get_pgresult(self), NUM2INT(column_number));
-    if (n == InvalidOid) {
-        rb_raise(rb_eArgError,"Oid is undefined for column: %d", 
+	if (n == InvalidOid) {
+		rb_raise(rb_eArgError,"Oid is undefined for column: %d", 
 			NUM2INT(column_number));
-    }
-    return INT2FIX(n);
+	}
+	return INT2FIX(n);
 }
 
 /*
@@ -2940,16 +2988,15 @@ pgresult_ftable(self, column_number)
  * the column number from its table is undefined for that column.
  */
 static VALUE
-pgresult_ftablecol(self, column_number)
-    VALUE self, column_number;
+pgresult_ftablecol(VALUE self, VALUE column_number)
 {
 	int n = PQftablecol(get_pgresult(self), NUM2INT(column_number));
-    if (n == 0) {
-        rb_raise(rb_eArgError,
+	if (n == 0) {
+		rb_raise(rb_eArgError,
 			"Column number from table is undefined for column: %d", 
 			NUM2INT(column_number));
-    }
-    return INT2FIX(n);
+	}
+	return INT2FIX(n);
 }
 
 /*
@@ -2962,15 +3009,14 @@ pgresult_ftablecol(self, column_number)
  * Raises ArgumentError if _column_number_ is out of range.
  */
 static VALUE
-pgresult_fformat(self, column_number)
-    VALUE self, column_number;
+pgresult_fformat(VALUE self, VALUE column_number)
 {
 	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", 
+	if (fnumber >= PQnfields(result)) {
+		rb_raise(rb_eArgError, "Column number is out of range: %d", 
 			fnumber);
-    }
+	}
 	return INT2FIX(PQfformat(result, fnumber));
 }
 
@@ -2983,15 +3029,14 @@ pgresult_fformat(self, column_number)
  * The integer returned is the internal +OID+ number (in PostgreSQL) of the type.
  */
 static VALUE
-pgresult_ftype(self, index)
-    VALUE self, index;
+pgresult_ftype(VALUE self, VALUE index)
 {
-    PGresult* result = get_pgresult(self);
-    int i = NUM2INT(index);
-    if (i < 0 || i >= PQnfields(result)) {
-        rb_raise(rb_eArgError, "invalid field number %d", i);
-    }
-    return INT2NUM(PQftype(result, i));
+	PGresult* result = get_pgresult(self);
+	int i = NUM2INT(index);
+	if (i < 0 || i >= PQnfields(result)) {
+		rb_raise(rb_eArgError, "invalid field number %d", i);
+	}
+	return INT2NUM(PQftype(result, i));
 }
 
 /*
@@ -3003,16 +3048,15 @@ pgresult_ftype(self, index)
  * Raises ArgumentError if _column_number_ is out of range.
  */
 static VALUE
-pgresult_fmod(self, column_number)
-    VALUE self, column_number;
+pgresult_fmod(VALUE self, VALUE column_number)
 {
 	PGresult *result = get_pgresult(self);
 	int fnumber = NUM2INT(column_number);
 	int modifier;
-    if (fnumber >= PQnfields(result)) {
-        rb_raise(rb_eArgError, "Column number is out of range: %d", 
+	if (fnumber >= PQnfields(result)) {
+		rb_raise(rb_eArgError, "Column number is out of range: %d", 
 			fnumber);
-    }
+	}
 	if((modifier = PQfmod(result,fnumber)) == -1)
 		rb_raise(rb_eArgError, 
 			"No modifier information available for column: %d", 
@@ -3031,17 +3075,16 @@ pgresult_fmod(self, column_number)
  *   res.size(1) => -1
  */
 static VALUE
-pgresult_fsize(self, index)
-    VALUE self, index;
+pgresult_fsize(VALUE self, VALUE index)
 {
-    PGresult *result;
-    int i = NUM2INT(index);
+	PGresult *result;
+	int i = NUM2INT(index);
 
-    result = get_pgresult(self);
-    if (i < 0 || i >= PQnfields(result)) {
-        rb_raise(rb_eArgError,"invalid field number %d", i);
-    }
-    return INT2NUM(PQfsize(result, i));
+	result = get_pgresult(self);
+	if (i < 0 || i >= PQnfields(result)) {
+		rb_raise(rb_eArgError,"invalid field number %d", i);
+	}
+	return INT2NUM(PQfsize(result, i));
 }
 
 /*
@@ -3052,20 +3095,19 @@ pgresult_fsize(self, index)
  * or +nil+ if the field is +NULL+.
  */
 static VALUE
-pgresult_getvalue(self, tup_num, field_num)
-    VALUE self, tup_num, field_num;
+pgresult_getvalue(VALUE self, VALUE tup_num, VALUE field_num)
 {
-    PGresult *result;
-    int i = NUM2INT(tup_num);
-    int j = NUM2INT(field_num);
+	PGresult *result;
+	int i = NUM2INT(tup_num);
+	int j = NUM2INT(field_num);
 
-    result = get_pgresult(self);
+	result = get_pgresult(self);
 	if(i < 0 || i >= PQntuples(result)) {
 		rb_raise(rb_eArgError,"invalid tuple number %d", i);
 	}
-   	if(j < 0 || j >= PQnfields(result)) {
+	if(j < 0 || j >= PQnfields(result)) {
 		rb_raise(rb_eArgError,"invalid field number %d", j);
-   	}
+	}
 	if(PQgetisnull(result, i, j))
 		return Qnil;
 	return rb_tainted_str_new(PQgetvalue(result, i, j), 
@@ -3079,21 +3121,20 @@ pgresult_getvalue(self, tup_num, field_num)
  * Returns +true+ if the specified value is +nil+; +false+ otherwise.
  */
 static VALUE
-pgresult_getisnull(self, tup_num, field_num)
-    VALUE self, tup_num, field_num;
+pgresult_getisnull(VALUE self, VALUE tup_num, VALUE field_num)
 {
-    PGresult *result;
-    int i = NUM2INT(tup_num);
-    int j = NUM2INT(field_num);
+	PGresult *result;
+	int i = NUM2INT(tup_num);
+	int j = NUM2INT(field_num);
 
-    result = get_pgresult(self);
-    if (i < 0 || i >= PQntuples(result)) {
-        rb_raise(rb_eArgError,"invalid tuple number %d", i);
-    }
-    if (j < 0 || j >= PQnfields(result)) {
-        rb_raise(rb_eArgError,"invalid field number %d", j);
-    }
-    return PQgetisnull(result, i, j) ? Qtrue : Qfalse;
+	result = get_pgresult(self);
+	if (i < 0 || i >= PQntuples(result)) {
+		rb_raise(rb_eArgError,"invalid tuple number %d", i);
+	}
+	if (j < 0 || j >= PQnfields(result)) {
+		rb_raise(rb_eArgError,"invalid field number %d", j);
+	}
+	return PQgetisnull(result, i, j) ? Qtrue : Qfalse;
 }
 
 /*
@@ -3105,21 +3146,20 @@ pgresult_getisnull(self, tup_num, field_num)
  * Equivalent to <tt>res.value(<i>tup_num</i>,<i>field_num</i>).length</tt>.
  */
 static VALUE
-pgresult_getlength(self, tup_num, field_num)
-    VALUE self, tup_num, field_num;
+pgresult_getlength(VALUE self, VALUE tup_num, VALUE field_num)
 {
-    PGresult *result;
-    int i = NUM2INT(tup_num);
-    int j = NUM2INT(field_num);
+	PGresult *result;
+	int i = NUM2INT(tup_num);
+	int j = NUM2INT(field_num);
 
-    result = get_pgresult(self);
-    if (i < 0 || i >= PQntuples(result)) {
-        rb_raise(rb_eArgError,"invalid tuple number %d", i);
-    }
-    if (j < 0 || j >= PQnfields(result)) {
-        rb_raise(rb_eArgError,"invalid field number %d", j);
-    }
-    return INT2FIX(PQgetlength(result, i, j));
+	result = get_pgresult(self);
+	if (i < 0 || i >= PQntuples(result)) {
+		rb_raise(rb_eArgError,"invalid tuple number %d", i);
+	}
+	if (j < 0 || j >= PQnfields(result)) {
+		rb_raise(rb_eArgError,"invalid field number %d", j);
+	}
+	return INT2FIX(PQgetlength(result, i, j));
 }
 
 /*
@@ -3130,13 +3170,12 @@ pgresult_getlength(self, tup_num, field_num)
  * Only useful for the result returned by conn.describePrepared
  */
 static VALUE
-pgresult_nparams(self)
-    VALUE self;
+pgresult_nparams(VALUE self)
 {
-    PGresult *result;
+	PGresult *result;
 
-    result = get_pgresult(self);
-    return INT2FIX(PQnparams(result));
+	result = get_pgresult(self);
+	return INT2FIX(PQnparams(result));
 }
 
 /*
@@ -3147,13 +3186,12 @@ pgresult_nparams(self)
  * Only useful for the result returned by conn.describePrepared
  */
 static VALUE
-pgresult_paramtype(self, param_number)
-    VALUE self, param_number;
+pgresult_paramtype(VALUE self, VALUE param_number)
 {
-    PGresult *result;
+	PGresult *result;
 
-    result = get_pgresult(self);
-    return INT2FIX(PQparamtype(result,NUM2INT(param_number)));
+	result = get_pgresult(self);
+	return INT2FIX(PQparamtype(result,NUM2INT(param_number)));
 }
 
 /*
@@ -3163,10 +3201,9 @@ pgresult_paramtype(self, param_number)
  * Returns the status string of the last query command.
  */
 static VALUE
-pgresult_cmd_status(self)
-    VALUE self;
+pgresult_cmd_status(VALUE self)
 {
-    return rb_tainted_str_new2(PQcmdStatus(get_pgresult(self)));
+	return rb_tainted_str_new2(PQcmdStatus(get_pgresult(self)));
 }
 
 /*
@@ -3184,12 +3221,11 @@ pgresult_cmd_status(self)
  * or if no tuples were affected, <tt>0</tt> is returned.
  */
 static VALUE
-pgresult_cmd_tuples(self)
-    VALUE self;
+pgresult_cmd_tuples(VALUE self)
 {
-    long n;
-    n = strtol(PQcmdTuples(get_pgresult(self)),NULL, 10);
-    return INT2NUM(n);
+	long n;
+	n = strtol(PQcmdTuples(get_pgresult(self)),NULL, 10);
+	return INT2NUM(n);
 }
 
 /*
@@ -3200,14 +3236,13 @@ pgresult_cmd_tuples(self)
  * otherwise +nil+.
  */
 static VALUE
-pgresult_oid_value(self)
-    VALUE self;
+pgresult_oid_value(VALUE self)
 {
-    Oid n = PQoidValue(get_pgresult(self));
-    if (n == InvalidOid)
-        return Qnil;
-    else
-        return INT2FIX(n);
+	Oid n = PQoidValue(get_pgresult(self));
+	if (n == InvalidOid)
+		return Qnil;
+	else
+		return INT2FIX(n);
 }
 
 /* Utility methods not in libpq */
@@ -3219,8 +3254,7 @@ pgresult_oid_value(self)
  * Returns tuple _n_ as a hash. 
  */
 static VALUE
-pgresult_aref(self, index)
-	VALUE self, index;
+pgresult_aref(VALUE self, VALUE index)
 {
 	PGresult *result = get_pgresult(self);
 	int tuple_num = NUM2INT(index);
@@ -3252,8 +3286,7 @@ pgresult_aref(self, index)
  * Invokes block for each tuple in the result set.
  */
 static VALUE
-pgresult_each(self)
-	VALUE self;
+pgresult_each(VALUE self)
 {
 	PGresult *result = get_pgresult(self);
 	int tuple_num;
@@ -3271,20 +3304,19 @@ pgresult_each(self)
  * Returns an array of Strings representing the names of the fields in the result.
  */
 static VALUE
-pgresult_fields(self)
-    VALUE self;
+pgresult_fields(VALUE self)
 {
-    PGresult *result;
-    VALUE ary;
-    int n, i;
-
-    result = get_pgresult(self);
-    n = PQnfields(result);
-    ary = rb_ary_new2(n);
-    for (i=0;i<n;i++) {
-        rb_ary_push(ary, rb_tainted_str_new2(PQfname(result, i)));
-    }
-    return ary;
+	PGresult *result;
+	VALUE ary;
+	int n, i;
+
+	result = get_pgresult(self);
+	n = PQnfields(result);
+	ary = rb_ary_new2(n);
+	for (i=0;i<n;i++) {
+		rb_ary_push(ary, rb_tainted_str_new2(PQfname(result, i)));
+	}
+	return ary;
 }
 
 /**************************************************************************/
@@ -3309,11 +3341,7 @@ Init_pg()
 	 *************************/
 
 	/******     PGconn CLASS METHODS     ******/
-#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 	rb_define_alloc_func(rb_cPGconn, pgconn_alloc);
-#else
-	rb_define_singleton_method(rb_cPGconn, "new", pgconn_s_new, -1);
-#endif  
 	rb_define_singleton_alias(rb_cPGconn, "connect", "new");
 	rb_define_singleton_alias(rb_cPGconn, "open", "new");
 	rb_define_singleton_alias(rb_cPGconn, "setdb", "new");
@@ -3417,14 +3445,12 @@ Init_pg()
 	rb_define_method(rb_cPGconn, "get_result", pgconn_get_result, 0);
 	rb_define_method(rb_cPGconn, "consume_input", pgconn_consume_input, 0);
 	rb_define_method(rb_cPGconn, "is_busy", pgconn_is_busy, 0);
-	rb_define_method(rb_cPGconn, "setnonblocking", pgconn_setnonblocking, 0);
+	rb_define_method(rb_cPGconn, "setnonblocking", pgconn_setnonblocking, 1);
 	rb_define_method(rb_cPGconn, "isnonblocking", pgconn_isnonblocking, 0);
 	rb_define_method(rb_cPGconn, "flush", pgconn_flush, 0);
 
 	/******     PGconn INSTANCE METHODS: Cancelling Queries in Progress     ******/
-	//rb_define_method(rb_cPGconn, "get_cancel", pgconn_get_result, 0);
-	//rb_define_method(rb_cPGconn, "free_cancel", pgconn_get_result, 0);
-	//rb_define_method(rb_cPGconn, "cancel", pgconn_get_result, 0);
+	rb_define_method(rb_cPGconn, "cancel", pgconn_cancel, 0);
 
 	/******     PGconn INSTANCE METHODS: NOTIFY     ******/
 	rb_define_method(rb_cPGconn, "notifies", pgconn_notifies, 0);