mysql2 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+# 0.2.2 (August 19th, 2010)
+* Change how AR adapter would send initial commands upon connecting
+** we can make multiple session variable assignments in a single query
+* fix signal handling when waiting on queries
+* retry connect if interrupted by signals
+
 ## 0.2.1 (August 16th, 2010)
 * bring mysql2 ActiveRecord adapter back into gem
 

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/ext/mysql2/client.c

@@ -1,5 +1,6 @@
 #include <mysql2_ext.h>
 #include <client.h>
+#include <errno.h>
 
 VALUE cMysql2Client;
 extern VALUE mMysql2, cMysql2Error;
@@ -96,10 +97,12 @@ static VALUE nogvl_connect(void *ptr) {
   struct nogvl_connect_args *args = ptr;
   MYSQL *client;
 
-  client = mysql_real_connect(args->mysql, args->host,
-                              args->user, args->passwd,
-                              args->db, args->port, args->unix_socket,
-                              args->client_flag);
+  do {
+    client = mysql_real_connect(args->mysql, args->host,
+                                args->user, args->passwd,
+                                args->db, args->port, args->unix_socket,
+                                args->client_flag);
+  } while (! client && errno == EINTR && (errno = 0) == 0);
 
   return client ? Qtrue : Qfalse;
 }
@@ -257,7 +260,6 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
   int fd, retval;
   int async = 0;
   VALUE opts, defaults;
-  int(*selector)(int, fd_set *, fd_set *, fd_set *, struct timeval *) = NULL;
   GET_CLIENT(self)
 
   REQUIRE_OPEN_DB(client);
@@ -299,12 +301,11 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
     // the below code is largely from do_mysql
     // http://github.com/datamapper/do
     fd = client->net.fd;
-    selector = rb_thread_alone() ? *select : *rb_thread_select;
     for(;;) {
       FD_ZERO(&fdset);
       FD_SET(fd, &fdset);
 
-      retval = selector(fd + 1, &fdset, NULL, NULL, NULL);
+      retval = rb_thread_select(fd + 1, &fdset, NULL, NULL, NULL);
 
       if (retval < 0) {
         rb_sys_fail(0);

data/lib/active_record/connection_adapters/mysql2_adapter.rb

@@ -606,12 +606,14 @@ module ActiveRecord
 
         def configure_connection
           @connection.query_options.merge!(:as => :array)
-          encoding = @config[:encoding]
-          execute("SET NAMES '#{encoding}'", :skip_logging) if encoding
 
           # By default, MySQL 'where id is null' selects the last inserted id.
           # Turn this off. http://dev.rubyonrails.org/ticket/6778
-          execute("SET SQL_AUTO_IS_NULL=0", :skip_logging)
+          variable_assignments = ['SQL_AUTO_IS_NULL=0']
+          encoding = @config[:encoding]
+          variable_assignments << "NAMES '#{encoding}'" if encoding
+
+          execute("SET #{variable_assignments.join(', ')}", :skip_logging)
         end
 
         # Returns an array of record hashes with the column names as keys and

data/lib/mysql2.rb

@@ -11,5 +11,5 @@ require 'mysql2/result'
 #
 # A modern, simple and very fast Mysql library for Ruby - binding to libmysql
 module Mysql2
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/mysql2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mysql2}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Lopez"]
-  s.date = %q{2010-08-16}
+  s.date = %q{2010-08-19}
   s.email = %q{seniorlopez@gmail.com}
   s.extensions = ["ext/mysql2/extconf.rb"]
   s.extra_rdoc_files = [

data/spec/mysql2/client_spec.rb

@@ -78,6 +78,33 @@ describe Mysql2::Client do
         @client.query("SELECT 1")
       }.should raise_error(Mysql2::Error)
     end
+
+    # XXX this test is not deterministic (because Unix signal handling is not)
+    # and may fail on a loaded system
+    it "should run signal handlers while waiting for a response" do
+      mark = {}
+      trap(:USR1) { mark[:USR1] = Time.now }
+      begin
+        mark[:START] = Time.now
+        pid = fork do
+          sleep 1 # wait for client "SELECT sleep(2)" query to start
+          Process.kill(:USR1, Process.ppid)
+          sleep # wait for explicit kill to prevent GC disconnect
+        end
+        @client.query("SELECT sleep(2)")
+        mark[:END] = Time.now
+        mark.include?(:USR1).should be_true
+        (mark[:USR1] - mark[:START]).should >= 1
+        (mark[:USR1] - mark[:START]).should < 1.1
+        (mark[:END] - mark[:USR1]).should > 0.9
+        (mark[:END] - mark[:START]).should >= 2
+        (mark[:END] - mark[:START]).should < 2.1
+        Process.kill(:TERM, pid)
+        Process.waitpid2(pid)
+      ensure
+        trap(:USR1, 'DEFAULT')
+      end
+    end if RUBY_PLATFORM !~ /mingw|mswin/
   end
 
   it "should respond to #escape" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mysql2
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Brian Lopez
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 -07:00
+date: 2010-08-19 00:00:00 -07:00
 default_executable: 
 dependencies: []