mysql2 0.2.6-x86-mswin32-60

data/benchmark/allocations.rb

@@ -0,0 +1,33 @@
+# encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+raise Mysql2::Mysql2Error.new("GC allocation benchmarks only supported on Ruby 1.9!") unless RUBY_VERSION =~ /1\.9/
+
+require 'rubygems'
+require 'benchmark'
+require 'active_record'
+
+ActiveRecord::Base.default_timezone = :local
+ActiveRecord::Base.time_zone_aware_attributes = true
+
+class Mysql2Model < ActiveRecord::Base
+  set_table_name :mysql2_test
+end
+
+def bench_allocations(feature, iterations = 10, &blk)
+  puts "GC overhead for #{feature}"
+  Mysql2Model.establish_connection(:adapter => 'mysql2', :database => 'test')
+  GC::Profiler.clear
+  GC::Profiler.enable
+  iterations.times{ blk.call }
+  GC::Profiler.report(STDOUT)
+  GC::Profiler.disable
+end
+
+bench_allocations('coercion') do
+  Mysql2Model.all(:limit => 1000).each{ |r|
+    r.attributes.keys.each{ |k|
+      r.send(k.to_sym)
+    }
+  }
+end

data/benchmark/escape.rb

@@ -0,0 +1,39 @@
+# encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+require 'rubygems'
+require 'benchmark'
+require 'mysql'
+require 'mysql2'
+require 'do_mysql'
+
+def run_escape_benchmarks(str, number_of = 1000)
+  Benchmark.bmbm do |x|
+    mysql = Mysql.new("localhost", "root")
+    x.report do
+      puts "Mysql #{str.inspect}"
+      number_of.times do
+        mysql.quote str
+      end
+    end
+
+    mysql2 = Mysql2::Client.new(:host => "localhost", :username => "root")
+    x.report do
+      puts "Mysql2 #{str.inspect}"
+      number_of.times do
+        mysql2.escape str
+      end
+    end
+
+    do_mysql = DataObjects::Connection.new("mysql://localhost/test")
+    x.report do
+      puts "do_mysql #{str.inspect}"
+      number_of.times do
+        do_mysql.quote_string str
+      end
+    end
+  end
+end
+
+run_escape_benchmarks "abc'def\"ghi\0jkl%mno"
+run_escape_benchmarks "clean string"

data/benchmark/query_with_mysql_casting.rb

@@ -0,0 +1,83 @@
+# encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+require 'rubygems'
+require 'benchmark'
+require 'mysql'
+require 'mysql2'
+require 'do_mysql'
+
+number_of = 100
+database = 'test'
+sql = "SELECT * FROM mysql2_test LIMIT 100"
+
+class Mysql
+  include Enumerable
+end
+
+def mysql_cast(type, value)
+  case type
+    when Mysql::Field::TYPE_NULL
+      nil
+    when Mysql::Field::TYPE_TINY, Mysql::Field::TYPE_SHORT, Mysql::Field::TYPE_LONG,
+         Mysql::Field::TYPE_INT24, Mysql::Field::TYPE_LONGLONG, Mysql::Field::TYPE_YEAR
+      value.to_i
+    when Mysql::Field::TYPE_DECIMAL, Mysql::Field::TYPE_NEWDECIMAL
+      BigDecimal.new(value)
+    when Mysql::Field::TYPE_DOUBLE, Mysql::Field::TYPE_FLOAT
+      value.to_f
+    when Mysql::Field::TYPE_DATE
+      Date.parse(value)
+    when Mysql::Field::TYPE_TIME, Mysql::Field::TYPE_DATETIME, Mysql::Field::TYPE_TIMESTAMP
+      Time.parse(value)
+    when Mysql::Field::TYPE_BLOB, Mysql::Field::TYPE_BIT, Mysql::Field::TYPE_STRING,
+         Mysql::Field::TYPE_VAR_STRING, Mysql::Field::TYPE_CHAR, Mysql::Field::TYPE_SET
+         Mysql::Field::TYPE_ENUM
+      value
+    else
+      value
+  end
+end
+
+Benchmark.bmbm do |x|
+  mysql2 = Mysql2::Client.new(:host => "localhost", :username => "root")
+  mysql2.query "USE #{database}"
+  x.report do
+    puts "Mysql2"
+    number_of.times do
+      mysql2_result = mysql2.query sql, :symbolize_keys => true
+      mysql2_result.each do |res|
+        # puts res.inspect
+      end
+    end
+  end
+
+  mysql = Mysql.new("localhost", "root")
+  mysql.query "USE #{database}"
+  x.report do
+    puts "Mysql"
+    number_of.times do
+      mysql_result = mysql.query sql
+      fields = mysql_result.fetch_fields
+      mysql_result.each do |row|
+        row_hash = {}
+        row.each_with_index do |f, j|
+          row_hash[fields[j].name.to_sym] = mysql_cast(fields[j].type, row[j])
+        end
+        # puts row_hash.inspect
+      end
+    end
+  end
+
+  do_mysql = DataObjects::Connection.new("mysql://localhost/#{database}")
+  command = do_mysql.create_command sql
+  x.report do
+    puts "do_mysql"
+    number_of.times do
+      do_result = command.execute_reader
+      do_result.each do |res|
+        # puts res.inspect
+      end
+    end
+  end
+end

