mysql2 0.2.24 → 0.3.0

data/ext/mysql2/client.h

@@ -1,30 +1,24 @@
 #ifndef MYSQL2_CLIENT_H
 #define MYSQL2_CLIENT_H
 
-#ifndef HAVE_RB_THREAD_CALL_WITHOUT_GVL
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
-
-/* emulate rb_thread_call_without_gvl with rb_thread_blocking_region */
-#define rb_thread_call_without_gvl(func, data1, ubf, data2) \
-  rb_thread_blocking_region((rb_blocking_function_t *)func, data1, ubf, data2)
-
-#else /* ! HAVE_RB_THREAD_BLOCKING_REGION */
 /*
- * partial emulation of the 2.0 rb_thread_call_without_gvl under 1.8,
+ * partial emulation of the 1.9 rb_thread_blocking_region under 1.8,
  * this is enough for dealing with blocking I/O functions in the
  * presence of threads.
  */
+#ifndef HAVE_RB_THREAD_BLOCKING_REGION
 
 #include <rubysig.h>
 #define RUBY_UBF_IO ((rb_unblock_function_t *)-1)
 typedef void rb_unblock_function_t(void *);
-static void *
-rb_thread_call_without_gvl(
-   void *(*func)(void *), void *data1,
+typedef VALUE rb_blocking_function_t(void *);
+static VALUE
+rb_thread_blocking_region(
+  rb_blocking_function_t *func, void *data1,
   RB_MYSQL_UNUSED rb_unblock_function_t *ubf,
   RB_MYSQL_UNUSED void *data2)
 {
-  void *rv;
+  VALUE rv;
 
   TRAP_BEG;
   rv = func(data1);
@@ -34,23 +28,14 @@ rb_thread_call_without_gvl(
 }
 
 #endif /* ! HAVE_RB_THREAD_BLOCKING_REGION */
-#endif /* ! HAVE_RB_THREAD_CALL_WITHOUT_GVL */
+
+void init_mysql2_client();
 
 typedef struct {
   VALUE encoding;
-  VALUE active_thread; /* rb_thread_current() or Qnil */
-  long server_version;
-  int reconnect_enabled;
-  unsigned int connect_timeout;
-  int active;
-  int connected;
-  int initialized;
-  int refcount;
-  int freed;
+  char active;
+  char closed;
   MYSQL *client;
 } mysql_client_wrapper;
 
-void init_mysql2_client();
-void decr_mysql2_client(mysql_client_wrapper *wrapper);
-
-#endif
+#endif

data/ext/mysql2/extconf.rb

@@ -5,14 +5,8 @@ def asplode lib
   abort "-----\n#{lib} is missing.  please check your installation of mysql and try again.\n-----"
 end
 
-# 2.0-only
-have_header('ruby/thread.h') && have_func('rb_thread_call_without_gvl', 'ruby/thread.h')
-
 # 1.9-only
 have_func('rb_thread_blocking_region')
-have_func('rb_wait_for_single_fd')
-have_func('rb_hash_dup')
-have_func('rb_intern3')
 
 # borrowed from mysqlplus
 # http://github.com/oldmoe/mysqlplus/blob/master/ext/extconf.rb
@@ -22,7 +16,6 @@ dirs = ENV['PATH'].split(File::PATH_SEPARATOR) + %w[
   /opt/local/mysql
   /opt/local/lib/mysql5
   /usr
-  /usr/mysql
   /usr/local
   /usr/local/mysql
   /usr/local/mysql-*
@@ -31,39 +24,20 @@ dirs = ENV['PATH'].split(File::PATH_SEPARATOR) + %w[
 
 GLOB = "{#{dirs.join(',')}}/{mysql_config,mysql_config5}"
 
-# If the user has provided a --with-mysql-dir argument, we must respect it or fail.
-inc, lib = dir_config('mysql')
-if inc && lib
-  # Ruby versions not incorporating the mkmf fix at
-  # https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/39717
-  # do not properly search for lib directories, and must be corrected
-  unless lib && lib[-3, 3] == 'lib'
-    @libdir_basename = 'lib'
-    inc, lib = dir_config('mysql')
-  end
-  abort "-----\nCannot find include dir(s) #{inc}\n-----" unless inc && inc.split(File::PATH_SEPARATOR).any?{|dir| File.directory?(dir)}
-  abort "-----\nCannot find library dir(s) #{lib}\n-----" unless lib && lib.split(File::PATH_SEPARATOR).any?{|dir| File.directory?(dir)}
-  warn  "-----\nUsing --with-mysql-dir=#{File.dirname inc}\n-----"
-  rpath_dir = lib
-elsif mc = (with_config('mysql-config') || Dir[GLOB].first)
-  # If the user has provided a --with-mysql-config argument, we must respect it or fail.
-  # If the user gave --with-mysql-config with no argument means we should try to find it.
+if RUBY_PLATFORM =~ /mswin|mingw/
+  inc, lib = dir_config('mysql')
+  exit 1 unless have_library("libmysql")
+elsif mc = (with_config('mysql-config') || Dir[GLOB].first) then
   mc = Dir[GLOB].first if mc == true
-  abort "-----\nCannot find mysql_config at #{mc}\n-----" unless mc && File.exists?(mc)
-  abort "-----\nCannot execute mysql_config at #{mc}\n-----" unless File.executable?(mc)
-  warn  "-----\nUsing mysql_config at #{mc}\n-----"
-  ver = `#{mc} --version`.chomp.to_f
-  includes = `#{mc} --include`.chomp
+  cflags = `#{mc} --cflags`.chomp
   exit 1 if $? != 0
   libs = `#{mc} --libs_r`.chomp
-  # MySQL 5.5 and above already have re-entrant code in libmysqlclient (no _r).
-  if ver >= 5.5 || libs.empty?
+  if libs.empty?
     libs = `#{mc} --libs`.chomp
   end
   exit 1 if $? != 0
-  $INCFLAGS += ' ' + includes
+  $CPPFLAGS += ' ' + cflags
   $libs = libs + " " + $libs
-  rpath_dir = libs
 else
   inc, lib = dir_config('mysql', '/usr/local')
   libs = ['m', 'z', 'socket', 'nsl', 'mygcc']
@@ -71,16 +45,11 @@ else
     exit 1 if libs.empty?
     have_library(libs.shift)
   end
-  rpath_dir = lib
-end
-
-if RUBY_PLATFORM =~ /mswin|mingw/
-  exit 1 unless have_library('libmysql')
 end
 
-if have_header('mysql.h')
+if have_header('mysql.h') then
   prefix = nil
-elsif have_header('mysql/mysql.h')
+elsif have_header('mysql/mysql.h') then
   prefix = 'mysql'
 else
   asplode 'mysql.h'
@@ -91,40 +60,13 @@ end
   asplode h unless have_header h
 end
 
-# These gcc style flags are also supported by clang and xcode compilers,
-# so we'll use a does-it-work test instead of an is-it-gcc test.
-gcc_flags = ' -Wall -funroll-loops'
-if try_link('int main() {return 0;}', gcc_flags)
-  $CFLAGS << gcc_flags
+unless RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /sparc/
+  $CFLAGS << ' -Wall -funroll-loops'
 end
+# $CFLAGS << ' -O0 -ggdb3 -Wextra'
 
-case explicit_rpath = with_config('mysql-rpath')
-when true
-  abort "-----\nOption --with-mysql-rpath must have an argument\n-----"
-when false
-  warn "-----\nOption --with-mysql-rpath has been disabled at your request\n-----"
-when String
-  # The user gave us a value so use it
-  rpath_flags = " -Wl,-rpath,#{explicit_rpath}"
-  warn "-----\nSetting mysql rpath to #{explicit_rpath}\n-----"
-  $LDFLAGS << rpath_flags
-else
-  if libdir = rpath_dir[%r{(-L)?(/[^ ]+)}, 2]
-    rpath_flags = " -Wl,-rpath,#{libdir}"
-    if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? && try_link('int main() {return 0;}', rpath_flags)
-      # Usually Ruby sets RPATHFLAG the right way for each system, but not on OS X.
-      warn "-----\nSetting rpath to #{libdir}\n-----"
-      $LDFLAGS << rpath_flags
-    else
-      if RbConfig::CONFIG["RPATHFLAG"].to_s.empty?
-        # If we got here because try_link failed, warn the user
-        warn "-----\nDon't know how to set rpath on your system, if MySQL libraries are not in path mysql2 may not load\n-----"
-      end
-      # Make sure that LIBPATH gets set if we didn't explicitly set the rpath.
-      warn "-----\nSetting libpath to #{libdir}\n-----"
-      $LIBPATH << libdir unless $LIBPATH.include?(libdir)
-    end
-  end
+if hard_mysql_path = $libs[%r{-L(/[^ ]+)}, 1]
+	$LDFLAGS << " -Wl,-rpath,#{hard_mysql_path}"
 end
 
 create_makefile('mysql2/mysql2')

data/ext/mysql2/mysql2_ext.h

@@ -1,11 +1,12 @@
 #ifndef MYSQL2_EXT
 #define MYSQL2_EXT
 
-/* tell rbx not to use it's caching compat layer
-   by doing this we're making a promise to RBX that
-   we'll never modify the pointers we get back from RSTRING_PTR */
+// tell rbx not to use it's caching compat layer
+// by doing this we're making a promize to RBX that
+// we'll never modify the pointers we get back from RSTRING_PTR
 #define RSTRING_NOT_MODIFIED
 #include <ruby.h>
+#include <fcntl.h>
 
 #ifndef HAVE_UINT
 #define HAVE_UINT
@@ -28,9 +29,6 @@ typedef unsigned int    uint;
 #ifdef HAVE_RUBY_ENCODING_H
 #include <ruby/encoding.h>
 #endif
-#ifdef HAVE_RUBY_THREAD_H
-#include <ruby/thread.h>
-#endif
 
 #if defined(__GNUC__) && (__GNUC__ >= 3)
 #define RB_MYSQL_UNUSED __attribute__ ((unused))
@@ -40,6 +38,5 @@ typedef unsigned int    uint;
 
 #include <client.h>
 #include <result.h>
-#include <infile.h>
 
 #endif

data/ext/mysql2/result.c

@@ -1,62 +1,28 @@
 #include <mysql2_ext.h>
 
-#include <stdint.h>
-
-#include "mysql_enc_to_ruby.h"
-
 #ifdef HAVE_RUBY_ENCODING_H
 static rb_encoding *binaryEncoding;
 #endif
 
-#if (SIZEOF_INT < SIZEOF_LONG) || defined(HAVE_RUBY_ENCODING_H)
-/* on 64bit platforms we can handle dates way outside 2038-01-19T03:14:07
- *
- * (9999*31557600) + (12*2592000) + (31*86400) + (11*3600) + (59*60) + 59
- */
-#define MYSQL2_MAX_TIME 315578267999ULL
-#else
-/**
- * On 32bit platforms the maximum date the Time class can handle is 2038-01-19T03:14:07
- * 2038 years + 1 month + 19 days + 3 hours + 14 minutes + 7 seconds = 64318634047 seconds
- *
- * (2038*31557600) + (1*2592000) + (19*86400) + (3*3600) + (14*60) + 7
- */
-#define MYSQL2_MAX_TIME 64318634047ULL
-#endif
+#define MYSQL2_MAX_YEAR 2058
 
-#if defined(HAVE_RUBY_ENCODING_H)
-/* 0000-1-1 00:00:00 UTC
- *
- * (0*31557600) + (1*2592000) + (1*86400) + (0*3600) + (0*60) + 0
- */
-#define MYSQL2_MIN_TIME 2678400ULL
-#elif SIZEOF_INT < SIZEOF_LONG /* 64bit Ruby 1.8 */
-/* 0139-1-1 00:00:00 UTC
- *
- * (139*31557600) + (1*2592000) + (1*86400) + (0*3600) + (0*60) + 0
- */
-#define MYSQL2_MIN_TIME 4389184800ULL
-#elif defined(NEGATIVE_TIME_T)
-/* 1901-12-13 20:45:52 UTC : The oldest time in 32-bit signed time_t.
- *
- * (1901*31557600) + (12*2592000) + (13*86400) + (20*3600) + (45*60) + 52
- */
-#define MYSQL2_MIN_TIME 60023299552ULL
+#ifdef NEGATIVE_TIME_T
+  /* 1901-12-13 20:45:52 UTC : The oldest time in 32-bit signed time_t. */
+#define MYSQL2_MIN_YEAR 1902
 #else
-/* 1970-01-01 00:00:01 UTC : The Unix epoch - the oldest time in portable time_t.
- *
- * (1970*31557600) + (1*2592000) + (1*86400) + (0*3600) + (0*60) + 1
- */
-#define MYSQL2_MIN_TIME 62171150401ULL
+ /* 1970-01-01 00:00:00 UTC : The Unix epoch - the oldest time in portable time_t. */
+#define MYSQL2_MIN_YEAR 1970
 #endif
 
 static VALUE cMysql2Result;
 static VALUE cBigDecimal, cDate, cDateTime;
 static VALUE opt_decimal_zero, opt_float_zero, opt_time_year, opt_time_month, opt_utc_offset;
 extern VALUE mMysql2, cMysql2Client, cMysql2Error;
-static ID intern_new, intern_utc, intern_local, intern_localtime, intern_local_offset, intern_civil, intern_new_offset;
+static VALUE intern_encoding_from_charset;
+static ID intern_new, intern_utc, intern_local, intern_encoding_from_charset_code,
+          intern_localtime, intern_local_offset, intern_civil, intern_new_offset;
 static VALUE sym_symbolize_keys, sym_as, sym_array, sym_database_timezone, sym_application_timezone,
-          sym_local, sym_utc, sym_cast_booleans, sym_cache_rows, sym_cast, sym_stream, sym_name;
+          sym_local, sym_utc, sym_cast_booleans, sym_cache_rows;
 static ID intern_merge;
 
 static void rb_mysql_result_mark(void * wrapper) {
@@ -65,29 +31,22 @@ static void rb_mysql_result_mark(void * wrapper) {
     rb_gc_mark(w->fields);
     rb_gc_mark(w->rows);
     rb_gc_mark(w->encoding);
-    rb_gc_mark(w->client);
   }
 }
 
 /* this may be called manually or during GC */
 static void rb_mysql_result_free_result(mysql2_result_wrapper * wrapper) {
   if (wrapper && wrapper->resultFreed != 1) {
-    /* FIXME: this may call flush_use_result, which can hit the socket */
     mysql_free_result(wrapper->result);
     wrapper->resultFreed = 1;
   }
 }
 
 /* this is called during GC */
-static void rb_mysql_result_free(void *ptr) {
-  mysql2_result_wrapper * wrapper = ptr;
-  rb_mysql_result_free_result(wrapper);
-
-  // If the GC gets to client first it will be nil
-  if (wrapper->client != Qnil) {
-    decr_mysql2_client(wrapper->client_wrapper);
-  }
-
+static void rb_mysql_result_free(void * wrapper) {
+  mysql2_result_wrapper * w = wrapper;
+  /* FIXME: this may call flush_use_result, which can hit the socket */
+  rb_mysql_result_free_result(w);
   xfree(wrapper);
 }
 
@@ -96,10 +55,10 @@ static void rb_mysql_result_free(void *ptr) {
  * reliable way for us to tell this so we'll always release the GVL
  * to be safe
  */
-static void *nogvl_fetch_row(void *ptr) {
+static VALUE nogvl_fetch_row(void *ptr) {
   MYSQL_RES *result = ptr;
 
-  return mysql_fetch_row(result);
+  return (VALUE)mysql_fetch_row(result);
 }
 
 static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, short int symbolize_keys) {
@@ -122,14 +81,10 @@ static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, short int
 
     field = mysql_fetch_field_direct(wrapper->result, idx);
     if (symbolize_keys) {
-#ifdef HAVE_RB_INTERN3
-      rb_field = rb_intern3(field->name, field->name_length, rb_utf8_encoding());
-      rb_field = ID2SYM(rb_field);
-#else
-      VALUE colStr;
-      colStr = rb_str_new(field->name, field->name_length);
-      rb_field = ID2SYM(rb_to_id(colStr));
-#endif
+      char buf[field->name_length+1];
+      memcpy(buf, field->name, field->name_length);
+      buf[field->name_length] = 0;
+      rb_field = ID2SYM(rb_intern(buf));
     } else {
       rb_field = rb_str_new(field->name, field->name_length);
 #ifdef HAVE_RUBY_ENCODING_H
@@ -145,56 +100,11 @@ static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, short int
   return rb_field;
 }
 
-#ifdef HAVE_RUBY_ENCODING_H
-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);
-  } else if (!field.charsetnr) {
-    /* MySQL 4.x may not provide an encoding, binary will get the bytes through */
-    rb_enc_associate(val, binaryEncoding);
-  } else {
-    /* lookup the encoding configured on this field */
-    const char *enc_name;
-    int enc_index;
-
-    enc_name = mysql2_mysql_enc_to_rb[field.charsetnr-1];
-    if (enc_name != NULL) {
-      /* use the field encoding we were able to match */
-      enc_index = rb_enc_find_index(enc_name);
-      rb_enc_set_index(val, enc_index);
-    } else {
-      /* otherwise fall-back to the connection's encoding */
-      rb_enc_associate(val, conn_enc);
-    }
-
-    if (default_internal_enc) {
-      val = rb_str_export_to_enc(val, default_internal_enc);
-    }
-  }
-  return val;
-}
-#endif
-
-/* Interpret microseconds digits left-aligned in fixed-width field.
- * e.g. 10.123 seconds means 10 seconds and 123000 microseconds,
- * because the microseconds are to the right of the decimal point.
- */
-static unsigned int msec_char_to_uint(char *msec_char, size_t len)
-{
-  int i;
-  for (i = 0; i < (len - 1); i++) {
-    if (msec_char[i] == '\0') {
-      msec_char[i] = '0';
-    }
-  }
-  return (unsigned int)strtoul(msec_char, NULL, 10);
-}
-
-static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezone, int symbolizeKeys, int asArray, int castBool, int cast, MYSQL_FIELD * fields) {
+static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezone, int symbolizeKeys, int asArray, int castBool) {
   VALUE rowVal;
   mysql2_result_wrapper * wrapper;
   MYSQL_ROW row;
+  MYSQL_FIELD * fields = NULL;
   unsigned int i = 0;
   unsigned long * fieldLengths;
   void * ptr;
@@ -210,7 +120,7 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezo
 #endif
 
   ptr = wrapper->result;
-  row = (MYSQL_ROW)rb_thread_call_without_gvl(nogvl_fetch_row, ptr, RUBY_UBF_IO, 0);
+  row = (MYSQL_ROW)rb_thread_blocking_region(nogvl_fetch_row, ptr, RUBY_UBF_IO, 0);
   if (row == NULL) {
     return Qnil;
   }
@@ -220,6 +130,7 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezo
   } else {
     rowVal = rb_hash_new();
   }
+  fields = mysql_fetch_fields(wrapper->result);
   fieldLengths = mysql_fetch_lengths(wrapper->result);
   if (wrapper->fields == Qnil) {
     wrapper->numberOfFields = mysql_num_fields(wrapper->result);
@@ -230,53 +141,35 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezo
     VALUE field = rb_mysql_result_fetch_field(self, i, symbolizeKeys);
     if (row[i]) {
       VALUE val = Qnil;
-      enum enum_field_types type = fields[i].type;
-
-      if(!cast) {
-        if (type == MYSQL_TYPE_NULL) {
-          val = Qnil;
-        } else {
-          val = rb_str_new(row[i], fieldLengths[i]);
-#ifdef HAVE_RUBY_ENCODING_H
-          val = mysql2_set_field_string_encoding(val, fields[i], default_internal_enc, conn_enc);
-#endif
-        }
-      } else {
-        switch(type) {
-        case MYSQL_TYPE_NULL:       /* NULL-type field */
+      switch(fields[i].type) {
+        case MYSQL_TYPE_NULL:       // NULL-type field
           val = Qnil;
           break;
-        case MYSQL_TYPE_BIT:        /* BIT field (MySQL 5.0.3 and up) */
-          if (castBool && fields[i].length == 1) {
-            val = *row[i] == 1 ? Qtrue : Qfalse;
-          }else{
-            val = rb_str_new(row[i], fieldLengths[i]);
-          }
+        case MYSQL_TYPE_BIT:        // BIT field (MySQL 5.0.3 and up)
+          val = rb_str_new(row[i], fieldLengths[i]);
           break;
-        case MYSQL_TYPE_TINY:       /* TINYINT field */
+        case MYSQL_TYPE_TINY:       // TINYINT field
           if (castBool && fields[i].length == 1) {
-            val = *row[i] != '0' ? Qtrue : Qfalse;
+            val = *row[i] == '1' ? Qtrue : Qfalse;
             break;
           }
-        case MYSQL_TYPE_SHORT:      /* SMALLINT field */
-        case MYSQL_TYPE_LONG:       /* INTEGER field */
-        case MYSQL_TYPE_INT24:      /* MEDIUMINT field */
-        case MYSQL_TYPE_LONGLONG:   /* BIGINT field */
-        case MYSQL_TYPE_YEAR:       /* YEAR field */
+        case MYSQL_TYPE_SHORT:      // SMALLINT field
+        case MYSQL_TYPE_LONG:       // INTEGER field
+        case MYSQL_TYPE_INT24:      // MEDIUMINT field
+        case MYSQL_TYPE_LONGLONG:   // BIGINT field
+        case MYSQL_TYPE_YEAR:       // YEAR field
           val = rb_cstr2inum(row[i], 10);
           break;
-        case MYSQL_TYPE_DECIMAL:    /* DECIMAL or NUMERIC field */
-        case MYSQL_TYPE_NEWDECIMAL: /* Precision math DECIMAL or NUMERIC field (MySQL 5.0.3 and up) */
-          if (fields[i].decimals == 0) {
-            val = rb_cstr2inum(row[i], 10);
-          } else if (strtod(row[i], NULL) == 0.000000){
+        case MYSQL_TYPE_DECIMAL:    // DECIMAL or NUMERIC field
+        case MYSQL_TYPE_NEWDECIMAL: // Precision math DECIMAL or NUMERIC field (MySQL 5.0.3 and up)
+          if (strtod(row[i], NULL) == 0.000000){
             val = rb_funcall(cBigDecimal, intern_new, 1, opt_decimal_zero);
           }else{
             val = rb_funcall(cBigDecimal, intern_new, 1, rb_str_new(row[i], fieldLengths[i]));
           }
           break;
-        case MYSQL_TYPE_FLOAT:      /* FLOAT field */
-        case MYSQL_TYPE_DOUBLE: {     /* DOUBLE or REAL field */
+        case MYSQL_TYPE_FLOAT:      // FLOAT field
+        case MYSQL_TYPE_DOUBLE: {     // DOUBLE or REAL field
           double column_to_double;
           column_to_double = strtod(row[i], NULL);
           if (column_to_double == 0.000000){
@@ -286,69 +179,50 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezo
           }
           break;
         }
-        case MYSQL_TYPE_TIME: {     /* TIME field */
-          int tokens;
-          unsigned int hour=0, min=0, sec=0, msec=0;
-          char msec_char[7] = {'0','0','0','0','0','0','\0'};
-
-          tokens = sscanf(row[i], "%2u:%2u:%2u.%6s", &hour, &min, &sec, msec_char);
-          if (tokens < 3) {
-            val = Qnil;
-            break;
-          }
-          msec = msec_char_to_uint(msec_char, sizeof(msec_char));
-          val = rb_funcall(rb_cTime, db_timezone, 6, opt_time_year, opt_time_month, opt_time_month, UINT2NUM(hour), UINT2NUM(min), UINT2NUM(sec), UINT2NUM(msec));
+        case MYSQL_TYPE_TIME: {     // TIME field
+          int hour, min, sec, tokens;
+          tokens = sscanf(row[i], "%2d:%2d:%2d", &hour, &min, &sec);
+          val = rb_funcall(rb_cTime, db_timezone, 6, opt_time_year, opt_time_month, opt_time_month, INT2NUM(hour), INT2NUM(min), INT2NUM(sec));
           if (!NIL_P(app_timezone)) {
             if (app_timezone == intern_local) {
               val = rb_funcall(val, intern_localtime, 0);
-            } else { /* utc */
+            } else { // utc
               val = rb_funcall(val, intern_utc, 0);
             }
           }
           break;
         }
-        case MYSQL_TYPE_TIMESTAMP:  /* TIMESTAMP field */
-        case MYSQL_TYPE_DATETIME: { /* DATETIME field */
-          int tokens;
-          unsigned int year=0, month=0, day=0, hour=0, min=0, sec=0, msec=0;
-          char msec_char[7] = {'0','0','0','0','0','0','\0'};
-          uint64_t seconds;
-
-          tokens = sscanf(row[i], "%4u-%2u-%2u %2u:%2u:%2u.%6s", &year, &month, &day, &hour, &min, &sec, msec_char);
-          if (tokens < 6) { /* msec might be empty */
-            val = Qnil;
-            break;
-          }
-          seconds = (year*31557600ULL) + (month*2592000ULL) + (day*86400ULL) + (hour*3600ULL) + (min*60ULL) + sec;
-
-          if (seconds == 0) {
+        case MYSQL_TYPE_TIMESTAMP:  // TIMESTAMP field
+        case MYSQL_TYPE_DATETIME: { // DATETIME field
+          int year, month, day, hour, min, sec, tokens;
+          tokens = sscanf(row[i], "%4d-%2d-%2d %2d:%2d:%2d", &year, &month, &day, &hour, &min, &sec);
+          if (year+month+day+hour+min+sec == 0) {
             val = Qnil;
           } else {
             if (month < 1 || day < 1) {
-              rb_raise(cMysql2Error, "Invalid date in field '%.*s': %s", fields[i].name_length, fields[i].name, row[i]);
+              rb_raise(cMysql2Error, "Invalid date: %s", row[i]);
               val = Qnil;
             } else {
-              if (seconds < MYSQL2_MIN_TIME || seconds > MYSQL2_MAX_TIME) { /* use DateTime for larger date range, does not support microseconds */
+              if (year < MYSQL2_MIN_YEAR || year+month+day > MYSQL2_MAX_YEAR) { // use DateTime instead
                 VALUE offset = INT2NUM(0);
                 if (db_timezone == intern_local) {
                   offset = rb_funcall(cMysql2Client, intern_local_offset, 0);
                 }
-                val = rb_funcall(cDateTime, intern_civil, 7, UINT2NUM(year), UINT2NUM(month), UINT2NUM(day), UINT2NUM(hour), UINT2NUM(min), UINT2NUM(sec), offset);
+                val = rb_funcall(cDateTime, intern_civil, 7, INT2NUM(year), INT2NUM(month), INT2NUM(day), INT2NUM(hour), INT2NUM(min), INT2NUM(sec), offset);
                 if (!NIL_P(app_timezone)) {
                   if (app_timezone == intern_local) {
                     offset = rb_funcall(cMysql2Client, intern_local_offset, 0);
                     val = rb_funcall(val, intern_new_offset, 1, offset);
-                  } else { /* utc */
+                  } else { // utc
                     val = rb_funcall(val, intern_new_offset, 1, opt_utc_offset);
                   }
                 }
               } else {
-                msec = msec_char_to_uint(msec_char, sizeof(msec_char));
-                val = rb_funcall(rb_cTime, db_timezone, 7, UINT2NUM(year), UINT2NUM(month), UINT2NUM(day), UINT2NUM(hour), UINT2NUM(min), UINT2NUM(sec), UINT2NUM(msec));
+                val = rb_funcall(rb_cTime, db_timezone, 6, INT2NUM(year), INT2NUM(month), INT2NUM(day), INT2NUM(hour), INT2NUM(min), INT2NUM(sec));
                 if (!NIL_P(app_timezone)) {
                   if (app_timezone == intern_local) {
                     val = rb_funcall(val, intern_localtime, 0);
-                  } else { /* utc */
+                  } else { // utc
                     val = rb_funcall(val, intern_utc, 0);
                   }
                 }
@@ -357,23 +231,18 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezo
           }
           break;
         }
-        case MYSQL_TYPE_DATE:       /* DATE field */
-        case MYSQL_TYPE_NEWDATE: {  /* Newer const used > 5.0 */
-          int tokens;
-          unsigned int year=0, month=0, day=0;
-          tokens = sscanf(row[i], "%4u-%2u-%2u", &year, &month, &day);
-          if (tokens < 3) {
-            val = Qnil;
-            break;
-          }
+        case MYSQL_TYPE_DATE:       // DATE field
+        case MYSQL_TYPE_NEWDATE: {  // Newer const used > 5.0
+          int year, month, day, tokens;
+          tokens = sscanf(row[i], "%4d-%2d-%2d", &year, &month, &day);
           if (year+month+day == 0) {
             val = Qnil;
           } else {
             if (month < 1 || day < 1) {
-              rb_raise(cMysql2Error, "Invalid date in field '%.*s': %s", fields[i].name_length, fields[i].name, row[i]);
+              rb_raise(cMysql2Error, "Invalid date: %s", row[i]);
               val = Qnil;
             } else {
-              val = rb_funcall(cDate, intern_new, 3, UINT2NUM(year), UINT2NUM(month), UINT2NUM(day));
+              val = rb_funcall(cDate, intern_new, 3, INT2NUM(year), INT2NUM(month), INT2NUM(day));
             }
           }
           break;
@@ -384,17 +253,33 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezo
         case MYSQL_TYPE_BLOB:
         case MYSQL_TYPE_VAR_STRING:
         case MYSQL_TYPE_VARCHAR:
-        case MYSQL_TYPE_STRING:     /* CHAR or BINARY field */
-        case MYSQL_TYPE_SET:        /* SET field */
-        case MYSQL_TYPE_ENUM:       /* ENUM field */
-        case MYSQL_TYPE_GEOMETRY:   /* Spatial fielda */
+        case MYSQL_TYPE_STRING:     // CHAR or BINARY field
+        case MYSQL_TYPE_SET:        // SET field
+        case MYSQL_TYPE_ENUM:       // ENUM field
+        case MYSQL_TYPE_GEOMETRY:   // Spatial fielda
         default:
           val = rb_str_new(row[i], fieldLengths[i]);
 #ifdef HAVE_RUBY_ENCODING_H
-          val = mysql2_set_field_string_encoding(val, fields[i], default_internal_enc, conn_enc);
+          // if binary flag is set, respect it's wishes
+          if (fields[i].flags & BINARY_FLAG && fields[i].charsetnr == 63) {
+            rb_enc_associate(val, binaryEncoding);
+          } else {
+            // lookup the encoding configured on this field
+            VALUE new_encoding = rb_funcall(cMysql2Client, intern_encoding_from_charset_code, 1, INT2NUM(fields[i].charsetnr));
+            if (new_encoding != Qnil) {
+              // use the field encoding we were able to match
+              rb_encoding *enc = rb_to_encoding(new_encoding);
+              rb_enc_associate(val, enc);
+            } else {
+              // otherwise fall-back to the connection's encoding
+              rb_enc_associate(val, conn_enc);
+            }
+            if (default_internal_enc) {
+              val = rb_str_export_to_enc(val, default_internal_enc);
+            }
+          }
 #endif
           break;
-        }
       }
       if (asArray) {
         rb_ary_push(rowVal, val);
@@ -421,7 +306,6 @@ static VALUE rb_mysql_result_fetch_fields(VALUE self) {
   GetMysql2Result(self, wrapper);
 
   defaults = rb_iv_get(self, "@query_options");
-  Check_Type(defaults, T_HASH);
   if (rb_hash_aref(defaults, sym_symbolize_keys) == Qtrue) {
     symbolizeKeys = 1;
   }
@@ -445,14 +329,11 @@ static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {
   ID db_timezone, app_timezone, dbTz, appTz;
   mysql2_result_wrapper * wrapper;
   unsigned long i;
-  const char * errstr;
-  int symbolizeKeys = 0, asArray = 0, castBool = 0, cacheRows = 1, cast = 1, streaming = 0;
-  MYSQL_FIELD * fields = NULL;
+  int symbolizeKeys = 0, asArray = 0, castBool = 0, cacheRows = 1;
 
   GetMysql2Result(self, wrapper);
 
   defaults = rb_iv_get(self, "@query_options");
-  Check_Type(defaults, T_HASH);
   if (rb_scan_args(argc, argv, "01&", &opts, &block) == 1) {
     opts = rb_funcall(defaults, intern_merge, 1, opts);
   } else {
@@ -475,18 +356,6 @@ static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {
     cacheRows = 0;
   }
 
-  if (rb_hash_aref(opts, sym_cast) == Qfalse) {
-    cast = 0;
-  }
-
-  if(rb_hash_aref(opts, sym_stream) == Qtrue) {
-    streaming = 1;
-  }
-
-  if(streaming && cacheRows) {
-    rb_warn("cacheRows is ignored if streaming is true");
-  }
-
   dbTz = rb_hash_aref(opts, sym_database_timezone);
   if (dbTz == sym_local) {
     db_timezone = intern_local;
@@ -509,111 +378,56 @@ static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {
   }
 
   if (wrapper->lastRowProcessed == 0) {
-    if (streaming) {
-      /* We can't get number of rows if we're streaming, */
-      /* until we've finished fetching all rows */
-      wrapper->numberOfRows = 0;
+    wrapper->numberOfRows = mysql_num_rows(wrapper->result);
+    if (wrapper->numberOfRows == 0) {
       wrapper->rows = rb_ary_new();
-    } else {
-      wrapper->numberOfRows = mysql_num_rows(wrapper->result);
-      if (wrapper->numberOfRows == 0) {
-        wrapper->rows = rb_ary_new();
-        return wrapper->rows;
-      }
-      wrapper->rows = rb_ary_new2(wrapper->numberOfRows);
+      return wrapper->rows;
     }
+    wrapper->rows = rb_ary_new2(wrapper->numberOfRows);
   }
 
-  if (streaming) {
-    if (!wrapper->streamingComplete) {
-      VALUE row;
-
-      fields = mysql_fetch_fields(wrapper->result);
-
-      do {
-        row = rb_mysql_result_fetch_row(self, db_timezone, app_timezone, symbolizeKeys, asArray, castBool, cast, fields);
-
-        if (block != Qnil && row != Qnil) {
-          rb_yield(row);
-          wrapper->lastRowProcessed++;
-        }
-      } while(row != Qnil);
-
-      rb_mysql_result_free_result(wrapper);
-
-      wrapper->numberOfRows = wrapper->lastRowProcessed;
-      wrapper->streamingComplete = 1;
-
-      // Check for errors, the connection might have gone out from under us
-      // mysql_error returns an empty string if there is no error
-      errstr = mysql_error(wrapper->client_wrapper->client);
-      if (errstr[0]) {
-        rb_raise(cMysql2Error, "%s", errstr);
-      }
-    } else {
-      rb_raise(cMysql2Error, "You have already fetched all the rows for this query and streaming is true. (to reiterate you must requery).");
+  if (cacheRows && wrapper->lastRowProcessed == wrapper->numberOfRows) {
+    // we've already read the entire dataset from the C result into our
+    // internal array. Lets hand that over to the user since it's ready to go
+    for (i = 0; i < wrapper->numberOfRows; i++) {
+      rb_yield(rb_ary_entry(wrapper->rows, i));
     }
   } else {
-    if (cacheRows && wrapper->lastRowProcessed == wrapper->numberOfRows) {
-      /* we've already read the entire dataset from the C result into our */
-      /* internal array. Lets hand that over to the user since it's ready to go */
-      for (i = 0; i < wrapper->numberOfRows; i++) {
-        rb_yield(rb_ary_entry(wrapper->rows, i));
-      }
-    } else {
-      unsigned long rowsProcessed = 0;
-      rowsProcessed = RARRAY_LEN(wrapper->rows);
-      fields = mysql_fetch_fields(wrapper->result);
-
-      for (i = 0; i < wrapper->numberOfRows; i++) {
-        VALUE row;
-        if (cacheRows && i < rowsProcessed) {
-          row = rb_ary_entry(wrapper->rows, i);
-        } else {
-          row = rb_mysql_result_fetch_row(self, db_timezone, app_timezone, symbolizeKeys, asArray, castBool, cast, fields);
-          if (cacheRows) {
-            rb_ary_store(wrapper->rows, i, row);
-          }
-          wrapper->lastRowProcessed++;
-        }
-
-        if (row == Qnil) {
-          /* we don't need the mysql C dataset around anymore, peace it */
-          rb_mysql_result_free_result(wrapper);
-          return Qnil;
-        }
-
-        if (block != Qnil) {
-          rb_yield(row);
+    unsigned long rowsProcessed = 0;
+    rowsProcessed = RARRAY_LEN(wrapper->rows);
+    for (i = 0; i < wrapper->numberOfRows; i++) {
+      VALUE row;
+      if (cacheRows && i < rowsProcessed) {
+        row = rb_ary_entry(wrapper->rows, i);
+      } else {
+        row = rb_mysql_result_fetch_row(self, db_timezone, app_timezone, symbolizeKeys, asArray, castBool);
+        if (cacheRows) {
+          rb_ary_store(wrapper->rows, i, row);
         }
+        wrapper->lastRowProcessed++;
       }
-      if (wrapper->lastRowProcessed == wrapper->numberOfRows) {
-        /* we don't need the mysql C dataset around anymore, peace it */
+
+      if (row == Qnil) {
+        // we don't need the mysql C dataset around anymore, peace it
         rb_mysql_result_free_result(wrapper);
+        return Qnil;
       }
+
+      if (block != Qnil) {
+        rb_yield(row);
+      }
+    }
+    if (wrapper->lastRowProcessed == wrapper->numberOfRows) {
+      // we don't need the mysql C dataset around anymore, peace it
+      rb_mysql_result_free_result(wrapper);
     }
   }
 
   return wrapper->rows;
 }
 
-static VALUE rb_mysql_result_count(VALUE self) {
-  mysql2_result_wrapper *wrapper;
-
-  GetMysql2Result(self, wrapper);
-  if(wrapper->resultFreed) {
-    if (wrapper->streamingComplete){
-      return LONG2NUM(wrapper->numberOfRows);
-    } else {
-      return LONG2NUM(RARRAY_LEN(wrapper->rows));
-    }
-  } else {
-    return INT2FIX(mysql_num_rows(wrapper->result));
-  }
-}
-
 /* Mysql2::Result */
-VALUE rb_mysql_result_to_obj(VALUE client, VALUE encoding, VALUE options, MYSQL_RES *r) {
+VALUE rb_mysql_result_to_obj(MYSQL_RES * r) {
   VALUE obj;
   mysql2_result_wrapper * wrapper;
   obj = Data_Make_Struct(cMysql2Result, mysql2_result_wrapper, rb_mysql_result_mark, rb_mysql_result_free, wrapper);
@@ -624,16 +438,8 @@ VALUE rb_mysql_result_to_obj(VALUE client, VALUE encoding, VALUE options, MYSQL_
   wrapper->result = r;
   wrapper->fields = Qnil;
   wrapper->rows = Qnil;
-  wrapper->encoding = encoding;
-  wrapper->streamingComplete = 0;
-  wrapper->client = client;
-  wrapper->client_wrapper = DATA_PTR(client);
-  wrapper->client_wrapper->refcount++;
-
+  wrapper->encoding = Qnil;
   rb_obj_call_init(obj, 0, NULL);
-
-  rb_iv_set(obj, "@query_options", options);
-
   return obj;
 }
 
@@ -645,8 +451,9 @@ void init_mysql2_result() {
   cMysql2Result = rb_define_class_under(mMysql2, "Result", rb_cObject);
   rb_define_method(cMysql2Result, "each", rb_mysql_result_each, -1);
   rb_define_method(cMysql2Result, "fields", rb_mysql_result_fetch_fields, 0);
-  rb_define_method(cMysql2Result, "count", rb_mysql_result_count, 0);
-  rb_define_alias(cMysql2Result, "size", "count");
+
+  intern_encoding_from_charset = rb_intern("encoding_from_charset");
+  intern_encoding_from_charset_code = rb_intern("encoding_from_charset_code");
 
   intern_new          = rb_intern("new");
   intern_utc          = rb_intern("utc");
@@ -666,12 +473,9 @@ void init_mysql2_result() {
   sym_database_timezone     = ID2SYM(rb_intern("database_timezone"));
   sym_application_timezone  = ID2SYM(rb_intern("application_timezone"));
   sym_cache_rows     = ID2SYM(rb_intern("cache_rows"));
-  sym_cast           = ID2SYM(rb_intern("cast"));
-  sym_stream         = ID2SYM(rb_intern("stream"));
-  sym_name           = ID2SYM(rb_intern("name"));
 
   opt_decimal_zero = rb_str_new2("0.0");
-  rb_global_variable(&opt_decimal_zero); /*never GC */
+  rb_global_variable(&opt_decimal_zero); //never GC
   opt_float_zero = rb_float_new((double)0);
   rb_global_variable(&opt_float_zero);
   opt_time_year = INT2NUM(2000);