do_postgres 0.9.5 → 0.9.6

data/Rakefile

@@ -40,7 +40,44 @@ task :uninstall => [ :clobber ] do
 end
 
 desc 'Run specifications'
-Spec::Rake::SpecTask.new(:spec => [ :compile ]) do |t|
-  t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-  t.spec_files = Pathname.glob(Pathname.new(__FILE__).dirname + 'spec/**/*_spec.rb')
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.spec_opts << '--format' << 'specdoc' << '--colour'
+  t.spec_opts << '--loadby' << 'random'
+  t.spec_files = Pathname.glob(ENV['FILES'] || 'spec/**/*_spec.rb')
+
+  begin
+    t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true
+    t.rcov_opts << '--exclude' << 'spec'
+    t.rcov_opts << '--text-summary'
+    t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+  rescue Exception
+    # rcov not installed
+  end
 end
+
+namespace :ci do
+
+  task :prepare do
+    rm_rf ROOT + "ci"
+    mkdir_p ROOT + "ci"
+    mkdir_p ROOT + "ci/doc"
+    mkdir_p ROOT + "ci/cyclomatic"
+    mkdir_p ROOT + "ci/token"
+  end
+
+  task :publish do
+    out = ENV['CC_BUILD_ARTIFACTS'] || "out"
+    mkdir_p out unless File.directory? out
+
+    mv "ci/rspec_report.html", "#{out}/rspec_report.html"
+    mv "ci/coverage", "#{out}/coverage"
+  end
+
+  task :spec => :prepare do
+    Rake::Task[:spec].invoke
+    mv ROOT + "coverage", ROOT + "ci/coverage"
+  end
+
+end
+
+task :ci => ["ci:spec"]

data/ext/do_postgres_ext.c

@@ -17,6 +17,7 @@
 #define CONST_GET(scope, constant) (rb_funcall(scope, ID_CONST_GET, 1, rb_str_new2(constant)))
 #define POSTGRES_CLASS(klass, parent) (rb_define_class_under(mPostgres, klass, parent))
 #define DEBUG(value) data_objects_debug(value)
+#define RUBY_CLASS(name) rb_const_get(rb_cObject, rb_intern(name))
 
 #ifdef _WIN32
 #define do_int64 signed __int64
@@ -29,6 +30,8 @@ static ID ID_NEW_DATE;
 static ID ID_LOGGER;
 static ID ID_DEBUG;
 static ID ID_LEVEL;
+static ID ID_TO_S;
+static ID ID_PARSE;
 
 static VALUE mDO;
 static VALUE cDO_Quoting;
@@ -41,6 +44,7 @@ static VALUE rb_cDate;
 static VALUE rb_cDateTime;
 static VALUE rb_cRational;
 static VALUE rb_cBigDecimal;
+static VALUE rb_cCGI;
 
 static VALUE mPostgres;
 static VALUE cConnection;