data/benchmark/query_without_mysql_casting.rb

@@ -0,0 +1,50 @@
+# encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+require 'rubygems'
+require 'benchmark'
+require 'mysql'
+require 'mysql2'
+require 'do_mysql'
+
+number_of = 100
+database = 'test'
+sql = "SELECT * FROM mysql2_test LIMIT 100"
+
+Benchmark.bmbm do |x|
+  mysql2 = Mysql2::Client.new(:host => "localhost", :username => "root")
+  mysql2.query "USE #{database}"
+  x.report do
+    puts "Mysql2"
+    number_of.times do
+      mysql2_result = mysql2.query sql, :symbolize_keys => true
+      mysql2_result.each do |res|
+        # puts res.inspect
+      end
+    end
+  end
+
+  mysql = Mysql.new("localhost", "root")
+  mysql.query "USE #{database}"
+  x.report do
+    puts "Mysql"
+    number_of.times do
+      mysql_result = mysql.query sql
+      mysql_result.each_hash do |res|
+        # puts res.inspect
+      end
+    end
+  end
+
+  do_mysql = DataObjects::Connection.new("mysql://localhost/#{database}")
+  command = DataObjects::Mysql::Command.new do_mysql, sql
+  x.report do
+    puts "do_mysql"
+    number_of.times do
+      do_result = command.execute_reader
+      do_result.each do |res|
+        # puts res.inspect
+      end
+    end
+  end
+end

data/benchmark/sequel.rb

@@ -0,0 +1,39 @@
+# encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+require 'rubygems'
+require 'benchmark'
+require 'sequel'
+require 'sequel/adapters/do'
+
+number_of = 10
+mysql2_opts = "mysql2://localhost/test"
+mysql_opts = "mysql://localhost/test"
+do_mysql_opts = "do:mysql://localhost/test"
+
+class Mysql2Model < Sequel::Model(Sequel.connect(mysql2_opts)[:mysql2_test]); end
+class MysqlModel < Sequel::Model(Sequel.connect(mysql_opts)[:mysql2_test]); end
+class DOMysqlModel < Sequel::Model(Sequel.connect(do_mysql_opts)[:mysql2_test]); end
+
+Benchmark.bmbm do |x|
+  x.report do
+    puts "Mysql2"
+    number_of.times do
+      Mysql2Model.limit(1000).all
+    end
+  end
+
+  x.report do
+    puts "do:mysql"
+    number_of.times do
+      DOMysqlModel.limit(1000).all
+    end
+  end
+
+  x.report do
+    puts "Mysql"
+    number_of.times do
+      MysqlModel.limit(1000).all
+    end
+  end
+end

data/benchmark/setup_db.rb

