do_mysql 0.10.3-x86-mswin32-60 → 0.10.4.rc1-x86-mswin32-60

data/ext/do_mysql/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_mysql/do_mysql.c

@@ -1,8 +1,6 @@
 #include <ruby.h>
-#include <string.h>
-#include <math.h>
-#include <ctype.h>
 #include <time.h>
+#include <string.h>
 
 #include <mysql.h>
 #include <errmsg.h>
@@ -12,100 +10,27 @@
 #include "compat.h"
 #include "error.h"
 
+#include "do_common.h"
+
 #ifndef HAVE_CONST_MYSQL_TYPE_STRING
 #define HAVE_OLD_MYSQL_VERSION
 #endif
 
-#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(mMysql, klass, parent))
 #define CHECK_AND_RAISE(mysql_result_value, query) if (0 != mysql_result_value) { raise_error(self, db, query); }
 
-#ifdef _WIN32
-#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
-
-#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;
-static ID ID_NEW_DATE;
-static ID ID_CONST_GET;
-static ID ID_RATIONAL;
-static ID ID_ESCAPE;
-static ID ID_STRFTIME;
-static ID ID_LOG;
-
-// Reference to Extlib module
-static VALUE mExtlib;
-
-// References to DataObjects base classes
-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;
-
-// References to Ruby classes that we'll need
-static VALUE rb_cDate;
-static VALUE rb_cDateTime;
-static VALUE rb_cBigDecimal;
-static VALUE rb_cByteArray;
+void full_connect(VALUE self, MYSQL *db);
 
 // Classes that we'll build in Init
-static VALUE mMysql;
-static VALUE cConnection;
-static VALUE cCommand;
-static VALUE cResult;
-static VALUE cReader;
-static VALUE eConnectionError;
-static VALUE eDataError;
+VALUE mMysql;
+VALUE mEncoding;
+VALUE cConnection;
+VALUE cCommand;
+VALUE cResult;
+VALUE cReader;
 
 // Figures out what we should cast a given mysql field type to
-static VALUE infer_ruby_type(MYSQL_FIELD *field) {
-  switch(field->type) {
+VALUE infer_ruby_type(const MYSQL_FIELD *field) {
+  switch (field->type) {
     case MYSQL_TYPE_NULL:
       return Qnil;
     case MYSQL_TYPE_TINY:
@@ -140,9 +65,10 @@ static VALUE infer_ruby_type(MYSQL_FIELD *field) {
     case MYSQL_TYPE_LONG_BLOB:
     case MYSQL_TYPE_BLOB:
 #ifdef HAVE_ST_CHARSETNR
-      if(field->charsetnr == 63) {
+      if (field->charsetnr == 63) {
         return rb_cByteArray;
-      } else {
+      }
+      else {
         return rb_cString;
       }
 #else
@@ -154,331 +80,48 @@ static VALUE infer_ruby_type(MYSQL_FIELD *field) {
   }
 }
 
-// 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.
-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 seconds_to_offset(long seconds_offset) {
-  do_int64 num = seconds_offset, 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(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));
-}
-
-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);
-    sscanf(subsec, "%d", &usec);
-  } 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;
-  }
-
-  if ( year + month + day + hour + min + sec + usec == 0 ) { // Mysql TIMESTAMPS can default to 0
-    return Qnil;
-  }
-
-  return rb_funcall(rb_cTime, rb_intern("local"), 7, INT2NUM(year), INT2NUM(month), INT2NUM(day), INT2NUM(hour), INT2NUM(min), INT2NUM(sec), INT2NUM(usec));
-}
-
-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;
-
-
-  time_t gmt_offset;
-  int dst_adjustment;
-
-  time_t rawtime;
-  struct tm timeinfo;
-
-  int tokens_read, max_tokens;
-
-  if ( strcmp(date, "") == 0 ) {
-    return Qnil;
-  }
-
-  if (0 != strchr(date, '.')) {
-    // This is a datetime with sub-second precision
-    tokens_read = sscanf(date, "%4d-%2d-%2d%*c%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%*c%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
-    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;
-    }
-
-    // Reset to GM Time
-#ifdef HAVE_GMTIME_R
-    gmtime_r(&rawtime, &timeinfo);
-#else
-    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));
-}
-
 // Convert C-string to a Ruby instance of Ruby type "type"
