do_sqlite3 0.10.5-x86-mingw32 → 0.10.6-x86-mingw32

data/ChangeLog.markdown

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

data/Rakefile

@@ -1,7 +1,12 @@
+require 'rubygems'
 require 'pathname'
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
+$: << '../do_mysql/lib'
+
+require 'do_mysql'
+
 require 'rake'
 require 'rake/clean'
 

data/ext/do_sqlite3/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_sqlite3/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_sqlite3/do_sqlite3.c

@@ -4,10 +4,10 @@
 #include "do_common.h"
 
 VALUE mSqlite3;
-VALUE cConnection;
-VALUE cCommand;
-VALUE cResult;
-VALUE cReader;
+VALUE cSqlite3Connection;
+VALUE cSqlite3Command;
+VALUE cSqlite3Result;
+VALUE cSqlite3Reader;
 
 VALUE OPEN_FLAG_READONLY;
 VALUE OPEN_FLAG_READWRITE;
@@ -15,15 +15,15 @@ VALUE OPEN_FLAG_CREATE;
 VALUE OPEN_FLAG_NO_MUTEX;
 VALUE OPEN_FLAG_FULL_MUTEX;
 
-void raise_error(VALUE self, sqlite3 *result, VALUE query) {
+void do_sqlite3_raise_error(VALUE self, sqlite3 *result, VALUE query) {
   int errnum = sqlite3_errcode(result);
   const char *message = sqlite3_errmsg(result);
   VALUE sql_state = rb_str_new2("");
 
-  do_raise_error(self, errors, errnum, message, query, sql_state);
+  data_objects_raise_error(self, do_sqlite3_errors, errnum, message, query, sql_state);
 }
 
-VALUE typecast(sqlite3_stmt *stmt, int i, VALUE type, int encoding) {
+VALUE do_sqlite3_typecast(sqlite3_stmt *stmt, int i, VALUE type, int encoding) {
   int original_type = sqlite3_column_type(stmt, i);
   int length = sqlite3_column_bytes(stmt, i);
 
@@ -61,7 +61,7 @@ VALUE typecast(sqlite3_stmt *stmt, int i, VALUE type, int encoding) {
     return LL2NUM(sqlite3_column_int64(stmt, i));
   }
   else if (type == rb_cString) {
-    return DO_STR_NEW((char*)sqlite3_column_text(stmt, i), length, encoding, internal_encoding);
+    return DATA_OBJECTS_STR_NEW((char*)sqlite3_column_text(stmt, i), length, encoding, internal_encoding);
   }
   else if (type == rb_cFloat) {
     return rb_float_new(sqlite3_column_double(stmt, i));
@@ -70,13 +70,13 @@ VALUE typecast(sqlite3_stmt *stmt, int i, VALUE type, int encoding) {
     return rb_funcall(rb_cBigDecimal, ID_NEW, 1, rb_str_new((char*)sqlite3_column_text(stmt, i), length));
   }
   else if (type == rb_cDate) {
-    return parse_date((char*)sqlite3_column_text(stmt, i));
+    return data_objects_parse_date((char*)sqlite3_column_text(stmt, i));
   }
   else if (type == rb_cDateTime) {
-    return parse_date_time((char*)sqlite3_column_text(stmt, i));
+    return data_objects_parse_date_time((char*)sqlite3_column_text(stmt, i));
   }
   else if (type == rb_cTime) {
-    return parse_time((char*)sqlite3_column_text(stmt, i));
+    return data_objects_parse_time((char*)sqlite3_column_text(stmt, i));
   }
   else if (type == rb_cTrueClass) {
     return strcmp((char*)sqlite3_column_text(stmt, i), "t") == 0 ? Qtrue : Qfalse;
@@ -91,7 +91,7 @@ VALUE typecast(sqlite3_stmt *stmt, int i, VALUE type, int encoding) {
     return Qnil;
   }
   else {
-    return DO_STR_NEW((char*)sqlite3_column_text(stmt, i), length, encoding, internal_encoding);
+    return DATA_OBJECTS_STR_NEW((char*)sqlite3_column_text(stmt, i), length, encoding, internal_encoding);
   }
 }
 
@@ -99,7 +99,7 @@ VALUE typecast(sqlite3_stmt *stmt, int i, VALUE type, int encoding) {
 
 #define FLAG_PRESENT(query_values, flag) !NIL_P(rb_hash_aref(query_values, flag))
 
-int flags_from_uri(VALUE uri) {
+int do_sqlite3_flags_from_uri(VALUE uri) {
   VALUE query_values = rb_funcall(uri, rb_intern("query"), 0);
   int flags = 0;
 
@@ -139,19 +139,19 @@ int flags_from_uri(VALUE uri) {
 
 /****** Public API ******/
 
-VALUE cConnection_initialize(VALUE self, VALUE uri) {
+VALUE do_sqlite3_cConnection_initialize(VALUE self, VALUE uri) {
   VALUE path = rb_funcall(uri, rb_intern("path"), 0);
   sqlite3 *db = NULL;
   int ret;
 
 #ifdef HAVE_SQLITE3_OPEN_V2
-  ret = sqlite3_open_v2(StringValuePtr(path), &db, flags_from_uri(uri), 0);
+  ret = sqlite3_open_v2(StringValuePtr(path), &db, do_sqlite3_flags_from_uri(uri), 0);
 #else
   ret = sqlite3_open(StringValuePtr(path), &db);
 #endif
 
   if (ret != SQLITE_OK) {
-    raise_error(self, db, Qnil);
+    do_sqlite3_raise_error(self, db, Qnil);
   }
 
   rb_iv_set(self, "@uri", uri);
@@ -165,7 +165,7 @@ VALUE cConnection_initialize(VALUE self, VALUE uri) {
   return Qtrue;
 }
 
-VALUE cConnection_dispose(VALUE self) {
+VALUE do_sqlite3_cConnection_dispose(VALUE self) {
   VALUE connection_container = rb_iv_get(self, "@connection");
 
   if (connection_container == Qnil) {
@@ -183,11 +183,11 @@ VALUE cConnection_dispose(VALUE self) {
   return Qtrue;
 }
 
-VALUE cConnection_quote_boolean(VALUE self, VALUE value) {
+VALUE do_sqlite3_cConnection_quote_boolean(VALUE self, VALUE value) {
   return rb_str_new2(value == Qtrue ? "'t'" : "'f'");
 }
 
-VALUE cConnection_quote_string(VALUE self, VALUE string) {
+VALUE do_sqlite3_cConnection_quote_string(VALUE self, VALUE string) {
   const char *source = rb_str_ptr_readonly(string);
 
   // Wrap the escaped string in single-quotes, this is DO's convention
@@ -206,7 +206,7 @@ VALUE cConnection_quote_string(VALUE self, VALUE string) {
   return result;
 }
 
-VALUE cConnection_quote_byte_array(VALUE self, VALUE string) {
+VALUE do_sqlite3_cConnection_quote_byte_array(VALUE self, VALUE string) {
   VALUE source = StringValue(string);
   VALUE array = rb_funcall(source, rb_intern("unpack"), 1, rb_str_new2("H*"));
 
@@ -215,7 +215,7 @@ VALUE cConnection_quote_byte_array(VALUE self, VALUE string) {
   return rb_ary_join(array, Qnil);
 }
 
-VALUE cConnection_enable_load_extension(VALUE self, VALUE value) {
+VALUE do_sqlite3_cConnection_enable_load_extension(VALUE self, VALUE value) {
   VALUE connection = rb_iv_get(self, "@connection");
 
   if (connection == Qnil) {
@@ -236,7 +236,7 @@ VALUE cConnection_enable_load_extension(VALUE self, VALUE value) {
   return Qtrue;
 }
 
-VALUE cConnection_load_extension(VALUE self, VALUE string) {
+VALUE do_sqlite3_cConnection_load_extension(VALUE self, VALUE string) {
   VALUE connection = rb_iv_get(self, "@connection");
 
   if (connection == Qnil) {
@@ -259,8 +259,8 @@ VALUE cConnection_load_extension(VALUE self, VALUE string) {
   return Qtrue;
 }
 
-VALUE cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
-  VALUE query = build_query_from_args(self, argc, argv);
+VALUE do_sqlite3_cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
+  VALUE query = data_objects_build_query_from_args(self, argc, argv);
   VALUE connection = rb_iv_get(self, "@connection");
   VALUE sqlite3_connection = rb_iv_get(connection, "@connection");
 
@@ -280,7 +280,7 @@ VALUE cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
   status = sqlite3_exec(db, rb_str_ptr_readonly(query), 0, 0, &error_message);
 
   if (status != SQLITE_OK) {
-    raise_error(self, db, query);
+    do_sqlite3_raise_error(self, db, query);
   }
 
   data_objects_debug(connection, query, &start);
@@ -288,11 +288,11 @@ VALUE cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
   int affected_rows = sqlite3_changes(db);
   do_int64 insert_id = sqlite3_last_insert_rowid(db);
 
-  return rb_funcall(cResult, ID_NEW, 3, self, INT2NUM(affected_rows), INT2NUM(insert_id));
+  return rb_funcall(cSqlite3Result, ID_NEW, 3, self, INT2NUM(affected_rows), INT2NUM(insert_id));
 }
 
-VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
-  VALUE query = build_query_from_args(self, argc, argv);
+VALUE do_sqlite3_cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
+  VALUE query = data_objects_build_query_from_args(self, argc, argv);
   VALUE connection = rb_iv_get(self, "@connection");
   VALUE sqlite3_connection = rb_iv_get(connection, "@connection");
 
@@ -313,11 +313,11 @@ VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
   data_objects_debug(connection, query, &start);
 
   if (status != SQLITE_OK) {
-    raise_error(self, db, query);
+    do_sqlite3_raise_error(self, db, query);
   }
 
   int field_count = sqlite3_column_count(sqlite3_reader);
-  VALUE reader = rb_funcall(cReader, ID_NEW, 0);
+  VALUE reader = rb_funcall(cSqlite3Reader, ID_NEW, 0);
 
   rb_iv_set(reader, "@reader", Data_Wrap_Struct(rb_cObject, 0, 0, sqlite3_reader));
   rb_iv_set(reader, "@field_count", INT2NUM(field_count));
@@ -347,7 +347,7 @@ VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
   return reader;
 }
 
-VALUE cReader_close(VALUE self) {
+VALUE do_sqlite3_cReader_close(VALUE self) {
   VALUE reader_obj = rb_iv_get(self, "@reader");
 
   if (reader_obj != Qnil) {
@@ -362,7 +362,7 @@ VALUE cReader_close(VALUE self) {
   return Qfalse;
 }
 
-VALUE cReader_next(VALUE self) {
+VALUE do_sqlite3_cReader_next(VALUE self) {
   if (rb_iv_get(self, "@done") == Qtrue) {
     return Qfalse;
   }
@@ -399,7 +399,7 @@ VALUE cReader_next(VALUE self) {
 
   for (i = 0; i < field_count; i++) {
     field_type = rb_ary_entry(field_types, i);
-    value = typecast(reader, i, field_type, enc);
+    value = do_sqlite3_typecast(reader, i, field_type, enc);
     rb_ary_push(arr, value);
   }
 
@@ -407,7 +407,7 @@ VALUE cReader_next(VALUE self) {
   return Qtrue;
 }
 
-VALUE cReader_values_sqlite(VALUE self) {
+VALUE do_sqlite3_cReader_values(VALUE self) {
   VALUE state = rb_iv_get(self, "@state");
 
   if (state == Qnil || NUM2INT(state) != SQLITE_ROW) {
@@ -419,36 +419,36 @@ VALUE cReader_values_sqlite(VALUE self) {
 }
 
 void Init_do_sqlite3() {
-  common_init();
+  data_objects_common_init();
 
   mSqlite3 = rb_define_module_under(mDO, "Sqlite3");
 
-  cConnection = rb_define_class_under(mSqlite3, "Connection", cDO_Connection);
-  rb_define_method(cConnection, "initialize", cConnection_initialize, 1);
-  rb_define_method(cConnection, "dispose", cConnection_dispose, 0);
-  rb_define_method(cConnection, "quote_boolean", cConnection_quote_boolean, 1);
-  rb_define_method(cConnection, "quote_string", cConnection_quote_string, 1);
-  rb_define_method(cConnection, "quote_byte_array", cConnection_quote_byte_array, 1);
-  rb_define_method(cConnection, "character_set", cConnection_character_set, 0);
-  rb_define_method(cConnection, "enable_load_extension", cConnection_enable_load_extension, 1);
-  rb_define_method(cConnection, "load_extension", cConnection_load_extension, 1);
-
-  cCommand = rb_define_class_under(mSqlite3, "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 = rb_define_class_under(mSqlite3, "Result", cDO_Result);
-
-  cReader = rb_define_class_under(mSqlite3, "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_sqlite, 0); // TODO: DRY?
-  rb_define_method(cReader, "fields", cReader_fields, 0);
-  rb_define_method(cReader, "field_count", cReader_field_count, 0);
-
-  rb_global_variable(&cResult);
-  rb_global_variable(&cReader);
+  cSqlite3Connection = rb_define_class_under(mSqlite3, "Connection", cDO_Connection);
+  rb_define_method(cSqlite3Connection, "initialize", do_sqlite3_cConnection_initialize, 1);
+  rb_define_method(cSqlite3Connection, "dispose", do_sqlite3_cConnection_dispose, 0);
+  rb_define_method(cSqlite3Connection, "quote_boolean", do_sqlite3_cConnection_quote_boolean, 1);
+  rb_define_method(cSqlite3Connection, "quote_string", do_sqlite3_cConnection_quote_string, 1);
+  rb_define_method(cSqlite3Connection, "quote_byte_array", do_sqlite3_cConnection_quote_byte_array, 1);
+  rb_define_method(cSqlite3Connection, "character_set", data_objects_cConnection_character_set, 0);
+  rb_define_method(cSqlite3Connection, "enable_load_extension", do_sqlite3_cConnection_enable_load_extension, 1);
+  rb_define_method(cSqlite3Connection, "load_extension", do_sqlite3_cConnection_load_extension, 1);
+
+  cSqlite3Command = rb_define_class_under(mSqlite3, "Command", cDO_Command);
+  rb_define_method(cSqlite3Command, "set_types", data_objects_cCommand_set_types, -1);
+  rb_define_method(cSqlite3Command, "execute_non_query", do_sqlite3_cCommand_execute_non_query, -1);
+  rb_define_method(cSqlite3Command, "execute_reader", do_sqlite3_cCommand_execute_reader, -1);
+
+  cSqlite3Result = rb_define_class_under(mSqlite3, "Result", cDO_Result);
+
+  cSqlite3Reader = rb_define_class_under(mSqlite3, "Reader", cDO_Reader);
+  rb_define_method(cSqlite3Reader, "close", do_sqlite3_cReader_close, 0);
+  rb_define_method(cSqlite3Reader, "next!", do_sqlite3_cReader_next, 0);
+  rb_define_method(cSqlite3Reader, "values", do_sqlite3_cReader_values, 0); // TODO: DRY?
+  rb_define_method(cSqlite3Reader, "fields", data_objects_cReader_fields, 0);
+  rb_define_method(cSqlite3Reader, "field_count", data_objects_cReader_field_count, 0);
+
+  rb_global_variable(&cSqlite3Result);
+  rb_global_variable(&cSqlite3Reader);
 
   OPEN_FLAG_READONLY = rb_str_new2("read_only");
   rb_global_variable(&OPEN_FLAG_READONLY);
@@ -463,5 +463,5 @@ void Init_do_sqlite3() {
 
   Init_do_sqlite3_extension();
 
-  do_define_errors(mSqlite3, errors);
+  data_objects_define_errors(mSqlite3, do_sqlite3_errors);
 }

data/ext/do_sqlite3/do_sqlite3_extension.c

@@ -2,13 +2,13 @@
 #include "do_common.h"
 #include "do_sqlite3.h"
 
-VALUE cExtension;
+VALUE cSqlite3Extension;
 
 /*****************************************************/
 /* File used for providing extensions on the default */
 /* API that are driver specific.                     */
 /*****************************************************/
-VALUE cExtension_enable_load_extension(VALUE self, VALUE on) {
+VALUE do_sqlite3_cExtension_enable_load_extension(VALUE self, VALUE on) {
   VALUE id_connection = rb_intern("connection");
   VALUE connection = rb_funcall(self, id_connection, 0);
 
@@ -34,7 +34,7 @@ VALUE cExtension_enable_load_extension(VALUE self, VALUE on) {
   return Qtrue;
 }
 
-VALUE cExtension_load_extension(VALUE self, VALUE path) {
+VALUE do_sqlite3_cExtension_load_extension(VALUE self, VALUE path) {
   VALUE id_connection = rb_intern("connection");
   VALUE connection = rb_funcall(self, id_connection, 0);
 
@@ -71,7 +71,7 @@ VALUE cExtension_load_extension(VALUE self, VALUE path) {
 }
 
 void Init_do_sqlite3_extension() {
-  cExtension = rb_define_class_under(mSqlite3, "Extension", cDO_Extension);
-  rb_define_method(cExtension, "load_extension", cExtension_load_extension, 1);
-  rb_define_method(cExtension, "enable_load_extension", cExtension_enable_load_extension, 1);
+  cSqlite3Extension = rb_define_class_under(mSqlite3, "Extension", cDO_Extension);
+  rb_define_method(cSqlite3Extension, "load_extension", do_sqlite3_cExtension_load_extension, 1);
+  rb_define_method(cSqlite3Extension, "enable_load_extension", do_sqlite3_cExtension_enable_load_extension, 1);
 }

data/ext/do_sqlite3/error.h

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

data/lib/do_sqlite3/version.rb

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

data/tasks/compile.rake

@@ -55,7 +55,7 @@ begin
     ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
     ext.java_compiling do |gem|
       gem.add_dependency 'jdbc-sqlite3', '>=3.5.8'
-      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_sqlite3
 version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: false
+  hash: 59
+  prerelease: 
   segments: 
   - 0
   - 10
-  - 5
-  version: 0.10.5
+  - 6
+  version: 0.10.6
 platform: x86-mingw32
 authors: 
 - Dirkjan Bussink
@@ -19,22 +19,23 @@ date: 2011-03-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 59
         segments: 
         - 0
         - 10
-        - 5
-        version: 0.10.5
-  type: :runtime
+        - 6
+        version: 0.10.6
   name: data_objects
-  prerelease: false
   version_requirements: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +46,11 @@ dependencies:
         - 2
         - 5
         version: "2.5"
-  type: :development
   name: rspec
-  prerelease: false
   version_requirements: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -60,10 +61,9 @@ dependencies:
         - 0
         - 7
         version: "0.7"
-  type: :development
   name: rake-compiler
-  prerelease: false
   version_requirements: *id003
+  prerelease: false
 description: Implements the DataObjects API for Sqlite3
 email: d.bussink@gmail.com
 executables: []
@@ -164,7 +164,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 Sqlite3 Driver