@@ -0,0 +1,115 @@
+# encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+# This script is for generating psudo-random data into a single table consisting of nearly every
+# data type MySQL 5.1 supports.
+#
+# It's meant to be used with the query.rb benchmark script (or others in the future)
+
+require 'mysql2'
+require 'rubygems'
+require 'faker'
+
+num = ENV['NUM'] && ENV['NUM'].to_i || 10_000
+
+create_table_sql = %[
+  CREATE TABLE IF NOT EXISTS mysql2_test (
+    null_test VARCHAR(10),
+    bit_test BIT,
+    tiny_int_test TINYINT,
+    small_int_test SMALLINT,
+    medium_int_test MEDIUMINT,
+    int_test INT,
+    big_int_test BIGINT,
+    float_test FLOAT(10,3),
+    float_zero_test FLOAT(10,3),
+    double_test DOUBLE(10,3),
+    decimal_test DECIMAL(10,3),
+    decimal_zero_test DECIMAL(10,3),
+    date_test DATE,
+    date_time_test DATETIME,
+    timestamp_test TIMESTAMP,
+    time_test TIME,
+    year_test YEAR(4),
+    char_test CHAR(10),
+    varchar_test VARCHAR(10),
+    binary_test BINARY(10),
+    varbinary_test VARBINARY(10),
+    tiny_blob_test TINYBLOB,
+    tiny_text_test TINYTEXT,
+    blob_test BLOB,
+    text_test TEXT,
+    medium_blob_test MEDIUMBLOB,
+    medium_text_test MEDIUMTEXT,
+    long_blob_test LONGBLOB,
+    long_text_test LONGTEXT,
+    enum_test ENUM('val1', 'val2'),
+    set_test SET('val1', 'val2')
+  ) DEFAULT CHARSET=utf8
+]
+
+# connect to localhost by default, pass options as needed
+@client = Mysql2::Client.new :host => "localhost", :username => "root", :database => "test"
+
+@client.query create_table_sql
+
+def insert_record(args)
+  insert_sql = "
+    INSERT INTO mysql2_test (
+      null_test, bit_test, tiny_int_test, small_int_test, medium_int_test, int_test, big_int_test,
+      float_test, float_zero_test, double_test, decimal_test, decimal_zero_test, date_test, date_time_test, timestamp_test, time_test,
+      year_test, char_test, varchar_test, binary_test, varbinary_test, tiny_blob_test,
+      tiny_text_test, blob_test, text_test, medium_blob_test, medium_text_test,
+      long_blob_test, long_text_test, enum_test, set_test
+    )
+
+    VALUES (
+      NULL, #{args[:bit_test]}, #{args[:tiny_int_test]}, #{args[:small_int_test]}, #{args[:medium_int_test]}, #{args[:int_test]}, #{args[:big_int_test]},
+      #{args[:float_test]}, #{args[:float_zero_test]}, #{args[:double_test]}, #{args[:decimal_test]}, #{args[:decimal_zero_test]}, '#{args[:date_test]}', '#{args[:date_time_test]}', '#{args[:timestamp_test]}', '#{args[:time_test]}',
+      #{args[:year_test]}, '#{args[:char_test]}', '#{args[:varchar_test]}', '#{args[:binary_test]}', '#{args[:varbinary_test]}', '#{args[:tiny_blob_test]}',
+      '#{args[:tiny_text_test]}', '#{args[:blob_test]}', '#{args[:text_test]}', '#{args[:medium_blob_test]}', '#{args[:medium_text_test]}',
+      '#{args[:long_blob_test]}', '#{args[:long_text_test]}', '#{args[:enum_test]}', '#{args[:set_test]}'
+    )
+  "
+  @client.query insert_sql
+end
+
+puts "Creating #{num} records"
+num.times do |n|
+  insert_record(
+    :bit_test => 1,
+    :tiny_int_test => rand(128),
+    :small_int_test => rand(32767),
+    :medium_int_test => rand(8388607),
+    :int_test => rand(2147483647),
+    :big_int_test => rand(9223372036854775807),
+    :float_test => rand(32767)/1.87,
+    :float_zero_test => 0.0,
+    :double_test => rand(8388607)/1.87,
+    :decimal_test => rand(8388607)/1.87,
+    :decimal_zero_test => 0,
+    :date_test => '2010-4-4',
+    :date_time_test => '2010-4-4 11:44:00',
+    :timestamp_test => '2010-4-4 11:44:00',
+    :time_test => '11:44:00',
+    :year_test => Time.now.year,
+    :char_test => Faker::Lorem.words(rand(5)),
+    :varchar_test => Faker::Lorem.words(rand(5)),
+    :binary_test => Faker::Lorem.words(rand(5)),
+    :varbinary_test => Faker::Lorem.words(rand(5)),
+    :tiny_blob_test => Faker::Lorem.words(rand(5)),
+    :tiny_text_test => Faker::Lorem.paragraph(rand(5)),
+    :blob_test => Faker::Lorem.paragraphs(rand(25)),
+    :text_test => Faker::Lorem.paragraphs(rand(25)),
+    :medium_blob_test => Faker::Lorem.paragraphs(rand(25)),
+    :medium_text_test => Faker::Lorem.paragraphs(rand(25)),
+    :long_blob_test => Faker::Lorem.paragraphs(rand(25)),
+    :long_text_test => Faker::Lorem.paragraphs(rand(25)),
+    :enum_test => ['val1', 'val2'].rand,
+    :set_test => ['val1', 'val2', 'val1,val2'].rand
+  )
+  $stdout.putc '.'
+  $stdout.flush
+end
+puts
+puts "Done"

data/examples/eventmachine.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+$LOAD_PATH.unshift 'lib'
+
+require 'rubygems'
+require 'eventmachine'
+require 'mysql2/em'
+
+EM.run do
+  client1 = Mysql2::EM::Client.new
+  defer1 = client1.query "SELECT sleep(3) as first_query"
+  defer1.callback do |result|
+    puts "Result: #{result.to_a.inspect}"
+  end
+
+  client2 = Mysql2::EM::Client.new
+  defer2 = client2.query "SELECT sleep(1) second_query"
+  defer2.callback do |result|
+    puts "Result: #{result.to_a.inspect}"
+  end
+end

data/examples/threaded.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+
+$LOAD_PATH.unshift 'lib'
+require 'mysql2'
+require 'timeout'
+
+threads = []
+# Should never exceed worst case 3.5 secs across all 20 threads
+Timeout.timeout(3.5) do
+  20.times do
+    threads << Thread.new do
+      overhead = rand(3)
+      puts ">> thread #{Thread.current.object_id} query, #{overhead} sec overhead"
+      # 3 second overhead per query
+      Mysql2::Client.new(:host => "localhost", :username => "root").query("SELECT sleep(#{overhead}) as result")
+      puts "<< thread #{Thread.current.object_id} result, #{overhead} sec overhead"
+    end
+  end
+  threads.each{|t| t.join }
+end

data/ext/mysql2/client.c

