do_mysql 0.10.10-x86-mswin32-60 → 0.10.11-x86-mswin32-60

data/ChangeLog.markdown

@@ -1,3 +1,7 @@
+## 0.10.11 2012-12-29
+
+* Rename C symbols to prevent name collitions
+
 ## 0.10.10 2012-10-11
 
 No changes

data/ext/do_mysql/do_common.c

@@ -11,13 +11,13 @@
  */
 
 // To store rb_intern values
-ID ID_NEW;
-ID ID_NEW_DATE;
-ID ID_CONST_GET;
-ID ID_RATIONAL;
-ID ID_ESCAPE;
-ID ID_STRFTIME;
-ID ID_LOG;
+ID DO_ID_NEW;
+ID DO_ID_NEW_DATE;
+ID DO_ID_CONST_GET;
+ID DO_ID_RATIONAL;
+ID DO_ID_ESCAPE;
+ID DO_ID_STRFTIME;
+ID DO_ID_LOG;
 
 // Reference to Extlib module
 VALUE mExtlib;
@@ -33,8 +33,8 @@ VALUE cDO_Reader;
 VALUE cDO_Logger;
 VALUE cDO_Logger_Message;
 VALUE cDO_Extension;
-VALUE eConnectionError;
-VALUE eDataError;
+VALUE eDO_ConnectionError;
+VALUE eDO_DataError;
 
 // References to Ruby classes that we'll need
 VALUE rb_cDate;
@@ -47,7 +47,7 @@ VALUE rb_cBigDecimal;
 
 
 VALUE data_objects_const_get(VALUE scope, const char *constant) {
-  return rb_funcall(scope, ID_CONST_GET, 1, rb_str_new2(constant));
+  return rb_funcall(scope, DO_ID_CONST_GET, 1, rb_str_new2(constant));
 }
 
 void data_objects_debug(VALUE connection, VALUE string, struct timeval *start) {
@@ -58,9 +58,9 @@ void data_objects_debug(VALUE connection, VALUE string, struct timeval *start) {
   gettimeofday(&stop, NULL);
   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));
+  message = rb_funcall(cDO_Logger_Message, DO_ID_NEW, 3, string, rb_time_new(start->tv_sec, start->tv_usec), INT2NUM(duration));
 
