do_mysql 0.10.0-x86-mswin32-60 → 0.10.1-x86-mswin32-60

data/ChangeLog.markdown

@@ -0,0 +1,27 @@
+## 0.10.1 (unreleased, in git)
+
+* 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.
+* Switch to the newly added rake-compiler `JavaExtensionTask` for compiling
+  JRuby extensions, instead of our (broken) home-grown solution.
+
+## 0.10.0 2009-09-15
+* Improvements
+  * JRuby Support (using *do_jdbc*)
+
+## 0.9.12 2009-05-17
+* Improvements
+  * Windows support
+
+## 0.9.11 2009-01-19
+* Improvements
+  * Ruby 1.9 support
+* Fixes
+  * Reconnecting now works properly
+
+## 0.9.9 2008-11-27
+* Improvements
+  * Added initial support for Ruby 1.9 [John Harrison]

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007, 2008, 2009 Yehuda Katz, Dirkjan Bussink
+Copyright (c) 2007 - 2010 Yehuda Katz, Dirkjan Bussink
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -1,4 +1,105 @@
-do_mysql
-========
+# do_mysql
 
-A MySQL driver for DataObjects
+* <http://dataobjects.info>
+
+## Description
+
+A MySQL driver for DataObjects.
+
+## Features/Problems
+
+This driver implements the DataObjects API for the MySQL relational database.
+
+## Synopsis
+
+An example of usage:
+
+    # default user (root, no password); default port (3306)
+    DataObjects::Connection.new("mysql://host/database")
+    # specified user, specified port
+    DataObjects::Connection.new("mysql://user:pass@host:8888/database")
+
+    @connection = DataObjects::Connection.new("mysql://localhost/employees")
+    @reader = @connection.create_command('SELECT * FROM users').execute_reader
+    @reader.next!
+
+In the future, the `Connection` constructor will be able to be passed either a
+DataObjects-style URL or JDBC style URL, when using do\_mysql on JRuby. However,
+this feature is not currently working reliably and is a known issue.
+
+## Requirements
+
+This driver is provided for the following platforms:
+ * Ruby MRI (1.8.6/7), 1.9: tested on Linux, Mac OS X and Windows platforms.
+ * JRuby 1.3.1 + (1.4+ recommended).
+ * Rubinius (experimental).
+
+Additionally you should have the following prerequisites:
+ * `data_objects` gem
+ * `do_jdbc` gem (shared library), if running on JRuby.
+
+## Install
+
+To install the gem:
+
+    gem install do_mysql
+
+If installing the MRI/1.9/Rubinius extension on OS X and you install a version
+of MySQL that was built for only a single architecture, you will need to set
+`ARCHFLAGS` appropriately:
+
+    sudo env ARCHFLAGS="-arch i386" gem install do_mysql
+
+To compile and install from source:
+
+* Install rake-compiler: `gem install rake-compiler`.
+
+* For MRI/Rubinius extensions:
+  * Install the `gcc` compiler. On OS X, you should install XCode tools. On
+    Ubuntu, run `apt-get install build-essential`.
+  * Install Ruby and MySQL.
+  * Install the Ruby and MySQL development headers.
+    * On Debian-Linux distributions, you can install the following packages
+      with `apt`: `ruby-dev` `libmysqlclient15-dev`.
+  * If you want to cross-compile for Windows:
+    * Install MinGW:
+      * On Debian-Linux distributions, you can install the following package
+        with `apt`: `mingw32`.
+      * On OS X, this can install the following package with MacPorts: `i386-mingw32-gcc`.
+    * Run `rake-compiler cross-ruby`.
+    * Run `rake-compiler update-config`.
+
+ * Then, install this driver with `(jruby -S) rake install`.
+
+For more information, see the MySQL driver wiki page:
+<http://wiki.github.com/datamapper/do/mysql>.
+
+## Developers
+
+Follow the above installation instructions. Additionally, you'll need:
+  * `bacon` gem for running specs.
+  * `YARD` gem for generating documentation.
+
+See the DataObjects wiki for more comprehensive information on installing and
+contributing to the JRuby-variant of this driver:
+<http://wiki.github.com/datamapper/do/jruby>.
+
+To run specs:
+
+    rake spec
+
+To run specs without compiling extensions first:
+
+    rake spec_no_compile
+
+To run individual specs:
+
+    rake spec TEST=spec/connection_spec.rb
+
+(Note that the `rake` task uses a `TEST` parameter, not `SPEC`. This is because
+the `Rake::TestTask` is used for executing the Bacon specs).
+
+## License
+
+This code is licensed under an **MIT (X11) License**. Please see the
+accompanying `LICENSE` file.

data/Rakefile

@@ -1,16 +1,63 @@
+require 'pathname'
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
 