@@ -0,0 +1,659 @@
+#include <mysql2_ext.h>
+#include <client.h>
+#include <errno.h>
+
+VALUE cMysql2Client;
+extern VALUE mMysql2, cMysql2Error;
+static VALUE intern_encoding_from_charset;
+static ID sym_id, sym_version, sym_async, sym_symbolize_keys, sym_as, sym_array;
+static ID intern_merge, intern_error_number_eql, intern_sql_state_eql;
+
+#define REQUIRE_OPEN_DB(wrapper) \
+  if(wrapper->closed) { \
+    rb_raise(cMysql2Error, "closed MySQL connection"); \
+    return Qnil; \
+  }
+
+#define MARK_CONN_INACTIVE(conn) \
+  wrapper->active = 0
+
+#define GET_CLIENT(self) \
+  mysql_client_wrapper *wrapper; \
+  Data_Get_Struct(self, mysql_client_wrapper, wrapper)
+
+/*
+ * used to pass all arguments to mysql_real_connect while inside
+ * rb_thread_blocking_region
+ */
+struct nogvl_connect_args {
+  MYSQL *mysql;
+  const char *host;
+  const char *user;
+  const char *passwd;
+  const char *db;
+  unsigned int port;
+  const char *unix_socket;
+  unsigned long client_flag;
+};
+
+/*
+ * used to pass all arguments to mysql_send_query while inside
+ * rb_thread_blocking_region
+ */
+struct nogvl_send_query_args {
+  MYSQL *mysql;
+  VALUE sql;
+};
+
+/*
+ * non-blocking mysql_*() functions that we won't be wrapping since
+ * they do not appear to hit the network nor issue any interruptible
+ * or blocking system calls.
+ *
+ * - mysql_affected_rows()
+ * - mysql_error()
+ * - mysql_fetch_fields()
+ * - mysql_fetch_lengths() - calls cli_fetch_lengths or emb_fetch_lengths
+ * - mysql_field_count()
+ * - mysql_get_client_info()
+ * - mysql_get_client_version()
+ * - mysql_get_server_info()
+ * - mysql_get_server_version()
+ * - mysql_insert_id()
+ * - mysql_num_fields()
+ * - mysql_num_rows()
+ * - mysql_options()
+ * - mysql_real_escape_string()
+ * - mysql_ssl_set()
+ */
+
+static void rb_mysql_client_mark(void * wrapper) {
+  mysql_client_wrapper * w = wrapper;
+  if (w) {
+    rb_gc_mark(w->encoding);
+  }
+}
+
+static VALUE rb_raise_mysql2_error(MYSQL *client) {
+  VALUE e = rb_exc_new2(cMysql2Error, mysql_error(client));
+  rb_funcall(e, intern_error_number_eql, 1, INT2NUM(mysql_errno(client)));
+  rb_funcall(e, intern_sql_state_eql, 1, rb_tainted_str_new2(mysql_sqlstate(client)));
+  rb_exc_raise(e);
+  return Qnil;
+}
+
+static VALUE nogvl_init(void *ptr) {
+  MYSQL *client;
+
+  /* may initialize embedded server and read /etc/services off disk */
+  client = mysql_init((MYSQL *)ptr);
+  return client ? Qtrue : Qfalse;
+}
+
+static VALUE nogvl_connect(void *ptr) {
+  struct nogvl_connect_args *args = ptr;
+  MYSQL *client;
+
+  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;
+}
+
+static VALUE nogvl_close(void *ptr) {
+  mysql_client_wrapper *wrapper = ptr;
+  if (!wrapper->closed) {
+    wrapper->closed = 1;
+
+    /*
+     * we'll send a QUIT message to the server, but that message is more of a
+     * formality than a hard requirement since the socket is getting shutdown
+     * anyways, so ensure the socket write does not block our interpreter
+     *
+     *
+     * if the socket is dead we have no chance of blocking,
+     * so ignore any potential fcntl errors since they don't matter
+     */
+#ifndef _WIN32
+    int flags = fcntl(wrapper->client->net.fd, F_GETFL);
+    if (flags > 0 && !(flags & O_NONBLOCK))
+      fcntl(wrapper->client->net.fd, F_SETFL, flags | O_NONBLOCK);
+#else
+    u_long iMode = 1;
+    ioctlsocket(wrapper->client->net.fd, FIONBIO, &iMode);
+#endif
+
+    mysql_close(wrapper->client);
+    free(wrapper->client);
+  }
+
+  return Qnil;
+}
+
+static void rb_mysql_client_free(void * ptr) {
+  mysql_client_wrapper *wrapper = (mysql_client_wrapper *)ptr;
+
+  nogvl_close(wrapper);
+
+  xfree(ptr);
+}
+
+static VALUE allocate(VALUE klass) {
+  VALUE obj;
+  mysql_client_wrapper * wrapper;
+  obj = Data_Make_Struct(klass, mysql_client_wrapper, rb_mysql_client_mark, rb_mysql_client_free, wrapper);
+  wrapper->encoding = Qnil;
+  wrapper->active = 0;
+  wrapper->closed = 1;
+  wrapper->client = (MYSQL*)malloc(sizeof(MYSQL));
+  return obj;
+}
+
+static VALUE rb_connect(VALUE self, VALUE user, VALUE pass, VALUE host, VALUE port, VALUE database, VALUE socket, VALUE flags) {
+  struct nogvl_connect_args args;
+  GET_CLIENT(self);
+
+  args.host = NIL_P(host) ? "localhost" : StringValuePtr(host);
+  args.unix_socket = NIL_P(socket) ? NULL : StringValuePtr(socket);
+  args.port = NIL_P(port) ? 3306 : NUM2INT(port);
+  args.user = NIL_P(user) ? NULL : StringValuePtr(user);
+  args.passwd = NIL_P(pass) ? NULL : StringValuePtr(pass);
+  args.db = NIL_P(database) ? NULL : StringValuePtr(database);
+  args.mysql = wrapper->client;
+  args.client_flag = NUM2ULONG(flags);
+
+  if (rb_thread_blocking_region(nogvl_connect, &args, RUBY_UBF_IO, 0) == Qfalse) {
+    // unable to connect
+    return rb_raise_mysql2_error(wrapper->client);
+  }
+
+  return self;
+}
+
+/*
+ * Immediately disconnect from the server, normally the garbage collector
+ * will disconnect automatically when a connection is no longer needed.
+ * Explicitly closing this will free up server resources sooner than waiting
+ * for the garbage collector.
+ */
+static VALUE rb_mysql_client_close(VALUE self) {
+  GET_CLIENT(self);
+
+  if (!wrapper->closed) {
+    rb_thread_blocking_region(nogvl_close, wrapper, RUBY_UBF_IO, 0);
+  }
+
+  return Qnil;
+}
+
+/*
+ * mysql_send_query is unlikely to block since most queries are small
+ * enough to fit in a socket buffer, but sometimes large UPDATE and
+ * INSERTs will cause the process to block
+ */
+static VALUE nogvl_send_query(void *ptr) {
+  struct nogvl_send_query_args *args = ptr;
+  int rv;
+  const char *sql = StringValuePtr(args->sql);
+  long sql_len = RSTRING_LEN(args->sql);
+
+  rv = mysql_send_query(args->mysql, sql, sql_len);
+
+  return rv == 0 ? Qtrue : Qfalse;
+}
+
+/*
+ * even though we did rb_thread_select before calling this, a large
+ * response can overflow the socket buffers and cause us to eventually
+ * block while calling mysql_read_query_result
+ */
+static VALUE nogvl_read_query_result(void *ptr) {
+  MYSQL * client = ptr;
+  my_bool res = mysql_read_query_result(client);
+
+  return res == 0 ? Qtrue : Qfalse;
+}
+
+/* mysql_store_result may (unlikely) read rows off the socket */
+static VALUE nogvl_store_result(void *ptr) {
+  MYSQL * client = ptr;
+  return (VALUE)mysql_store_result(client);
+}
+
+static VALUE rb_mysql_client_async_result(VALUE self) {
+  MYSQL_RES * result;
+  GET_CLIENT(self);
+
+  REQUIRE_OPEN_DB(wrapper);
+  if (rb_thread_blocking_region(nogvl_read_query_result, wrapper->client, RUBY_UBF_IO, 0) == Qfalse) {
+    // an error occurred, mark this connection inactive
+    MARK_CONN_INACTIVE(self);
+    return rb_raise_mysql2_error(wrapper->client);
+  }
+
+  result = (MYSQL_RES *)rb_thread_blocking_region(nogvl_store_result, wrapper->client, RUBY_UBF_IO, 0);
+
+  // we have our result, mark this connection inactive
+  MARK_CONN_INACTIVE(self);
+
+  if (result == NULL) {
+    if (mysql_field_count(wrapper->client) != 0) {
+      rb_raise_mysql2_error(wrapper->client);
+    }
+    return Qnil;
+  }
+
+  VALUE resultObj = rb_mysql_result_to_obj(result);
+  // pass-through query options for result construction later
+  rb_iv_set(resultObj, "@query_options", rb_funcall(rb_iv_get(self, "@query_options"), rb_intern("dup"), 0));
+
+#ifdef HAVE_RUBY_ENCODING_H
+  mysql2_result_wrapper * result_wrapper;
+  GetMysql2Result(resultObj, result_wrapper);
+  result_wrapper->encoding = wrapper->encoding;
+#endif
+  return resultObj;
+}
+
+static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
+  struct nogvl_send_query_args args;
+  fd_set fdset;
+  int fd, retval;
+  int async = 0;
+  VALUE opts, defaults;
+  GET_CLIENT(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) {
+    opts = rb_funcall(defaults, intern_merge, 1, opts);
+    rb_iv_set(self, "@query_options", opts);
+
+    if (rb_hash_aref(opts, sym_async) == Qtrue) {
+      async = 1;
+    }
+  } else {
+    opts = defaults;
+  }
+
+#ifdef HAVE_RUBY_ENCODING_H
+  rb_encoding *conn_enc = rb_to_encoding(wrapper->encoding);
+  // ensure the string is in the encoding the connection is expecting
+  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->client);
+  }
+
+  if (!async) {
+    // the below code is largely from do_mysql
+    // http://github.com/datamapper/do
+    fd = wrapper->client->net.fd;
+    for(;;) {
+      FD_ZERO(&fdset);
+      FD_SET(fd, &fdset);
+
+      retval = rb_thread_select(fd + 1, &fdset, NULL, NULL, NULL);
+
+      if (retval < 0) {
+        rb_sys_fail(0);
+      }
+
+      if (retval > 0) {
+        break;
+      }
+    }
+
+    VALUE result = rb_mysql_client_async_result(self);
+
+    return result;
+  } else {
+    return Qnil;
+  }
+}
+
+static VALUE rb_mysql_client_escape(VALUE self, VALUE str) {
+  VALUE newStr;
+  unsigned long newLen, oldLen;
+  GET_CLIENT(self);
+
+  REQUIRE_OPEN_DB(wrapper);
+  Check_Type(str, T_STRING);
+#ifdef HAVE_RUBY_ENCODING_H
+  rb_encoding *default_internal_enc = rb_default_internal_encoding();
+  rb_encoding *conn_enc = rb_to_encoding(wrapper->encoding);
+  // ensure the string is in the encoding the connection is expecting
+  str = rb_str_export_to_enc(str, conn_enc);
+#endif
+
+  oldLen = RSTRING_LEN(str);
+  newStr = rb_str_new(0, oldLen*2+1);
+
+  newLen = mysql_real_escape_string(wrapper->client, RSTRING_PTR(newStr), StringValuePtr(str), oldLen);
+  if (newLen == oldLen) {
+    // no need to return a new ruby string if nothing changed
+    return str;
+  } else {
+    rb_str_resize(newStr, newLen);
+#ifdef HAVE_RUBY_ENCODING_H
+    rb_enc_associate(newStr, conn_enc);
+    if (default_internal_enc) {
+      newStr = rb_str_export_to_enc(newStr, default_internal_enc);
+    }
+#endif
+    return newStr;
+  }
+}
+
+static VALUE rb_mysql_client_info(VALUE self) {
+  VALUE version = rb_hash_new(), client_info;
+  GET_CLIENT(self);
+
+#ifdef HAVE_RUBY_ENCODING_H
+  rb_encoding *default_internal_enc = rb_default_internal_encoding();
+  rb_encoding *conn_enc = rb_to_encoding(wrapper->encoding);
+#endif
+
+  rb_hash_aset(version, sym_id, LONG2NUM(mysql_get_client_version()));
+  client_info = rb_str_new2(mysql_get_client_info());
+#ifdef HAVE_RUBY_ENCODING_H
+  rb_enc_associate(client_info, conn_enc);
+  if (default_internal_enc) {
+    client_info = rb_str_export_to_enc(client_info, default_internal_enc);
+  }
+#endif
+  rb_hash_aset(version, sym_version, client_info);
+  return version;
+}
+
+static VALUE rb_mysql_client_server_info(VALUE self) {
+  VALUE version, server_info;
+  GET_CLIENT(self);
+
+  REQUIRE_OPEN_DB(wrapper);
+#ifdef HAVE_RUBY_ENCODING_H
+  rb_encoding *default_internal_enc = rb_default_internal_encoding();
+  rb_encoding *conn_enc = rb_to_encoding(wrapper->encoding);
+#endif
+
+  version = rb_hash_new();
+  rb_hash_aset(version, sym_id, LONG2FIX(mysql_get_server_version(wrapper->client)));
+  server_info = rb_str_new2(mysql_get_server_info(wrapper->client));
+#ifdef HAVE_RUBY_ENCODING_H
+  rb_enc_associate(server_info, conn_enc);
+  if (default_internal_enc) {
+    server_info = rb_str_export_to_enc(server_info, default_internal_enc);
+  }
+#endif
+  rb_hash_aset(version, sym_version, server_info);
+  return version;
+}
+
+static VALUE rb_mysql_client_socket(VALUE self) {
+  GET_CLIENT(self);
+  REQUIRE_OPEN_DB(wrapper);
+  return INT2NUM(wrapper->client->net.fd);
+}
+
+static VALUE rb_mysql_client_last_id(VALUE self) {
+  GET_CLIENT(self);
+  REQUIRE_OPEN_DB(wrapper);
+  return ULL2NUM(mysql_insert_id(wrapper->client));
+}
+
+static VALUE rb_mysql_client_affected_rows(VALUE self) {
+  GET_CLIENT(self);
+  my_ulonglong retVal;
+
+  REQUIRE_OPEN_DB(wrapper);
+  retVal = mysql_affected_rows(wrapper->client);
+  if (retVal == (my_ulonglong)-1) {
+    rb_raise_mysql2_error(wrapper->client);
+  }
+  return ULL2NUM(retVal);
+}
+
+static VALUE set_reconnect(VALUE self, VALUE value) {
+  my_bool reconnect;
+  GET_CLIENT(self);
+
+  if(!NIL_P(value)) {
+    reconnect = value == Qfalse ? 0 : 1;
+
+    /* set default reconnect behavior */
+    if (mysql_options(wrapper->client, MYSQL_OPT_RECONNECT, &reconnect)) {
+      /* TODO: warning - unable to set reconnect behavior */
+      rb_warn("%s\n", mysql_error(wrapper->client));
+    }
+  }
+  return value;
+}
+
+static VALUE set_connect_timeout(VALUE self, VALUE value) {
+  unsigned int connect_timeout = 0;
+  GET_CLIENT(self);
+
+  if(!NIL_P(value)) {
+    connect_timeout = NUM2INT(value);
+    if(0 == connect_timeout) return value;
+
+    /* set default connection timeout behavior */
+    if (mysql_options(wrapper->client, MYSQL_OPT_CONNECT_TIMEOUT, &connect_timeout)) {
+      /* TODO: warning - unable to set connection timeout */
+      rb_warn("%s\n", mysql_error(wrapper->client));
+    }
+  }
+  return value;
+}
+
+static VALUE set_charset_name(VALUE self, VALUE value) {
+  char * charset_name;
+  GET_CLIENT(self);
+
+#ifdef HAVE_RUBY_ENCODING_H
+  VALUE new_encoding;
+  new_encoding = rb_funcall(cMysql2Client, intern_encoding_from_charset, 1, value);
+  if (new_encoding == Qnil) {
+    rb_raise(cMysql2Error, "Unsupported charset: '%s'", RSTRING_PTR(value));
+  } else {
+    if (wrapper->encoding == Qnil) {
+      wrapper->encoding = new_encoding;
+    }
+  }
+#endif
+
+  charset_name = StringValuePtr(value);
+
+  if (mysql_options(wrapper->client, MYSQL_SET_CHARSET_NAME, charset_name)) {
+    /* TODO: warning - unable to set charset */
+    rb_warn("%s\n", mysql_error(wrapper->client));
+  }
+
+  return value;
+}
+
+static VALUE set_ssl_options(VALUE self, VALUE key, VALUE cert, VALUE ca, VALUE capath, VALUE cipher) {
+  GET_CLIENT(self);
+
+  if(!NIL_P(ca) || !NIL_P(key)) {
+    mysql_ssl_set(wrapper->client,
+        NIL_P(key) ? NULL : StringValuePtr(key),
+        NIL_P(cert) ? NULL : StringValuePtr(cert),
+        NIL_P(ca) ? NULL : StringValuePtr(ca),
+        NIL_P(capath) ? NULL : StringValuePtr(capath),
+        NIL_P(cipher) ? NULL : StringValuePtr(cipher));
+  }
+
+  return self;
+}
+
+static VALUE init_connection(VALUE self) {
+  GET_CLIENT(self);
+
+  if (rb_thread_blocking_region(nogvl_init, wrapper->client, RUBY_UBF_IO, 0) == Qfalse) {
+    /* TODO: warning - not enough memory? */
+    return rb_raise_mysql2_error(wrapper->client);
+  }
+
+  wrapper->closed = 0;
+  return self;
+}
+
+void init_mysql2_client() {
+  cMysql2Client = rb_define_class_under(mMysql2, "Client", rb_cObject);
+
+  rb_define_alloc_func(cMysql2Client, allocate);
+
+  rb_define_method(cMysql2Client, "close", rb_mysql_client_close, 0);
+  rb_define_method(cMysql2Client, "query", rb_mysql_client_query, -1);
+  rb_define_method(cMysql2Client, "escape", rb_mysql_client_escape, 1);
+  rb_define_method(cMysql2Client, "info", rb_mysql_client_info, 0);
+  rb_define_method(cMysql2Client, "server_info", rb_mysql_client_server_info, 0);
+  rb_define_method(cMysql2Client, "socket", rb_mysql_client_socket, 0);
+  rb_define_method(cMysql2Client, "async_result", rb_mysql_client_async_result, 0);
+  rb_define_method(cMysql2Client, "last_id", rb_mysql_client_last_id, 0);
+  rb_define_method(cMysql2Client, "affected_rows", rb_mysql_client_affected_rows, 0);
+
+  rb_define_private_method(cMysql2Client, "reconnect=", set_reconnect, 1);
+  rb_define_private_method(cMysql2Client, "connect_timeout=", set_connect_timeout, 1);
+  rb_define_private_method(cMysql2Client, "charset_name=", set_charset_name, 1);
+  rb_define_private_method(cMysql2Client, "ssl_set", set_ssl_options, 5);
+  rb_define_private_method(cMysql2Client, "init_connection", init_connection, 0);
+  rb_define_private_method(cMysql2Client, "connect", rb_connect, 7);
+
+  intern_encoding_from_charset = rb_intern("encoding_from_charset");
+
+  sym_id              = ID2SYM(rb_intern("id"));
+  sym_version         = ID2SYM(rb_intern("version"));
+  sym_async           = ID2SYM(rb_intern("async"));
+  sym_symbolize_keys  = ID2SYM(rb_intern("symbolize_keys"));
+  sym_as              = ID2SYM(rb_intern("as"));
+  sym_array           = ID2SYM(rb_intern("array"));
+
+  intern_merge = rb_intern("merge");
+  intern_error_number_eql = rb_intern("error_number=");
+  intern_sql_state_eql = rb_intern("sql_state=");
+
+#ifdef CLIENT_LONG_PASSWORD
+  rb_const_set(cMysql2Client, rb_intern("LONG_PASSWORD"),
+      INT2NUM(CLIENT_LONG_PASSWORD));
+#endif
+
+#ifdef CLIENT_FOUND_ROWS
+  rb_const_set(cMysql2Client, rb_intern("FOUND_ROWS"),
+      INT2NUM(CLIENT_FOUND_ROWS));
+#endif
+
+#ifdef CLIENT_LONG_FLAG
+  rb_const_set(cMysql2Client, rb_intern("LONG_FLAG"),
+      INT2NUM(CLIENT_LONG_FLAG));
+#endif
+
+#ifdef CLIENT_CONNECT_WITH_DB
+  rb_const_set(cMysql2Client, rb_intern("CONNECT_WITH_DB"),
+      INT2NUM(CLIENT_CONNECT_WITH_DB));
+#endif
+
+#ifdef CLIENT_NO_SCHEMA
+  rb_const_set(cMysql2Client, rb_intern("NO_SCHEMA"),
+      INT2NUM(CLIENT_NO_SCHEMA));
+#endif
+
+#ifdef CLIENT_COMPRESS
+  rb_const_set(cMysql2Client, rb_intern("COMPRESS"), INT2NUM(CLIENT_COMPRESS));
+#endif
+
+#ifdef CLIENT_ODBC
+  rb_const_set(cMysql2Client, rb_intern("ODBC"), INT2NUM(CLIENT_ODBC));
+#endif
+
+#ifdef CLIENT_LOCAL_FILES
+  rb_const_set(cMysql2Client, rb_intern("LOCAL_FILES"),
+      INT2NUM(CLIENT_LOCAL_FILES));
+#endif
+
+#ifdef CLIENT_IGNORE_SPACE
+  rb_const_set(cMysql2Client, rb_intern("IGNORE_SPACE"),
+      INT2NUM(CLIENT_IGNORE_SPACE));
+#endif
+
+#ifdef CLIENT_PROTOCOL_41
+  rb_const_set(cMysql2Client, rb_intern("PROTOCOL_41"),
+      INT2NUM(CLIENT_PROTOCOL_41));
+#endif
+
+#ifdef CLIENT_INTERACTIVE
+  rb_const_set(cMysql2Client, rb_intern("INTERACTIVE"),
+      INT2NUM(CLIENT_INTERACTIVE));
+#endif
+
+#ifdef CLIENT_SSL
+  rb_const_set(cMysql2Client, rb_intern("SSL"), INT2NUM(CLIENT_SSL));
+#endif
+
+#ifdef CLIENT_IGNORE_SIGPIPE
+  rb_const_set(cMysql2Client, rb_intern("IGNORE_SIGPIPE"),
+      INT2NUM(CLIENT_IGNORE_SIGPIPE));
+#endif
+
+#ifdef CLIENT_TRANSACTIONS
+  rb_const_set(cMysql2Client, rb_intern("TRANSACTIONS"),
+      INT2NUM(CLIENT_TRANSACTIONS));
+#endif
+
+#ifdef CLIENT_RESERVED
+  rb_const_set(cMysql2Client, rb_intern("RESERVED"), INT2NUM(CLIENT_RESERVED));
+#endif
+
+#ifdef CLIENT_SECURE_CONNECTION
+  rb_const_set(cMysql2Client, rb_intern("SECURE_CONNECTION"),
+      INT2NUM(CLIENT_SECURE_CONNECTION));
+#endif
+
+#ifdef CLIENT_MULTI_STATEMENTS
+  rb_const_set(cMysql2Client, rb_intern("MULTI_STATEMENTS"),
+      INT2NUM(CLIENT_MULTI_STATEMENTS));
+#endif
+
+#ifdef CLIENT_PS_MULTI_RESULTS
+  rb_const_set(cMysql2Client, rb_intern("PS_MULTI_RESULTS"),
+      INT2NUM(CLIENT_PS_MULTI_RESULTS));
+#endif
+
+#ifdef CLIENT_SSL_VERIFY_SERVER_CERT
+  rb_const_set(cMysql2Client, rb_intern("SSL_VERIFY_SERVER_CERT"),
+      INT2NUM(CLIENT_SSL_VERIFY_SERVER_CERT));
+#endif
+
+#ifdef CLIENT_REMEMBER_OPTIONS
+  rb_const_set(cMysql2Client, rb_intern("REMEMBER_OPTIONS"),
+      INT2NUM(CLIENT_REMEMBER_OPTIONS));
+#endif
+
+#ifdef CLIENT_ALL_FLAGS
+  rb_const_set(cMysql2Client, rb_intern("ALL_FLAGS"),
+      INT2NUM(CLIENT_ALL_FLAGS));
+#endif
+
+#ifdef CLIENT_BASIC_FLAGS
+  rb_const_set(cMysql2Client, rb_intern("BASIC_FLAGS"),
+      INT2NUM(CLIENT_BASIC_FLAGS));
+#endif
+}