do_mysql 0.10.1 → 0.10.2

data/ChangeLog.markdown

@@ -1,10 +1,17 @@
-## 0.10.1 (unreleased, in git)
+## 0.10.2 2010-05-19
+* Make sure Text is returned in the proper encoding
+* Make Encoding.default_internal aware
+* Fix insert_id if no incrementing key is used
+* Rework logging for making callbacks possible
+* Remove handling Object types directly
+
+## 0.10.1 2010-01-08
 
 * Support for Ruby 1.8 and 1.9 on Windows.
 * Switch to Jeweler for Gem building tasks (this change may be temporary).
 * Switch to using Bacon for running specs: This should make specs friendlier to
   new Ruby implementations that are not yet 100% MRI-compatible, and in turn,
-  prepared the road for our own IronRuby and MacRuby support.
+  pave the road for our own IronRuby and MacRuby support.
 * Switch to the newly added rake-compiler `JavaExtensionTask` for compiling
   JRuby extensions, instead of our (broken) home-grown solution.
 

data/Rakefile

@@ -11,7 +11,7 @@ JRUBY    = RUBY_PLATFORM =~ /java/
 IRONRUBY = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ironruby'
 WINDOWS  = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i)
 SUDO     = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
-BINARY_VERSION = '5.0.89'
+BINARY_VERSION = '5.1.46'
 
 CLEAN.include(%w[ {tmp,pkg}/ **/*.{o,so,bundle,jar,log,a,gem,dSYM,obj,pdb,exp,DS_Store,rbc,db} ext/do_mysql/Makefile ext-java/target ])
 

data/ext/do_mysql/do_mysql.c

@@ -10,9 +10,9 @@
 
 #include "compat.h"
 #include "error.h"
-#define RUBY_CLASS(name) rb_const_get(rb_cObject, rb_intern(name))
-#define DRIVER_CLASS(klass, parent) (rb_define_class_under(mDOMysql, klass, parent))
+
 #define CONST_GET(scope, constant) (rb_funcall(scope, ID_CONST_GET, 1, rb_str_new2(constant)))
+#define DRIVER_CLASS(klass, parent) (rb_define_class_under(mMysql, klass, parent))
 #define CHECK_AND_RAISE(mysql_result_value, query) if (0 != mysql_result_value) { raise_error(self, db, query); }
 
 #ifdef _WIN32
@@ -26,49 +26,48 @@
 #ifdef HAVE_RUBY_ENCODING_H
 #include <ruby/encoding.h>
 
-#define DO_STR_NEW2(str, encoding) \
+#define DO_STR_NEW2(str, encoding, internal_encoding) \
   ({ \
     VALUE _string = rb_str_new2((const char *)str); \
     if(encoding != -1) { \
       rb_enc_associate_index(_string, encoding); \
     } \
+    if(internal_encoding) { \
+      _string = rb_str_export_to_enc(_string, internal_encoding); \
+    } \
     _string; \
   })
 
-#define DO_STR_NEW(str, len, encoding) \
+#define DO_STR_NEW(str, len, encoding, internal_encoding) \
   ({ \
     VALUE _string = rb_str_new((const char *)str, (long)len); \
     if(encoding != -1) { \
       rb_enc_associate_index(_string, encoding); \
     } \
+    if(internal_encoding) { \
+      _string = rb_str_export_to_enc(_string, internal_encoding); \
+    } \
     _string; \
   })
 
 #else
 
-#define DO_STR_NEW2(str, encoding) \
+#define DO_STR_NEW2(str, encoding, internal_encoding) \
   rb_str_new2((const char *)str)
 
-#define DO_STR_NEW(str, len, encoding) \
+#define DO_STR_NEW(str, len, encoding, internal_encoding) \
   rb_str_new((const char *)str, (long)len)
 #endif
 
 
 // To store rb_intern values
-static ID ID_TO_I;
-static ID ID_TO_F;
-static ID ID_TO_S;
-static ID ID_TO_TIME;
 static ID ID_NEW;
 static ID ID_NEW_DATE;
 static ID ID_CONST_GET;
 static ID ID_RATIONAL;
-static ID ID_UTC;
-static ID ID_ESCAPE_SQL;
+static ID ID_ESCAPE;
 static ID ID_STRFTIME;
-static ID ID_LOGGER;
-static ID ID_DEBUG;
-static ID ID_LEVEL;
+static ID ID_LOG;
 
 // Reference to Extlib module
 static VALUE mExtlib;
@@ -81,6 +80,8 @@ static VALUE cDO_Connection;
 static VALUE cDO_Command;
 static VALUE cDO_Result;
 static VALUE cDO_Reader;
+static VALUE cDO_Logger;
+static VALUE cDO_Logger_Message;
 
 // References to Ruby classes that we'll need
 static VALUE rb_cDate;
@@ -89,12 +90,11 @@ static VALUE rb_cBigDecimal;
 static VALUE rb_cByteArray;
 
 // Classes that we'll build in Init
-static VALUE mDOMysql;
+static VALUE mMysql;
 static VALUE cConnection;
 static VALUE cCommand;
 static VALUE cResult;
 static VALUE cReader;
-static VALUE eArgumentError;
 static VALUE eConnectionError;
 static VALUE eDataError;
 
@@ -124,11 +124,17 @@ static VALUE infer_ruby_type(MYSQL_FIELD *field) {
     case MYSQL_TYPE_DATE:
     case MYSQL_TYPE_NEWDATE:
       return rb_cDate;
+    case MYSQL_TYPE_STRING:
+    case MYSQL_TYPE_VAR_STRING:
     case MYSQL_TYPE_TINY_BLOB:
     case MYSQL_TYPE_MEDIUM_BLOB:
     case MYSQL_TYPE_LONG_BLOB:
     case MYSQL_TYPE_BLOB:
-      return rb_cByteArray;
+      if(field->charsetnr == 63) {
+        return rb_cByteArray;
+      } else {
+        return rb_cString;
+      }
     default:
       return rb_cString;
   }
@@ -320,10 +326,16 @@ static VALUE typecast(const char *value, long length, const VALUE type, int enco
     return Qnil;
   }
 
+#ifdef HAVE_RUBY_ENCODING_H
+  rb_encoding * internal_encoding = rb_default_internal_encoding();
+#else
+  void * internal_encoding = NULL;
+#endif
+
   if (type == rb_cInteger) {
     return rb_cstr2inum(value, 10);
   } else if (type == rb_cString) {
-    return DO_STR_NEW(value, length, encoding);
+    return DO_STR_NEW(value, length, encoding, internal_encoding);
   } else if (type == rb_cFloat) {
     return rb_float_new(rb_cstr_to_dbl(value, Qfalse));
   } else if (type == rb_cBigDecimal) {
@@ -340,38 +352,24 @@ static VALUE typecast(const char *value, long length, const VALUE type, int enco
     return rb_funcall(rb_cByteArray, ID_NEW, 1, rb_str_new(value, length));
   } else if (type == rb_cClass) {
     return rb_funcall(mDO, rb_intern("full_const_get"), 1, rb_str_new(value, length));
-  } else if (type == rb_cObject) {
-    return rb_marshal_load(rb_str_new(value, length));
   } else if (type == rb_cNilClass) {
     return Qnil;
   } else {
-    return DO_STR_NEW(value, length, encoding);
+    return DO_STR_NEW(value, length, encoding, internal_encoding);
   }
 
 }
 
-static void data_objects_debug(VALUE string, struct timeval* start) {
+static void data_objects_debug(VALUE connection, VALUE string, struct timeval* start) {
   struct timeval stop;
-  char *message;
-
-  const char *query = rb_str_ptr_readonly(string);
-  size_t length     = rb_str_len(string);
-  char total_time[32];
-  do_int64 duration = 0;
+  VALUE message;
 
-  VALUE logger = rb_funcall(mDOMysql, ID_LOGGER, 0);
-  int log_level = NUM2INT(rb_funcall(logger, ID_LEVEL, 0));
+  gettimeofday(&stop, NULL);
+  do_int64 duration = (stop.tv_sec - start->tv_sec) * 1000000 + stop.tv_usec - start->tv_usec;
 
-  if (0 == log_level) {
-    gettimeofday(&stop, NULL);
+  message = rb_funcall(cDO_Logger_Message, ID_NEW, 3, string, rb_time_new(start->tv_sec, start->tv_usec), INT2NUM(duration));
 
-    duration = (stop.tv_sec - start->tv_sec) * 1000000 + stop.tv_usec - start->tv_usec;
-
-    snprintf(total_time, 32, "%.6f", duration / 1000000.0);
-    message = (char *)calloc(length + strlen(total_time) + 4, sizeof(char));
-    snprintf(message, length + strlen(total_time) + 4, "(%s) %s", total_time, query);
-    rb_funcall(logger, ID_DEBUG, 1, rb_str_new(message, length + strlen(total_time) + 3));
-  }
+  rb_funcall(connection, ID_LOG, 1, message);
 }
 
 static void raise_error(VALUE self, MYSQL *db, VALUE query) {
@@ -418,14 +416,14 @@ static char * get_uri_option(VALUE query_hash, const char * key) {
 static void assert_file_exists(char * file, const char * message) {
   if (file == NULL) { return; }
   if (rb_funcall(rb_cFile, rb_intern("exist?"), 1, rb_str_new2(file)) == Qfalse) {
-    rb_raise(eArgumentError, "%s", message);
+    rb_raise(rb_eArgError, "%s", message);
   }
 }
 
 static void full_connect(VALUE self, MYSQL *db);
 
 #ifdef _WIN32
-static MYSQL_RES* cCommand_execute_sync(VALUE self, MYSQL* db, VALUE query) {
+static MYSQL_RES* cCommand_execute_sync(VALUE self, VALUE connection, MYSQL* db, VALUE query) {
   int retval;
   struct timeval start;
   const char* str = rb_str_ptr_readonly(query);
@@ -438,14 +436,14 @@ static MYSQL_RES* cCommand_execute_sync(VALUE self, MYSQL* db, VALUE query) {
   }
   gettimeofday(&start, NULL);
   retval = mysql_real_query(db, str, len);
-  data_objects_debug(query, &start);
+  data_objects_debug(connection, query, &start);
 
   CHECK_AND_RAISE(retval, query);
 
   return mysql_store_result(db);
 }
 #else
-static MYSQL_RES* cCommand_execute_async(VALUE self, MYSQL* db, VALUE query) {
+static MYSQL_RES* cCommand_execute_async(VALUE self, VALUE connection, MYSQL* db, VALUE query) {
   int socket_fd;
   int retval;
   fd_set rset;
@@ -454,18 +452,16 @@ static MYSQL_RES* cCommand_execute_async(VALUE self, MYSQL* db, VALUE query) {
   size_t len      = rb_str_len(query);
 
   if((retval = mysql_ping(db)) && mysql_errno(db) == CR_SERVER_GONE_ERROR) {
-    VALUE connection = rb_iv_get(self, "@connection");
     full_connect(connection, db);
   }
+  gettimeofday(&start, NULL);
+
   retval = mysql_send_query(db, str, len);
 
   CHECK_AND_RAISE(retval, query);
-  gettimeofday(&start, NULL);
 
   socket_fd = db->net.fd;
 
-  data_objects_debug(query, &start);
-
   for(;;) {
     FD_ZERO(&rset);
     FD_SET(socket_fd, &rset);
@@ -487,6 +483,7 @@ static MYSQL_RES* cCommand_execute_async(VALUE self, MYSQL* db, VALUE query) {
 
   retval = mysql_read_query_result(db);
   CHECK_AND_RAISE(retval, query);
+  data_objects_debug(connection, query, &start);
 
   return mysql_store_result(db);
 }
@@ -561,7 +558,7 @@ static void full_connect(VALUE self, MYSQL* db) {
 
       mysql_ssl_set(db, ssl_client_key, ssl_client_cert, ssl_ca_cert, ssl_ca_path, ssl_cipher);
     } else if(r_ssl != Qnil) {
-      rb_raise(eArgumentError, "ssl must be passed a hash");
+      rb_raise(rb_eArgError, "ssl must be passed a hash");
     }
   }
 #endif
@@ -618,11 +615,17 @@ static void full_connect(VALUE self, MYSQL* db) {
   }
 
   // Disable sql_auto_is_null
-  cCommand_execute(self, db, rb_str_new2("SET sql_auto_is_null = 0"));
+  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
-  cCommand_execute(self, db, rb_str_new2("SET SESSION sql_mode = 'ANSI,NO_BACKSLASH_ESCAPES,NO_DIR_IN_CREATE,NO_ENGINE_SUBSTITUTION,NO_UNSIGNED_SUBTRACTION,TRADITIONAL'"));
-
+   
+  //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'"));
+  }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'"));
+  }
+ 
   rb_iv_set(self, "@connection", Data_Wrap_Struct(rb_cObject, 0, 0, db));
 }
 
@@ -732,11 +735,11 @@ static VALUE cCommand_set_types(int argc, VALUE *argv, VALUE self) {
         if(TYPE(sub_entry) == T_CLASS) {
           rb_ary_push(type_strings, sub_entry);
         } else {
-          rb_raise(eArgumentError, "Invalid type given");
+          rb_raise(rb_eArgError, "Invalid type given");
         }
       }
     } else {
-      rb_raise(eArgumentError, "Invalid type given");
+      rb_raise(rb_eArgError, "Invalid type given");
     }
   }
 
@@ -779,7 +782,9 @@ static VALUE cConnection_quote_string(VALUE self, VALUE string) {
 
   // Wrap the escaped string in single-quotes, this is DO's convention
   escaped[0] = escaped[quoted_length + 1] = '\'';
-  result = DO_STR_NEW(escaped, quoted_length + 2, FIX2INT(rb_iv_get(self, "@encoding_id")));
+  // 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);
 
   free(escaped);
   return result;
@@ -793,7 +798,7 @@ static VALUE build_query_from_args(VALUE klass, int count, VALUE *args) {
   for ( i = 0; i < count; i++) {
     rb_ary_push(array, (VALUE)args[i]);
   }
-  query = rb_funcall(klass, ID_ESCAPE_SQL, 1, array);
+  query = rb_funcall(klass, ID_ESCAPE, 1, array);
 
   return query;
 }
@@ -804,6 +809,7 @@ static VALUE cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
   MYSQL_RES *response = 0;
 
   my_ulonglong affected_rows;
+  my_ulonglong insert_id;
   VALUE connection = rb_iv_get(self, "@connection");
   VALUE mysql_connection = rb_iv_get(connection, "@connection");
   if (Qnil == mysql_connection) {
@@ -813,15 +819,17 @@ static VALUE cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
   MYSQL *db = DATA_PTR(mysql_connection);
   query = build_query_from_args(self, argc, argv);
 
-  response = cCommand_execute(self, db, query);
+  response = cCommand_execute(self, connection, db, query);
 
   affected_rows = mysql_affected_rows(db);
+  insert_id     = mysql_insert_id(db);
   mysql_free_result(response);
 
-  if ((my_ulonglong)-1 == affected_rows)
+  if ((my_ulonglong)-1 == affected_rows) {
     return Qnil;
+  }
 
-  return rb_funcall(cResult, ID_NEW, 3, self, INT2NUM(affected_rows), INT2NUM(mysql_insert_id(db)));
+  return rb_funcall(cResult, ID_NEW, 3, self, INT2NUM(affected_rows), insert_id == 0 ? Qnil : INT2NUM(insert_id));
 }
 
 static VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
@@ -845,7 +853,7 @@ static VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
 
   query = build_query_from_args(self, argc, argv);
 
-  response = cCommand_execute(self, db, query);
+  response = cCommand_execute(self, connection, db, query);
 
   if (!response) {
     return Qnil;
@@ -869,7 +877,7 @@ static VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
     // Whoops...  wrong number of types passed to set_types.  Close the reader and raise
     // and error
     rb_funcall(reader, rb_intern("close"), 0);
-    rb_raise(eArgumentError, "Field-count mismatch. Expected %ld fields, but the query yielded %d", RARRAY_LEN(field_types), field_count);
+    rb_raise(rb_eArgError, "Field-count mismatch. Expected %ld fields, but the query yielded %d", RARRAY_LEN(field_types), field_count);
   }
 
   for(i = 0; i < field_count; i++) {
@@ -983,13 +991,15 @@ static VALUE cReader_field_count(VALUE self) {
 void Init_do_mysql() {
   rb_require("bigdecimal");
   rb_require("date");
+  rb_require("data_objects");
+
+  ID_CONST_GET = rb_intern("const_get");
 
-  rb_funcall(rb_mKernel, rb_intern("require"), 1, rb_str_new2("data_objects"));
+  // Get references classes needed for Date/Time parsing
+  rb_cDate = CONST_GET(rb_mKernel, "Date");
+  rb_cDateTime = CONST_GET(rb_mKernel, "DateTime");
+  rb_cBigDecimal = CONST_GET(rb_mKernel, "BigDecimal");
 
-  ID_TO_I = rb_intern("to_i");
-  ID_TO_F = rb_intern("to_f");
-  ID_TO_S = rb_intern("to_s");
-  ID_TO_TIME = rb_intern("to_time");
   ID_NEW = rb_intern("new");
 #ifdef RUBY_LESS_THAN_186
   ID_NEW_DATE = rb_intern("new0");
@@ -998,17 +1008,9 @@ void Init_do_mysql() {
 #endif
   ID_CONST_GET = rb_intern("const_get");
   ID_RATIONAL = rb_intern("Rational");
-  ID_UTC = rb_intern("utc");
-  ID_ESCAPE_SQL = rb_intern("escape_sql");
+  ID_ESCAPE = rb_intern("escape_sql");
   ID_STRFTIME = rb_intern("strftime");
-  ID_LOGGER = rb_intern("logger");
-  ID_DEBUG = rb_intern("debug");
-  ID_LEVEL = rb_intern("level");
-
-  // Store references to a few helpful clases that aren't in Ruby Core
-  rb_cDate = RUBY_CLASS("Date");
-  rb_cDateTime = RUBY_CLASS("DateTime");
-  rb_cBigDecimal = RUBY_CLASS("BigDecimal");
+  ID_LOG = rb_intern("log");
 
   // Get references to the Extlib module
   mExtlib = CONST_GET(rb_mKernel, "Extlib");
@@ -1021,14 +1023,14 @@ void Init_do_mysql() {
   cDO_Command = CONST_GET(mDO, "Command");
   cDO_Result = CONST_GET(mDO, "Result");
   cDO_Reader = CONST_GET(mDO, "Reader");
+  cDO_Logger = CONST_GET(mDO, "Logger");
+  cDO_Logger_Message = CONST_GET(cDO_Logger, "Message");
 
   // Top Level Module that all the classes live under
-  mDOMysql = rb_define_module_under(mDO, "Mysql");
-
-  eArgumentError = CONST_GET(rb_mKernel, "ArgumentError");
+  mMysql = rb_define_module_under(mDO, "Mysql");
   eConnectionError = CONST_GET(mDO, "ConnectionError");
   eDataError = CONST_GET(mDO, "DataError");
-  mEncoding = rb_define_module_under(mDOMysql, "Encoding");
+  mEncoding = rb_define_module_under(mMysql, "Encoding");
 
   cConnection = DRIVER_CLASS("Connection", cDO_Connection);
   rb_define_method(cConnection, "initialize", cConnection_initialize, 1);
@@ -1057,9 +1059,30 @@ void Init_do_mysql() {
   rb_define_method(cReader, "fields", cReader_fields, 0);
   rb_define_method(cReader, "field_count", cReader_field_count, 0);
 
+  rb_global_variable(&ID_NEW_DATE);
+  rb_global_variable(&ID_RATIONAL);
+  rb_global_variable(&ID_CONST_GET);
+  rb_global_variable(&ID_ESCAPE);
+  rb_global_variable(&ID_LOG);
+  rb_global_variable(&ID_NEW);
+
+  rb_global_variable(&rb_cDate);
+  rb_global_variable(&rb_cDateTime);
+  rb_global_variable(&rb_cBigDecimal);
+  rb_global_variable(&rb_cByteArray);
+
+  rb_global_variable(&mDO);
+  rb_global_variable(&cDO_Logger_Message);
+
+  rb_global_variable(&cResult);
+  rb_global_variable(&cReader);
+
+  rb_global_variable(&eConnectionError);
+  rb_global_variable(&eDataError);
+
   struct errcodes *errs;
 
   for (errs = errors; errs->error_name; errs++) {
-    rb_const_set(mDOMysql, rb_intern(errs->error_name), INT2NUM(errs->error_no));
+    rb_const_set(mMysql, rb_intern(errs->error_name), INT2NUM(errs->error_no));
   }
 }

data/ext/do_mysql/extconf.rb

@@ -35,9 +35,9 @@ end
 if RUBY_PLATFORM =~ /mswin|mingw/
   dir_config('mysql')
   have_header 'my_global.h'
-  have_header 'mysql.h' || exit(1)
-  have_library 'libmysql' || exit(1)
-  have_func('mysql_query', 'mysql.h') || exit(1)
+  have_header 'mysql.h'
+  have_library 'libmysql'
+  have_func('mysql_query', 'mysql.h')
   have_func('mysql_ssl_set', 'mysql.h')
 elsif mc = with_config('mysql-config', default_mysql_config_path)
   includes = mysql_config('include').split(/\s+/).map do |dir|
@@ -46,7 +46,15 @@ elsif mc = with_config('mysql-config', default_mysql_config_path)
   libs     = mysql_config('libs').split(/\s+/).select {|lib| lib =~ /^-L/}.map do |dir|
     dir.gsub(/^-L/, "")
   end.uniq
+
+  linked     = mysql_config('libs').split(/\s+/).select {|lib| lib =~ /^-l/}.map do |dir|
+    dir.gsub(/^-l/, "")
+  end.uniq
+
   dir_config('mysql', includes, libs)
+  linked.each do |link|
+    have_library link
+  end
 else
   inc, lib = dir_config('mysql', default_prefix)
   libs = ['m', 'z', 'socket', 'nsl']
@@ -60,8 +68,7 @@ end
 
 unless RUBY_PLATFORM =~ /mswin|mingw/
   have_header 'mysql.h'
-  have_library 'mysqlclient' || exit(1)
-  have_func 'mysql_query' || exit(1)
+  have_func 'mysql_query'
   have_func 'mysql_ssl_set'
 end
 

data/lib/do_mysql/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Mysql
-    VERSION = '0.10.1'.freeze
+    VERSION = '0.10.2'
   end
 end

data/spec/encoding_spec.rb

@@ -5,5 +5,6 @@ require 'data_objects/spec/encoding_spec'
 
 describe DataObjects::Mysql::Connection do
   behaves_like 'a driver supporting different encodings'
-  behaves_like 'returning correctly encoded strings for the default encoding'
+  behaves_like 'returning correctly encoded strings for the default database encoding'
+  behaves_like 'returning correctly encoded strings for the default internal encoding'
 end

data/spec/result_spec.rb

@@ -12,5 +12,6 @@ describe DataObjects::Mysql::Result do
 end
 
 describe DataObjects::Mysql::Result do
-  behaves_like 'a Result which returns inserted keys'
+  behaves_like 'a Result which returns inserted key with sequences'
+  behaves_like 'a Result which returns nil without sequences'
 end

data/spec/spec_helper.rb

@@ -71,9 +71,8 @@ module DataObjectsSpecHelpers
 
     conn.create_command(<<-EOF).execute_non_query
       CREATE TABLE `invoices` (
-        `id` int(11) NOT NULL auto_increment,
         `invoice_number` varchar(50) NOT NULL,
-        PRIMARY KEY  (`id`)
+        PRIMARY KEY  (`invoice_number`)
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
     EOF
 

data/tasks/compile.rake

@@ -57,7 +57,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.1'
+      gem.add_dependency 'do_jdbc',    '0.10.2'
     end
   end
 rescue LoadError

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: do_mysql
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
+  prerelease: false
+  segments: 
+  - 0
+  - 10
+  - 2
+  version: 0.10.2
 platform: ruby
 authors: 
 - Dirkjan Bussink
@@ -9,39 +14,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-09 00:00:00 +01:00
+date: 2010-05-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: data_objects
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.10.1
-    version: 
+        segments: 
+        - 0
+        - 10
+        - 2
+        version: 0.10.2
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bacon
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
         version: "1.1"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
         version: "0.7"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: Implements the DataObjects API for MySQL
 email: d.bussink@gmail.com
 executables: []
@@ -103,18 +118,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: DataObjects MySQL Driver