do_mysql 0.10.5-x86-mswin32-60 → 0.10.6-x86-mswin32-60

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

@@ -8,28 +8,34 @@
 
 #include "mysql_compat.h"
 #include "compat.h"
-#include "error.h"
 
+#include "error.h"
 #include "do_common.h"
 
 #ifndef HAVE_CONST_MYSQL_TYPE_STRING
 #define HAVE_OLD_MYSQL_VERSION
 #endif
 
-#define CHECK_AND_RAISE(mysql_result_value, query) if (0 != mysql_result_value) { raise_error(self, db, query); }
+#ifdef _WIN32
+#define do_mysql_cCommand_execute do_mysql_cCommand_execute_sync
+#else
+#define do_mysql_cCommand_execute do_mysql_cCommand_execute_async
+#endif
 
-void full_connect(VALUE self, MYSQL *db);
+#define CHECK_AND_RAISE(mysql_result_value, query) if (0 != mysql_result_value) { do_mysql_raise_error(self, db, query); }
+
+void do_mysql_full_connect(VALUE self, MYSQL *db);
 
 // Classes that we'll build in Init
 VALUE mMysql;
 VALUE mEncoding;
-VALUE cConnection;
-VALUE cCommand;
-VALUE cResult;
-VALUE cReader;
+VALUE cMysqlConnection;
+VALUE cMysqlCommand;
+VALUE cMysqlResult;
+VALUE cMysqlReader;
 
 // Figures out what we should cast a given mysql field type to
