pg 0.7.9.2008.10.13 → 0.8.0

data/Rakefile

@@ -0,0 +1,103 @@
+
+require 'rubygems'
+require 'rake/clean'
+require 'rake/gempackagetask'
+require 'spec/rake/spectask'
+require 'rake/rdoctask'
+require 'ext_helper'
+require 'date'
+
+# House-keeping
+CLEAN.include '**/*.o', 'ext/*.so', '**/*.bundle', '**/*.a',
+	 '**/*.log', "{ext,lib}/*.{bundle,so,obj,pdb,lib,def,exp}",
+	"ext/Makefile", 'lib', '**/*.db'
+
+FILES = FileList[
+  'Rakefile',
+  'README',
+  'LICENSE',
+  'COPYING.txt',
+  'ChangeLog',
+  'Contributors',
+  'GPL',
+  'BSD',
+  'doc/**/*',
+  'ext/*',
+  'ext/mingw/Rakefile',
+  'ext/mingw/build.rake',
+  'ext/vc/*.sln',
+  'ext/vc/*.vcproj',
+  'lib/**/*',
+  'sample/**/*',
+  'spec/**/*'
+]
+
+spec = Gem::Specification.new do |s|
+	s.name              = 'pg'
+  s.platform = Gem::Platform::RUBY
+  s.require_path = "lib"
+	s.rubyforge_project = 'ruby-pg'
+	s.version           = "0.8.0"
+  s.date = DateTime.now
+	s.summary           = 'Ruby extension library providing an API to PostgreSQL'
+	s.authors           = [
+		'Yukihiro Matsumoto', 
+		'Eiji Matsumoto', 
+		'Noboru Saitou', 
+		'Dave Lee', 
+		'Jeff Davis']
+	s.email             = 'ruby-pg@j-davis.com'
+	s.homepage          = 'http://rubyforge.org/projects/ruby-pg'
+	s.requirements      = 'PostgreSQL libpq library and headers'
+	s.has_rdoc          = true
+	s.extra_rdoc_files  = ['ext/pg.c']
+	s.extensions        = [ 'ext/extconf.rb' ]
+  s.required_ruby_version = '>= 1.8.4'
+	s.files = FILES.to_a.reject { |x| CLEAN.include?(x) }
+end
+
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.gem_spec = spec
+  pkg.need_tar = true
+end
+
+# ------- Windows Package ----------
+if RUBY_PLATFORM.match(/win32/)
+  binaries = (FileList['ext/mingw/*.so',
+                       'ext/mingw/*.dll*'])
+
+  # Windows specification
+  win_spec = spec.clone
+  win_spec.extensions = ['ext/mingw/Rakefile']
+  win_spec.platform = Gem::Platform::CURRENT
+  win_spec.files += binaries.to_a
+
+  # Rake task to build the windows package
+  Rake::GemPackageTask.new(win_spec) do |pkg|
+  end
+end
+
+# ---------  RDoc Documentation ---------
+desc "Generate rdoc documentation"
+Rake::RDocTask.new("rdoc") do |rdoc|
+  rdoc.rdoc_dir = 'doc/rdoc'
+  rdoc.title    = "pg"
+  # Show source inline with line numbers
+  rdoc.options << "--line-numbers"
+  # Make the readme file the start page for the generated html
+  rdoc.options << '--main' << 'README'
+  rdoc.rdoc_files.include('ext/**/*.c',
+                          'ChangeLog',
+                          'README*',
+                          'LICENSE')
+end
+
+
+setup_extension 'pg', spec
+
+desc "Run all specs in spec directory"
+Spec::Rake::SpecTask.new("spec") do |t|
+  t.spec_opts = ["--format", "specdoc", "--colour"]
+  t.spec_files = FileList["spec/**/*_spec.rb"]
+end
+task :spec => [:compile]

data/ext/compat.c

@@ -283,7 +283,7 @@ PQsetClientEncoding(PGconn *conn, const char *encoding)
 	PGresult   *res;
 	int         status;
 
-	if (!conn || conn->status != CONNECTION_OK)
+	if (!conn || PQstatus(conn) != CONNECTION_OK)
 		return -1;
 
 	if (!encoding)
@@ -299,7 +299,7 @@ PQsetClientEncoding(PGconn *conn, const char *encoding)
 
 	if (res == NULL)
 	return -1;
-	if (res->resultStatus != PGRES_COMMAND_OK)
+	if (PQresultStatus(res) != PGRES_COMMAND_OK)
 	status = -1;
 	else
 	{
@@ -309,7 +309,7 @@ PQsetClientEncoding(PGconn *conn, const char *encoding)
 		 * backend to report the parameter value, and we'll change state at
 		 * that time.
 		 */
-		if (PG_PROTOCOL_MAJOR(conn->pversion) < 3)
+		if (PQprotocolVersion(conn) < 3)
 			pqSaveParameterStatus(conn, "client_encoding", encoding);
 		status = 0;             /* everything is ok */
 	}

data/ext/mingw/Rakefile

@@ -0,0 +1,24 @@
+# We can't use Ruby's standard build procedures
+# on Windows because the Ruby executable is
+# built with VC++ while here we want to build
+# with MingW.  So just roll our own...
+
+require 'fileutils'
+require 'rbconfig'
+
+EXTENSION_NAME = "pg.#{Config::CONFIG["DLEXT"]}"
+
+# This is called when the Windows GEM is installed!
+task :install do
+  # Gems will pass these two environment variables:
+  # RUBYARCHDIR=#{dest_path}
+  # RUBYLIBDIR=#{dest_path}
+
+  dest_path = ENV['RUBYLIBDIR']
+  mkdir_p(dest_path)
+  
+  # Copy the extension
+  cp(EXTENSION_NAME, dest_path)
+end
+
+task :default => :install

data/ext/mingw/build.rake

@@ -0,0 +1,40 @@
+# We can't use Ruby's standard build procedures
+# on Windows because the Ruby executable is
+# built with VC++ while here we want to build
+# with MingW.  So just roll our own...
+
+require 'rake/clean'
+require 'rbconfig'
+
+RUBY_INCLUDE_DIR = Config::CONFIG["archdir"]
+RUBY_BIN_DIR = Config::CONFIG["bindir"]
+RUBY_LIB_DIR = Config::CONFIG["libdir"]
+RUBY_SHARED_LIB = Config::CONFIG["LIBRUBY"]
+RUBY_SHARED_DLL = RUBY_SHARED_LIB.gsub(/lib$/, 'dll')
+    
+EXTENSION_NAME = "pg.#{Config::CONFIG["DLEXT"]}"
+
+CLEAN.include('*.o')
+CLOBBER.include(EXTENSION_NAME)
+
+task :default => "pg"
+
+DEFINES = "-DHAVE_LIBPQ_FE_H -DHAVE_LIBPQ_LIBPQ_FS_H -DHAVE_PQCONNECTIONUSEDPASSWORD -DHAVE_PQISTHREADSAFE -DHAVE_LO_CREATE -DHAVE_PQPREPARE -DHAVE_PQEXECPARAMS -DHAVE_PQESCAPESTRING -DHAVE_PQESCAPESTRINGCONN -DHAVE_PG_ENCODING_TO_CHAR -DHAVE_PQSETCLIENTENCODING"
+LIBS = "-lpq -lm"
+SRC = FileList['../*.c']
+OBJ = SRC.collect do |file_name|
+  File.basename(file_name).ext('o')
+end
+
+SRC.each do |srcfile|
+  objfile = File.basename(srcfile).ext('o')
+  file objfile => srcfile do
+    command = "gcc -c -O2 -Wall #{DEFINES} -o #{objfile} -I/usr/local/include #{srcfile} -I#{RUBY_INCLUDE_DIR}"
+    sh "sh -c '#{command}'" 
+  end
+end
+
+file "pg" => OBJ do
+  command = "gcc -shared -o #{EXTENSION_NAME} #{OBJ} -L/usr/local/lib #{LIBS} #{RUBY_BIN_DIR}/#{RUBY_SHARED_DLL}"
+  sh "sh -c '#{command}'" 
+end

data/ext/mkrf_config.rb

@@ -1,7 +1,14 @@
 require 'rubygems'
 require 'mkrf'
 
-unless system("pg_config --bindir > /dev/null")
+pg_config_command =
+  if RUBY_PLATFORM.match(/win32/)
+    "pg_config --bindir > nul"
+  else
+    "pg_config --bindir > /dev/null"
+  end
+
+unless system(pg_config_command)
 	$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/pg.c

@@ -9,7 +9,7 @@
   modified at: Wed Jan 20 16:41:51 1999
 
   $Author: jdavis $
-  $Date: 2008-10-05 12:43:27 -0700 (Sun, 05 Oct 2008) $
+  $Date: 2009-03-28 09:49:43 -0700 (Sat, 28 Mar 2009) $
 ************************************************/
 
 #include "pg.h"