-require 'pathname'
-require 'lib/do_mysql/version'
+ROOT = Pathname(__FILE__).dirname.expand_path
+
+require ROOT + 'lib/do_mysql/version'
+
+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'
+
+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 ])
+
+begin
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gem|
+    gem.name        = 'do_mysql'
+    gem.version     = DataObjects::Mysql::VERSION
+    gem.summary     = 'DataObjects MySQL Driver'
+    gem.description = 'Implements the DataObjects API for MySQL'
+    gem.platform    = Gem::Platform::RUBY
+    gem.files       = Dir['lib/**/*.rb', 'spec/**/*.rb', 'tasks/**/*.rake',
+                          'ext/**/*.{rb,c,h}', 'LICENSE', 'Rakefile',
+                          '*.{markdown,rdoc,txt,yml}']
+    gem.extra_rdoc_files = FileList['README*', 'ChangeLog*', 'LICENSE']
+    gem.test_files  = FileList['spec/**/*.rb']
+
+    # rake-compiler should generate gemspecs for other platforms (e.g. 'java')
+    # and modify dependencies and extensions appropriately
+    gem.extensions << 'ext/do_mysql/extconf.rb'
+
+    gem.add_dependency 'data_objects', DataObjects::Mysql::VERSION
+
+    gem.add_development_dependency 'bacon',         '~>1.1'
+    gem.add_development_dependency 'rake-compiler', '~>0.7'
+
+    gem.has_rdoc = false
+    gem.rubyforge_project = 'dorb'
+    gem.authors     = [ 'Dirkjan Bussink' ]
+    gem.email       = 'd.bussink@gmail.com'
+  end
 
-ROOT    = Pathname(__FILE__).dirname.expand_path
-JRUBY   = RUBY_PLATFORM =~ /java/
-WINDOWS = Gem.win_platform?
-SUDO    = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
-BINARY_VERSION = '5.0.85'
+  if JRUBY
+    Rake::Task['build'].clear_actions   if Rake::Task.task_defined?('build')
+    Rake::Task['install'].clear_actions if Rake::Task.task_defined?('install')
+    task :build => [ :java, :gem ]
+    task :install do
+      sh "#{Config::CONFIG['RUBY_INSTALL_NAME']} -S gem install pkg/do_mysql-#{DataObjects::Mysql::VERSION}-java.gem"
+    end
+  end
 
-Dir['tasks/*.rake'].sort.each { |f| import f }
+  Jeweler::GemcutterTasks.new
 