-VALUE infer_ruby_type(const MYSQL_FIELD *field) {
+VALUE do_mysql_infer_ruby_type(const MYSQL_FIELD *field) {
   switch (field->type) {
     case MYSQL_TYPE_NULL:
       return Qnil;
@@ -81,7 +87,7 @@ VALUE infer_ruby_type(const MYSQL_FIELD *field) {
 }
 
 // Convert C-string to a Ruby instance of Ruby type "type"
-VALUE typecast(const char *value, long length, const VALUE type, int encoding) {
+VALUE do_mysql_typecast(const char *value, long length, const VALUE type, int encoding) {
   if (!value) {
     return Qnil;
   }
@@ -93,11 +99,11 @@ VALUE typecast(const char *value, long length, const VALUE type, int encoding) {
     return rb_funcall(rb_cByteArray, ID_NEW, 1, rb_str_new(value, length));
   }
   else {
-    return do_typecast(value, length, type, encoding);
+    return data_objects_typecast(value, length, type, encoding);
   }
 }
 
-void raise_error(VALUE self, MYSQL *db, VALUE query) {
+void do_mysql_raise_error(VALUE self, MYSQL *db, VALUE query) {
   int errnum = mysql_errno(db);
   const char *message = mysql_error(db);
   VALUE sql_state = Qnil;
@@ -106,11 +112,11 @@ void raise_error(VALUE self, MYSQL *db, VALUE query) {
   sql_state = rb_str_new2(mysql_sqlstate(db));
 #endif
 
-  do_raise_error(self, errors, errnum, message, query, sql_state);
+  data_objects_raise_error(self, do_mysql_errors, errnum, message, query, sql_state);
 }
 
 #ifdef _WIN32
-MYSQL_RES *cCommand_execute_sync(VALUE self, VALUE connection, MYSQL *db, VALUE query) {
+MYSQL_RES *do_mysql_cCommand_execute_sync(VALUE self, VALUE connection, MYSQL *db, VALUE query) {
   int retval;
   struct timeval start;
   const char *str = rb_str_ptr_readonly(query);
@@ -119,7 +125,7 @@ MYSQL_RES *cCommand_execute_sync(VALUE self, VALUE connection, MYSQL *db, VALUE
   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);
+    do_mysql_full_connect(connection, db);
   }
 
   gettimeofday(&start, NULL);
@@ -131,11 +137,11 @@ MYSQL_RES *cCommand_execute_sync(VALUE self, VALUE connection, MYSQL *db, VALUE
   return mysql_store_result(db);
 }
 #else
-MYSQL_RES *cCommand_execute_async(VALUE self, VALUE connection, MYSQL *db, VALUE query) {
+MYSQL_RES *do_mysql_cCommand_execute_async(VALUE self, VALUE connection, MYSQL *db, VALUE query) {
   int retval;
 
   if ((retval = mysql_ping(db)) && mysql_errno(db) == CR_SERVER_GONE_ERROR) {
-    full_connect(connection, db);
+    do_mysql_full_connect(connection, db);
   }
 
   struct timeval start;
@@ -183,7 +189,7 @@ MYSQL_RES *cCommand_execute_async(VALUE self, VALUE connection, MYSQL *db, VALUE
 }
 #endif
 
-void full_connect(VALUE self, MYSQL *db) {
+void do_mysql_full_connect(VALUE self, MYSQL *db) {
   VALUE r_host = rb_iv_get(self, "@host");
   const char *host = "localhost";
 
@@ -230,7 +236,7 @@ void full_connect(VALUE self, MYSQL *db) {
 
   // 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");
+    socket = data_objects_get_uri_option(r_query, "socket");
 
     if (socket) {
       rb_iv_set(self, "@using_socket", Qtrue);
@@ -245,15 +251,15 @@ void full_connect(VALUE self, MYSQL *db) {
     r_ssl = rb_hash_aref(r_query, rb_str_new2("ssl"));
 
     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");
-      ssl_ca_path     = get_uri_option(r_ssl, "ca_path");
-      ssl_cipher      = get_uri_option(r_ssl, "cipher");
+      ssl_client_key  = data_objects_get_uri_option(r_ssl, "client_key");
+      ssl_client_cert = data_objects_get_uri_option(r_ssl, "client_cert");
+      ssl_ca_cert     = data_objects_get_uri_option(r_ssl, "ca_cert");
+      ssl_ca_path     = data_objects_get_uri_option(r_ssl, "ca_path");
+      ssl_cipher      = data_objects_get_uri_option(r_ssl, "cipher");
 
-      assert_file_exists(ssl_client_key,  "client_key doesn't exist");
-      assert_file_exists(ssl_client_cert, "client_cert doesn't exist");
-      assert_file_exists(ssl_ca_cert,     "ca_cert doesn't exist");
+      data_objects_assert_file_exists(ssl_client_key,  "client_key doesn't exist");
+      data_objects_assert_file_exists(ssl_client_cert, "client_cert doesn't exist");
+      data_objects_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);
     }
@@ -277,7 +283,7 @@ void full_connect(VALUE self, MYSQL *db) {
   );
 
   if (!result) {
-    raise_error(self, db, Qnil);
+    do_mysql_raise_error(self, db, Qnil);
   }
 
 #ifdef HAVE_MYSQL_GET_SSL_CIPHER
@@ -302,13 +308,13 @@ void full_connect(VALUE self, MYSQL *db) {
 #ifdef HAVE_MYSQL_SET_CHARACTER_SET
   // Set the connections character set
   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(data_objects_const_get(mEncoding, "MAP"), encoding);
 
   if (my_encoding != Qnil) {
     int encoding_error = mysql_set_character_set(db, rb_str_ptr_readonly(my_encoding));
 
     if (encoding_error != 0) {
-      raise_error(self, db, Qnil);
+      do_mysql_raise_error(self, db, Qnil);
     }
     else {
 #ifdef HAVE_RUBY_ENCODING_H
@@ -329,7 +335,7 @@ void full_connect(VALUE self, MYSQL *db) {
 #endif
 
   // Disable sql_auto_is_null
-  cCommand_execute(Qnil, self, db, rb_str_new2("SET sql_auto_is_null = 0"));
+  do_mysql_cCommand_execute(Qnil, self, db, rb_str_new2("SET sql_auto_is_null = 0"));
   // removed NO_AUTO_VALUE_ON_ZERO because of MySQL bug http://bugs.mysql.com/bug.php?id=42270
   // added NO_BACKSLASH_ESCAPES so that backslashes should not be escaped as in other databases
 
@@ -337,17 +343,17 @@ void full_connect(VALUE self, MYSQL *db) {
 #ifdef HAVE_MYSQL_GET_SERVER_VERSION
   //4.x versions do not support certain session parameters
   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'"));
+    do_mysql_cCommand_execute(Qnil, self, db, rb_str_new2("SET SESSION sql_mode = 'ANSI,NO_DIR_IN_CREATE,NO_UNSIGNED_SUBTRACTION'"));
   }
   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'"));
+    do_mysql_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
 
   rb_iv_set(self, "@connection", Data_Wrap_Struct(rb_cObject, 0, 0, db));
 }
 
-VALUE cConnection_initialize(VALUE self, VALUE uri) {
+VALUE do_mysql_cConnection_initialize(VALUE self, VALUE uri) {
   rb_iv_set(self, "@using_socket", Qfalse);
   rb_iv_set(self, "@ssl_cipher", Qnil);
 
@@ -386,10 +392,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"; }
   }
@@ -398,12 +404,12 @@ VALUE cConnection_initialize(VALUE self, VALUE uri) {
 
   MYSQL *db = mysql_init(NULL);
 
-  full_connect(self, db);
+  do_mysql_full_connect(self, db);
   rb_iv_set(self, "@uri", uri);
   return Qtrue;
 }
 
-VALUE cConnection_dispose(VALUE self) {
+VALUE do_mysql_cConnection_dispose(VALUE self) {
   VALUE connection_container = rb_iv_get(self, "@connection");
 
   MYSQL *db;
@@ -423,7 +429,8 @@ VALUE cConnection_dispose(VALUE self) {
   return Qtrue;
 }
 
-VALUE cConnection_quote_string(VALUE self, VALUE string) {
+VALUE do_mysql_cConnection_quote_string(VALUE self, VALUE string) {
+
   MYSQL *db = DATA_PTR(rb_iv_get(self, "@connection"));
   const char *source = rb_str_ptr_readonly(string);
   long source_len = rb_str_len(string);
@@ -453,13 +460,15 @@ VALUE cConnection_quote_string(VALUE self, VALUE string) {
   escaped[0] = escaped[quoted_length + 1] = '\'';
   // We don't want to use the internal encoding, because this needs
   // to go into the database in the connection encoding
-  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 cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
+VALUE do_mysql_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");
 
@@ -468,8 +477,8 @@ VALUE cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
   }
 
   MYSQL *db = DATA_PTR(mysql_connection);
-  VALUE query = build_query_from_args(self, argc, argv);
-  MYSQL_RES *response = cCommand_execute(self, connection, db, query);
+  VALUE query = data_objects_build_query_from_args(self, argc, argv);
+  MYSQL_RES *response = do_mysql_cCommand_execute(self, connection, db, query);
 
   my_ulonglong affected_rows = mysql_affected_rows(db);
   my_ulonglong insert_id = mysql_insert_id(db);
@@ -480,10 +489,10 @@ VALUE cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
     return Qnil;
   }
 
-  return rb_funcall(cResult, ID_NEW, 3, self, INT2NUM(affected_rows), insert_id == 0 ? Qnil : INT2NUM(insert_id));
+  return rb_funcall(cMysqlResult, ID_NEW, 3, self, INT2NUM(affected_rows), insert_id == 0 ? Qnil : INT2NUM(insert_id));
 }
 
-VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
+VALUE do_mysql_cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
   VALUE connection = rb_iv_get(self, "@connection");
   VALUE mysql_connection = rb_iv_get(connection, "@connection");
 
@@ -491,16 +500,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);
   MYSQL *db = DATA_PTR(mysql_connection);
-  MYSQL_RES *response = cCommand_execute(self, connection, db, query);
+  MYSQL_RES *response = do_mysql_cCommand_execute(self, connection, db, query);
 
   if (!response) {
     rb_raise(eConnectionError, "No result set received for a query that should yield one.");
   }
 
   unsigned int field_count = mysql_field_count(db);
-  VALUE reader = rb_funcall(cReader, ID_NEW, 0);
+  VALUE reader = rb_funcall(cMysqlReader, ID_NEW, 0);
 
   rb_iv_set(reader, "@connection", connection);
   rb_iv_set(reader, "@reader", Data_Wrap_Struct(rb_cObject, 0, 0, response));
@@ -531,7 +540,7 @@ VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
     rb_ary_push(field_names, rb_str_new2(field->name));
 
     if (guess_default_field_types == 1) {
-      rb_ary_push(field_types, infer_ruby_type(field));
+      rb_ary_push(field_types, do_mysql_infer_ruby_type(field));
     }
   }
 
@@ -547,7 +556,7 @@ VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
 }
 
 // This should be called to ensure that the internal result reader is freed
-VALUE cReader_close(VALUE self) {
+VALUE do_mysql_cReader_close(VALUE self) {
   // Get the reader from the instance variable, maybe refactor this?
   VALUE reader_container = rb_iv_get(self, "@reader");
 
@@ -569,7 +578,7 @@ VALUE cReader_close(VALUE self) {
 }
 
 // Retrieve a single row
-VALUE cReader_next(VALUE self) {
+VALUE do_mysql_cReader_next(VALUE self) {
   // Get the reader from the instance variable, maybe refactor this?
   VALUE reader_container = rb_iv_get(self, "@reader");
 
@@ -606,7 +615,7 @@ VALUE cReader_next(VALUE self) {
   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);
-    rb_ary_push(row, typecast(result[i], lengths[i], field_type, enc));
+    rb_ary_push(row, do_mysql_typecast(result[i], lengths[i], field_type, enc));
   }
 
   rb_iv_set(self, "@values", row);
@@ -614,41 +623,41 @@ VALUE cReader_next(VALUE self) {
 }
 
 void Init_do_mysql() {
-  common_init();
+  data_objects_common_init();
 
   // Top Level Module that all the classes live under
   mMysql    = rb_define_module_under(mDO, "Mysql");
   mEncoding = rb_define_module_under(mMysql, "Encoding");
 
-  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);
-  rb_define_method(cConnection, "character_set", cConnection_character_set , 0);
-  rb_define_method(cConnection, "dispose", cConnection_dispose, 0);
-  rb_define_method(cConnection, "quote_string", cConnection_quote_string, 1);
-  rb_define_method(cConnection, "quote_date", cConnection_quote_date, 1);
-  rb_define_method(cConnection, "quote_time", cConnection_quote_time, 1);
-  rb_define_method(cConnection, "quote_datetime", cConnection_quote_date_time, 1);
-
-  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);
+  cMysqlConnection = rb_define_class_under(mMysql, "Connection", cDO_Connection);
+  rb_define_method(cMysqlConnection, "initialize", do_mysql_cConnection_initialize, 1);
+  rb_define_method(cMysqlConnection, "using_socket?", data_objects_cConnection_is_using_socket, 0);
+  rb_define_method(cMysqlConnection, "ssl_cipher", data_objects_cConnection_ssl_cipher, 0);
+  rb_define_method(cMysqlConnection, "character_set", data_objects_cConnection_character_set , 0);
+  rb_define_method(cMysqlConnection, "dispose", do_mysql_cConnection_dispose, 0);
+  rb_define_method(cMysqlConnection, "quote_string", do_mysql_cConnection_quote_string, 1);
+  rb_define_method(cMysqlConnection, "quote_date", data_objects_cConnection_quote_date, 1);
+  rb_define_method(cMysqlConnection, "quote_time", data_objects_cConnection_quote_time, 1);
+  rb_define_method(cMysqlConnection, "quote_datetime", data_objects_cConnection_quote_date_time, 1);
+
+  cMysqlCommand = rb_define_class_under(mMysql, "Command", cDO_Command);
+  rb_define_method(cMysqlCommand, "set_types", data_objects_cCommand_set_types, -1);
+  rb_define_method(cMysqlCommand, "execute_non_query", do_mysql_cCommand_execute_non_query, -1);
+  rb_define_method(cMysqlCommand, "execute_reader", do_mysql_cCommand_execute_reader, -1);
 
   // Non-Query result
-  cResult = rb_define_class_under(mMysql, "Result", cDO_Result);
+  cMysqlResult = rb_define_class_under(mMysql, "Result", cDO_Result);
 
   // Query result
-  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);
+  cMysqlReader = rb_define_class_under(mMysql, "Reader", cDO_Reader);
+  rb_define_method(cMysqlReader, "close", do_mysql_cReader_close, 0);
+  rb_define_method(cMysqlReader, "next!", do_mysql_cReader_next, 0);
+  rb_define_method(cMysqlReader, "values", data_objects_cReader_values, 0);
+  rb_define_method(cMysqlReader, "fields", data_objects_cReader_fields, 0);
+  rb_define_method(cMysqlReader, "field_count", data_objects_cReader_field_count, 0);
 
-  rb_global_variable(&cResult);
-  rb_global_variable(&cReader);
+  rb_global_variable(&cMysqlResult);
+  rb_global_variable(&cMysqlReader);
 
-  do_define_errors(mMysql, errors);
+  data_objects_define_errors(mMysql, do_mysql_errors);
 }

data/ext/do_mysql/error.h

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

data/lib/do_mysql/version.rb

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

data/tasks/compile.rake

@@ -56,7 +56,7 @@ begin
     ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
     ext.java_compiling do |gem|
       gem.add_dependency 'jdbc-mysql', '>=5.0.4'
-      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_mysql
 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-mswin32-60
 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 MySQL
 email: d.bussink@gmail.com
 executables: []
@@ -165,7 +165,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 MySQL Driver