mysql2 0.2.13 → 0.2.14

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.2@mysql2 --create
+rvm use 1.9.3@mysql2 --create

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.2.14 (November 9th, 2011)
+* use rb_wait_for_single_fd() if available
+* fixed a bug with inheriting query options
+* remove ext/ from the default loadpath
+* fix build issues on OSX with Xcode 4.2 (gcc-llvm compiler)
+
 ## 0.2.13 (August 16th, 2011)
 * fix stupid bug around symbol encoding support (thanks coderrr!)
 
@@ -167,4 +173,4 @@
 * updated extconf (thanks to the mysqlplus project) for easier gem building
 
 ## 0.1.0 (April 6th, 2010)
-* initial release
+* initial release

data/ext/mysql2/client.c

@@ -4,6 +4,7 @@
 #ifndef _WIN32
 #include <sys/socket.h>
 #endif
+#include "wait_for_single_fd.h"
 
 VALUE cMysql2Client;
 extern VALUE mMysql2, cMysql2Error;
@@ -45,6 +46,7 @@ struct nogvl_connect_args {
 struct nogvl_send_query_args {
   MYSQL *mysql;
   VALUE sql;
+  mysql_client_wrapper *wrapper;
 };
 
 /*
@@ -145,7 +147,7 @@ static VALUE nogvl_close(void *ptr) {
 #endif
 
     mysql_close(wrapper->client);
-    xfree(wrapper->client);
+    free(wrapper->client);
   }
 
   return Qnil;
@@ -156,7 +158,7 @@ static void rb_mysql_client_free(void * ptr) {
 
   nogvl_close(wrapper);
 
-  xfree(ptr);
+  free(ptr);
 }
 
 static VALUE allocate(VALUE klass) {
@@ -167,7 +169,7 @@ static VALUE allocate(VALUE klass) {
   wrapper->active = 0;
   wrapper->reconnect_enabled = 0;
   wrapper->closed = 1;
-  wrapper->client = (MYSQL*)xmalloc(sizeof(MYSQL));
+  wrapper->client = (MYSQL*)malloc(sizeof(MYSQL));
   return obj;
 }
 
@@ -179,19 +181,19 @@ static VALUE rb_mysql_client_escape(RB_MYSQL_UNUSED VALUE klass, VALUE str) {
   Check_Type(str, T_STRING);
 
   oldLen = RSTRING_LEN(str);
-  newStr = xmalloc(oldLen*2+1);
+  newStr = malloc(oldLen*2+1);
 
   newLen = mysql_escape_string((char *)newStr, StringValuePtr(str), oldLen);
   if (newLen == oldLen) {
     // no need to return a new ruby string if nothing changed
-    xfree(newStr);
+    free(newStr);
     return str;
   } else {
     rb_str = rb_str_new((const char*)newStr, newLen);
 #ifdef HAVE_RUBY_ENCODING_H
     rb_enc_copy(rb_str, str);
 #endif
-    xfree(newStr);
+    free(newStr);
     return rb_str;
   }
 }
@@ -249,6 +251,17 @@ static VALUE nogvl_send_query(void *ptr) {
   return rv == 0 ? Qtrue : Qfalse;
 }
 
+static VALUE do_send_query(void *args) {
+  struct nogvl_send_query_args *query_args = args;
+  mysql_client_wrapper *wrapper = query_args->wrapper;
+  if (rb_thread_blocking_region(nogvl_send_query, args, RUBY_UBF_IO, 0) == Qfalse) {
+    // an error occurred, we're not active anymore
+    MARK_CONN_INACTIVE(self);
+    return rb_raise_mysql2_error(wrapper);
+  }
+  return Qnil;
+}
+
 /*
  * even though we did rb_thread_select before calling this, a large
  * response can overflow the socket buffers and cause us to eventually
@@ -341,9 +354,7 @@ static VALUE do_query(void *args) {
   struct timeval tv;
   struct timeval* tvp;
   long int sec;
-  fd_set fdset;
   int retval;
-  int fd_set_fd;
   VALUE read_timeout;
 
   async_args = (struct async_query_args *)args;
@@ -364,14 +375,8 @@ static VALUE do_query(void *args) {
     tvp->tv_usec = 0;
   }
 
-  fd_set_fd = async_args->fd;
   for(;;) {
-    // the below code is largely from do_mysql
-    // http://github.com/datamapper/do
-    FD_ZERO(&fdset);
-    FD_SET(fd_set_fd, &fdset);
-
-    retval = rb_thread_select(fd_set_fd + 1, &fdset, NULL, NULL, tvp);
+    retval = rb_wait_for_single_fd(async_args->fd, RB_WAITFD_IN, tvp);
 
     if (retval == 0) {
       rb_raise(cMysql2Error, "Timeout waiting for a response from the last query. (waited %d seconds)", FIX2INT(read_timeout));
@@ -426,13 +431,6 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
   REQUIRE_OPEN_DB(wrapper);
   args.mysql = wrapper->client;
 
-  // see if this connection is still waiting on a result from a previous query
-  if (wrapper->active == 0) {
-    // mark this connection active
-    wrapper->active = 1;
-  } else {
-    rb_raise(cMysql2Error, "This connection is still waiting for a result, try again once you have the result");
-  }
 
   defaults = rb_iv_get(self, "@query_options");
   if (rb_scan_args(argc, argv, "11", &args.sql, &opts) == 2) {
@@ -453,12 +451,17 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
   args.sql = rb_str_export_to_enc(args.sql, conn_enc);
 #endif
 
-  if (rb_thread_blocking_region(nogvl_send_query, &args, RUBY_UBF_IO, 0) == Qfalse) {
-    // an error occurred, we're not active anymore
-    MARK_CONN_INACTIVE(self);
-    return rb_raise_mysql2_error(wrapper);
+  // see if this connection is still waiting on a result from a previous query
+  if (wrapper->active == 0) {
+    // mark this connection active
+    wrapper->active = 1;
+  } else {
+    rb_raise(cMysql2Error, "This connection is still waiting for a result, try again once you have the result");
   }
 
+  args.wrapper = wrapper;
+  rb_rescue2(do_send_query, (VALUE)&args, disconnect_and_raise, self, rb_eException, (VALUE)0);
+
 #ifndef _WIN32
   if (!async) {
     async_args.fd = wrapper->client->net.fd;
@@ -496,12 +499,12 @@ static VALUE rb_mysql_client_real_escape(VALUE self, VALUE str) {
 #endif
 
   oldLen = RSTRING_LEN(str);
-  newStr = xmalloc(oldLen*2+1);
+  newStr = malloc(oldLen*2+1);
 
   newLen = mysql_real_escape_string(wrapper->client, (char *)newStr, StringValuePtr(str), oldLen);
   if (newLen == oldLen) {
     // no need to return a new ruby string if nothing changed
-    xfree(newStr);
+    free(newStr);
     return str;
   } else {
     rb_str = rb_str_new((const char*)newStr, newLen);
@@ -511,7 +514,7 @@ static VALUE rb_mysql_client_real_escape(VALUE self, VALUE str) {
       rb_str = rb_str_export_to_enc(rb_str, default_internal_enc);
     }
 #endif
-    xfree(newStr);
+    free(newStr);
     return rb_str;
   }
 }
@@ -884,4 +887,4 @@ void init_mysql2_client() {
   rb_const_set(cMysql2Client, rb_intern("BASIC_FLAGS"),
       INT2NUM(CLIENT_BASIC_FLAGS));
 #endif
-}
+}

data/ext/mysql2/extconf.rb

@@ -7,6 +7,7 @@ end
 
 # 1.9-only
 have_func('rb_thread_blocking_region')
+have_func('rb_wait_for_single_fd')
 
 # borrowed from mysqlplus
 # http://github.com/oldmoe/mysqlplus/blob/master/ext/extconf.rb

data/ext/mysql2/result.c

@@ -139,7 +139,7 @@ static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, short int
 }
 
 #ifdef HAVE_RUBY_ENCODING_H
-inline VALUE mysql2_set_field_string_encoding(VALUE val, MYSQL_FIELD field, rb_encoding *default_internal_enc, rb_encoding *conn_enc) {
+static VALUE mysql2_set_field_string_encoding(VALUE val, MYSQL_FIELD field, rb_encoding *default_internal_enc, rb_encoding *conn_enc) {
   // if binary flag is set, respect it's wishes
   if (field.flags & BINARY_FLAG && field.charsetnr == 63) {
     rb_enc_associate(val, binaryEncoding);

data/ext/mysql2/wait_for_single_fd.h

@@ -0,0 +1,36 @@
+/*
+ * backwards compatibility for pre-1.9.3 C API
+ *
+ * Ruby 1.9.3 provides this API which allows the use of ppoll() on Linux
+ * to minimize select() and malloc() overhead on high-numbered FDs.
+ */
+#ifdef HAVE_RB_WAIT_FOR_SINGLE_FD
+#  include <ruby/io.h>
+#else
+#  define RB_WAITFD_IN  0x001
+#  define RB_WAITFD_PRI 0x002
+#  define RB_WAITFD_OUT 0x004
+
+static int my_wait_for_single_fd(int fd, int events, struct timeval *tvp)
+{
+  fd_set fdset;
+  fd_set *rfds = NULL;
+  fd_set *wfds = NULL;
+  fd_set *efds = NULL;
+
+  FD_ZERO(&fdset);
+  FD_SET(fd, &fdset);
+
+  if (events & RB_WAITFD_IN)
+    rfds = &fdset;
+  if (events & RB_WAITFD_OUT)
+    wfds = &fdset;
+  if (events & RB_WAITFD_PRI)
+    efds = &fdset;
+
+  return rb_thread_select(fd + 1, rfds, wfds, efds, tvp);
+}
+
+#define rb_wait_for_single_fd(fd,events,tvp) \
+        my_wait_for_single_fd((fd),(events),(tvp))
+#endif

data/lib/mysql2/client.rb

@@ -15,6 +15,7 @@ module Mysql2
 
     def initialize(opts = {})
       @query_options = @@default_query_options.dup
+      @query_options.merge! opts
 
       init_connection
 
@@ -30,7 +31,7 @@ module Mysql2
         raise Mysql2::Error, "read_timeout must be a positive integer, you passed #{@read_timeout}"
       end
 
-      ssl_set(*opts.values_at(:sslkey, :sslcert, :sslca, :sslcapath, :sslciper))
+      ssl_set(*opts.values_at(:sslkey, :sslcert, :sslca, :sslcapath, :sslcipher))
 
       user     = opts[:username]
       pass     = opts[:password]

data/lib/mysql2/version.rb

@@ -1,3 +1,3 @@
 module Mysql2
-  VERSION = "0.2.13"
-end
+  VERSION = "0.2.14"
+end

data/mysql2.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.homepage = %q{http://github.com/brianmario/mysql2}
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib", "ext"]
+  s.require_paths = ["lib"]
   s.rubygems_version = %q{1.4.2}
   s.summary = %q{A simple, fast Mysql library for Ruby, binding to libmysql}
   s.test_files = `git ls-files spec examples`.split("\n")
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   # tests
   s.add_development_dependency 'eventmachine'
   s.add_development_dependency 'rake-compiler', "~> 0.7.7"
+  s.add_development_dependency 'rake', '0.8.7' # NB: 0.8.7 required by rake-compiler 0.7.9
   s.add_development_dependency 'rspec'
   # benchmarks
   s.add_development_dependency 'activerecord'
@@ -26,4 +27,3 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sequel'
   s.add_development_dependency 'faker'
 end
-

metadata

@@ -1,112 +1,162 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mysql2
-version: !ruby/object:Gem::Version
-  version: 0.2.13
+version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 14
+  version: 0.2.14
 platform: ruby
-authors:
+authors: 
 - Brian Lopez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-17 00:00:00.000000000 -07:00
+
+date: 2011-11-09 00:00:00 -08:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: eventmachine
-  requirement: &70274481462240 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70274481462240
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake-compiler
-  requirement: &70274481461740 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 7
+        - 7
         version: 0.7.7
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: *70274481461740
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70274481461320 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: *70274481461320
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &70274481460860 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: activerecord
   prerelease: false
-  version_requirements: *70274481460860
-- !ruby/object:Gem::Dependency
-  name: mysql
-  requirement: &70274481460440 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: mysql
   prerelease: false
-  version_requirements: *70274481460440
-- !ruby/object:Gem::Dependency
-  name: do_mysql
-  requirement: &70274481460020 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: do_mysql
   prerelease: false
-  version_requirements: *70274481460020
-- !ruby/object:Gem::Dependency
-  name: sequel
-  requirement: &70274481459600 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: sequel
   prerelease: false
-  version_requirements: *70274481459600
-- !ruby/object:Gem::Dependency
-  name: faker
-  requirement: &70274465320920 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: faker
   prerelease: false
-  version_requirements: *70274465320920
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
 description: 
 email: seniorlopez@gmail.com
 executables: []
-extensions:
+
+extensions: 
 - ext/mysql2/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .rvmrc
@@ -133,6 +183,7 @@ files:
 - ext/mysql2/mysql2_ext.h
 - ext/mysql2/result.c
 - ext/mysql2/result.h
+- ext/mysql2/wait_for_single_fd.h
 - lib/active_record/connection_adapters/em_mysql2_adapter.rb
 - lib/active_record/connection_adapters/mysql2_adapter.rb
 - lib/active_record/fiber_patches.rb
@@ -159,31 +210,38 @@ files:
 has_rdoc: true
 homepage: http://github.com/brianmario/mysql2
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-- ext
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A simple, fast Mysql library for Ruby, binding to libmysql
-test_files:
+test_files: 
 - examples/eventmachine.rb
 - examples/threaded.rb
 - spec/em/em_fiber_spec.rb