-static VALUE typecast(const char *value, long length, const VALUE type, int encoding) {
-
-  if(NULL == value) {
+VALUE typecast(const char *value, long length, const VALUE type, int encoding) {
+  if (!value) {
     return Qnil;
   }
 
-#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) {
-    return (0 == value || 0 == strcmp("0", value)) ? Qfalse : Qtrue;
-  } else if (type == rb_cByteArray) {
+  if (type == rb_cTrueClass) {
+    return (value == 0 || strcmp("0", value) == 0) ? Qfalse : Qtrue;
+  }
+  else if (type == rb_cByteArray) {
     return rb_funcall(rb_cByteArray, ID_NEW, 1, rb_str_new(value, length));
-  } 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);
   }
-
-}
-
-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 void raise_error(VALUE self, MYSQL *db, VALUE query) {
-  VALUE exception;
-  const char *exception_type = "SQLError";
-  char *mysql_error_message = (char *)mysql_error(db);
-  int mysql_error_code = mysql_errno(db);
-
-  struct errcodes *errs;
-
-  for (errs = errors; errs->error_name; errs++) {
-    if(errs->error_no == mysql_error_code) {
-      exception_type = errs->exception;
-      break;
-    }
+  else {
+    return do_typecast(value, length, type, encoding);
   }
+}
 
-  VALUE uri = rb_funcall(rb_iv_get(self, "@connection"), rb_intern("to_s"), 0);
-
+void raise_error(VALUE self, MYSQL *db, VALUE query) {
+  int errnum = mysql_errno(db);
+  const char *message = mysql_error(db);
   VALUE sql_state = Qnil;
+
 #ifdef HAVE_MYSQL_SQLSTATE
   sql_state = rb_str_new2(mysql_sqlstate(db));
 #endif
 
-  exception = rb_funcall(CONST_GET(mDO, exception_type), ID_NEW, 5,
-                         rb_str_new2(mysql_error_message),
-                         INT2NUM(mysql_error_code),
-                         sql_state,
-                         query,
-                         uri);
-  rb_exc_raise(exception);
-}
-
-static char * get_uri_option(VALUE query_hash, const char * key) {
-  VALUE query_value;
-  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;
-}
-
-static void assert_file_exists(char * file, const char * message) {
-  if (file == NULL) { return; }
-  if (rb_funcall(rb_cFile, rb_intern("exist?"), 1, rb_str_new2(file)) == Qfalse) {
-    rb_raise(rb_eArgError, "%s", message);
-  }
+  do_raise_error(self, errors, errnum, message, query, sql_state);
 }
 
-static void full_connect(VALUE self, MYSQL *db);
-
 #ifdef _WIN32
-static MYSQL_RES* cCommand_execute_sync(VALUE self, VALUE connection, MYSQL* db, VALUE query) {
+MYSQL_RES *cCommand_execute_sync(VALUE self, VALUE connection, MYSQL *db, VALUE query) {
   int retval;
   struct timeval start;
-  const char* str = rb_str_ptr_readonly(query);
-  int len         = rb_str_len(query);
+  const char *str = rb_str_ptr_readonly(query);
+  long len = rb_str_len(query);
 
-  if(mysql_ping(db) && mysql_errno(db) == CR_SERVER_GONE_ERROR) {
+  if (mysql_ping(db) && mysql_errno(db) == CR_SERVER_GONE_ERROR) {
     // Ok, we do one more try here by doing a full connect
     VALUE connection = rb_iv_get(self, "@connection");
     full_connect(connection, db);
   }
+
   gettimeofday(&start, NULL);
   retval = mysql_real_query(db, str, len);
   data_objects_debug(connection, query, &start);
@@ -488,38 +131,37 @@ static MYSQL_RES* cCommand_execute_sync(VALUE self, VALUE connection, MYSQL* db,
   return mysql_store_result(db);
 }
 #else
-static MYSQL_RES* cCommand_execute_async(VALUE self, VALUE connection, MYSQL* db, VALUE query) {
-  int socket_fd;
+MYSQL_RES *cCommand_execute_async(VALUE self, VALUE connection, MYSQL *db, VALUE query) {
   int retval;
-  fd_set rset;
-  struct timeval start;
-  const char* str = rb_str_ptr_readonly(query);
-  size_t len      = rb_str_len(query);
-  MYSQL_RES* result;
 
-  if((retval = mysql_ping(db)) && mysql_errno(db) == CR_SERVER_GONE_ERROR) {
+  if ((retval = mysql_ping(db)) && mysql_errno(db) == CR_SERVER_GONE_ERROR) {
     full_connect(connection, db);
   }
-  gettimeofday(&start, NULL);
 
+  struct timeval start;
+  const char *str = rb_str_ptr_readonly(query);
+  long len = rb_str_len(query);
+
+  gettimeofday(&start, NULL);
   retval = mysql_send_query(db, str, len);
 
   CHECK_AND_RAISE(retval, query);
 
-  socket_fd = db->net.fd;
+  int socket_fd = db->net.fd;
+  fd_set rset;
 
-  for(;;) {
+  while (1) {
     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);
+      rb_sys_fail(0);
     }
 
     if (retval == 0) {
-        continue;
+      continue;
     }
 
     if (db->status == MYSQL_STATUS_READY) {
@@ -531,60 +173,66 @@ static MYSQL_RES* cCommand_execute_async(VALUE self, VALUE connection, MYSQL* db
   CHECK_AND_RAISE(retval, query);
   data_objects_debug(connection, query, &start);
 
-  result = mysql_store_result(db);
+  MYSQL_RES *result = mysql_store_result(db);
 
-  if (!result)
+  if (!result) {
     CHECK_AND_RAISE(mysql_errno(db), query);
+  }
 
   return result;
 }
 #endif
 
+void full_connect(VALUE self, MYSQL *db) {
+  VALUE r_host = rb_iv_get(self, "@host");
+  const char *host = "localhost";
 
-static void full_connect(VALUE self, MYSQL* db) {
-  // Check to see if we're on the db machine.  If so, try to use the socket
-  VALUE r_host, r_user, r_password, r_path, r_query, r_port;
-
-  const char *host = "localhost", *user = "root";
-  char *database = NULL, *socket = NULL, *password = NULL, *path = NULL;
-  VALUE encoding = Qnil;
-
-  MYSQL *result;
+  if (r_host != Qnil) {
+    host = StringValuePtr(r_host);
+  }
 
-  int port = 3306;
-  unsigned long client_flags = 0;
-  int encoding_error;
+  VALUE r_user = rb_iv_get(self, "@user");
+  const char *user = "root";
 
-  if((r_host = rb_iv_get(self, "@host")) != Qnil) {
-    host     = StringValuePtr(r_host);
+  if (r_user != Qnil) {
+    user = StringValuePtr(r_user);
   }
 
-  if((r_user = rb_iv_get(self, "@user")) != Qnil) {
-    user     = StringValuePtr(r_user);
-  }
+  VALUE r_password = rb_iv_get(self, "@password");
+  char *password = NULL;
 
-  if((r_password = rb_iv_get(self, "@password")) != Qnil) {
+  if (r_password != Qnil) {
     password = StringValuePtr(r_password);
   }
 
-  if((r_port = rb_iv_get(self, "@port")) != Qnil) {
+  VALUE r_port = rb_iv_get(self, "@port");
+  int port = 3306;
+
+  if (r_port != Qnil) {
     port = NUM2INT(r_port);
   }
 
-  if((r_path = rb_iv_get(self, "@path")) != Qnil) {
+  VALUE r_path = rb_iv_get(self, "@path");
+  char *path = NULL;
+  char *database = NULL;
+
+  if (r_path != Qnil) {
     path = StringValuePtr(r_path);
-    database = strtok(path, "/");
+    database = strtok(path, "/"); // not threadsafe
   }
 
-  if (NULL == database || 0 == strlen(database)) {
+  if (!database || !*database) {
     rb_raise(eConnectionError, "Database must be specified");
   }
 
-  r_query        = rb_iv_get(self, "@query");
+  VALUE r_query = rb_iv_get(self, "@query");
+  char *socket = NULL;
 
-  if (0 == strcasecmp(host, "localhost")) {
+  // Check to see if we're on the db machine.  If so, try to use the socket
+  if (strcasecmp(host, "localhost") == 0) {
     socket = get_uri_option(r_query, "socket");
-    if (NULL != socket) {
+
+    if (socket) {
       rb_iv_set(self, "@using_socket", Qtrue);
     }
   }
@@ -593,10 +241,10 @@ static void full_connect(VALUE self, MYSQL* db) {
   char *ssl_client_key, *ssl_client_cert, *ssl_ca_cert, *ssl_ca_path, *ssl_cipher;
   VALUE r_ssl;
 
-  if(rb_obj_is_kind_of(r_query, rb_cHash)) {
+  if (rb_obj_is_kind_of(r_query, rb_cHash)) {
     r_ssl = rb_hash_aref(r_query, rb_str_new2("ssl"));
 
-    if(rb_obj_is_kind_of(r_ssl, rb_cHash)) {
+    if (rb_obj_is_kind_of(r_ssl, rb_cHash)) {
       ssl_client_key  = get_uri_option(r_ssl, "client_key");
       ssl_client_cert = get_uri_option(r_ssl, "client_cert");
       ssl_ca_cert     = get_uri_option(r_ssl, "ca_cert");
@@ -608,13 +256,16 @@ static void full_connect(VALUE self, MYSQL* db) {
       assert_file_exists(ssl_ca_cert,     "ca_cert doesn't exist");
 
       mysql_ssl_set(db, ssl_client_key, ssl_client_cert, ssl_ca_cert, ssl_ca_path, ssl_cipher);
-    } else if(r_ssl != Qnil) {
+    }
+    else if (r_ssl != Qnil) {
       rb_raise(rb_eArgError, "ssl must be passed a hash");
     }
   }
 #endif
 
-  result = (MYSQL *)mysql_real_connect(
+  unsigned long client_flags = 0;
+
+  MYSQL *result = mysql_real_connect(
     db,
     host,
     user,
@@ -625,14 +276,14 @@ static void full_connect(VALUE self, MYSQL* db) {
     client_flags
   );
 
-  if (NULL == result) {
+  if (!result) {
     raise_error(self, db, Qnil);
   }
 
 #ifdef HAVE_MYSQL_GET_SSL_CIPHER
   const char *ssl_cipher_used = mysql_get_ssl_cipher(db);
 
-  if (NULL != ssl_cipher_used) {
+  if (ssl_cipher_used) {
     rb_iv_set(self, "@ssl_cipher", rb_str_new2(ssl_cipher_used));
   }
 #endif
@@ -642,7 +293,6 @@ static void full_connect(VALUE self, MYSQL* db) {
   mysql_options(db, MYSQL_OPT_RECONNECT, &reconnect);
 #endif
 
-
   // We only support encoding for MySQL versions providing mysql_set_character_set.
   // Without this function there are potential issues with mysql_real_escape_string
   // since that doesn't take the character set into consideration when setting it
@@ -651,21 +301,24 @@ static void full_connect(VALUE self, MYSQL* db) {
 
 #ifdef HAVE_MYSQL_SET_CHARACTER_SET
   // Set the connections character set
-  encoding = rb_iv_get(self, "@encoding");
+  VALUE encoding = rb_iv_get(self, "@encoding");
+  VALUE my_encoding = rb_hash_aref(do_const_get(mEncoding, "MAP"), encoding);
 
-  VALUE my_encoding = rb_hash_aref(CONST_GET(mEncoding, "MAP"), encoding);
-  if(my_encoding != Qnil) {
+  if (my_encoding != Qnil) {
+    int encoding_error = mysql_set_character_set(db, rb_str_ptr_readonly(my_encoding));
 
-    encoding_error = mysql_set_character_set(db, rb_str_ptr_readonly(my_encoding));
-    if (0 != encoding_error) {
+    if (encoding_error != 0) {
       raise_error(self, db, Qnil);
-    } 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, "@my_encoding", my_encoding);
     }
-  } else {
+  }
+  else {
     rb_warn("Encoding %s is not a known Ruby encoding for MySQL\n", rb_str_ptr_readonly(encoding));
     rb_iv_set(self, "@encoding", rb_str_new2("UTF-8"));
 #ifdef HAVE_RUBY_ENCODING_H
@@ -673,7 +326,6 @@ static void full_connect(VALUE self, MYSQL* db) {
 #endif
     rb_iv_set(self, "@my_encoding", rb_str_new2("utf8"));
   }
-
 #endif
 
   // Disable sql_auto_is_null
@@ -684,9 +336,10 @@ static void full_connect(VALUE self, MYSQL* db) {
 // For really anscient MySQL versions we don't attempt any strictness
 #ifdef HAVE_MYSQL_GET_SERVER_VERSION
   //4.x versions do not support certain session parameters
-  if(mysql_get_server_version(db) < 50000 ){
+  if (mysql_get_server_version(db) < 50000) {
     cCommand_execute(Qnil, self, db, rb_str_new2("SET SESSION sql_mode = 'ANSI,NO_DIR_IN_CREATE,NO_UNSIGNED_SUBTRACTION'"));
-  }else{
+  }
+  else {
     cCommand_execute(Qnil, self, db, rb_str_new2("SET SESSION sql_mode = 'ANSI,NO_BACKSLASH_ESCAPES,NO_DIR_IN_CREATE,NO_ENGINE_SUBSTITUTION,NO_UNSIGNED_SUBTRACTION,TRADITIONAL'"));
   }
 #endif
@@ -694,153 +347,104 @@ static void full_connect(VALUE self, MYSQL* db) {
   rb_iv_set(self, "@connection", Data_Wrap_Struct(rb_cObject, 0, 0, db));
 }
 
-static VALUE cConnection_initialize(VALUE self, VALUE uri) {
-  VALUE r_host, r_user, r_password, r_path, r_query, r_port;
-
-  MYSQL *db = 0;
-  db = (MYSQL *)mysql_init(NULL);
-
+VALUE cConnection_initialize(VALUE self, VALUE uri) {
   rb_iv_set(self, "@using_socket", Qfalse);
   rb_iv_set(self, "@ssl_cipher", Qnil);
 
-  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) {
     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);
+  MYSQL *db = mysql_init(NULL);
 
+  full_connect(self, db);
   rb_iv_set(self, "@uri", uri);
-
   return Qtrue;
 }
 
-static VALUE cConnection_character_set(VALUE self) {
-  return rb_iv_get(self, "@encoding");
-}
-
-static VALUE cConnection_is_using_socket(VALUE self) {
-  return rb_iv_get(self, "@using_socket");
-}
-
-static VALUE cConnection_ssl_cipher(VALUE self) {
-  return rb_iv_get(self, "@ssl_cipher");
-}
-
-static VALUE cConnection_dispose(VALUE self) {
+VALUE cConnection_dispose(VALUE self) {
   VALUE connection_container = rb_iv_get(self, "@connection");
 
   MYSQL *db;
 
-  if (Qnil == connection_container)
+  if (connection_container == Qnil) {
     return Qfalse;
+  }
 
   db = DATA_PTR(connection_container);
 
-  if (NULL == db)
+  if (!db) {
     return Qfalse;
+  }
 
   mysql_close(db);
   rb_iv_set(self, "@connection", Qnil);
-
   return Qtrue;
 }
 
-/*
-Accepts an array of Ruby types (Fixnum, Float, String, etc...) and turns them
-into Ruby-strings so we can easily typecast later
-*/
-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;
-}
-
-VALUE 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) {
-  // 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) {
-  return rb_funcall(value, ID_STRFTIME, 1, rb_str_new2("'%Y-%m-%d'"));
-}
-
-static VALUE cConnection_quote_string(VALUE self, VALUE string) {
+VALUE cConnection_quote_string(VALUE self, VALUE string) {
   MYSQL *db = DATA_PTR(rb_iv_get(self, "@connection"));
   const char *source = rb_str_ptr_readonly(string);
-  size_t source_len  = rb_str_len(string);
-  char *escaped;
-  VALUE result;
+  long source_len = rb_str_len(string);
+  long buffer_len = source_len * 2 + 3;
 
-  size_t quoted_length = 0;
+  // Overflow check
+  if(buffer_len <= source_len) {
+    rb_raise(rb_eArgError, "Input string is too large to be safely quoted");
+  }
 
   // Allocate space for the escaped version of 'string'.  Use + 3 allocate space for null term.
   // and the leading and trailing single-quotes.
   // Thanks to http://www.browardphp.com/mysql_manual_en/manual_MySQL_APIs.html#mysql_real_escape_string
-  escaped = (char *)calloc(source_len * 2 + 3, sizeof(char));
+  char *escaped = calloc(buffer_len, sizeof(char));
+
+  if (!escaped) {
+    rb_memerror();
+  }
+
+  unsigned long quoted_length;
+  VALUE result;
 
   // Escape 'source' using the current encoding in use on the conection 'db'
   quoted_length = mysql_real_escape_string(db, escaped + 1, source, source_len);
@@ -855,101 +459,78 @@ static VALUE cConnection_quote_string(VALUE self, VALUE string) {
   return result;
 }
 
-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 cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
-  VALUE query;
-
-  MYSQL_RES *response = 0;
-
-  my_ulonglong affected_rows;
-  my_ulonglong insert_id;
+VALUE cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
   VALUE connection = rb_iv_get(self, "@connection");
   VALUE mysql_connection = rb_iv_get(connection, "@connection");
-  if (Qnil == mysql_connection) {
+
+  if (mysql_connection == Qnil) {
     rb_raise(eConnectionError, "This connection has already been closed.");
   }
 
   MYSQL *db = DATA_PTR(mysql_connection);
-  query = build_query_from_args(self, argc, argv);
+  VALUE query = build_query_from_args(self, argc, argv);
+  MYSQL_RES *response = cCommand_execute(self, connection, db, query);
 
-  response = cCommand_execute(self, connection, db, query);
+  my_ulonglong affected_rows = mysql_affected_rows(db);
+  my_ulonglong insert_id = mysql_insert_id(db);
 
-  affected_rows = mysql_affected_rows(db);
-  insert_id     = mysql_insert_id(db);
   mysql_free_result(response);
 
-  if ((my_ulonglong)-1 == affected_rows) {
+  if (((my_ulonglong)-1) == affected_rows) {
     return Qnil;
   }
 
   return rb_funcall(cResult, ID_NEW, 3, self, INT2NUM(affected_rows), insert_id == 0 ? Qnil : INT2NUM(insert_id));
 }
 
-static VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
-  VALUE query, reader;
-  VALUE field_names, field_types;
-
-  unsigned int field_count;
-  unsigned int i;
-
-  char guess_default_field_types = 0;
+VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
   VALUE connection = rb_iv_get(self, "@connection");
   VALUE mysql_connection = rb_iv_get(connection, "@connection");
-  if (Qnil == mysql_connection) {
+
+  if (mysql_connection == Qnil) {
     rb_raise(eConnectionError, "This connection has already been closed.");
   }
 
+  VALUE query = build_query_from_args(self, argc, argv);
   MYSQL *db = DATA_PTR(mysql_connection);
-
-  MYSQL_RES *response = 0;
-  MYSQL_FIELD *field;
-
-  query = build_query_from_args(self, argc, argv);
-
-  response = cCommand_execute(self, connection, db, query);
+  MYSQL_RES *response = cCommand_execute(self, connection, db, query);
 
   if (!response) {
-    return Qnil;
+    rb_raise(eConnectionError, "No result set received for a query that should yield one.");
   }
 
-  field_count = mysql_field_count(db);
+  unsigned int field_count = mysql_field_count(db);
+  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));
 
-  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");
+
+  char guess_default_field_types = 0;
 
-  if ( field_types == Qnil || 0 == RARRAY_LEN(field_types) ) {
+  if (field_types == Qnil || RARRAY_LEN(field_types) == 0) {
     field_types = rb_ary_new();
     guess_default_field_types = 1;
-  } else if (RARRAY_LEN(field_types) != field_count) {
-    // Whoops...  wrong number of types passed to set_types.  Close the reader and raise
+  }
+  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);
   }
 
+  MYSQL_FIELD *field;
+  unsigned int i;
+
   for(i = 0; i < field_count; i++) {
     field = mysql_fetch_field_direct(response, i);
     rb_ary_push(field_names, rb_str_new2(field->name));
 
-    if (1 == guess_default_field_types) {
+    if (guess_default_field_types == 1) {
       rb_ary_push(field_types, infer_ruby_type(field));
     }
   }
@@ -966,51 +547,43 @@ static VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
 }
 
 // This should be called to ensure that the internal result reader is freed
-static VALUE cReader_close(VALUE self) {
+VALUE cReader_close(VALUE self) {
   // Get the reader from the instance variable, maybe refactor this?
   VALUE reader_container = rb_iv_get(self, "@reader");
 
-  MYSQL_RES *reader;
-
-  if (Qnil == reader_container)
+  if (reader_container == Qnil) {
     return Qfalse;
+  }
 
-  reader = DATA_PTR(reader_container);
+  MYSQL_RES *reader = DATA_PTR(reader_container);
 
   // The Meat
-  if (NULL == reader)
+  if (!reader) {
     return Qfalse;
+  }
 
   mysql_free_result(reader);
   rb_iv_set(self, "@reader", Qnil);
   rb_iv_set(self, "@opened", Qfalse);
-
   return Qtrue;
 }
 
 // Retrieve a single row
-static VALUE cReader_next(VALUE self) {
+VALUE cReader_next(VALUE self) {
   // Get the reader from the instance variable, maybe refactor this?
   VALUE reader_container = rb_iv_get(self, "@reader");
-  VALUE field_types, field_type, row;
-
-  MYSQL_RES *reader;
-  MYSQL_ROW result;
-  unsigned long *lengths;
-
-  unsigned int i;
 
-  if (Qnil == reader_container) {
+  if (reader_container == Qnil) {
     return Qfalse;
   }
 
-  reader = DATA_PTR(reader_container);
+  MYSQL_RES *reader = DATA_PTR(reader_container);
+  MYSQL_ROW result = mysql_fetch_row(reader);
 
   // The Meat
-  field_types = rb_iv_get(self, "@field_types");
-  row = rb_ary_new();
-  result = mysql_fetch_row(reader);
-  lengths = mysql_fetch_lengths(reader);
+  VALUE field_types = rb_iv_get(self, "@field_types");
+  VALUE row = rb_ary_new();
+  unsigned long *lengths = mysql_fetch_lengths(reader);
 
   rb_iv_set(self, "@opened", result ? Qtrue : Qfalse);
 
@@ -1021,11 +594,15 @@ static VALUE cReader_next(VALUE self) {
   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
 
+  VALUE field_type;
+  unsigned int i;
+
   for (i = 0; i < reader->field_count; i++) {
     // The field_type data could be cached in a c-array
     field_type = rb_ary_entry(field_types, i);
@@ -1033,72 +610,17 @@ static VALUE cReader_next(VALUE self) {
   }
 
   rb_iv_set(self, "@values", row);
-
   return Qtrue;
 }
 
-static VALUE cReader_values(VALUE self) {
-  VALUE state = rb_iv_get(self, "@opened");
-  if ( state == Qnil || state == Qfalse ) {
-    rb_raise(eDataError, "Reader is not initialized");
-  }
-  return rb_iv_get(self, "@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_mysql() {
-  rb_require("bigdecimal");
-  rb_require("rational");
-  rb_require("date");
-  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");
-
-  ID_NEW = rb_intern("new");
-#ifdef RUBY_LESS_THAN_186
-  ID_NEW_DATE = rb_intern("new0");
-#else
-  ID_NEW_DATE = rb_intern("new!");
-#endif
-  ID_CONST_GET = rb_intern("const_get");
-  ID_RATIONAL = rb_intern("Rational");
-  ID_ESCAPE = rb_intern("escape_sql");
-  ID_STRFTIME = rb_intern("strftime");
-  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();
 
   // Top Level Module that all the classes live under
-  mMysql = rb_define_module_under(mDO, "Mysql");
-  eConnectionError = CONST_GET(mDO, "ConnectionError");
-  eDataError = CONST_GET(mDO, "DataError");
+  mMysql    = rb_define_module_under(mDO, "Mysql");
   mEncoding = rb_define_module_under(mMysql, "Encoding");
 
-  cConnection = DRIVER_CLASS("Connection", cDO_Connection);
+  cConnection = rb_define_class_under(mMysql, "Connection", cDO_Connection);
   rb_define_method(cConnection, "initialize", cConnection_initialize, 1);
   rb_define_method(cConnection, "using_socket?", cConnection_is_using_socket, 0);
   rb_define_method(cConnection, "ssl_cipher", cConnection_ssl_cipher, 0);
@@ -1109,46 +631,24 @@ void Init_do_mysql() {
   rb_define_method(cConnection, "quote_time", cConnection_quote_time, 1);
   rb_define_method(cConnection, "quote_datetime", cConnection_quote_date_time, 1);
 
-  cCommand = DRIVER_CLASS("Command", cDO_Command);
+  cCommand = rb_define_class_under(mMysql, "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);
 
   // Non-Query result
-  cResult = DRIVER_CLASS("Result", cDO_Result);
+  cResult = rb_define_class_under(mMysql, "Result", cDO_Result);
 
   // Query result
-  cReader = DRIVER_CLASS("Reader", cDO_Reader);
+  cReader = rb_define_class_under(mMysql, "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(mMysql, rb_intern(errs->error_name), INT2NUM(errs->error_no));
-  }
+  do_define_errors(mMysql, errors);
 }