-CLEAN.include(%w[ {tmp,pkg}/ **/*.{o,so,bundle,jar,log,a,gem,dSYM,obj,pdb,exp,DS_Store,rbc,db} ext/do_mysql_ext/Makefile ext-java/target ])
+  FileList['tasks/**/*.rake'].each { |task| import task }
+rescue LoadError
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
+end

data/ext/do_mysql/compat.h

@@ -0,0 +1,55 @@
+#ifndef RUBY_COMPAT_H
+#define RUBY_COMPAT_H
+
+/*
+ * Rules for better ruby C extensions:
+ *
+ * Never use the R<TYPE> macros directly, always use R<TYPE>_<FIELD>
+ *
+ * Never compare with RBASIC(obj)->klass, always use
+ *   rb_obj_is_instance_of()
+ *
+ * Never use RHASH(obj)->tbl or RHASH_TBL().
+ *
+ */
+
+
+// Array
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(obj) RARRAY(obj)->ptr
+#endif
+
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(obj) RARRAY(obj)->len
+#endif
+
+// String
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(obj) RSTRING(obj)->ptr
+#endif
+
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(obj) RSTRING(obj)->len
+#endif
+
+#ifndef rb_str_ptr
+#define rb_str_ptr(str) RSTRING_PTR(str)
+#endif
+
+#ifndef rb_str_ptr_readonly
+#define rb_str_ptr_readonly(str) RSTRING_PTR(str)
+#endif
+
+#ifndef rb_str_flush
+#define rb_str_flush(str)
+#endif
+
+#ifndef rb_str_update
+#define rb_str_update(str)
+#endif
+
+#ifndef rb_str_len
+#define rb_str_len(str) RSTRING_LEN(str)
+#endif
+
+#endif

data/ext/{do_mysql_ext/do_mysql_ext.c → do_mysql/do_mysql.c}

@@ -3,28 +3,18 @@
 #include <math.h>
 #include <ctype.h>
 #include <time.h>
+
 #include <mysql.h>
 #include <errmsg.h>
 #include <mysqld_error.h>
-#include "error.h"
 
+#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 CHECK_AND_RAISE(mysql_result_value, query) if (0 != mysql_result_value) { raise_error(self, db, query); }
 
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(s) (RSTRING(s)->ptr)
-#endif
-
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(s) (RSTRING(s)->len)
-#endif
-
-#ifndef RARRAY_LEN
-#define RARRAY_LEN(a) RARRAY(a)->len
-#endif
-
 #ifdef _WIN32
 #define cCommand_execute cCommand_execute_sync
 #define do_int64 signed __int64
@@ -166,7 +156,7 @@ static int jd_from_date(int year, int month, int day) {
   }
   a = year / 100;
   b = 2 - a + (a / 4);
-  return floor(365.25 * (year + 4716)) + floor(30.6001 * (month + 1)) + day + b - 1524;
+  return (int) (floor(365.25 * (year + 4716)) + floor(30.6001 * (month + 1)) + day + b - 1524);
 }
 
 static VALUE seconds_to_offset(long seconds_offset) {
@@ -233,7 +223,7 @@ static VALUE parse_date_time(const char *date) {
   do_int64 num, den;
 
 
-  long int gmt_offset;
+  time_t gmt_offset;
   int is_dst;
 
   time_t rawtime;
@@ -285,8 +275,8 @@ static VALUE parse_date_time(const char *date) {
     if ( is_dst > 0 )
       gmt_offset -= is_dst;
 
-    hour_offset = -(gmt_offset / 3600);
-    minute_offset = -(gmt_offset % 3600 / 60);
+    hour_offset = -((int)gmt_offset / 3600);
+    minute_offset = -((int)gmt_offset % 3600 / 60);
 
   } else {
     // Something went terribly wrong
@@ -349,7 +339,7 @@ static VALUE typecast(const char *value, long length, const VALUE type, int enco
   } else if (type == rb_cByteArray) {
     return rb_funcall(rb_cByteArray, ID_NEW, 1, rb_str_new(value, length));
   } else if (type == rb_cClass) {
-    return rb_funcall(rb_cObject, rb_intern("full_const_get"), 1, rb_str_new(value, length));
+    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) {
@@ -364,8 +354,8 @@ static void data_objects_debug(VALUE string, struct timeval* start) {
   struct timeval stop;
   char *message;
 
-  char *query = RSTRING_PTR(string);
-  int length  = RSTRING_LEN(string);
+  const char *query = rb_str_ptr_readonly(string);
+  size_t length     = rb_str_len(string);
   char total_time[32];
   do_int64 duration = 0;
 
@@ -410,7 +400,7 @@ static void raise_error(VALUE self, MYSQL *db, VALUE query) {
   rb_exc_raise(exception);
 }
 
-static char * get_uri_option(VALUE query_hash, char * key) {
+static char * get_uri_option(VALUE query_hash, const char * key) {
   VALUE query_value;
   char * value = NULL;
 
@@ -425,10 +415,10 @@ static char * get_uri_option(VALUE query_hash, char * key) {
   return value;
 }
 
-static void assert_file_exists(char * file, char * message) {
+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, message);
+    rb_raise(eArgumentError, "%s", message);
   }
 }
 
@@ -438,8 +428,8 @@ static void full_connect(VALUE self, MYSQL *db);
 static MYSQL_RES* cCommand_execute_sync(VALUE self, MYSQL* db, VALUE query) {
   int retval;
   struct timeval start;
-  char* str = RSTRING_PTR(query);
-  int len   = RSTRING_LEN(query);
+  const char* str = rb_str_ptr_readonly(query);
+  int len         = rb_str_len(query);
 
   if(mysql_ping(db) && mysql_errno(db) == CR_SERVER_GONE_ERROR) {
     // Ok, we do one more try here by doing a full connect
@@ -448,10 +438,10 @@ static MYSQL_RES* cCommand_execute_sync(VALUE self, MYSQL* db, VALUE query) {
   }
   gettimeofday(&start, NULL);
   retval = mysql_real_query(db, str, len);
-  CHECK_AND_RAISE(retval, query);
-
   data_objects_debug(query, &start);
 
+  CHECK_AND_RAISE(retval, query);
+
   return mysql_store_result(db);
 }
 #else
@@ -460,8 +450,8 @@ static MYSQL_RES* cCommand_execute_async(VALUE self, MYSQL* db, VALUE query) {
   int retval;
   fd_set rset;
   struct timeval start;
-  char* str = RSTRING_PTR(query);
-  int len   = RSTRING_LEN(query);
+  const char* str = rb_str_ptr_readonly(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");
@@ -474,6 +464,8 @@ static MYSQL_RES* cCommand_execute_async(VALUE self, MYSQL* db, VALUE query) {
 
   socket_fd = db->net.fd;
 
+  data_objects_debug(query, &start);
+
   for(;;) {
     FD_ZERO(&rset);
     FD_SET(socket_fd, &rset);
@@ -496,8 +488,6 @@ 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(query, &start);
-
   return mysql_store_result(db);
 }
 #endif
@@ -507,8 +497,8 @@ static void full_connect(VALUE self, MYSQL* db) {
   // Check to see if we're on the db machine.  If so, try to use the socket
   VALUE r_host, r_user, r_password, r_path, r_query, r_port;
 
-  char *host = "localhost", *user = "root", *password = NULL, *path;
-  char *database = "", *socket = NULL;
+  const char *host = "localhost", *user = "root"; 
+  char *database = NULL, *socket = NULL, *password = NULL, *path = NULL;
   VALUE encoding = Qnil;
 
   MYSQL *result;
@@ -609,17 +599,17 @@ static void full_connect(VALUE self, MYSQL* db) {
 
   VALUE my_encoding = rb_hash_aref(CONST_GET(mEncoding, "MAP"), encoding);
   if(my_encoding != Qnil) {
-    encoding_error = mysql_set_character_set(db, RSTRING_PTR(my_encoding));
+    encoding_error = mysql_set_character_set(db, rb_str_ptr_readonly(my_encoding));
     if (0 != encoding_error) {
       raise_error(self, db, Qnil);
     } else {
 #ifdef HAVE_RUBY_ENCODING_H
-      rb_iv_set(self, "@encoding_id", INT2FIX(rb_enc_find_index(RSTRING_PTR(encoding))));
+      rb_iv_set(self, "@encoding_id", INT2FIX(rb_enc_find_index(rb_str_ptr_readonly(encoding))));
 #endif
       rb_iv_set(self, "@my_encoding", my_encoding);
     }
   } else {
-    rb_warn("Encoding %s is not a known Ruby encoding for MySQL\n", RSTRING_PTR(encoding));
+    rb_warn("Encoding %s is not a known Ruby encoding for MySQL\n", rb_str_ptr_readonly(encoding));
     rb_iv_set(self, "@encoding", rb_str_new2("UTF-8"));
 #ifdef HAVE_RUBY_ENCODING_H
     rb_iv_set(self, "@encoding_id", INT2FIX(rb_enc_find_index("UTF-8")));
@@ -699,16 +689,6 @@ static VALUE cConnection_ssl_cipher(VALUE self) {
   return rb_iv_get(self, "@ssl_cipher");
 }
 
-static VALUE cConnection_secure(VALUE self) {
-  VALUE blank_cipher = rb_funcall(rb_iv_get(self, "@ssl_cipher"), rb_intern("blank?"), 0);
-
-  if (blank_cipher == Qtrue) {
-    return Qfalse;
-  } else {
-    return Qtrue;
-  }
-}
-
 static VALUE cConnection_dispose(VALUE self) {
   VALUE connection_container = rb_iv_get(self, "@connection");
 
@@ -782,12 +762,12 @@ VALUE cConnection_quote_date(VALUE self, VALUE value) {
 
 static VALUE cConnection_quote_string(VALUE self, VALUE string) {
   MYSQL *db = DATA_PTR(rb_iv_get(self, "@connection"));
-  const char *source = RSTRING_PTR(string);
-  int source_len     = RSTRING_LEN(string);
+  const char *source = rb_str_ptr_readonly(string);
+  size_t source_len  = rb_str_len(string);
   char *escaped;
   VALUE result;
 
-  int quoted_length = 0;
+  size_t quoted_length = 0;
 
   // Allocate space for the escaped version of 'string'.  Use + 3 allocate space for null term.
   // and the leading and trailing single-quotes.
@@ -838,7 +818,7 @@ static VALUE cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
   affected_rows = mysql_affected_rows(db);
   mysql_free_result(response);
 
-  if (-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)));
@@ -849,7 +829,7 @@ static VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
   VALUE field_names, field_types;
 
   unsigned int field_count;
-  int i;
+  unsigned int i;
 
   char guess_default_field_types = 0;
   VALUE connection = rb_iv_get(self, "@connection");
@@ -945,7 +925,7 @@ static VALUE cReader_next(VALUE self) {
   MYSQL_ROW result;
   unsigned long *lengths;
 
-  int i;
+  unsigned int i;
 
   if (Qnil == reader_container) {
     return Qfalse;
@@ -989,9 +969,7 @@ static VALUE cReader_values(VALUE self) {
   if ( state == Qnil || state == Qfalse ) {
     rb_raise(eDataError, "Reader is not initialized");
   }
-  else {
-    return rb_iv_get(self, "@values");
-  }
+  return rb_iv_get(self, "@values");
 }
 
 static VALUE cReader_fields(VALUE self) {
@@ -1002,7 +980,7 @@ static VALUE cReader_field_count(VALUE self) {
   return rb_iv_get(self, "@field_count");
 }
 
-void Init_do_mysql_ext() {
+void Init_do_mysql() {
   rb_require("bigdecimal");
   rb_require("date");
 
@@ -1056,7 +1034,6 @@ void Init_do_mysql_ext() {
   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, "secure?", cConnection_secure, 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);