-  rb_funcall(connection, ID_LOG, 1, message);
+  rb_funcall(connection, DO_ID_LOG, 1, message);
 }
 
 void data_objects_raise_error(VALUE self, const struct errcodes *errors, int errnum, const char *message, VALUE query, VALUE state) {
@@ -80,7 +80,7 @@ void data_objects_raise_error(VALUE self, const struct errcodes *errors, int err
 
   exception = rb_funcall(
     data_objects_const_get(mDO, exception_type),
-    ID_NEW,
+    DO_ID_NEW,
     5,
     rb_str_new2(message),
     INT2NUM(errnum),
@@ -125,7 +125,7 @@ VALUE data_objects_build_query_from_args(VALUE klass, int count, VALUE *args) {
     rb_ary_push(array, args[i]);
   }
 
-  return rb_funcall(klass, ID_ESCAPE, 1, array);
+  return rb_funcall(klass, DO_ID_ESCAPE, 1, array);
 }
 
 // Find the greatest common denominator and reduce the provided numerator and denominator.
@@ -163,7 +163,7 @@ VALUE data_objects_seconds_to_offset(long seconds_offset) {
   do_int64 den = 86400;
 
   data_objects_reduce(&num, &den);
-  return rb_funcall(rb_mKernel, ID_RATIONAL, 2, rb_ll2inum(num), rb_ll2inum(den));
+  return rb_funcall(rb_mKernel, DO_ID_RATIONAL, 2, rb_ll2inum(num), rb_ll2inum(den));
 }
 
 VALUE data_objects_timezone_to_offset(int hour_offset, int minute_offset) {
@@ -189,7 +189,7 @@ VALUE data_objects_parse_date(const char *date) {
     return Qnil;
   }
 
-  return rb_funcall(rb_cDate, ID_NEW, 3, INT2NUM(year), INT2NUM(month), INT2NUM(day));
+  return rb_funcall(rb_cDate, DO_ID_NEW, 3, INT2NUM(year), INT2NUM(month), INT2NUM(day));
 }
 
 VALUE data_objects_parse_time(const char *date) {
@@ -299,11 +299,11 @@ VALUE data_objects_parse_date_time(const char *date) {
       break;
 
     default: /* Any other combo of missing tokens and we can't do anything */
-      rb_raise(eDataError, "Couldn't parse date: %s", date);
+      rb_raise(eDO_DataError, "Couldn't parse date: %s", date);
   }
 
   offset = data_objects_timezone_to_offset(hour_offset, minute_offset);
-  return rb_funcall(rb_cDateTime, ID_NEW, 7, INT2NUM(year), INT2NUM(month), INT2NUM(day),
+  return rb_funcall(rb_cDateTime, DO_ID_NEW, 7, INT2NUM(year), INT2NUM(month), INT2NUM(day),
                                              INT2NUM(hour), INT2NUM(min), INT2NUM(sec), offset);
 }
 
@@ -320,17 +320,17 @@ VALUE data_objects_cConnection_ssl_cipher(VALUE self) {
 }
 
 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'"));
+  return rb_funcall(value, DO_ID_STRFTIME, 1, rb_str_new2("'%Y-%m-%d %H:%M:%S'"));
 }
 
 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'"));
+  return rb_funcall(value, DO_ID_STRFTIME, 1, rb_str_new2("'%Y-%m-%d %H:%M:%S'"));
 }
 
 VALUE data_objects_cConnection_quote_date(VALUE self, VALUE value) {
-  return rb_funcall(value, ID_STRFTIME, 1, rb_str_new2("'%Y-%m-%d'"));
+  return rb_funcall(value, DO_ID_STRFTIME, 1, rb_str_new2("'%Y-%m-%d'"));
 }
 
 /*
@@ -379,7 +379,7 @@ VALUE data_objects_cReader_values(VALUE self) {
   VALUE values = rb_iv_get(self, "@values");
 
   if (state == Qnil || state == Qfalse || values == Qnil) {
-    rb_raise(eDataError, "Reader is not initialized");
+    rb_raise(eDO_DataError, "Reader is not initialized");
   }
 
   return rb_iv_get(self, "@values");
@@ -400,24 +400,24 @@ void data_objects_common_init(void) {
   rb_require("data_objects");
 
   // Needed by data_objects_const_get
-  ID_CONST_GET = rb_intern("const_get");
+  DO_ID_CONST_GET = rb_intern("const_get");
 
   // Get references classes needed for Date/Time parsing
   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");
+  DO_ID_NEW = rb_intern("new");
 #ifdef RUBY_LESS_THAN_186
-  ID_NEW_DATE = rb_intern("new0");
+  DO_ID_NEW_DATE = rb_intern("new0");
 #else
-  ID_NEW_DATE = rb_intern("new!");
+  DO_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");
+  DO_ID_CONST_GET = rb_intern("const_get");
+  DO_ID_RATIONAL = rb_intern("Rational");
+  DO_ID_ESCAPE = rb_intern("escape_sql");
+  DO_ID_STRFTIME = rb_intern("strftime");
+  DO_ID_LOG = rb_intern("log");
 
   // Get references to the Extlib module
   mExtlib = data_objects_const_get(rb_mKernel, "Extlib");
@@ -434,15 +434,15 @@ void data_objects_common_init(void) {
   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");
+  eDO_ConnectionError = data_objects_const_get(mDO, "ConnectionError");
+  eDO_DataError = data_objects_const_get(mDO, "DataError");
 
-  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(&DO_ID_NEW_DATE);
+  rb_global_variable(&DO_ID_RATIONAL);
+  rb_global_variable(&DO_ID_CONST_GET);
+  rb_global_variable(&DO_ID_ESCAPE);
+  rb_global_variable(&DO_ID_LOG);
+  rb_global_variable(&DO_ID_NEW);
 
   rb_global_variable(&rb_cDate);
   rb_global_variable(&rb_cDateTime);
@@ -452,8 +452,8 @@ void data_objects_common_init(void) {
   rb_global_variable(&mDO);
   rb_global_variable(&cDO_Logger_Message);
 
-  rb_global_variable(&eConnectionError);
-  rb_global_variable(&eDataError);
+  rb_global_variable(&eDO_ConnectionError);
+  rb_global_variable(&eDO_DataError);
 
   tzset();
 }
@@ -478,7 +478,7 @@ extern VALUE data_objects_typecast(const char *value, long length, const VALUE t
     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));
+    return rb_funcall(rb_cBigDecimal, DO_ID_NEW, 1, rb_str_new(value, length));
   }
   else if (type == rb_cDate) {
     return data_objects_parse_date(value);
@@ -493,7 +493,7 @@ extern VALUE data_objects_typecast(const char *value, long length, const VALUE t
     return (!value || strcmp("0", value) == 0) ? Qfalse : Qtrue;
   }
   else if (type == rb_cByteArray) {
-    return rb_funcall(rb_cByteArray, ID_NEW, 1, rb_str_new(value, length));
+    return rb_funcall(rb_cByteArray, DO_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));

data/ext/do_mysql/do_common.h

@@ -54,13 +54,13 @@ typedef signed long long int do_int64;
 #endif
 
 // 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;
+extern ID DO_ID_NEW;
+extern ID DO_ID_NEW_DATE;
+extern ID DO_ID_CONST_GET;
+extern ID DO_ID_RATIONAL;
+extern ID DO_ID_ESCAPE;
+extern ID DO_ID_STRFTIME;
+extern ID DO_ID_LOG;
 
 // Reference to Extlib module
 extern VALUE mExtlib;
@@ -68,7 +68,6 @@ 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;
@@ -77,8 +76,8 @@ extern VALUE cDO_Reader;
 extern VALUE cDO_Logger;
 extern VALUE cDO_Logger_Message;
 extern VALUE cDO_Extension;
-extern VALUE eConnectionError;
-extern VALUE eDataError;
+extern VALUE eDO_ConnectionError;
+extern VALUE eDO_DataError;
 
 // References to Ruby classes that we'll need
 extern VALUE rb_cDate;

data/ext/do_mysql/do_mysql.c

@@ -27,12 +27,12 @@
 void do_mysql_full_connect(VALUE self, MYSQL *db);
 
 // Classes that we'll build in Init
-VALUE mMysql;
-VALUE mEncoding;
-VALUE cMysqlConnection;
-VALUE cMysqlCommand;
-VALUE cMysqlResult;
-VALUE cMysqlReader;
+VALUE mDO_Mysql;
+VALUE mDO_MysqlEncoding;
+VALUE cDO_MysqlConnection;
+VALUE cDO_MysqlCommand;
+VALUE cDO_MysqlResult;
+VALUE cDO_MysqlReader;
 
 // Figures out what we should cast a given mysql field type to
 VALUE do_mysql_infer_ruby_type(const MYSQL_FIELD *field) {
@@ -96,7 +96,7 @@ VALUE do_mysql_typecast(const char *value, long length, const VALUE type, int en
     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));
+    return rb_funcall(rb_cByteArray, DO_ID_NEW, 1, rb_str_new(value, length));
   }
   else {
     return data_objects_typecast(value, length, type, encoding);
@@ -308,7 +308,7 @@ void do_mysql_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(data_objects_const_get(mEncoding, "MAP"), encoding);
+  VALUE my_encoding = rb_hash_aref(data_objects_const_get(mDO_MysqlEncoding, "MAP"), encoding);
 
   if (my_encoding != Qnil) {
     int encoding_error = mysql_set_character_set(db, rb_str_ptr_readonly(my_encoding));
@@ -473,7 +473,7 @@ VALUE do_mysql_cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
   VALUE mysql_connection = rb_iv_get(connection, "@connection");
 
   if (mysql_connection == Qnil) {
-    rb_raise(eConnectionError, "This connection has already been closed.");
+    rb_raise(eDO_ConnectionError, "This connection has already been closed.");
   }
 
   MYSQL *db = DATA_PTR(mysql_connection);
@@ -489,7 +489,7 @@ VALUE do_mysql_cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
     return Qnil;
   }
 
-  return rb_funcall(cMysqlResult, ID_NEW, 3, self, INT2NUM(affected_rows), insert_id == 0 ? Qnil : ULL2NUM(insert_id));
+  return rb_funcall(cDO_MysqlResult, DO_ID_NEW, 3, self, INT2NUM(affected_rows), insert_id == 0 ? Qnil : ULL2NUM(insert_id));
 }
 
 VALUE do_mysql_cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
@@ -497,7 +497,7 @@ VALUE do_mysql_cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
   VALUE mysql_connection = rb_iv_get(connection, "@connection");
 
   if (mysql_connection == Qnil) {
-    rb_raise(eConnectionError, "This result set has already been closed.");
+    rb_raise(eDO_ConnectionError, "This result set has already been closed.");
   }
 
   VALUE query = data_objects_build_query_from_args(self, argc, argv);
@@ -505,11 +505,11 @@ VALUE do_mysql_cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
   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.");
+    rb_raise(eDO_ConnectionError, "No result set received for a query that should yield one.");
   }
 
   unsigned int field_count = mysql_field_count(db);
-  VALUE reader = rb_funcall(cMysqlReader, ID_NEW, 0);
+  VALUE reader = rb_funcall(cDO_MysqlReader, DO_ID_NEW, 0);
 
   rb_iv_set(reader, "@connection", connection);
   rb_iv_set(reader, "@reader", Data_Wrap_Struct(rb_cObject, 0, 0, response));
@@ -626,38 +626,38 @@ void Init_do_mysql() {
   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");
-
-  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);
+  mDO_Mysql    = rb_define_module_under(mDO, "Mysql");
+  mDO_MysqlEncoding = rb_define_module_under(mDO_Mysql, "Encoding");
+
+  cDO_MysqlConnection = rb_define_class_under(mDO_Mysql, "Connection", cDO_Connection);
+  rb_define_method(cDO_MysqlConnection, "initialize", do_mysql_cConnection_initialize, 1);
+  rb_define_method(cDO_MysqlConnection, "using_socket?", data_objects_cConnection_is_using_socket, 0);
+  rb_define_method(cDO_MysqlConnection, "ssl_cipher", data_objects_cConnection_ssl_cipher, 0);
+  rb_define_method(cDO_MysqlConnection, "character_set", data_objects_cConnection_character_set , 0);
+  rb_define_method(cDO_MysqlConnection, "dispose", do_mysql_cConnection_dispose, 0);
+  rb_define_method(cDO_MysqlConnection, "quote_string", do_mysql_cConnection_quote_string, 1);
+  rb_define_method(cDO_MysqlConnection, "quote_date", data_objects_cConnection_quote_date, 1);
+  rb_define_method(cDO_MysqlConnection, "quote_time", data_objects_cConnection_quote_time, 1);
+  rb_define_method(cDO_MysqlConnection, "quote_datetime", data_objects_cConnection_quote_date_time, 1);
+
+  cDO_MysqlCommand = rb_define_class_under(mDO_Mysql, "Command", cDO_Command);
+  rb_define_method(cDO_MysqlCommand, "set_types", data_objects_cCommand_set_types, -1);
+  rb_define_method(cDO_MysqlCommand, "execute_non_query", do_mysql_cCommand_execute_non_query, -1);
+  rb_define_method(cDO_MysqlCommand, "execute_reader", do_mysql_cCommand_execute_reader, -1);
 
   // Non-Query result
-  cMysqlResult = rb_define_class_under(mMysql, "Result", cDO_Result);
+  cDO_MysqlResult = rb_define_class_under(mDO_Mysql, "Result", cDO_Result);
 
   // Query result
-  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);
+  cDO_MysqlReader = rb_define_class_under(mDO_Mysql, "Reader", cDO_Reader);
+  rb_define_method(cDO_MysqlReader, "close", do_mysql_cReader_close, 0);
+  rb_define_method(cDO_MysqlReader, "next!", do_mysql_cReader_next, 0);
+  rb_define_method(cDO_MysqlReader, "values", data_objects_cReader_values, 0);
+  rb_define_method(cDO_MysqlReader, "fields", data_objects_cReader_fields, 0);
+  rb_define_method(cDO_MysqlReader, "field_count", data_objects_cReader_field_count, 0);
 
-  rb_global_variable(&cMysqlResult);
-  rb_global_variable(&cMysqlReader);
+  rb_global_variable(&cDO_MysqlResult);
+  rb_global_variable(&cDO_MysqlReader);
 
-  data_objects_define_errors(mMysql, do_mysql_errors);
+  data_objects_define_errors(mDO_Mysql, do_mysql_errors);
 }

data/lib/do_mysql/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Mysql
-    VERSION = '0.10.10'
+    VERSION = '0.10.11'
   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.10'
+      gem.add_dependency 'do_jdbc',    '0.10.11'
     end
   end
 rescue LoadError

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 10
-  version: 0.10.10
+  - 11
+  version: 0.10.11
 platform: x86-mswin32-60
 authors: 
 - Dirkjan Bussink
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 +02:00
+date: 2012-12-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
         segments: 
         - 0
         - 10
-        - 10
-        version: 0.10.10
+        - 11
+        version: 0.10.11
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false