do_postgres 0.10.5-x86-mingw32 → 0.10.6-x86-mingw32

data/ChangeLog.markdown

@@ -1,3 +1,8 @@
+## 0.10.6 2011-05-22
+
+Bugfixes
+* Fix an issue on some platforms when multiple DO drivers are loaded
+
 ## 0.10.5 2011-05-03
 
 No changes

data/Rakefile

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'rubygems'
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/ext/do_postgres/do_common.c

@@ -45,6 +45,11 @@ VALUE rb_cBigDecimal;
  * Common Functions
  */
 
+
+VALUE data_objects_const_get(VALUE scope, const char *constant) {
+  return rb_funcall(scope, ID_CONST_GET, 1, rb_str_new2(constant));
+}
+
 void data_objects_debug(VALUE connection, VALUE string, struct timeval *start) {
   struct timeval stop;
   VALUE message;
@@ -57,7 +62,7 @@ void data_objects_debug(VALUE connection, VALUE string, struct timeval *start) {
   rb_funcall(connection, ID_LOG, 1, message);
 }
 
-void do_raise_error(VALUE self, const struct errcodes *errors, int errnum, const char *message, VALUE query, VALUE state) {
+void data_objects_raise_error(VALUE self, const struct errcodes *errors, int errnum, const char *message, VALUE query, VALUE state) {
   const char *exception_type = "SQLError";
   const struct errcodes *e;
 
@@ -72,7 +77,7 @@ void do_raise_error(VALUE self, const struct errcodes *errors, int errnum, const
   VALUE uri = rb_funcall(rb_iv_get(self, "@connection"), rb_intern("to_s"), 0);
 
   VALUE exception = rb_funcall(
-    do_const_get(mDO, exception_type),
+    data_objects_const_get(mDO, exception_type),
     ID_NEW,
     5,
     rb_str_new2(message),
@@ -85,7 +90,7 @@ void do_raise_error(VALUE self, const struct errcodes *errors, int errnum, const
   rb_exc_raise(exception);
 }
 
-char *get_uri_option(VALUE query_hash, const char *key) {
+char *data_objects_get_uri_option(VALUE query_hash, const char *key) {
   VALUE query_value;
   char *value = NULL;
 
@@ -102,7 +107,7 @@ char *get_uri_option(VALUE query_hash, const char *key) {
   return value;
 }
 
-void assert_file_exists(char *file, const char *message) {
+void data_objects_assert_file_exists(char *file, const char *message) {
   if (file) {
     if (rb_funcall(rb_cFile, rb_intern("exist?"), 1, rb_str_new2(file)) == Qfalse) {
       rb_raise(rb_eArgError, "%s", message);
@@ -110,7 +115,7 @@ void assert_file_exists(char *file, const char *message) {
   }
 }
 
-VALUE build_query_from_args(VALUE klass, int count, VALUE *args) {
+VALUE data_objects_build_query_from_args(VALUE klass, int count, VALUE *args) {
   VALUE array = rb_ary_new();
   int i;
 
@@ -123,7 +128,7 @@ VALUE build_query_from_args(VALUE klass, int count, VALUE *args) {
 
 // Find the greatest common denominator and reduce the provided numerator and denominator.
 // This replaces calles to Rational.reduce! which does the same thing, but really slowly.
-void reduce(do_int64 *numerator, do_int64 *denominator) {
+void data_objects_reduce(do_int64 *numerator, do_int64 *denominator) {
   do_int64 a = *numerator, b = *denominator, c;
 
   while (a != 0) {
@@ -137,7 +142,7 @@ void reduce(do_int64 *numerator, do_int64 *denominator) {
 }
 
 // Generate the date integer which Date.civil_to_jd returns
-int jd_from_date(int year, int month, int day) {
+int data_objects_jd_from_date(int year, int month, int day) {
   int a, b;
 
   if (month <= 2) {
@@ -151,24 +156,24 @@ int jd_from_date(int year, int month, int day) {
   return (int)(floor(365.25 * (year + 4716)) + floor(30.6001 * (month + 1)) + day + b - 1524);
 }
 
-VALUE seconds_to_offset(long seconds_offset) {
+VALUE data_objects_seconds_to_offset(long seconds_offset) {
   do_int64 num = seconds_offset;
   do_int64 den = 86400;
 
-  reduce(&num, &den);
+  data_objects_reduce(&num, &den);
   return rb_funcall(rb_mKernel, ID_RATIONAL, 2, rb_ll2inum(num), rb_ll2inum(den));
 }
 
-VALUE timezone_to_offset(int hour_offset, int minute_offset) {
+VALUE data_objects_timezone_to_offset(int hour_offset, int minute_offset) {
   do_int64 seconds = 0;
 
   seconds += hour_offset * 3600;
   seconds += minute_offset * 60;
 
-  return seconds_to_offset(seconds);
+  return data_objects_seconds_to_offset(seconds);
 }
 
-VALUE parse_date(const char *date) {
+VALUE data_objects_parse_date(const char *date) {
   static char const *const _fmt_date = "%4d-%2d-%2d";
   int year = 0, month = 0, day = 0;
   int jd, ajd;
@@ -180,14 +185,14 @@ VALUE parse_date(const char *date) {
       return Qnil;
   }
 
-  jd       = jd_from_date(year, month, day);
+  jd       = data_objects_jd_from_date(year, month, day);
   ajd      = (jd * 2) - 1;        // Math from Date.jd_to_ajd
   rational = rb_funcall(rb_mKernel, ID_RATIONAL, 2, INT2NUM(ajd), INT2NUM(2));
 
   return rb_funcall(rb_cDate, ID_NEW_DATE, 3, rational, INT2NUM(0), INT2NUM(2299161));
 }
 
-VALUE parse_time(const char *date) {
+VALUE data_objects_parse_time(const char *date) {
   static char const* const _fmt_datetime = "%4d-%2d-%2d %2d:%2d:%2d%7lf";
   int year = 0, month = 0, day = 0, hour = 0, min = 0, sec = 0, usec = 0;
   double subsec = 0;
@@ -208,7 +213,7 @@ VALUE parse_time(const char *date) {
   return rb_funcall(rb_cTime, rb_intern("local"), 7, INT2NUM(year), INT2NUM(month), INT2NUM(day), INT2NUM(hour), INT2NUM(min), INT2NUM(sec), INT2NUM(usec));
 }
 
-VALUE parse_date_time(const char *date) {
+VALUE data_objects_parse_date_time(const char *date) {
   static char const* const _fmt_datetime_tz_normal = "%4d-%2d-%2d%*c%2d:%2d:%2d%3d:%2d";
   static char const* const _fmt_datetime_tz_subsec = "%4d-%2d-%2d%*c%2d:%2d:%2d.%*d%3d:%2d";
   int tokens_read;
@@ -294,7 +299,7 @@ VALUE parse_date_time(const char *date) {
       rb_raise(eDataError, "Couldn't parse date: %s", date);
   }
 
-  jd = jd_from_date(year, month, day);
+  jd = data_objects_jd_from_date(year, month, day);
 
   /*
    * Generate ajd with fractional days for the time.
@@ -306,47 +311,47 @@ VALUE parse_date_time(const char *date) {
   num = (hour * 1440) + (min * 24);
   num -= (hour_offset * 1440) + (minute_offset * 24);
   den = (24 * 1440);
-  reduce(&num, &den);
+  data_objects_reduce(&num, &den);
 
   num = (num * 86400) + (sec * den);
   den = den * 86400;
-  reduce(&num, &den);
+  data_objects_reduce(&num, &den);
 
   num += jd * den;
 
   num = (num * 2) - den;
   den *= 2;
-  reduce(&num, &den);
+  data_objects_reduce(&num, &den);
 
   ajd = rb_funcall(rb_mKernel, ID_RATIONAL, 2, rb_ull2inum(num), rb_ull2inum(den));
-  offset = timezone_to_offset(hour_offset, minute_offset);
+  offset = data_objects_timezone_to_offset(hour_offset, minute_offset);
 
   return rb_funcall(rb_cDateTime, ID_NEW_DATE, 3, ajd, offset, INT2NUM(2299161));
 }
 
-VALUE cConnection_character_set(VALUE self) {
+VALUE data_objects_cConnection_character_set(VALUE self) {
   return rb_iv_get(self, "@encoding");
 }
 
-VALUE cConnection_is_using_socket(VALUE self) {
+VALUE data_objects_cConnection_is_using_socket(VALUE self) {
   return rb_iv_get(self, "@using_socket");
 }
 
-VALUE cConnection_ssl_cipher(VALUE self) {
+VALUE data_objects_cConnection_ssl_cipher(VALUE self) {
   return rb_iv_get(self, "@ssl_cipher");
 }
 
-VALUE cConnection_quote_time(VALUE self, VALUE value) {
+VALUE data_objects_cConnection_quote_time(VALUE self, VALUE value) {
   return rb_funcall(value, ID_STRFTIME, 1, rb_str_new2("'%Y-%m-%d %H:%M:%S'"));
 }
 
-VALUE cConnection_quote_date_time(VALUE self, VALUE value) {
+VALUE data_objects_cConnection_quote_date_time(VALUE self, VALUE value) {
   // TODO: Support non-local dates. we need to call #new_offset on the date to be
   // quoted and pass in the current locale's date offset (self.new_offset((hours * 3600).to_r / 86400)
   return rb_funcall(value, ID_STRFTIME, 1, rb_str_new2("'%Y-%m-%d %H:%M:%S'"));
 }
 
-VALUE cConnection_quote_date(VALUE self, VALUE value) {
+VALUE data_objects_cConnection_quote_date(VALUE self, VALUE value) {
   return rb_funcall(value, ID_STRFTIME, 1, rb_str_new2("'%Y-%m-%d'"));
 }
 
@@ -354,7 +359,7 @@ VALUE cConnection_quote_date(VALUE self, VALUE value) {
  * Accepts an array of Ruby types (Fixnum, Float, String, etc...) and turns them
  * into Ruby-strings so we can easily typecast later
  */
-VALUE cCommand_set_types(int argc, VALUE *argv, VALUE self) {
+VALUE data_objects_cCommand_set_types(int argc, VALUE *argv, VALUE self) {
   VALUE type_strings = rb_ary_new();
   VALUE array = rb_ary_new();
 
@@ -393,7 +398,7 @@ VALUE cCommand_set_types(int argc, VALUE *argv, VALUE self) {
   return array;
 }
 
-VALUE cReader_values(VALUE self) {
+VALUE data_objects_cReader_values(VALUE self) {
   VALUE state = rb_iv_get(self, "@opened");
   VALUE values = rb_iv_get(self, "@values");
 
@@ -404,27 +409,27 @@ VALUE cReader_values(VALUE self) {
   return rb_iv_get(self, "@values");
 }
 
-VALUE cReader_fields(VALUE self) {
+VALUE data_objects_cReader_fields(VALUE self) {
   return rb_iv_get(self, "@fields");
 }
 
-VALUE cReader_field_count(VALUE self) {
+VALUE data_objects_cReader_field_count(VALUE self) {
   return rb_iv_get(self, "@field_count");
 }
 
-void common_init(void) {
+void data_objects_common_init(void) {
   rb_require("bigdecimal");
   rb_require("rational");
   rb_require("date");
   rb_require("data_objects");
 
-  // Needed by do_const_get
+  // Needed by data_objects_const_get
   ID_CONST_GET = rb_intern("const_get");
 
   // Get references classes needed for Date/Time parsing
-  rb_cDate = do_const_get(rb_mKernel, "Date");
-  rb_cDateTime = do_const_get(rb_mKernel, "DateTime");
-  rb_cBigDecimal = do_const_get(rb_mKernel, "BigDecimal");
+  rb_cDate = data_objects_const_get(rb_mKernel, "Date");
+  rb_cDateTime = data_objects_const_get(rb_mKernel, "DateTime");
+  rb_cBigDecimal = data_objects_const_get(rb_mKernel, "BigDecimal");
 
   ID_NEW = rb_intern("new");
 #ifdef RUBY_LESS_THAN_186
@@ -439,22 +444,22 @@ void common_init(void) {
   ID_LOG = rb_intern("log");
 
   // Get references to the Extlib module
-  mExtlib = do_const_get(rb_mKernel, "Extlib");
-  rb_cByteArray = do_const_get(mExtlib, "ByteArray");
+  mExtlib = data_objects_const_get(rb_mKernel, "Extlib");
+  rb_cByteArray = data_objects_const_get(mExtlib, "ByteArray");
 
   // Get references to the DataObjects module and its classes
-  mDO = do_const_get(rb_mKernel, "DataObjects");
-  cDO_Quoting = do_const_get(mDO, "Quoting");
-  cDO_Connection = do_const_get(mDO, "Connection");
-  cDO_Command = do_const_get(mDO, "Command");
-  cDO_Result = do_const_get(mDO, "Result");
-  cDO_Reader = do_const_get(mDO, "Reader");
-  cDO_Logger = do_const_get(mDO, "Logger");
-  cDO_Logger_Message = do_const_get(cDO_Logger, "Message");
-  cDO_Extension = do_const_get(mDO, "Extension");
-
-  eConnectionError = do_const_get(mDO, "ConnectionError");
-  eDataError = do_const_get(mDO, "DataError");
+  mDO = data_objects_const_get(rb_mKernel, "DataObjects");
+  cDO_Quoting = data_objects_const_get(mDO, "Quoting");
+  cDO_Connection = data_objects_const_get(mDO, "Connection");
+  cDO_Command = data_objects_const_get(mDO, "Command");
+  cDO_Result = data_objects_const_get(mDO, "Result");
+  cDO_Reader = data_objects_const_get(mDO, "Reader");
+  cDO_Logger = data_objects_const_get(mDO, "Logger");
+  cDO_Logger_Message = data_objects_const_get(cDO_Logger, "Message");
+  cDO_Extension = data_objects_const_get(mDO, "Extension");
+
+  eConnectionError = data_objects_const_get(mDO, "ConnectionError");
+  eDataError = data_objects_const_get(mDO, "DataError");
 
   rb_global_variable(&ID_NEW_DATE);
   rb_global_variable(&ID_RATIONAL);
@@ -480,7 +485,7 @@ void common_init(void) {
 /*
  * Common typecasting logic that can be used or overriden by Adapters.
  */
-extern VALUE do_typecast(const char *value, long length, const VALUE type, int encoding) {
+extern VALUE data_objects_typecast(const char *value, long length, const VALUE type, int encoding) {
 #ifdef HAVE_RUBY_ENCODING_H
   rb_encoding *internal_encoding = rb_default_internal_encoding();
 #else
@@ -491,7 +496,7 @@ extern VALUE do_typecast(const char *value, long length, const VALUE type, int e
     return rb_cstr2inum(value, 10);
   }
   else if (type == rb_cString) {
-    return do_str_new(value, length, encoding, internal_encoding);
+    return DATA_OBJECTS_STR_NEW(value, length, encoding, internal_encoding);
   }
   else if (type == rb_cFloat) {
     return rb_float_new(rb_cstr_to_dbl(value, Qfalse));
@@ -500,13 +505,13 @@ extern VALUE do_typecast(const char *value, long length, const VALUE type, int e
     return rb_funcall(rb_cBigDecimal, ID_NEW, 1, rb_str_new(value, length));
   }
   else if (type == rb_cDate) {
-    return parse_date(value);
+    return data_objects_parse_date(value);
   }
   else if (type == rb_cDateTime) {
-    return parse_date_time(value);
+    return data_objects_parse_date_time(value);
   }
   else if (type == rb_cTime) {
-    return parse_time(value);
+    return data_objects_parse_time(value);
   }
   else if (type == rb_cTrueClass) {
     return (!value || strcmp("0", value) == 0) ? Qfalse : Qtrue;
@@ -521,6 +526,6 @@ extern VALUE do_typecast(const char *value, long length, const VALUE type, int e
     return Qnil;
   }
   else {
-    return DO_STR_NEW(value, length, encoding, internal_encoding);
+    return DATA_OBJECTS_STR_NEW(value, length, encoding, internal_encoding);
   }
 }

data/ext/do_postgres/do_common.h

@@ -3,18 +3,24 @@
 
 #include <ruby.h>
 
+// Needed for defining error.h
+struct errcodes {
+  int error_no;
+  const char *error_name;
+  const char *exception;
+};
+
+#define ERRCODE(name,message)   {name, #name, message}
+
 #ifdef _WIN32
-#define cCommand_execute cCommand_execute_sync
 typedef signed __int64 do_int64;
 #else
-#define cCommand_execute cCommand_execute_async
 typedef signed long long int do_int64;
 #endif
 
 #ifdef HAVE_RUBY_ENCODING_H
 #include <ruby/encoding.h>
-
-#define DO_STR_NEW2(str, encoding, internal_encoding) \
+#define DATA_OBJECTS_STR_NEW2(str, encoding, internal_encoding) \
   ({ \
     VALUE _string = rb_str_new2((const char *)str); \
     if(encoding != -1) { \
@@ -26,7 +32,7 @@ typedef signed long long int do_int64;
     _string; \
   })
 
-#define DO_STR_NEW(str, len, encoding, internal_encoding) \
+#define DATA_OBJECTS_STR_NEW(str, len, encoding, internal_encoding) \
   ({ \
     VALUE _string = rb_str_new((const char *)str, (long)len); \
     if(encoding != -1) { \
@@ -38,24 +44,15 @@ typedef signed long long int do_int64;
     _string; \
   })
 
-# else
+#else
 
-#define DO_STR_NEW2(str, encoding, internal_encoding) \
+#define DATA_OBJECTS_STR_NEW2(str, encoding, internal_encoding) \
   rb_str_new2((const char *)str)
 
-#define DO_STR_NEW(str, len, encoding, internal_encoding) \
+#define DATA_OBJECTS_STR_NEW(str, len, encoding, internal_encoding) \
   rb_str_new((const char *)str, (long)len)
 #endif
 
-// Needed for defining error.h
-struct errcodes {
-  int error_no;
-  const char *error_name;
-  const char *exception;
-};
-
-#define ERRCODE(name,message)   {name, #name, message}
-
 // To store rb_intern values
 extern ID ID_NEW;
 extern ID ID_NEW_DATE;
@@ -89,71 +86,37 @@ extern VALUE rb_cDateTime;
 extern VALUE rb_cBigDecimal;
 
 extern void data_objects_debug(VALUE connection, VALUE string, struct timeval *start);
-extern char *get_uri_option(VALUE query_hash, const char *key);
-extern void assert_file_exists(char *file, const char *message);
-extern VALUE build_query_from_args(VALUE klass, int count, VALUE *args);
-
-extern void reduce(do_int64 *numerator, do_int64 *denominator);
-extern int jd_from_date(int year, int month, int day);
-extern VALUE seconds_to_offset(long seconds_offset);
-extern VALUE timezone_to_offset(int hour_offset, int minute_offset);
-
-extern VALUE parse_date(const char *date);
-extern VALUE parse_time(const char *date);
-extern VALUE parse_date_time(const char *date);
-
-extern VALUE cConnection_character_set(VALUE self);
-extern VALUE cConnection_is_using_socket(VALUE self);
-extern VALUE cConnection_ssl_cipher(VALUE self);
-extern VALUE cConnection_quote_time(VALUE self, VALUE value);
-extern VALUE cConnection_quote_date_time(VALUE self, VALUE value);
-extern VALUE cConnection_quote_date(VALUE self, VALUE value);
-
-extern VALUE cCommand_set_types(int argc, VALUE *argv, VALUE self);
-
-extern VALUE cReader_values(VALUE self);
-extern VALUE cReader_fields(VALUE self);
-extern VALUE cReader_field_count(VALUE self);
-
-extern void common_init(void);
-
-static inline VALUE do_const_get(VALUE scope, const char *constant) {
-  return rb_funcall(scope, ID_CONST_GET, 1, rb_str_new2(constant));
-}
+extern char *data_objects_get_uri_option(VALUE query_hash, const char *key);
+extern void data_objects_assert_file_exists(char *file, const char *message);
+extern VALUE data_objects_build_query_from_args(VALUE klass, int count, VALUE *args);
 
-static inline VALUE do_str_new(const void *string, long length, int encoding, void *internal_encoding) {
-  VALUE new_string = rb_str_new(string, length);
+extern void data_objects_reduce(do_int64 *numerator, do_int64 *denominator);
+extern int data_objects_jd_from_date(int year, int month, int day);
+extern VALUE data_objects_seconds_to_offset(long seconds_offset);
+extern VALUE data_objects_timezone_to_offset(int hour_offset, int minute_offset);
 
-#ifdef HAVE_RUBY_ENCODING_H
-  if(encoding != -1) {
-    rb_enc_associate_index(new_string, encoding);
-  }
+extern VALUE data_objects_parse_date(const char *date);
+extern VALUE data_objects_parse_time(const char *date);
+extern VALUE data_objects_parse_date_time(const char *date);
 
-  if(internal_encoding) {
-    new_string = rb_str_export_to_enc(new_string, internal_encoding);
-  }
-#endif
+extern VALUE data_objects_cConnection_character_set(VALUE self);
+extern VALUE data_objects_cConnection_is_using_socket(VALUE self);
+extern VALUE data_objects_cConnection_ssl_cipher(VALUE self);
+extern VALUE data_objects_cConnection_quote_time(VALUE self, VALUE value);
+extern VALUE data_objects_cConnection_quote_date_time(VALUE self, VALUE value);
+extern VALUE data_objects_cConnection_quote_date(VALUE self, VALUE value);
 
-  return new_string;
-}
+extern VALUE data_objects_cCommand_set_types(int argc, VALUE *argv, VALUE self);
 
-static inline VALUE do_str_new2(const void *string, int encoding, void *internal_encoding) {
-    VALUE new_string = rb_str_new2(string);
+extern VALUE data_objects_cReader_values(VALUE self);
+extern VALUE data_objects_cReader_fields(VALUE self);
+extern VALUE data_objects_cReader_field_count(VALUE self);
 
-#ifdef HAVE_RUBY_ENCODING_H
-    if(encoding != -1) {
-      rb_enc_associate_index(new_string, encoding);
-    }
-
-    if(internal_encoding) {
-      new_string = rb_str_export_to_enc(new_string, internal_encoding);
-    }
-#endif
+extern void data_objects_common_init(void);
 
-    return new_string;
-}
+extern VALUE data_objects_const_get(VALUE scope, const char *constant);
 
-static inline void do_define_errors(VALUE scope, const struct errcodes *errors) {
+static inline void data_objects_define_errors(VALUE scope, const struct errcodes *errors) {
   const struct errcodes *e;
 
   for (e = errors; e->error_name; e++) {
@@ -161,9 +124,9 @@ static inline void do_define_errors(VALUE scope, const struct errcodes *errors)
   }
 }
 
-extern void do_raise_error(VALUE self, const struct errcodes *errors, int errnum, const char *message, VALUE query, VALUE state);
+extern void data_objects_raise_error(VALUE self, const struct errcodes *errors, int errnum, const char *message, VALUE query, VALUE state);
 
-extern VALUE do_typecast(const char *value, long length, const VALUE type, int encoding);
+extern VALUE data_objects_typecast(const char *value, long length, const VALUE type, int encoding);
 
 #define RSTRING_NOT_MODIFIED
 

data/ext/do_postgres/do_postgres.c

@@ -25,6 +25,13 @@
 #undef printf
 #endif
 
+#ifdef _WIN32
+#define do_postgres_cCommand_execute do_postgres_cCommand_execute_sync
+#else
+#define do_postgres_cCommand_execute do_postgres_cCommand_execute_async
+#endif
+
+
 #include <ruby.h>
 #include <string.h>
 #include <math.h>
@@ -37,16 +44,16 @@
 
 VALUE mPostgres;
 VALUE mEncoding;
-VALUE cConnection;
-VALUE cCommand;
-VALUE cResult;
-VALUE cReader;
+VALUE cPostgresConnection;
+VALUE cPostgresCommand;
+VALUE cPostgresResult;
+VALUE cPostgresReader;
 
-void full_connect(VALUE self, PGconn *db);
+void do_postgres_full_connect(VALUE self, PGconn *db);
 
 /* ===== Typecasting Functions ===== */
 
-VALUE infer_ruby_type(Oid type) {
+VALUE do_postgres_infer_ruby_type(Oid type) {
   switch(type) {
     case BITOID:
     case VARBITOID:
@@ -74,7 +81,7 @@ VALUE infer_ruby_type(Oid type) {
   }
 }
 
-VALUE typecast(const char *value, long length, const VALUE type, int encoding) {
+VALUE do_postgres_typecast(const char *value, long length, const VALUE type, int encoding) {
   if (type == rb_cTrueClass) {
     return *value == 't' ? Qtrue : Qfalse;
   }
@@ -87,23 +94,23 @@ VALUE typecast(const char *value, long length, const VALUE type, int encoding) {
     return byte_array;
   }
   else {
-    return do_typecast(value, length, type, encoding);
+    return data_objects_typecast(value, length, type, encoding);
   }
 }
 
-void raise_error(VALUE self, PGresult *result, VALUE query) {
+void do_postgres_raise_error(VALUE self, PGresult *result, VALUE query) {
   const char *message = PQresultErrorMessage(result);
   char *sql_state = PQresultErrorField(result, PG_DIAG_SQLSTATE);
   int postgres_errno = MAKE_SQLSTATE(sql_state[0], sql_state[1], sql_state[2], sql_state[3], sql_state[4]);
 
   PQclear(result);
 
-  do_raise_error(self, errors, postgres_errno, message, query, rb_str_new2(sql_state));
+  data_objects_raise_error(self, do_postgres_errors, postgres_errno, message, query, rb_str_new2(sql_state));
 }
 
 /* ====== Public API ======= */
 
-VALUE cConnection_dispose(VALUE self) {
+VALUE do_postgres_cConnection_dispose(VALUE self) {
   VALUE connection_container = rb_iv_get(self, "@connection");
 
   if (connection_container == Qnil) {
@@ -121,7 +128,7 @@ VALUE cConnection_dispose(VALUE self) {
   return Qtrue;
 }
 
-VALUE cConnection_quote_string(VALUE self, VALUE string) {
+VALUE do_postgres_cConnection_quote_string(VALUE self, VALUE string) {
   PGconn *db = DATA_PTR(rb_iv_get(self, "@connection"));
   const char *source = rb_str_ptr_readonly(string);
   int error = 0;
@@ -154,13 +161,13 @@ VALUE cConnection_quote_string(VALUE self, VALUE string) {
   // Wrap the escaped string in single-quotes, this is DO's convention
   escaped[0] = escaped[quoted_length + 1] = '\'';
 
-  result = DO_STR_NEW(escaped, quoted_length + 2, FIX2INT(rb_iv_get(self, "@encoding_id")), NULL);
+  result = DATA_OBJECTS_STR_NEW(escaped, quoted_length + 2, FIX2INT(rb_iv_get(self, "@encoding_id")), NULL);
 
   free(escaped);
   return result;
 }
 
-VALUE cConnection_quote_byte_array(VALUE self, VALUE string) {
+VALUE do_postgres_cConnection_quote_byte_array(VALUE self, VALUE string) {
   PGconn *db = DATA_PTR(rb_iv_get(self, "@connection"));
   const unsigned char *source = (unsigned char *)rb_str_ptr_readonly(string);
   size_t source_len = rb_str_len(string);
@@ -194,7 +201,7 @@ VALUE cConnection_quote_byte_array(VALUE self, VALUE string) {
 }
 
 #ifdef _WIN32
-PGresult * cCommand_execute_sync(VALUE self, VALUE connection, PGconn *db, VALUE query) {
+PGresult * do_postgres_cCommand_execute_sync(VALUE self, VALUE connection, PGconn *db, VALUE query) {
   char *str = StringValuePtr(query);
   PGresult *response;
 
@@ -215,7 +222,7 @@ PGresult * cCommand_execute_sync(VALUE self, VALUE connection, PGconn *db, VALUE
         response = PQexec(db, str);
       }
       else {
-        full_connect(connection, db);
+        do_postgres_full_connect(connection, db);
         response = PQexec(db, str);
       }
     }
@@ -229,7 +236,7 @@ PGresult * cCommand_execute_sync(VALUE self, VALUE connection, PGconn *db, VALUE
   return response;
 }
 #else
-PGresult * cCommand_execute_async(VALUE self, VALUE connection, PGconn *db, VALUE query) {
+PGresult * do_postgres_cCommand_execute_async(VALUE self, VALUE connection, PGconn *db, VALUE query) {
   PGresult *response;
   char* str = StringValuePtr(query);
 
@@ -251,7 +258,7 @@ PGresult * cCommand_execute_async(VALUE self, VALUE connection, PGconn *db, VALU
         retval = PQsendQuery(db, str);
       }
       else {
-        full_connect(connection, db);
+        do_postgres_full_connect(connection, db);
         retval = PQsendQuery(db, str);
       }
     }
@@ -291,7 +298,7 @@ PGresult * cCommand_execute_async(VALUE self, VALUE connection, PGconn *db, VALU
 }
 #endif
 
-VALUE cConnection_initialize(VALUE self, VALUE uri) {
+VALUE do_postgres_cConnection_initialize(VALUE self, VALUE uri) {
   rb_iv_set(self, "@using_socket", Qfalse);
 
   VALUE r_host = rb_funcall(uri, rb_intern("host"), 0);
@@ -330,10 +337,10 @@ VALUE cConnection_initialize(VALUE self, VALUE uri) {
 
   rb_iv_set(self, "@query", r_query);
 
-  const char *encoding = get_uri_option(r_query, "encoding");
+  const char *encoding = data_objects_get_uri_option(r_query, "encoding");
 
   if (!encoding) {
-    encoding = get_uri_option(r_query, "charset");
+    encoding = data_objects_get_uri_option(r_query, "charset");
 
     if (!encoding) {
       encoding = "UTF-8";
@@ -344,12 +351,12 @@ VALUE cConnection_initialize(VALUE self, VALUE uri) {
 
   PGconn *db = NULL;
 
-  full_connect(self, db);
+  do_postgres_full_connect(self, db);
   rb_iv_set(self, "@uri", uri);
   return Qtrue;
 }
 
-void full_connect(VALUE self, PGconn *db) {
+void do_postgres_full_connect(VALUE self, PGconn *db) {
   VALUE r_host;
   char *host = NULL;
 
@@ -392,7 +399,7 @@ void full_connect(VALUE self, PGconn *db) {
   }
 
   VALUE r_query = rb_iv_get(self, "@query");
-  const char *search_path = get_uri_option(r_query, "search_path");
+  const char *search_path = data_objects_get_uri_option(r_query, "search_path");
 
   db = PQsetdbLogin(
     host,
@@ -420,11 +427,11 @@ void full_connect(VALUE self, PGconn *db) {
     snprintf(search_path_query, 256, "set search_path to %s;", search_path);
 
     r_query = rb_str_new2(search_path_query);
-    result = cCommand_execute(Qnil, self, db, r_query);
+    result = do_postgres_cCommand_execute(Qnil, self, db, r_query);
 
     if (PQresultStatus(result) != PGRES_COMMAND_OK) {
       free(search_path_query);
-      raise_error(self, result, r_query);
+      do_postgres_raise_error(self, result, r_query);
     }
 
     free(search_path_query);
@@ -436,21 +443,21 @@ void full_connect(VALUE self, PGconn *db) {
   VALUE r_options;
 
   r_options = rb_str_new2(backslash_off);
-  result = cCommand_execute(Qnil, self, db, r_options);
+  result = do_postgres_cCommand_execute(Qnil, self, db, r_options);
 
   if (PQresultStatus(result) != PGRES_COMMAND_OK) {
     rb_warn("%s", PQresultErrorMessage(result));
   }
 
   r_options = rb_str_new2(standard_strings_on);
-  result = cCommand_execute(Qnil, self, db, r_options);
+  result = do_postgres_cCommand_execute(Qnil, self, db, r_options);
 
   if (PQresultStatus(result) != PGRES_COMMAND_OK) {
     rb_warn("%s", PQresultErrorMessage(result));
   }
 
   r_options = rb_str_new2(warning_messages);
-  result = cCommand_execute(Qnil, self, db, r_options);
+  result = do_postgres_cCommand_execute(Qnil, self, db, r_options);
 
   if (PQresultStatus(result) != PGRES_COMMAND_OK) {
     rb_warn("%s", PQresultErrorMessage(result));
@@ -458,7 +465,7 @@ void full_connect(VALUE self, PGconn *db) {
 
   VALUE encoding = rb_iv_get(self, "@encoding");
 #ifdef HAVE_PQSETCLIENTENCODING
-  VALUE pg_encoding = rb_hash_aref(do_const_get(mEncoding, "MAP"), encoding);
+  VALUE pg_encoding = rb_hash_aref(data_objects_const_get(mEncoding, "MAP"), encoding);
 
   if (pg_encoding != Qnil) {
     if (PQsetClientEncoding(db, rb_str_ptr_readonly(pg_encoding))) {
@@ -485,7 +492,7 @@ void full_connect(VALUE self, PGconn *db) {
   rb_iv_set(self, "@connection", Data_Wrap_Struct(rb_cObject, 0, 0, db));
 }
 
-VALUE cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
+VALUE do_postgres_cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
   VALUE connection = rb_iv_get(self, "@connection");
   VALUE postgres_connection = rb_iv_get(connection, "@connection");
 
@@ -493,12 +500,12 @@ VALUE cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
     rb_raise(eConnectionError, "This connection has already been closed.");
   }
 
-  VALUE query = build_query_from_args(self, argc, argv);
+  VALUE query = data_objects_build_query_from_args(self, argc, argv);
   PGconn *db = DATA_PTR(postgres_connection);
   PGresult *response;
   int status;
 
-  response = cCommand_execute(self, connection, db, query);
+  response = do_postgres_cCommand_execute(self, connection, db, query);
   status = PQresultStatus(response);
 
   VALUE affected_rows = Qnil;
@@ -519,14 +526,14 @@ VALUE cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
     affected_rows = INT2NUM(atoi(PQcmdTuples(response)));
   }
   else {
-    raise_error(self, response, query);
+    do_postgres_raise_error(self, response, query);
   }
 
   PQclear(response);
-  return rb_funcall(cResult, ID_NEW, 3, self, affected_rows, insert_id);
+  return rb_funcall(cPostgresResult, ID_NEW, 3, self, affected_rows, insert_id);
 }
 
-VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
+VALUE do_postgres_cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
   VALUE connection = rb_iv_get(self, "@connection");
   VALUE postgres_connection = rb_iv_get(connection, "@connection");
 
@@ -534,16 +541,16 @@ VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
     rb_raise(eConnectionError, "This connection has already been closed.");
   }
 
-  VALUE query = build_query_from_args(self, argc, argv);
+  VALUE query = data_objects_build_query_from_args(self, argc, argv);
   PGconn *db = DATA_PTR(postgres_connection);
-  PGresult *response = cCommand_execute(self, connection, db, query);
+  PGresult *response = do_postgres_cCommand_execute(self, connection, db, query);
 
   if (PQresultStatus(response) != PGRES_TUPLES_OK) {
-    raise_error(self, response, query);
+    do_postgres_raise_error(self, response, query);
   }
 
   int field_count = PQnfields(response);
-  VALUE reader = rb_funcall(cReader, ID_NEW, 0);
+  VALUE reader = rb_funcall(cPostgresReader, ID_NEW, 0);
 
   rb_iv_set(reader, "@connection", connection);
   rb_iv_set(reader, "@reader", Data_Wrap_Struct(rb_cObject, 0, 0, response));
@@ -572,7 +579,7 @@ VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
     rb_ary_push(field_names, rb_str_new2(PQfname(response, i)));
 
     if (infer_types == 1) {
-      rb_ary_push(field_types, infer_ruby_type(PQftype(response, i)));
+      rb_ary_push(field_types, do_postgres_infer_ruby_type(PQftype(response, i)));
     }
   }
 
@@ -582,7 +589,7 @@ VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
   return reader;
 }
 
-VALUE cReader_close(VALUE self) {
+VALUE do_postgres_cReader_close(VALUE self) {
   VALUE reader_container = rb_iv_get(self, "@reader");
 
   if (reader_container == Qnil) {
@@ -602,7 +609,7 @@ VALUE cReader_close(VALUE self) {
   return Qtrue;
 }
 
-VALUE cReader_next(VALUE self) {
+VALUE do_postgres_cReader_next(VALUE self) {
   PGresult *reader = DATA_PTR(rb_iv_get(self, "@reader"));
 
   int row_count = NUM2INT(rb_iv_get(self, "@row_count"));
@@ -636,7 +643,7 @@ VALUE cReader_next(VALUE self) {
 
     // Always return nil if the value returned from Postgres is null
     if (!PQgetisnull(reader, position, i)) {
-      value = typecast(PQgetvalue(reader, position, i), PQgetlength(reader, position, i), field_type, enc);
+      value = do_postgres_typecast(PQgetvalue(reader, position, i), PQgetlength(reader, position, i), field_type, enc);
     }
     else {
       value = Qnil;
@@ -651,34 +658,34 @@ VALUE cReader_next(VALUE self) {
 }
 
 void Init_do_postgres() {
-  common_init();
+  data_objects_common_init();
 
   mPostgres = rb_define_module_under(mDO, "Postgres");
   mEncoding = rb_define_module_under(mPostgres, "Encoding");
 
-  cConnection = rb_define_class_under(mPostgres, "Connection", cDO_Connection);
-  rb_define_method(cConnection, "initialize", cConnection_initialize, 1);
-  rb_define_method(cConnection, "dispose", cConnection_dispose, 0);
-  rb_define_method(cConnection, "character_set", cConnection_character_set , 0);
-  rb_define_method(cConnection, "quote_string", cConnection_quote_string, 1);
-  rb_define_method(cConnection, "quote_byte_array", cConnection_quote_byte_array, 1);
+  cPostgresConnection = rb_define_class_under(mPostgres, "Connection", cDO_Connection);
+  rb_define_method(cPostgresConnection, "initialize", do_postgres_cConnection_initialize, 1);
+  rb_define_method(cPostgresConnection, "dispose", do_postgres_cConnection_dispose, 0);
+  rb_define_method(cPostgresConnection, "character_set", data_objects_cConnection_character_set , 0);
+  rb_define_method(cPostgresConnection, "quote_string", do_postgres_cConnection_quote_string, 1);
+  rb_define_method(cPostgresConnection, "quote_byte_array", do_postgres_cConnection_quote_byte_array, 1);
 
-  cCommand = rb_define_class_under(mPostgres, "Command", cDO_Command);
-  rb_define_method(cCommand, "set_types", cCommand_set_types, -1);
-  rb_define_method(cCommand, "execute_non_query", cCommand_execute_non_query, -1);
-  rb_define_method(cCommand, "execute_reader", cCommand_execute_reader, -1);
+  cPostgresCommand = rb_define_class_under(mPostgres, "Command", cDO_Command);
+  rb_define_method(cPostgresCommand, "set_types", data_objects_cCommand_set_types, -1);
+  rb_define_method(cPostgresCommand, "execute_non_query", do_postgres_cCommand_execute_non_query, -1);
+  rb_define_method(cPostgresCommand, "execute_reader", do_postgres_cCommand_execute_reader, -1);
 
-  cResult = rb_define_class_under(mPostgres, "Result", cDO_Result);
+  cPostgresResult = rb_define_class_under(mPostgres, "Result", cDO_Result);
 
-  cReader = rb_define_class_under(mPostgres, "Reader", cDO_Reader);
-  rb_define_method(cReader, "close", cReader_close, 0);
-  rb_define_method(cReader, "next!", cReader_next, 0);
-  rb_define_method(cReader, "values", cReader_values, 0);
-  rb_define_method(cReader, "fields", cReader_fields, 0);
-  rb_define_method(cReader, "field_count", cReader_field_count, 0);
+  cPostgresReader = rb_define_class_under(mPostgres, "Reader", cDO_Reader);
+  rb_define_method(cPostgresReader, "close", do_postgres_cReader_close, 0);
+  rb_define_method(cPostgresReader, "next!", do_postgres_cReader_next, 0);
+  rb_define_method(cPostgresReader, "values", data_objects_cReader_values, 0);
+  rb_define_method(cPostgresReader, "fields", data_objects_cReader_fields, 0);
+  rb_define_method(cPostgresReader, "field_count", data_objects_cReader_field_count, 0);
 
-  rb_global_variable(&cResult);
-  rb_global_variable(&cReader);
+  rb_global_variable(&cPostgresResult);
+  rb_global_variable(&cPostgresReader);
 
-  do_define_errors(mPostgres, errors);
+  data_objects_define_errors(mPostgres, do_postgres_errors);
 }

data/ext/do_postgres/error.h

@@ -3,7 +3,7 @@
 
 #include "do_common.h"
 
-static struct errcodes errors[] = {
+static struct errcodes do_postgres_errors[] = {
 #ifdef ERRCODE_CONNECTION_EXCEPTION
   ERRCODE(ERRCODE_CONNECTION_EXCEPTION, "ConnectionError"),
 #endif

data/lib/do_postgres/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Postgres
-    VERSION = '0.10.5'
+    VERSION = '0.10.6'
   end
 end

data/tasks/compile.rake

@@ -70,7 +70,7 @@ begin
     ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
     ext.java_compiling do |gem|
       gem.add_dependency 'jdbc-postgres', '>=8.2'
-      gem.add_dependency 'do_jdbc',       '0.10.5'
+      gem.add_dependency 'do_jdbc',       '0.10.6'
     end
   end
 rescue LoadError

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: do_postgres
 version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: false
+  hash: 59
+  prerelease: 
   segments: 
   - 0
   - 10
-  - 5
-  version: 0.10.5
+  - 6
+  version: 0.10.6
 platform: x86-mingw32
 authors: 
 - Dirkjan Bussink
@@ -19,22 +19,23 @@ date: 2011-03-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 59
         segments: 
         - 0
         - 10
-        - 5
-        version: 0.10.5
-  type: :runtime
+        - 6
+        version: 0.10.6
   name: data_objects
-  prerelease: false
   version_requirements: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +46,11 @@ dependencies:
         - 2
         - 5
         version: "2.5"
-  type: :development
   name: rspec
-  prerelease: false
   version_requirements: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -60,10 +61,9 @@ dependencies:
         - 0
         - 7
         version: "0.7"
-  type: :development
   name: rake-compiler
-  prerelease: false
   version_requirements: *id003
+  prerelease: false
 description: Implements the DataObjects API for PostgreSQL
 email: d.bussink@gmail.com
 executables: []
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: DataObjects PostgreSQL Driver