@@ -210,9 +214,9 @@ static VALUE parse_time(char *date) {
 
 	if (0 != strchr(date, '.')) {
 		// right padding usec with 0. e.g. '012' will become 12000 microsecond, since Time#local use microsecond
-	  sscanf(date, "%4d-%2d-%2d %2d:%2d:%2d.%s", &year, &month, &day, &hour, &min, &sec, subsec);
-      usec = atoi(subsec);
-      usec *= pow(10, (6 - strlen(subsec)));
+		sscanf(date, "%4d-%2d-%2d %2d:%2d:%2d.%s", &year, &month, &day, &hour, &min, &sec, subsec);
+			usec = atoi(subsec);
+			usec *= pow(10, (6 - strlen(subsec)));
 	} else {
 		sscanf(date, "%4d-%2d-%2d %2d:%2d:%2d", &year, &month, &day, &hour, &min, &sec);
 		usec = 0;
@@ -262,7 +266,7 @@ static VALUE infer_ruby_type(Oid type) {
 static VALUE typecast(char *value, char *type) {
 
 	if ( strcmp(type, "Class") == 0) {
-	  return rb_funcall(mDO, rb_intern("find_const"), 1, TAINTED_STRING(value));
+		return rb_funcall(mDO, rb_intern("find_const"), 1, TAINTED_STRING(value));
 	} else if ( strcmp(type, "Integer") == 0 || strcmp(type, "Fixnum") == 0 || strcmp(type, "Bignum") == 0 ) {
 		return rb_cstr2inum(value, 10);
 	} else if ( strcmp(type, "Float") == 0 ) {
@@ -283,65 +287,30 @@ static VALUE typecast(char *value, char *type) {
 
 }
 
-/* ====== Public API ======= */
-
-static VALUE cConnection_initialize(VALUE self, VALUE uri) {
-	VALUE r_host, r_user, r_password, r_path, r_port;
-	char *host = NULL, *user = NULL, *password = NULL, *path;
-	char *database = "", *port = "5432";
+// Pull an option out of a querystring-formmated option list using CGI::parse
+static char * get_uri_option(VALUE querystring, char * key) {
+  VALUE options_hash, option_value;
 
-	PGconn *db;
+  char * value = NULL;
 
-	r_host = rb_funcall(uri, rb_intern("host"), 0);
-	if ( Qnil != r_host && "localhost" != StringValuePtr(r_host) ) {
-		host = StringValuePtr(r_host);
-	}
-
-	r_user = rb_funcall(uri, rb_intern("user"), 0);
-	if (Qnil != r_user) {
-		user = StringValuePtr(r_user);
-	}
-
-	r_password = rb_funcall(uri, rb_intern("password"), 0);
-	if (Qnil != r_password) {
-		password = StringValuePtr(r_password);
-	}
+  // Ensure that we're dealing with a string
+  querystring = rb_funcall(querystring, ID_TO_S, 0);
 
-	r_path = rb_funcall(uri, rb_intern("path"), 0);
-	path = StringValuePtr(r_path);
-	if (Qnil != r_path) {
-		database = strtok(path, "/");
-	}
+  options_hash = rb_funcall(rb_cCGI, ID_PARSE, 1, querystring);
 
-	if (NULL == database || 0 == strlen(database)) {
-		rb_raise(ePostgresError, "Database must be specified");
-	}
+  // TODO: rb_hash_aref always returns an array?
+  option_value = rb_ary_entry(rb_hash_aref(options_hash, RUBY_STRING(key)), 0);
 
-	r_port = rb_funcall(uri, rb_intern("port"), 0);
-	if (Qnil != r_port) {
-		r_port = rb_funcall(r_port, rb_intern("to_s"), 0);
-		port = StringValuePtr(r_port);
-	}
+  if (Qnil != option_value) {
+    value = StringValuePtr(option_value);
+  }
 
-	db = PQsetdbLogin(
-		host,
-		port,
-		NULL,
-		NULL,
-		database,
-		user,
-		password
-	);
+  return value;
+}
 
-	if ( PQstatus(db) == CONNECTION_BAD ) {
-		rb_raise(ePostgresError, PQerrorMessage(db));
-	}
+/* ====== Public API ======= */
 
-	rb_iv_set(self, "@uri", uri);
-	rb_iv_set(self, "@connection", Data_Wrap_Struct(rb_cObject, 0, 0, db));
 
-	return Qtrue;
-}
 
 static VALUE cConnection_dispose(VALUE self) {
 	PGconn *db = DATA_PTR(rb_iv_get(self, "@connection"));
@@ -393,6 +362,132 @@ static VALUE cCommand_quote_string(VALUE self, VALUE string) {
 	return result;
 }
 
+static PGresult* cCommand_execute_async(PGconn *db, VALUE query) {
+	int socket_fd;
+	int retval;
+	fd_set rset;
+	PGresult *response;          
+	char* str = StringValuePtr(query);
+	while ((response = PQgetResult(db)) != NULL) {
+		PQclear(response);
+	}
+
+	retval = PQsendQuery(db, str);
+	data_objects_debug(query);
+
+	if (!retval) {
+		rb_raise(ePostgresError, PQerrorMessage(db));
+	}
+
+	socket_fd = PQsocket(db);
+
+	for(;;) {
+			FD_ZERO(&rset);
+			FD_SET(socket_fd, &rset);
+			retval = rb_thread_select(socket_fd + 1, &rset, NULL, NULL, NULL);
+			if (retval < 0) {
+					rb_sys_fail(0);
+			}
+
+			if (retval == 0) {
+					continue;
+			}
+
+			if (PQconsumeInput(db) == 0) {
+					rb_raise(ePostgresError, PQerrorMessage(db));
+			}
+
+			if (PQisBusy(db) == 0) {
+					break;
+			}
+	}
+
+	return PQgetResult(db);
+}
+
+static VALUE cConnection_initialize(VALUE self, VALUE uri) { 
+  PGresult *result = NULL;
+	VALUE r_host, r_user, r_password, r_path, r_port, r_options, r_query;
+	char *host = NULL, *user = NULL, *password = NULL, *path;
+	char *database = "", *port = "5432";
+	char *search_path = NULL;
+  char *search_path_query = NULL;
+	PGconn *db;             
+	      
+	r_host = rb_funcall(uri, rb_intern("host"), 0);
+	if ( Qnil != r_host && "localhost" != StringValuePtr(r_host) ) {
+		host = StringValuePtr(r_host);
+	}
+
+	r_user = rb_funcall(uri, rb_intern("user"), 0);
+	if (Qnil != r_user) {
+		user = StringValuePtr(r_user);
+	}
+
+	r_password = rb_funcall(uri, rb_intern("password"), 0);
+	if (Qnil != r_password) {
+		password = StringValuePtr(r_password);
+	}
+
+	r_path = rb_funcall(uri, rb_intern("path"), 0);
+	path = StringValuePtr(r_path);
+	if (Qnil != r_path) {
+		database = strtok(path, "/");
+	}
+
+	if (NULL == database || 0 == strlen(database)) {
+		rb_raise(ePostgresError, "Database must be specified");
+	}
+
+	r_port = rb_funcall(uri, rb_intern("port"), 0);
+	if (Qnil != r_port) {
+		r_port = rb_funcall(r_port, rb_intern("to_s"), 0);
+		port = StringValuePtr(r_port);
+	}
+	
+  // Pull the querystring off the URI
+  r_options = rb_funcall(uri, rb_intern("query"), 0);
+  
+  search_path = get_uri_option(r_options, "search_path");
+
+	db = PQsetdbLogin(
+		host,
+		port,
+		NULL,
+		NULL,
+		database,
+		user,
+		password
+	);
+
+	if ( PQstatus(db) == CONNECTION_BAD ) {
+		rb_raise(ePostgresError, PQerrorMessage(db));
+	}
+	
+	if (search_path != NULL) {
+    search_path_query = (char *) malloc(256 * sizeof(char));    
+    memset(search_path_query, 0, 256); 
+    sprintf(search_path_query, "set search_path to %s;", search_path);
+    r_query = rb_str_new(search_path_query, strlen(search_path_query) + 1);  
+    result = cCommand_execute_async(db, r_query);    
+    // printf("status = %s\n", PQresStatus(PQresultStatus(result)));
+    // printf("result msg: %s\n", PQresultErrorMessage(result));
+    
+    if (PQresultStatus(result) != PGRES_COMMAND_OK) {
+      free(search_path_query);
+      rb_raise(ePostgresError, PQresultErrorMessage(result));
+    }
+    
+    free(search_path_query); 
+  }
+
+	rb_iv_set(self, "@uri", uri);
+	rb_iv_set(self, "@connection", Data_Wrap_Struct(rb_cObject, 0, 0, db));
+ 
+
+	return Qtrue;
+}
+
 static VALUE cCommand_execute_non_query(int argc, VALUE *argv[], VALUE self) {
 	PGconn *db = DATA_PTR(rb_iv_get(rb_iv_get(self, "@connection"), "@connection"));
 	PGresult *response;
@@ -402,9 +497,8 @@ static VALUE cCommand_execute_non_query(int argc, VALUE *argv[], VALUE self) {
 	int insert_id;
 
 	VALUE query = build_query_from_args(self, argc, argv);
-	data_objects_debug(query);
 
-	response = PQexec(db, StringValuePtr(query));
+	response = cCommand_execute_async(db, query);
 
 	status = PQresultStatus(response);
 
@@ -439,9 +533,8 @@ static VALUE cCommand_execute_reader(int argc, VALUE *argv[], VALUE self) {
 	PGresult *response;
 
 	query = build_query_from_args(self, argc, argv);
-	data_objects_debug(query);
 
-	response = PQexec(db, StringValuePtr(query));
+	response = cCommand_execute_async(db, query);
 
 	if ( PQresultStatus(response) != PGRES_TUPLES_OK ) {
 		char *message = PQresultErrorMessage(response);
@@ -566,6 +659,7 @@ void Init_do_postgres_ext() {
 	rb_require("rubygems");
 	rb_require("date");
 	rb_require("bigdecimal");
+	rb_require("cgi");
 
 	// Get references classes needed for Date/Time parsing
 	rb_cDate = CONST_GET(rb_mKernel, "Date");
@@ -573,6 +667,8 @@ void Init_do_postgres_ext() {
 	rb_cTime = CONST_GET(rb_mKernel, "Time");
 	rb_cRational = CONST_GET(rb_mKernel, "Rational");
 	rb_cBigDecimal = CONST_GET(rb_mKernel, "BigDecimal");
+	
+	rb_cCGI = RUBY_CLASS("CGI");
 
 	rb_funcall(rb_mKernel, rb_intern("require"), 1, rb_str_new2("data_objects"));
 
@@ -580,6 +676,8 @@ void Init_do_postgres_ext() {
 	ID_LOGGER = rb_intern("logger");
 	ID_DEBUG = rb_intern("debug");
 	ID_LEVEL = rb_intern("level");
+	ID_TO_S = rb_intern("to_s");
+	ID_PARSE = rb_intern("parse");
 
 	// Get references to the DataObjects module and its classes
 	mDO = CONST_GET(rb_mKernel, "DataObjects");

data/lib/do_postgres/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Postgres
-    VERSION = "0.9.5"
+    VERSION = "0.9.6"
   end
 end

data/spec/integration/do_postgres_spec.rb

@@ -4,7 +4,7 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 #
 #
 # Create a postgres db named do_test that accepts connections
-# from localhost from your current user (without password) to enable this spec.
+# from localhost from the postgres user (without password) to enable this spec.
 #
 # You also need to allow passwordless access from localhost-
 # locate the following line in your pg_hba.conf file:
@@ -20,9 +20,27 @@ describe "DataObjects::Postgres::Connection" do
   include PostgresSpecHelpers
 
   it "should connect to the db" do
-    connection = DataObjects::Connection.new("postgres://localhost/do_test")
+    connection = DataObjects::Connection.new("postgres://postgres@localhost/do_test")
     connection.close
   end
+
+  it "should be able to send querues asynchronuously in parallel" do
+    threads = []
+
+    start = Time.now
+    4.times do |i|
+      threads << Thread.new do
+        connection = DataObjects::Connection.new("postgres://postgres@localhost/do_test")
+        command = connection.create_command("SELECT pg_sleep(1)")
+        result = command.execute_non_query
+      end
+    end
+
+    threads.each{|t| t.join }
+    finish = Time.now
+    (finish - start).should < 2
+  end
+
 end
 
 describe "DataObjects::Postgres::Command" do

data/spec/integration/logging_spec.rb

@@ -4,7 +4,11 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 describe DataObjects::Postgres::Command do
 
   before(:each) do
-    @connection = DataObjects::Connection.new("postgres://localhost/do_test")
+    @connection = DataObjects::Connection.new("postgres://postgres@localhost/do_test")
+  end
+
+  after(:each) do
+    @connection.close
   end
 
   describe "Executing a Reader" do

data/spec/integration/quoting_spec.rb

@@ -4,10 +4,14 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 describe DataObjects::Postgres::Command do
 
   before(:each) do
-    @connection = DataObjects::Connection.new("postgres://localhost/do_test")
+    @connection = DataObjects::Connection.new("postgres://postgres@localhost/do_test")
     @command = @connection.create_command("INSERT INTO users (name) VALUES (?)")
   end
 
+  after(:each) do
+    @connection.close
+  end
+
   it "should properly quote a string" do
     @command.quote_string("O'Hare").should == "'O''Hare'"
     @command.quote_string("Willy O'Hare & Johnny O'Toole").should == "'Willy O''Hare & Johnny O''Toole'"

data/spec/integration/timezone_spec.rb

@@ -13,6 +13,9 @@ describe "DataObjects::Postgres::Reader" do
     @connection.create_command("INSERT INTO users (name) VALUES ('Test')").execute_non_query
   end
 
+  after :all do
+    @connection.close
+  end
 
   it "should return DateTimes using the current locale's Time Zone for TIMESTAMP WITHOUT TIME ZONE fields" do
     date = DateTime.now

data/spec/spec_helper.rb

@@ -27,7 +27,7 @@ DataObjects::Postgres.logger = DataObjects::Logger.new(log_path, 0)
 module PostgresSpecHelpers
 
   def ensure_users_table_and_return_connection
-    connection = DataObjects::Connection.new("postgres://localhost/do_test")
+    connection = DataObjects::Connection.new("postgres://postgres@localhost/do_test")
     connection.create_command("DROP TABLE users").execute_non_query rescue nil
     connection.create_command("DROP TABLE companies").execute_non_query rescue nil
     connection.create_command(<<-EOF).execute_non_query

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: do_postgres
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Bernerd Schaefer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-26 00:00:00 -05:00
+date: 2008-10-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe