do_postgres 0.10.3 → 0.10.4.rc1

data/ext/do_postgres/do_common.h

@@ -0,0 +1,170 @@
+#ifndef _DO_COMMON_H_
+#define _DO_COMMON_H_
+
+#include <ruby.h>
+
+#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) \
+  ({ \
+    VALUE _string = rb_str_new2((const char *)str); \
+    if(encoding != -1) { \
+      rb_enc_associate_index(_string, encoding); \
+    } \
+    if(internal_encoding) { \
+      _string = rb_str_export_to_enc(_string, internal_encoding); \
+    } \
+    _string; \
+  })
+
+#define DO_STR_NEW(str, len, encoding, internal_encoding) \
+  ({ \
+    VALUE _string = rb_str_new((const char *)str, (long)len); \
+    if(encoding != -1) { \
+      rb_enc_associate_index(_string, encoding); \
+    } \
+    if(internal_encoding) { \
+      _string = rb_str_export_to_enc(_string, internal_encoding); \
+    } \
+    _string; \
+  })
+
+# else
+
+#define DO_STR_NEW2(str, encoding, internal_encoding) \
+  rb_str_new2((const char *)str)
+
+#define DO_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;
+extern ID ID_CONST_GET;
+extern ID ID_RATIONAL;
+extern ID ID_ESCAPE;
+extern ID ID_STRFTIME;
+extern ID ID_LOG;
+
+// Reference to Extlib module
+extern VALUE mExtlib;
+extern VALUE rb_cByteArray;
+
+// References to DataObjects base classes
+extern VALUE mDO;
+extern VALUE mEncoding;
+extern VALUE cDO_Quoting;
+extern VALUE cDO_Connection;
+extern VALUE cDO_Command;
+extern VALUE cDO_Result;
+extern VALUE cDO_Reader;
+extern VALUE cDO_Logger;
+extern VALUE cDO_Logger_Message;
+extern VALUE cDO_Extension;
+extern VALUE eConnectionError;
+extern VALUE eDataError;
+
+// References to Ruby classes that we'll need
+extern VALUE rb_cDate;
+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));
+}
+
+static inline VALUE do_str_new(const void *string, long length, int encoding, void *internal_encoding) {
+  VALUE new_string = rb_str_new(string, length);
+
+#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
+
+  return new_string;
+}
+
+static inline VALUE do_str_new2(const void *string, int encoding, void *internal_encoding) {
+    VALUE new_string = rb_str_new2(string);
+
+#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
+
+    return new_string;
+}
+
+static inline void do_define_errors(VALUE scope, const struct errcodes *errors) {
+  const struct errcodes *e;
+
+  for (e = errors; e->error_name; e++) {
+    rb_const_set(scope, rb_intern(e->error_name), INT2NUM(e->error_no));
+  }
+}
+
+extern void do_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);
+
+#define RSTRING_NOT_MODIFIED
+
+#endif

data/ext/do_postgres/do_postgres.c

@@ -23,11 +23,6 @@
 #undef snprintf
 #undef sprintf
 #undef printf
-#define cCommand_execute cCommand_execute_sync
-#define do_int64 signed __int64
-#else
-#define cCommand_execute cCommand_execute_async
-#define do_int64 signed long long int
 #endif
 
 #include <ruby.h>
@@ -38,308 +33,20 @@
 #include "error.h"
 #include "compat.h"
 
-#define CONST_GET(scope, constant) (rb_funcall(scope, ID_CONST_GET, 1, rb_str_new2(constant)))
-#define DRIVER_CLASS(klass, parent) (rb_define_class_under(mPostgres, klass, parent))
-
-#ifdef HAVE_RUBY_ENCODING_H
-#include <ruby/encoding.h>
-
-#define DO_STR_NEW2(str, encoding, internal_encoding) \
-  ({ \
-    VALUE _string = rb_str_new2((const char *)str); \
-    if(encoding != -1) { \
-      rb_enc_associate_index(_string, encoding); \
-    } \
-    if(internal_encoding) { \
-      _string = rb_str_export_to_enc(_string, internal_encoding); \
-    } \
-    _string; \
-  })
-
-#define DO_STR_NEW(str, len, encoding, internal_encoding) \
-  ({ \
-    VALUE _string = rb_str_new((const char *)str, (long)len); \
-    if(encoding != -1) { \
-      rb_enc_associate_index(_string, encoding); \
-    } \
-    if(internal_encoding) { \
-      _string = rb_str_export_to_enc(_string, internal_encoding); \
-    } \
-    _string; \
-  })
-
-#else
-
-#define DO_STR_NEW2(str, encoding, internal_encoding) \
-  rb_str_new2((const char *)str)
-
-#define DO_STR_NEW(str, len, encoding, internal_encoding) \
-  rb_str_new((const char *)str, (long)len)
-#endif
-
-// To store rb_intern values
-static ID ID_NEW_DATE;
-static ID ID_RATIONAL;
-static ID ID_CONST_GET;
-static ID ID_NEW;
-static ID ID_ESCAPE;
-static ID ID_LOG;
-
-static VALUE mExtlib;
-static VALUE mDO;
-static VALUE mEncoding;
-static VALUE cDO_Quoting;
-static VALUE cDO_Connection;
-static VALUE cDO_Command;
-static VALUE cDO_Result;
-static VALUE cDO_Reader;
-static VALUE cDO_Logger;
-static VALUE cDO_Logger_Message;
-
-static VALUE rb_cDate;
-static VALUE rb_cDateTime;
-static VALUE rb_cBigDecimal;
-static VALUE rb_cByteArray;
-
-static VALUE mPostgres;
-static VALUE cConnection;
-static VALUE cCommand;
-static VALUE cResult;
-static VALUE cReader;
-
-static VALUE eConnectionError;
-static VALUE eDataError;
-
-static void data_objects_debug(VALUE connection, VALUE string, struct timeval* start) {
-  struct timeval stop;
-  VALUE message;
-
-  gettimeofday(&stop, NULL);
-  do_int64 duration = (stop.tv_sec - start->tv_sec) * 1000000 + stop.tv_usec - start->tv_usec;
-
-  message = rb_funcall(cDO_Logger_Message, ID_NEW, 3, string, rb_time_new(start->tv_sec, start->tv_usec), INT2NUM(duration));
-
-  rb_funcall(connection, ID_LOG, 1, message);
-}
-
-static const char * get_uri_option(VALUE query_hash, const char * key) {
-  VALUE query_value;
-  const char * value = NULL;
-
-  if(!rb_obj_is_kind_of(query_hash, rb_cHash)) { return NULL; }
-
-  query_value = rb_hash_aref(query_hash, rb_str_new2(key));
-
-  if (Qnil != query_value) {
-    value = StringValuePtr(query_value);
-  }
-
-  return value;
-}
-
-/* ====== Time/Date Parsing Helper Functions ====== */
-static void reduce( do_int64 *numerator, do_int64 *denominator ) {
-  do_int64 a, b, c;
-  a = *numerator;
-  b = *denominator;
-  while ( a != 0 ) {
-    c = a; a = b % a; b = c;
-  }
-  *numerator = *numerator / b;
-  *denominator = *denominator / b;
-}
-
-// Generate the date integer which Date.civil_to_jd returns
-static int jd_from_date(int year, int month, int day) {
-  int a, b;
-  if ( month <= 2 ) {
-    year -= 1;
-    month += 12;
-  }
-  a = year / 100;
-  b = 2 - a + (a / 4);
-  return (int) (floor(365.25 * (year + 4716)) + floor(30.6001 * (month + 1)) + day + b - 1524);
-}
-
-static VALUE parse_date(const char *date) {
-  int year, month, day;
-  int jd, ajd;
-  VALUE rational;
-
-  sscanf(date, "%4d-%2d-%2d", &year, &month, &day);
-
-  jd = jd_from_date(year, month, day);
-
-  // Math from Date.jd_to_ajd
-  ajd = jd * 2 - 1;
-  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));
-}
-
-// Creates a Rational for use as a Timezone offset to be passed to DateTime.new!
-static VALUE seconds_to_offset(do_int64 num) {
-  do_int64 den = 86400;
-  reduce(&num, &den);
-  return rb_funcall(rb_mKernel, ID_RATIONAL, 2, rb_ll2inum(num), rb_ll2inum(den));
-}
-
-static VALUE 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);
-}
-
-static VALUE parse_date_time(const char *date) {
-  VALUE ajd, offset;
-
-  int year, month, day, hour, min, sec, usec, hour_offset, minute_offset;
-  int jd;
-  do_int64 num, den;
-
-  long int gmt_offset;
-  int dst_adjustment;
-
-  time_t rawtime;
-  struct tm timeinfo;
-
-  int tokens_read, max_tokens;
-
-  if (0 != strchr(date, '.')) {
-    // This is a datetime with sub-second precision
-    tokens_read = sscanf(date, "%4d-%2d-%2d %2d:%2d:%2d.%d%3d:%2d", &year, &month, &day, &hour, &min, &sec, &usec, &hour_offset, &minute_offset);
-    max_tokens = 9;
-  } else {
-    // This is a datetime second precision
-    tokens_read = sscanf(date, "%4d-%2d-%2d %2d:%2d:%2d%3d:%2d", &year, &month, &day, &hour, &min, &sec, &hour_offset, &minute_offset);
-    max_tokens = 8;
-  }
-
-  if (max_tokens == tokens_read) {
-    // We read the Date, Time, and Timezone info
-    minute_offset *= hour_offset < 0 ? -1 : 1;
-  } else if ((max_tokens - 1) == tokens_read) {
-    // We read the Date and Time, but no Minute Offset
-    minute_offset = 0;
-  } else if (tokens_read == 3 || tokens_read >= (max_tokens - 3)) {
-    if (tokens_read == 3) {
-      hour = 0;
-      min = 0;
-      hour_offset = 0;
-      minute_offset = 0;
-      sec = 0;
-    }
-    // We read the Date and Time, default to the current locale's offset
-
-    tzset();
-
-    // Get localtime
-    time(&rawtime);
-#ifdef HAVE_LOCALTIME_R
-    localtime_r(&rawtime, &timeinfo);
-#else
-    // Thread unsafe, this is used on Windows...
-    timeinfo = *localtime(&rawtime);
-#endif
-
-    timeinfo.tm_sec = sec;
-    timeinfo.tm_min = min;
-    timeinfo.tm_hour = hour;
-    timeinfo.tm_mday = day;
-    timeinfo.tm_mon = month;
-    timeinfo.tm_year = year - 1900;
-    timeinfo.tm_isdst = -1;
-
-    // Update tm_isdst
-    mktime(&timeinfo);
-
-    if (timeinfo.tm_isdst) {
-      dst_adjustment = 3600;
-    } else {
-      dst_adjustment = 0;
-    }
-
-#ifdef HAVE_GMTIME_R
-    // Reset to GM Time
-    gmtime_r(&rawtime, &timeinfo);
-#else
-    // Same as for localtime_r above
-    timeinfo = *gmtime(&rawtime);
-#endif
-
-    gmt_offset = rawtime - mktime(&timeinfo);
-
-    if (dst_adjustment) {
-      gmt_offset += dst_adjustment;
-    }
-
-    hour_offset = ((int)gmt_offset / 3600);
-    minute_offset = ((int)gmt_offset % 3600 / 60);
-
-  } else {
-    // Something went terribly wrong
-    rb_raise(eDataError, "Couldn't parse date: %s", date);
-  }
-
-  jd = jd_from_date(year, month, day);
-
-  // Generate ajd with fractional days for the time
-  // Extracted from Date#jd_to_ajd, Date#day_fraction_to_time, and Rational#+ and #-
-  num = (hour * 1440) + (min * 24);
-
-  // Modify the numerator so when we apply the timezone everything works out
-  num -= (hour_offset * 1440) + (minute_offset * 24);
-
-  den = (24 * 1440);
-  reduce(&num, &den);
-
-  num = (num * 86400) + (sec * den);
-  den = den * 86400;
-  reduce(&num, &den);
-
-  num = (jd * den) + num;
-
-  num = num * 2;
-  num = num - den;
-  den = den * 2;
-
-  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);
-
-  return rb_funcall(rb_cDateTime, ID_NEW_DATE, 3, ajd, offset, INT2NUM(2299161));
-}
+#include "do_common.h"
 
-static VALUE parse_time(const char *date) {
-
-  int year, month, day, hour, min, sec, usec, tokens;
-  char subsec[7];
-
-  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  *= (int) pow(10, (6 - strlen(subsec)));
-  } else {
-    tokens = sscanf(date, "%4d-%2d-%2d %2d:%2d:%2d", &year, &month, &day, &hour, &min, &sec);
-    if (tokens == 3) {
-      hour = 0;
-      min  = 0;
-      sec  = 0;
-    }
-    usec = 0;
-  }
+VALUE mPostgres;
+VALUE mEncoding;
+VALUE cConnection;
+VALUE cCommand;
+VALUE cResult;
+VALUE cReader;
 
-  return rb_funcall(rb_cTime, rb_intern("local"), 7, INT2NUM(year), INT2NUM(month), INT2NUM(day), INT2NUM(hour), INT2NUM(min), INT2NUM(sec), INT2NUM(usec));
-}
+void full_connect(VALUE self, PGconn *db);
 
 /* ===== Typecasting Functions ===== */
 
-static VALUE infer_ruby_type(Oid type) {
+VALUE infer_ruby_type(Oid type) {
   switch(type) {
     case BITOID:
     case VARBITOID:
@@ -367,165 +74,85 @@ static VALUE infer_ruby_type(Oid type) {
   }
 }
 
-static VALUE 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
-  void * internal_encoding = NULL;
-#endif
-
-  if (type == rb_cInteger) {
-    return rb_cstr2inum(value, 10);
-  } else if (type == rb_cString) {
-    return DO_STR_NEW(value, length, encoding, internal_encoding);
-  } else if (type == rb_cFloat) {
-    return rb_float_new(rb_cstr_to_dbl(value, Qfalse));
-  } else if (type == rb_cBigDecimal) {
-    return rb_funcall(rb_cBigDecimal, ID_NEW, 1, rb_str_new(value, length));
-  } else if (type == rb_cDate) {
-    return parse_date(value);
-  } else if (type == rb_cDateTime) {
-    return parse_date_time(value);
-  } else if (type == rb_cTime) {
-    return parse_time(value);
-  } else if (type == rb_cTrueClass) {
+VALUE typecast(const char *value, long length, const VALUE type, int encoding) {
+  if (type == rb_cTrueClass) {
     return *value == 't' ? Qtrue : Qfalse;
-  } else if (type == rb_cByteArray) {
+  }
+  else if (type == rb_cByteArray) {
     size_t new_length = 0;
-    char* unescaped = (char *)PQunescapeBytea((unsigned char*)value, &new_length);
+    char *unescaped = (char *)PQunescapeBytea((unsigned char*)value, &new_length);
     VALUE byte_array = rb_funcall(rb_cByteArray, ID_NEW, 1, rb_str_new(unescaped, new_length));
+
     PQfreemem(unescaped);
     return byte_array;
-  } else if (type == rb_cClass) {
-    return rb_funcall(mDO, rb_intern("full_const_get"), 1, rb_str_new(value, length));
-  } else if (type == rb_cNilClass) {
-    return Qnil;
-  } else {
-    return DO_STR_NEW(value, length, encoding, internal_encoding);
   }
-
+  else {
+    return do_typecast(value, length, type, encoding);
+  }
 }
 
-static void raise_error(VALUE self, PGresult *result, VALUE query) {
-  VALUE exception;
-  char *message;
-  char *sqlstate;
-  int postgres_errno;
+void 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]);
 
-  message  = PQresultErrorMessage(result);
-  sqlstate = PQresultErrorField(result, PG_DIAG_SQLSTATE);
-  postgres_errno = MAKE_SQLSTATE(sqlstate[0], sqlstate[1], sqlstate[2], sqlstate[3], sqlstate[4]);
   PQclear(result);
 
-  const char *exception_type = "SQLError";
-
-  struct errcodes *errs;
-
-  for (errs = errors; errs->error_name; errs++) {
-    if(errs->error_no == postgres_errno) {
-      exception_type = errs->exception;
-      break;
-    }
-  }
-
-  VALUE uri = rb_funcall(rb_iv_get(self, "@connection"), rb_intern("to_s"), 0);
-
-  exception = rb_funcall(CONST_GET(mDO, exception_type), ID_NEW, 5,
-                         rb_str_new2(message),
-                         INT2NUM(postgres_errno),
-                         rb_str_new2(sqlstate),
-                         query,
-                         uri);
-  rb_exc_raise(exception);
+  do_raise_error(self, errors, postgres_errno, message, query, rb_str_new2(sql_state));
 }
 
-
 /* ====== Public API ======= */
-static VALUE cConnection_dispose(VALUE self) {
-  VALUE connection_container = rb_iv_get(self, "@connection");
 
-  PGconn *db;
+VALUE cConnection_dispose(VALUE self) {
+  VALUE connection_container = rb_iv_get(self, "@connection");
 
-  if (Qnil == connection_container)
+  if (connection_container == Qnil) {
     return Qfalse;
+  }
 
-  db = DATA_PTR(connection_container);
+  PGconn *db = DATA_PTR(connection_container);
 
-  if (NULL == db)
+  if (!db) {
     return Qfalse;
+  }
 
   PQfinish(db);
   rb_iv_set(self, "@connection", Qnil);
-
   return Qtrue;
 }
 
-static VALUE cCommand_set_types(int argc, VALUE *argv, VALUE self) {
-  VALUE type_strings = rb_ary_new();
-  VALUE array = rb_ary_new();
-
-  int i, j;
-
-  for ( i = 0; i < argc; i++) {
-    rb_ary_push(array, argv[i]);
-  }
-
-  for (i = 0; i < RARRAY_LEN(array); i++) {
-    VALUE entry = rb_ary_entry(array, i);
-    if(TYPE(entry) == T_CLASS) {
-      rb_ary_push(type_strings, entry);
-    } else if (TYPE(entry) == T_ARRAY) {
-      for (j = 0; j < RARRAY_LEN(entry); j++) {
-        VALUE sub_entry = rb_ary_entry(entry, j);
-        if(TYPE(sub_entry) == T_CLASS) {
-          rb_ary_push(type_strings, sub_entry);
-        } else {
-          rb_raise(rb_eArgError, "Invalid type given");
-        }
-      }
-    } else {
-      rb_raise(rb_eArgError, "Invalid type given");
-    }
-  }
-
-  rb_iv_set(self, "@field_types", type_strings);
-
-  return array;
-}
-
-static VALUE build_query_from_args(VALUE klass, int count, VALUE *args[]) {
-  VALUE query = rb_iv_get(klass, "@text");
-
-  int i;
-  VALUE array = rb_ary_new();
-  for ( i = 0; i < count; i++) {
-    rb_ary_push(array, (VALUE)args[i]);
-  }
-  query = rb_funcall(klass, ID_ESCAPE, 1, array);
-
-  return query;
-}
-
-static VALUE cConnection_quote_string(VALUE self, VALUE string) {
+VALUE cConnection_quote_string(VALUE self, VALUE string) {
   PGconn *db = DATA_PTR(rb_iv_get(self, "@connection"));
-
   const char *source = rb_str_ptr_readonly(string);
-  size_t source_len  = rb_str_len(string);
+  int error = 0;
+  long source_len  = rb_str_len(string);
+  long buffer_len  = source_len * 2 + 3;
+
+  // Overflow check
+  if(buffer_len <= source_len) {
+    rb_raise(rb_eArgError, "Input string is too large to be safely quoted");
+  }
 
   char *escaped;
-  size_t quoted_length = 0;
-  VALUE result;
 
   // Allocate space for the escaped version of 'string'
   // http://www.postgresql.org/docs/8.3/static/libpq-exec.html#LIBPQ-EXEC-ESCAPE-STRING
-  escaped = (char *)calloc(source_len * 2 + 3, sizeof(char));
+  if (!(escaped = calloc(buffer_len, sizeof(char)))) {
+    rb_memerror();
+  }
+
+  long quoted_length;
+  VALUE result;
 
   // Escape 'source' using the current charset in use on the conection 'db'
-  quoted_length = PQescapeStringConn(db, escaped + 1, source, source_len, NULL);
+  quoted_length = PQescapeStringConn(db, escaped + 1, source, source_len, &error);
+
+  if(error) {
+    rb_raise(eDataError, "%s", PQerrorMessage(db));
+  }
 
   // Wrap the escaped string in single-quotes, this is DO's convention
-  escaped[quoted_length + 1] = escaped[0] = '\'';
+  escaped[0] = escaped[quoted_length + 1] = '\'';
 
   result = DO_STR_NEW(escaped, quoted_length + 2, FIX2INT(rb_iv_get(self, "@encoding_id")), NULL);
 
@@ -533,11 +160,10 @@ static VALUE cConnection_quote_string(VALUE self, VALUE string) {
   return result;
 }
 
-static VALUE cConnection_quote_byte_array(VALUE self, VALUE string) {
+VALUE 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);
+  const unsigned char *source = (unsigned char *)rb_str_ptr_readonly(string);
+  size_t source_len = rb_str_len(string);
 
   unsigned char *escaped;
   unsigned char *escaped_quotes;
@@ -547,11 +173,19 @@ static VALUE cConnection_quote_byte_array(VALUE self, VALUE string) {
   // Allocate space for the escaped version of 'string'
   // http://www.postgresql.org/docs/8.3/static/libpq-exec.html#LIBPQ-EXEC-ESCAPE-STRING
   escaped = PQescapeByteaConn(db, source, source_len, &quoted_length);
-  escaped_quotes = (unsigned char *)calloc(quoted_length + 1, sizeof(unsigned char));
-  memcpy(escaped_quotes + 1, escaped, quoted_length);
+
+  if(!escaped) {
+    rb_memerror();
+  }
+
+  if (!(escaped_quotes = calloc(quoted_length + 1, sizeof(unsigned char)))) {
+    rb_memerror();
+  }
+
+  memcpy(escaped_quotes + 1, escaped, quoted_length * sizeof(unsigned char));
 
   // Wrap the escaped string in single-quotes, this is DO's convention (replace trailing \0)
-  escaped_quotes[quoted_length] = escaped_quotes[0] = '\'';
+  escaped_quotes[0] = escaped_quotes[quoted_length] = '\'';
 
   result = rb_str_new((const char *)escaped_quotes, quoted_length + 1);
   PQfreemem(escaped);
@@ -559,195 +193,206 @@ static VALUE cConnection_quote_byte_array(VALUE self, VALUE string) {
   return result;
 }
 
-static void full_connect(VALUE self, PGconn *db);
-
 #ifdef _WIN32
-static PGresult* cCommand_execute_sync(VALUE self, VALUE connection, PGconn *db, VALUE query) {
+PGresult * cCommand_execute_sync(VALUE self, VALUE connection, PGconn *db, VALUE query) {
+  char *str = StringValuePtr(query);
   PGresult *response;
-  struct timeval start;
-  char* str = StringValuePtr(query);
 
-  while ((response = PQgetResult(db)) != NULL) {
+  while ((response = PQgetResult(db))) {
     PQclear(response);
   }
 
-  gettimeofday(&start, NULL);
+  struct timeval start;
 
+  gettimeofday(&start, NULL);
   response = PQexec(db, str);
 
-  if (response == NULL) {
-    if(PQstatus(db) != CONNECTION_OK) {
+  if (!response) {
+    if (PQstatus(db) != CONNECTION_OK) {
       PQreset(db);
+
       if (PQstatus(db) == CONNECTION_OK) {
         response = PQexec(db, str);
-      } else {
+      }
+      else {
         full_connect(connection, db);
         response = PQexec(db, str);
       }
     }
 
-    if(response == NULL) {
+    if(!response) {
       rb_raise(eConnectionError, PQerrorMessage(db));
     }
   }
 
   data_objects_debug(connection, query, &start);
-
   return response;
 }
 #else
-static PGresult* cCommand_execute_async(VALUE self, VALUE connection, PGconn *db, VALUE query) {
-  int socket_fd;
-  int retval;
-  fd_set rset;
+PGresult * cCommand_execute_async(VALUE self, VALUE connection, PGconn *db, VALUE query) {
   PGresult *response;
-  struct timeval start;
   char* str = StringValuePtr(query);
 
-  while ((response = PQgetResult(db)) != NULL) {
+  while ((response = PQgetResult(db))) {
     PQclear(response);
   }
 
-  gettimeofday(&start, NULL);
+  struct timeval start;
+  int retval;
 
+  gettimeofday(&start, NULL);
   retval = PQsendQuery(db, str);
 
   if (!retval) {
-    if(PQstatus(db) != CONNECTION_OK) {
+    if (PQstatus(db) != CONNECTION_OK) {
       PQreset(db);
+
       if (PQstatus(db) == CONNECTION_OK) {
         retval = PQsendQuery(db, str);
-      } else {
+      }
+      else {
         full_connect(connection, db);
         retval = PQsendQuery(db, str);
       }
     }
 
-    if(!retval) {
+    if (!retval) {
       rb_raise(eConnectionError, "%s", PQerrorMessage(db));
     }
   }
 
-  socket_fd = PQsocket(db);
+  int socket_fd = PQsocket(db);
+  fd_set rset;
 
-  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);
-      }
+  while (1) {
+    FD_ZERO(&rset);
+    FD_SET(socket_fd, &rset);
+    retval = rb_thread_select(socket_fd + 1, &rset, NULL, NULL, NULL);
 
-      if (retval == 0) {
-          continue;
-      }
+    if (retval < 0) {
+      rb_sys_fail(0);
+    }
 
-      if (PQconsumeInput(db) == 0) {
-          rb_raise(eConnectionError, "%s", PQerrorMessage(db));
-      }
+    if (retval == 0) {
+      continue;
+    }
 
-      if (PQisBusy(db) == 0) {
-          break;
-      }
+    if (PQconsumeInput(db) == 0) {
+      rb_raise(eConnectionError, "%s", PQerrorMessage(db));
+    }
+
+    if (PQisBusy(db) == 0) {
+      break;
+    }
   }
 
   data_objects_debug(connection, query, &start);
-
   return PQgetResult(db);
 }
 #endif
 
-static VALUE cConnection_initialize(VALUE self, VALUE uri) {
-  VALUE r_host, r_user, r_password, r_path, r_query, r_port;
-
-  PGconn *db = NULL;
-
+VALUE cConnection_initialize(VALUE self, VALUE uri) {
   rb_iv_set(self, "@using_socket", Qfalse);
 
-  r_host = rb_funcall(uri, rb_intern("host"), 0);
-  if (Qnil != r_host) {
+  VALUE r_host = rb_funcall(uri, rb_intern("host"), 0);
+
+  if (r_host != Qnil) {
     rb_iv_set(self, "@host", r_host);
   }
 
-  r_user = rb_funcall(uri, rb_intern("user"), 0);
-  if (Qnil != r_user) {
+  VALUE r_user = rb_funcall(uri, rb_intern("user"), 0);
+
+  if (r_user != Qnil) {
     rb_iv_set(self, "@user", r_user);
   }
 
-  r_password = rb_funcall(uri, rb_intern("password"), 0);
-  if (Qnil != r_password) {
+  VALUE r_password = rb_funcall(uri, rb_intern("password"), 0);
+
+  if (r_password != Qnil) {
     rb_iv_set(self, "@password", r_password);
   }
 
-  r_path = rb_funcall(uri, rb_intern("path"), 0);
-  if (Qnil != r_path) {
+  VALUE r_path = rb_funcall(uri, rb_intern("path"), 0);
+
+  if (r_path != Qnil) {
     rb_iv_set(self, "@path", r_path);
   }
 
-  r_port = rb_funcall(uri, rb_intern("port"), 0);
-  if (Qnil != r_port) {
+  VALUE r_port = rb_funcall(uri, rb_intern("port"), 0);
+
+  if (r_port != Qnil) {
     r_port = rb_funcall(r_port, rb_intern("to_s"), 0);
     rb_iv_set(self, "@port", r_port);
   }
 
   // Pull the querystring off the URI
-  r_query = rb_funcall(uri, rb_intern("query"), 0);
+  VALUE r_query = rb_funcall(uri, rb_intern("query"), 0);
+
   rb_iv_set(self, "@query", r_query);
 
-  const char* encoding = get_uri_option(r_query, "encoding");
-  if (!encoding) { encoding = get_uri_option(r_query, "charset"); }
-  if (!encoding) { encoding = "UTF-8"; }
+  const char *encoding = get_uri_option(r_query, "encoding");
+
+  if (!encoding) {
+    encoding = get_uri_option(r_query, "charset");
+
+    if (!encoding) {
+      encoding = "UTF-8";
+    }
+  }
 
   rb_iv_set(self, "@encoding", rb_str_new2(encoding));
 
-  full_connect(self, db);
+  PGconn *db = NULL;
 
+  full_connect(self, db);
   rb_iv_set(self, "@uri", uri);
-
   return Qtrue;
 }
 
-static void full_connect(VALUE self, PGconn *db) {
+void full_connect(VALUE self, PGconn *db) {
+  VALUE r_host;
+  char *host = NULL;
 
-  PGresult *result = NULL;
-  VALUE r_host, r_user, r_password, r_path, r_port, r_query, r_options;
-  char *host = NULL, *user = NULL, *password = NULL, *path = NULL, *database = NULL;
-  const char *port = "5432";
-  VALUE encoding = Qnil;
-  const char *search_path = NULL;
-  char *search_path_query = NULL;
-  const char *backslash_off = "SET backslash_quote = off";
-  const char *standard_strings_on = "SET standard_conforming_strings = on";
-  const char *warning_messages = "SET client_min_messages = warning";
-
-  if((r_host = rb_iv_get(self, "@host")) != Qnil) {
-    host     = StringValuePtr(r_host);
+  if ((r_host = rb_iv_get(self, "@host")) != Qnil) {
+    host = StringValuePtr(r_host);
   }
 
-  if((r_user = rb_iv_get(self, "@user")) != Qnil) {
-    user     = StringValuePtr(r_user);
+  VALUE r_user;
+  char *user = NULL;
+
+  if ((r_user = rb_iv_get(self, "@user")) != Qnil) {
+    user = StringValuePtr(r_user);
   }
 
-  if((r_password = rb_iv_get(self, "@password")) != Qnil) {
+  VALUE r_password;
+  char *password = NULL;
+
+  if ((r_password = rb_iv_get(self, "@password")) != Qnil) {
     password = StringValuePtr(r_password);
   }
 
-  if((r_port = rb_iv_get(self, "@port")) != Qnil) {
+  VALUE r_port;
+  const char *port = "5432";
+
+  if ((r_port = rb_iv_get(self, "@port")) != Qnil) {
     port = StringValuePtr(r_port);
   }
 
-  if((r_path = rb_iv_get(self, "@path")) != Qnil) {
+  VALUE r_path;
+  char *path = NULL;
+  char *database = NULL;
+
+  if ((r_path = rb_iv_get(self, "@path")) != Qnil) {
     path = StringValuePtr(r_path);
     database = strtok(path, "/");
   }
 
-  if (NULL == database || 0 == strlen(database)) {
+  if (!database || !*database) {
     rb_raise(eConnectionError, "Database must be specified");
   }
 
-  r_query        = rb_iv_get(self, "@query");
-
-  search_path = get_uri_option(r_query, "search_path");
+  VALUE r_query = rb_iv_get(self, "@query");
+  const char *search_path = get_uri_option(r_query, "search_path");
 
   db = PQsetdbLogin(
     host,
@@ -759,24 +404,37 @@ static void full_connect(VALUE self, PGconn *db) {
     password
   );
 
-  if ( PQstatus(db) == CONNECTION_BAD ) {
+  if (PQstatus(db) == CONNECTION_BAD) {
     rb_raise(eConnectionError, "%s", PQerrorMessage(db));
   }
 
-  if (search_path != NULL) {
-    search_path_query = (char *)calloc(256, sizeof(char));
+  PGresult *result;
+
+  if (search_path) {
+    char *search_path_query;
+
+    if (!(search_path_query = calloc(256, sizeof(char)))) {
+      rb_memerror();
+    }
+
     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);
 
     if (PQresultStatus(result) != PGRES_COMMAND_OK) {
-      free((void *)search_path_query);
+      free(search_path_query);
       raise_error(self, result, r_query);
     }
 
-    free((void *)search_path_query);
+    free(search_path_query);
   }
 
+  const char *backslash_off = "SET backslash_quote = off";
+  const char *standard_strings_on = "SET standard_conforming_strings = on";
+  const char *warning_messages = "SET client_min_messages = warning";
+  VALUE r_options;
+
   r_options = rb_str_new2(backslash_off);
   result = cCommand_execute(Qnil, self, db, r_options);
 
@@ -798,21 +456,24 @@ static void full_connect(VALUE self, PGconn *db) {
     rb_warn("%s", PQresultErrorMessage(result));
   }
 
-  encoding = rb_iv_get(self, "@encoding");
-
+  VALUE encoding = rb_iv_get(self, "@encoding");
 #ifdef HAVE_PQSETCLIENTENCODING
-  VALUE pg_encoding = rb_hash_aref(CONST_GET(mEncoding, "MAP"), encoding);
-  if(pg_encoding != Qnil) {
-    if(PQsetClientEncoding(db, rb_str_ptr_readonly(pg_encoding))) {
+  VALUE pg_encoding = rb_hash_aref(do_const_get(mEncoding, "MAP"), encoding);
+
+  if (pg_encoding != Qnil) {
+    if (PQsetClientEncoding(db, rb_str_ptr_readonly(pg_encoding))) {
       rb_raise(eConnectionError, "Couldn't set encoding: %s", rb_str_ptr_readonly(encoding));
-    } else {
+    }
+    else {
 #ifdef HAVE_RUBY_ENCODING_H
       rb_iv_set(self, "@encoding_id", INT2FIX(rb_enc_find_index(rb_str_ptr_readonly(encoding))));
 #endif
       rb_iv_set(self, "@pg_encoding", pg_encoding);
     }
-  } else {
+  }
+  else {
     rb_warn("Encoding %s is not a known Ruby encoding for PostgreSQL\n", rb_str_ptr_readonly(encoding));
+
     rb_iv_set(self, "@encoding", rb_str_new2("UTF-8"));
 #ifdef HAVE_RUBY_ENCODING_H
     rb_iv_set(self, "@encoding_id", INT2FIX(rb_enc_find_index("UTF-8")));
@@ -820,42 +481,40 @@ static void full_connect(VALUE self, PGconn *db) {
     rb_iv_set(self, "@pg_encoding", rb_str_new2("UTF8"));
   }
 #endif
-  rb_iv_set(self, "@connection", Data_Wrap_Struct(rb_cObject, 0, 0, db));
-}
 
-static VALUE cConnection_character_set(VALUE self) {
-  return rb_iv_get(self, "@encoding");
+  rb_iv_set(self, "@connection", Data_Wrap_Struct(rb_cObject, 0, 0, db));
 }
 
-static VALUE cCommand_execute_non_query(int argc, VALUE *argv[], VALUE self) {
+VALUE 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");
-  if (Qnil == postgres_connection) {
+
+  if (postgres_connection == Qnil) {
     rb_raise(eConnectionError, "This connection has already been closed.");
   }
 
+  VALUE query = build_query_from_args(self, argc, argv);
   PGconn *db = DATA_PTR(postgres_connection);
   PGresult *response;
   int status;
 
-  VALUE affected_rows = Qnil;
-  VALUE insert_id = Qnil;
-
-  VALUE query = build_query_from_args(self, argc, argv);
-
   response = cCommand_execute(self, connection, db, query);
-
   status = PQresultStatus(response);
 
-  if ( status == PGRES_TUPLES_OK ) {
-    if (PQgetlength(response, 0, 0) == 0)  {
+  VALUE affected_rows = Qnil;
+  VALUE insert_id = Qnil;
+
+  if (status == PGRES_TUPLES_OK) {
+    if (PQgetlength(response, 0, 0) == 0) {
       insert_id = Qnil;
-    } else {
+    }
+    else {
       insert_id = INT2NUM(atoi(PQgetvalue(response, 0, 0)));
     }
+
     affected_rows = INT2NUM(atoi(PQcmdTuples(response)));
   }
-  else if ( status == PGRES_COMMAND_OK ) {
+  else if (status == PGRES_COMMAND_OK) {
     insert_id = Qnil;
     affected_rows = INT2NUM(atoi(PQcmdTuples(response)));
   }
@@ -864,59 +523,55 @@ static VALUE cCommand_execute_non_query(int argc, VALUE *argv[], VALUE self) {
   }
 
   PQclear(response);
-
   return rb_funcall(cResult, ID_NEW, 3, self, affected_rows, insert_id);
 }
 
-static VALUE cCommand_execute_reader(int argc, VALUE *argv[], VALUE self) {
-  VALUE reader, query;
-  VALUE field_names, field_types;
-
-  int i;
-  int field_count;
-  int infer_types = 0;
-
+VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
   VALUE connection = rb_iv_get(self, "@connection");
   VALUE postgres_connection = rb_iv_get(connection, "@connection");
-  if (Qnil == postgres_connection) {
+
+  if (postgres_connection == Qnil) {
     rb_raise(eConnectionError, "This connection has already been closed.");
   }
 
+  VALUE query = build_query_from_args(self, argc, argv);
   PGconn *db = DATA_PTR(postgres_connection);
-  PGresult *response;
+  PGresult *response = cCommand_execute(self, connection, db, query);
 
-  query = build_query_from_args(self, argc, argv);
-
-  response = cCommand_execute(self, connection, db, query);
-
-  if ( PQresultStatus(response) != PGRES_TUPLES_OK ) {
+  if (PQresultStatus(response) != PGRES_TUPLES_OK) {
     raise_error(self, response, query);
   }
 
-  field_count = PQnfields(response);
+  int field_count = PQnfields(response);
+  VALUE reader = rb_funcall(cReader, ID_NEW, 0);
 
-  reader = rb_funcall(cReader, ID_NEW, 0);
   rb_iv_set(reader, "@connection", connection);
   rb_iv_set(reader, "@reader", Data_Wrap_Struct(rb_cObject, 0, 0, response));
+  rb_iv_set(reader, "@opened", Qfalse);
   rb_iv_set(reader, "@field_count", INT2NUM(field_count));
   rb_iv_set(reader, "@row_count", INT2NUM(PQntuples(response)));
 
-  field_names = rb_ary_new();
-  field_types = rb_iv_get(self, "@field_types");
+  VALUE field_names = rb_ary_new();
+  VALUE field_types = rb_iv_get(self, "@field_types");
+  int infer_types = 0;
 
-  if ( field_types == Qnil || 0 == RARRAY_LEN(field_types) ) {
+  if (field_types == Qnil || 0 == RARRAY_LEN(field_types)) {
     field_types = rb_ary_new();
     infer_types = 1;
-  } else if (RARRAY_LEN(field_types) != field_count) {
+  }
+  else if (RARRAY_LEN(field_types) != field_count) {
     // Whoops...  wrong number of types passed to set_types.  Close the reader and raise
     // and error
     rb_funcall(reader, rb_intern("close"), 0);
     rb_raise(rb_eArgError, "Field-count mismatch. Expected %ld fields, but the query yielded %d", RARRAY_LEN(field_types), field_count);
   }
 
-  for ( i = 0; i < field_count; i++ ) {
+  int i;
+
+  for (i = 0; i < field_count; i++) {
     rb_ary_push(field_names, rb_str_new2(PQfname(response, i)));
-    if ( infer_types == 1 ) {
+
+    if (infer_types == 1) {
       rb_ary_push(field_types, infer_ruby_type(PQftype(response, i)));
     }
   }
@@ -924,65 +579,66 @@ static VALUE cCommand_execute_reader(int argc, VALUE *argv[], VALUE self) {
   rb_iv_set(reader, "@position", INT2NUM(0));
   rb_iv_set(reader, "@fields", field_names);
   rb_iv_set(reader, "@field_types", field_types);
-
   return reader;
 }
 
-static VALUE cReader_close(VALUE self) {
+VALUE cReader_close(VALUE self) {
   VALUE reader_container = rb_iv_get(self, "@reader");
 
-  PGresult *reader;
-
-  if (Qnil == reader_container)
+  if (reader_container == Qnil) {
     return Qfalse;
+  }
 
-  reader = DATA_PTR(reader_container);
+  PGresult *reader = DATA_PTR(reader_container);
 
-  if (NULL == reader)
+  if (!reader) {
     return Qfalse;
+  }
 
   PQclear(reader);
+
   rb_iv_set(self, "@reader", Qnil);
+  rb_iv_set(self, "@opened", Qfalse);
   return Qtrue;
 }
 
-static VALUE cReader_next(VALUE self) {
+VALUE cReader_next(VALUE self) {
   PGresult *reader = DATA_PTR(rb_iv_get(self, "@reader"));
 
-  int field_count;
-  int row_count;
-  int i;
-  int position;
-
-  VALUE array = rb_ary_new();
-  VALUE field_types, field_type;
-  VALUE value;
+  int row_count = NUM2INT(rb_iv_get(self, "@row_count"));
+  int field_count = NUM2INT(rb_iv_get(self, "@field_count"));
+  VALUE field_types = rb_iv_get(self, "@field_types");
+  int position = NUM2INT(rb_iv_get(self, "@position"));
 
-  row_count = NUM2INT(rb_iv_get(self, "@row_count"));
-  field_count = NUM2INT(rb_iv_get(self, "@field_count"));
-  field_types = rb_iv_get(self, "@field_types");
-  position = NUM2INT(rb_iv_get(self, "@position"));
-
-  if ( position > (row_count - 1) ) {
+  if (position > (row_count - 1)) {
     rb_iv_set(self, "@values", Qnil);
     return Qfalse;
   }
 
+  rb_iv_set(self, "@opened", Qtrue);
+
   int enc = -1;
 #ifdef HAVE_RUBY_ENCODING_H
   VALUE encoding_id = rb_iv_get(rb_iv_get(self, "@connection"), "@encoding_id");
+
   if (encoding_id != Qnil) {
     enc = FIX2INT(encoding_id);
   }
 #endif
 
-  for ( i = 0; i < field_count; i++ ) {
+  VALUE array = rb_ary_new();
+  VALUE field_type;
+  VALUE value;
+  int i;
+
+  for (i = 0; i < field_count; i++) {
     field_type = rb_ary_entry(field_types, i);
 
     // 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);
-    } else {
+    }
+    else {
       value = Qnil;
     }
 
@@ -991,117 +647,38 @@ static VALUE cReader_next(VALUE self) {
 
   rb_iv_set(self, "@values", array);
   rb_iv_set(self, "@position", INT2NUM(position+1));
-
   return Qtrue;
 }
 
-static VALUE cReader_values(VALUE self) {
-
-  VALUE values = rb_iv_get(self, "@values");
-  if(values == Qnil) {
-    rb_raise(eDataError, "Reader not initialized");
-    return Qnil;
-  } else {
-    return values;
-  }
-}
-
-static VALUE cReader_fields(VALUE self) {
-  return rb_iv_get(self, "@fields");
-}
-
-static VALUE cReader_field_count(VALUE self) {
-  return rb_iv_get(self, "@field_count");
-}
-
 void Init_do_postgres() {
-  rb_require("date");
-  rb_require("rational");
-  rb_require("bigdecimal");
-  rb_require("data_objects");
-
-  ID_CONST_GET = rb_intern("const_get");
-
-  // Get references classes needed for Date/Time parsing
-  rb_cDate = CONST_GET(rb_mKernel, "Date");
-  rb_cDateTime = CONST_GET(rb_mKernel, "DateTime");
-  rb_cBigDecimal = CONST_GET(rb_mKernel, "BigDecimal");
-
-#ifdef RUBY_LESS_THAN_186
-  ID_NEW_DATE = rb_intern("new0");
-#else
-  ID_NEW_DATE = rb_intern("new!");
-#endif
-  ID_RATIONAL = rb_intern("Rational");
-  ID_NEW = rb_intern("new");
-  ID_ESCAPE = rb_intern("escape_sql");
-  ID_LOG = rb_intern("log");
-
-  // Get references to the Extlib module
-  mExtlib = CONST_GET(rb_mKernel, "Extlib");
-  rb_cByteArray = CONST_GET(mExtlib, "ByteArray");
-
-  // Get references to the DataObjects module and its classes
-  mDO = CONST_GET(rb_mKernel, "DataObjects");
-  cDO_Quoting = CONST_GET(mDO, "Quoting");
-  cDO_Connection = CONST_GET(mDO, "Connection");
-  cDO_Command = CONST_GET(mDO, "Command");
-  cDO_Result = CONST_GET(mDO, "Result");
-  cDO_Reader = CONST_GET(mDO, "Reader");
-  cDO_Logger = CONST_GET(mDO, "Logger");
-  cDO_Logger_Message = CONST_GET(cDO_Logger, "Message");
+  common_init();
 
   mPostgres = rb_define_module_under(mDO, "Postgres");
-  eConnectionError = CONST_GET(mDO, "ConnectionError");
-  eDataError = CONST_GET(mDO, "DataError");
   mEncoding = rb_define_module_under(mPostgres, "Encoding");
 
-  cConnection = DRIVER_CLASS("Connection", cDO_Connection);
+  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);
 
-  cCommand = DRIVER_CLASS("Command", cDO_Command);
+  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);
 
-  cResult = DRIVER_CLASS("Result", cDO_Result);
+  cResult = rb_define_class_under(mPostgres, "Result", cDO_Result);
 
-  cReader = DRIVER_CLASS("Reader", cDO_Reader);
+  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);
 
-  rb_global_variable(&ID_NEW_DATE);
-  rb_global_variable(&ID_RATIONAL);
-  rb_global_variable(&ID_CONST_GET);
-  rb_global_variable(&ID_ESCAPE);
-  rb_global_variable(&ID_LOG);
-  rb_global_variable(&ID_NEW);
-
-  rb_global_variable(&rb_cDate);
-  rb_global_variable(&rb_cDateTime);
-  rb_global_variable(&rb_cBigDecimal);
-  rb_global_variable(&rb_cByteArray);
-
-  rb_global_variable(&mDO);
-  rb_global_variable(&cDO_Logger_Message);
-
   rb_global_variable(&cResult);
   rb_global_variable(&cReader);
 
-  rb_global_variable(&eConnectionError);
-  rb_global_variable(&eDataError);
-
-  struct errcodes *errs;
-
-  for (errs = errors; errs->error_name; errs++) {
-    rb_const_set(mPostgres, rb_intern(errs->error_name), INT2NUM(errs->error_no));
-  }
-
+  do_define_errors(mPostgres, errors);
 }