@@ -79,17 +79,10 @@ pgconn_s_quote_connstr(VALUE string)
 	}
 	str[j++] = '\'';
 	result = rb_str_new(str, j);
-	free(str);
+	xfree(str);
 	return result;
 }
 
-static char *
-value_as_cstring(VALUE in_str)
-{
-	VALUE rstring = rb_obj_as_string(in_str);
-	return StringValuePtr(rstring);
-}
-
 static void
 free_pgconn(PGconn *conn)
 {
@@ -228,9 +221,7 @@ 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;
 
@@ -372,15 +363,16 @@ pgconn_init(int argc, VALUE *argv, VALUE self)
 
 	if(conn == NULL)
 		rb_raise(rb_ePGError, "PQconnectStart() unable to allocate structure");
+
+	Check_Type(self, T_DATA);
+	DATA_PTR(self) = conn;
+
 	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);
 	}
@@ -957,7 +949,7 @@ pgconn_exec(int argc, VALUE *argv, VALUE self)
 	sym_type = ID2SYM(rb_intern("type"));
 	sym_value = ID2SYM(rb_intern("value"));
 	sym_format = ID2SYM(rb_intern("format"));
-	nParams = RARRAY(params)->len;
+	nParams = RARRAY_LEN(params);
 	paramTypes = ALLOC_N(Oid, nParams); 
 	paramValues = ALLOC_N(char *, nParams);
 	paramLengths = ALLOC_N(int, nParams);
@@ -1010,10 +1002,10 @@ pgconn_exec(int argc, VALUE *argv, VALUE self)
 
 	rb_gc_unregister_address(&gc_array);
 
-	free(paramTypes);
-	free(paramValues);
-	free(paramLengths);
-	free(paramFormats);
+	xfree(paramTypes);
+	xfree(paramValues);
+	xfree(paramLengths);
+	xfree(paramFormats);
 
 	rb_pgresult = new_pgresult(result);
 	pgresult_check(self, rb_pgresult);
@@ -1062,7 +1054,7 @@ pgconn_prepare(int argc, VALUE *argv, VALUE self)
 
 	if(! NIL_P(in_paramtypes)) {
 		Check_Type(in_paramtypes, T_ARRAY);
-		nParams = RARRAY(in_paramtypes)->len;
+		nParams = RARRAY_LEN(in_paramtypes);
 		paramTypes = ALLOC_N(Oid, nParams); 
 		for(i = 0; i < nParams; i++) {
 			param = rb_ary_entry(in_paramtypes, i);
@@ -1076,7 +1068,7 @@ pgconn_prepare(int argc, VALUE *argv, VALUE self)
 	result = PQprepare(conn, StringValuePtr(name), StringValuePtr(command),
 			nParams, paramTypes);
 
-	free(paramTypes);
+	xfree(paramTypes);
 
 	rb_pgresult = new_pgresult(result);
 	pgresult_check(self, rb_pgresult);
@@ -1148,7 +1140,7 @@ pgconn_exec_prepared(int argc, VALUE *argv, VALUE self)
 	rb_gc_register_address(&gc_array);
 	sym_value = ID2SYM(rb_intern("value"));
 	sym_format = ID2SYM(rb_intern("format"));
-	nParams = RARRAY(params)->len;
+	nParams = RARRAY_LEN(params);
 	paramValues = ALLOC_N(char *, nParams);
 	paramLengths = ALLOC_N(int, nParams);
 	paramFormats = ALLOC_N(int, nParams);
@@ -1193,9 +1185,9 @@ pgconn_exec_prepared(int argc, VALUE *argv, VALUE self)
 
 	rb_gc_unregister_address(&gc_array);
 
-	free(paramValues);
-	free(paramLengths);
-	free(paramFormats);
+	xfree(paramValues);
+	xfree(paramLengths);
+	xfree(paramFormats);
 
 	rb_pgresult = new_pgresult(result);
 	pgresult_check(self, rb_pgresult);
@@ -1327,7 +1319,7 @@ pgconn_s_escape(VALUE self, VALUE string)
 			RSTRING_LEN(string));
 	}
 	result = rb_str_new(escaped, size);
-	free(escaped);
+	xfree(escaped);
 	OBJ_INFECT(result, string);
 	return result;
 }
@@ -1488,7 +1480,7 @@ pgconn_send_query(int argc, VALUE *argv, VALUE self)
 	sym_type = ID2SYM(rb_intern("type"));
 	sym_value = ID2SYM(rb_intern("value"));
 	sym_format = ID2SYM(rb_intern("format"));
-	nParams = RARRAY(params)->len;
+	nParams = RARRAY_LEN(params);
 	paramTypes = ALLOC_N(Oid, nParams); 
 	paramValues = ALLOC_N(char *, nParams);
 	paramLengths = ALLOC_N(int, nParams);
@@ -1541,10 +1533,10 @@ pgconn_send_query(int argc, VALUE *argv, VALUE self)
 
 	rb_gc_unregister_address(&gc_array);	
 
-	free(paramTypes);
-	free(paramValues);
-	free(paramLengths);
-	free(paramFormats);
+	xfree(paramTypes);
+	xfree(paramValues);
+	xfree(paramLengths);
+	xfree(paramFormats);
 
 	if(result == 0) {
 		error = rb_exc_new2(rb_ePGError, PQerrorMessage(conn));
@@ -1592,7 +1584,7 @@ pgconn_send_prepare(int argc, VALUE *argv, VALUE self)
 
 	if(! NIL_P(in_paramtypes)) {
 		Check_Type(in_paramtypes, T_ARRAY);
-		nParams = RARRAY(in_paramtypes)->len;
+		nParams = RARRAY_LEN(in_paramtypes);
 		paramTypes = ALLOC_N(Oid, nParams); 
 		for(i = 0; i < nParams; i++) {
 			param = rb_ary_entry(in_paramtypes, i);
@@ -1606,7 +1598,7 @@ pgconn_send_prepare(int argc, VALUE *argv, VALUE self)
 	result = PQsendPrepare(conn, StringValuePtr(name), StringValuePtr(command),
 			nParams, paramTypes);
 
-	free(paramTypes);
+	xfree(paramTypes);
 
 	if(result == 0) {
 		error = rb_exc_new2(rb_ePGError, PQerrorMessage(conn));
@@ -1681,7 +1673,7 @@ pgconn_send_query_prepared(int argc, VALUE *argv, VALUE self)
 	rb_gc_register_address(&gc_array);
 	sym_value = ID2SYM(rb_intern("value"));
 	sym_format = ID2SYM(rb_intern("format"));
-	nParams = RARRAY(params)->len;
+	nParams = RARRAY_LEN(params);
 	paramValues = ALLOC_N(char *, nParams);
 	paramLengths = ALLOC_N(int, nParams);
 	paramFormats = ALLOC_N(int, nParams);
@@ -1727,9 +1719,9 @@ pgconn_send_query_prepared(int argc, VALUE *argv, VALUE self)
 
 	rb_gc_unregister_address(&gc_array);
 
-	free(paramValues);
-	free(paramLengths);
-	free(paramFormats);
+	xfree(paramValues);
+	xfree(paramLengths);
+	xfree(paramFormats);
 
 	if(result == 0) {
 		error = rb_exc_new2(rb_ePGError, PQerrorMessage(conn));
@@ -2138,7 +2130,6 @@ pgconn_set_error_verbosity(VALUE self, VALUE in_verbosity)
 static VALUE
 pgconn_trace(VALUE self, VALUE stream)
 {
-	FILE *fp;
 	VALUE fileno;
 	FILE *new_fp;
 	int old_fd, new_fd;
@@ -2658,15 +2649,15 @@ static VALUE
 pgconn_loread(VALUE self, VALUE in_lo_desc, VALUE in_len)
 {
 	int ret;
-	PGconn *conn = get_pgconn(self);
+  PGconn *conn = get_pgconn(self);
 	int len = NUM2INT(in_len);
 	int lo_desc = NUM2INT(in_lo_desc);
 	VALUE str;
 	char *buffer;
 
-	buffer = malloc(len);
+  buffer = ALLOC_N(char, len);
 	if(buffer == NULL)
-		rb_raise(rb_eNoMemError, "Malloc failed!");
+		rb_raise(rb_eNoMemError, "ALLOC failed!");
 
 	if (len < 0){
 		rb_raise(rb_ePGError,"nagative length %d given", len);
@@ -2676,12 +2667,12 @@ pgconn_loread(VALUE self, VALUE in_lo_desc, VALUE in_len)
 		rb_raise(rb_ePGError, "lo_read failed");
 
 	if(ret == 0) {
-		free(buffer);
+		xfree(buffer);
 		return Qnil;
 	}
 
 	str = rb_tainted_str_new(buffer, len);
-	free(buffer);
+	xfree(buffer);
 
 	return str;
 }
@@ -2759,7 +2750,7 @@ 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)
+	if(lo_close(conn,lo_desc) < 0)
 		rb_raise(rb_ePGError,"lo_close failed");
 
 	return Qnil;