mysql2 0.1.9 → 0.2.0

data/ext/mysql2/mysql2_ext.h

@@ -26,73 +26,7 @@
 #define RB_MYSQL_UNUSED
 #endif
 
+#include <client.h>
 #include <result.h>
 
-extern VALUE mMysql2;
-
-/* Mysql2::Error */
-extern VALUE cMysql2Error;
-
-/* Mysql2::Result */
-typedef struct {
-    VALUE fields;
-    VALUE rows;
-    unsigned int numberOfFields;
-    unsigned long numberOfRows;
-    unsigned long lastRowProcessed;
-    short int resultFreed;
-    MYSQL_RES *result;
-} mysql2_result_wrapper;
-#define GetMysql2Result(obj, sval) (sval = (mysql2_result_wrapper*)DATA_PTR(obj));
-
-/*
- * 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;
-};
-
-/*
- * 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 *);
-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)
-{
-	VALUE rv;
-
-	TRAP_BEG;
-	rv = func(data1);
-	TRAP_END;
-
-	return rv;
-}
-#endif /* ! HAVE_RB_THREAD_BLOCKING_REGION */
-
 #endif

data/ext/mysql2/result.c

@@ -4,19 +4,24 @@
 rb_encoding *binaryEncoding;
 #endif
 
-ID sym_symbolize_keys;
-ID intern_new, intern_utc, intern_encoding_from_charset_code;
-
-VALUE cBigDecimal, cDate, cDateTime;
 VALUE cMysql2Result;
-extern VALUE cMysql2Client;
+VALUE cBigDecimal, cDate, cDateTime;
+VALUE opt_decimal_zero, opt_float_zero, opt_time_year, opt_time_month;
+extern VALUE mMysql2, cMysql2Client, cMysql2Error;
+static VALUE intern_encoding_from_charset;
+static ID intern_new, intern_utc, intern_local, intern_encoding_from_charset_code,
+          intern_localtime;
+static ID sym_symbolize_keys, sym_as, sym_array, sym_database_timezone, sym_application_timezone,
+          sym_local, sym_utc, sym_cast_booleans;
+static ID intern_merge;
 
 static void rb_mysql_result_mark(void * wrapper) {
-    mysql2_result_wrapper * w = wrapper;
-    if (w) {
-        rb_gc_mark(w->fields);
-        rb_gc_mark(w->rows);
-    }
+  mysql2_result_wrapper * w = wrapper;
+  if (w) {
+    rb_gc_mark(w->fields);
+    rb_gc_mark(w->rows);
+    rb_gc_mark(w->encoding);
+  }
 }
 
 /* this may be called manually or during GC */
@@ -61,7 +66,7 @@ static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, short int
     MYSQL_FIELD *field = NULL;
 #ifdef HAVE_RUBY_ENCODING_H
     rb_encoding *default_internal_enc = rb_default_internal_encoding();
-    rb_encoding *conn_enc = rb_to_encoding(rb_iv_get(self, "@encoding"));
+    rb_encoding *conn_enc = rb_to_encoding(wrapper->encoding);
 #endif
 
     field = mysql_fetch_field_direct(wrapper->result, idx);
@@ -85,27 +90,21 @@ static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, short int
   return rb_field;
 }
 
-static VALUE rb_mysql_result_fetch_row(int argc, VALUE * argv, VALUE self) {
-  VALUE rowHash, opts, block;
+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, symbolizeKeys = 0;
+  unsigned int i = 0;
   unsigned long * fieldLengths;
   void * ptr;
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *default_internal_enc = rb_default_internal_encoding();
-  rb_encoding *conn_enc = rb_to_encoding(rb_iv_get(self, "@encoding"));
-#endif
 
   GetMysql2Result(self, wrapper);
 
-  if (rb_scan_args(argc, argv, "01&", &opts, &block) == 1) {
-    Check_Type(opts, T_HASH);
-    if (rb_hash_aref(opts, sym_symbolize_keys) == Qtrue) {
-        symbolizeKeys = 1;
-    }
-  }
+#ifdef HAVE_RUBY_ENCODING_H
+  rb_encoding *default_internal_enc = rb_default_internal_encoding();
+  rb_encoding *conn_enc = rb_to_encoding(wrapper->encoding);
+#endif
 
   ptr = wrapper->result;
   row = (MYSQL_ROW)rb_thread_blocking_region(nogvl_fetch_row, ptr, RUBY_UBF_IO, 0);
@@ -113,7 +112,11 @@ static VALUE rb_mysql_result_fetch_row(int argc, VALUE * argv, VALUE self) {
     return Qnil;
   }
 
-  rowHash = rb_hash_new();
+  if (asArray) {
+    rowVal = rb_ary_new2(wrapper->numberOfFields);
+  } else {
+    rowVal = rb_hash_new();
+  }
   fields = mysql_fetch_fields(wrapper->result);
   fieldLengths = mysql_fetch_lengths(wrapper->result);
   if (wrapper->fields == Qnil) {
@@ -133,6 +136,10 @@ static VALUE rb_mysql_result_fetch_row(int argc, VALUE * argv, VALUE self) {
           val = rb_str_new(row[i], fieldLengths[i]);
           break;
         case MYSQL_TYPE_TINY:       // TINYINT field
+          if (castBool && fields[i].length == 1) {
+            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
@@ -142,16 +149,34 @@ static VALUE rb_mysql_result_fetch_row(int argc, VALUE * argv, VALUE self) {
           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)
-          val = rb_funcall(cBigDecimal, intern_new, 1, rb_str_new(row[i], fieldLengths[i]));
+          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
-          val = rb_float_new(strtod(row[i], NULL));
+        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){
+            val = opt_float_zero;
+          }else{
+            val = rb_float_new(column_to_double);
+          }
           break;
+        }
         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, intern_utc, 6, INT2NUM(0), INT2NUM(1), INT2NUM(1), INT2NUM(hour), INT2NUM(min), INT2NUM(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
+              val = rb_funcall(val, intern_utc, 0);
+            }
+          }
           break;
         }
         case MYSQL_TYPE_TIMESTAMP:  // TIMESTAMP field
@@ -165,7 +190,14 @@ static VALUE rb_mysql_result_fetch_row(int argc, VALUE * argv, VALUE self) {
               rb_raise(cMysql2Error, "Invalid date: %s", row[i]);
               val = Qnil;
             } else {
-              val = rb_funcall(rb_cTime, intern_utc, 6, INT2NUM(year), INT2NUM(month), INT2NUM(day), INT2NUM(hour), INT2NUM(min), INT2NUM(sec));
+              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
+                  val = rb_funcall(val, intern_utc, 0);
+                }
+              }
             }
           }
           break;
@@ -220,20 +252,35 @@ static VALUE rb_mysql_result_fetch_row(int argc, VALUE * argv, VALUE self) {
 #endif
           break;
       }
-      rb_hash_aset(rowHash, field, val);
+      if (asArray) {
+        rb_ary_push(rowVal, val);
+      } else {
+        rb_hash_aset(rowVal, field, val);
+      }
     } else {
-      rb_hash_aset(rowHash, field, Qnil);
+      if (asArray) {
+        rb_ary_push(rowVal, Qnil);
+      } else {
+        rb_hash_aset(rowVal, field, Qnil);
+      }
     }
   }
-  return rowHash;
+  return rowVal;
 }
 
 static VALUE rb_mysql_result_fetch_fields(VALUE self) {
   mysql2_result_wrapper * wrapper;
   unsigned int i = 0;
+  short int symbolizeKeys = 0;
+  VALUE defaults;
 
   GetMysql2Result(self, wrapper);
 
+  defaults = rb_iv_get(self, "@query_options");
+  if (rb_hash_aref(defaults, sym_symbolize_keys) == Qtrue) {
+    symbolizeKeys = 1;
+  }
+
   if (wrapper->fields == Qnil) {
     wrapper->numberOfFields = mysql_num_fields(wrapper->result);
     wrapper->fields = rb_ary_new2(wrapper->numberOfFields);
@@ -241,7 +288,7 @@ static VALUE rb_mysql_result_fetch_fields(VALUE self) {
 
   if (RARRAY_LEN(wrapper->fields) != wrapper->numberOfFields) {
     for (i=0; i<wrapper->numberOfFields; i++) {
-      rb_mysql_result_fetch_field(self, i, 0);
+      rb_mysql_result_fetch_field(self, i, symbolizeKeys);
     }
   }
 
@@ -249,18 +296,59 @@ static VALUE rb_mysql_result_fetch_fields(VALUE self) {
 }
 
 static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {
-  VALUE opts, block;
+  VALUE defaults, opts, block;
+  ID db_timezone, app_timezone, dbTz, appTz;
   mysql2_result_wrapper * wrapper;
   unsigned long i;
+  int symbolizeKeys = 0, asArray = 0, castBool = 0;
 
   GetMysql2Result(self, wrapper);
 
-  rb_scan_args(argc, argv, "01&", &opts, &block);
+  defaults = rb_iv_get(self, "@query_options");
+  if (rb_scan_args(argc, argv, "01&", &opts, &block) == 1) {
+    opts = rb_funcall(defaults, intern_merge, 1, opts);
+  } else {
+    opts = defaults;
+  }
+
+  if (rb_hash_aref(opts, sym_symbolize_keys) == Qtrue) {
+    symbolizeKeys = 1;
+  }
+
+  if (rb_hash_aref(opts, sym_as) == sym_array) {
+    asArray = 1;
+  }
+
+  if (rb_hash_aref(opts, sym_cast_booleans) == Qtrue) {
+    castBool = 1;
+  }
+
+  dbTz = rb_hash_aref(opts, sym_database_timezone);
+  if (dbTz == sym_local) {
+    db_timezone = intern_local;
+  } else if (dbTz == sym_utc) {
+    db_timezone = intern_utc;
+  } else {
+    if (!NIL_P(dbTz)) {
+      rb_warn(":database_timezone option must be :utc or :local - defaulting to :local");
+    }
+    db_timezone = intern_local;
+  }
+
+  appTz = rb_hash_aref(opts, sym_application_timezone);
+  if (appTz == sym_local) {
+    app_timezone = intern_local;
+  } else if (appTz == sym_utc) {
+    app_timezone = intern_utc;
+  } else {
+    app_timezone = Qnil;
+  }
 
   if (wrapper->lastRowProcessed == 0) {
     wrapper->numberOfRows = mysql_num_rows(wrapper->result);
     if (wrapper->numberOfRows == 0) {
-      return Qnil;
+      wrapper->rows = rb_ary_new();
+      return wrapper->rows;
     }
     wrapper->rows = rb_ary_new2(wrapper->numberOfRows);
   }
@@ -279,7 +367,7 @@ static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {
       if (i < rowsProcessed) {
         row = rb_ary_entry(wrapper->rows, i);
       } else {
-        row = rb_mysql_result_fetch_row(argc, argv, self);
+        row = rb_mysql_result_fetch_row(self, db_timezone, app_timezone, symbolizeKeys, asArray, castBool);
         rb_ary_store(wrapper->rows, i, row);
         wrapper->lastRowProcessed++;
       }
@@ -315,12 +403,12 @@ VALUE rb_mysql_result_to_obj(MYSQL_RES * r) {
   wrapper->result = r;
   wrapper->fields = Qnil;
   wrapper->rows = Qnil;
+  wrapper->encoding = Qnil;
   rb_obj_call_init(obj, 0, NULL);
   return obj;
 }
 
-void init_mysql2_result()
-{
+void init_mysql2_result() {
   cBigDecimal = rb_const_get(rb_cObject, rb_intern("BigDecimal"));
   cDate = rb_const_get(rb_cObject, rb_intern("Date"));
   cDateTime = rb_const_get(rb_cObject, rb_intern("DateTime"));
@@ -329,11 +417,31 @@ void init_mysql2_result()
   rb_define_method(cMysql2Result, "each", rb_mysql_result_each, -1);
   rb_define_method(cMysql2Result, "fields", rb_mysql_result_fetch_fields, 0);
 
-  sym_symbolize_keys = ID2SYM(rb_intern("symbolize_keys"));
-  intern_new = rb_intern("new");
-  intern_utc = rb_intern("utc");
+  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");
+  intern_local      = rb_intern("local");
+  intern_merge      = rb_intern("merge");
+  intern_localtime  = rb_intern("localtime");
+
+  sym_symbolize_keys  = ID2SYM(rb_intern("symbolize_keys"));
+  sym_as              = ID2SYM(rb_intern("as"));
+  sym_array           = ID2SYM(rb_intern("array"));
+  sym_local           = ID2SYM(rb_intern("local"));
+  sym_utc             = ID2SYM(rb_intern("utc"));
+  sym_cast_booleans   = ID2SYM(rb_intern("cast_booleans"));
+  sym_database_timezone     = ID2SYM(rb_intern("database_timezone"));
+  sym_application_timezone  = ID2SYM(rb_intern("application_timezone"));
+
+  rb_global_variable(&opt_decimal_zero); //never GC
+  opt_decimal_zero = rb_str_new2("0.0");
+  rb_global_variable(&opt_float_zero);
+  opt_float_zero = rb_float_new((double)0);
+  opt_time_year = INT2NUM(2000);
+  opt_time_month = INT2NUM(1);
+
 #ifdef HAVE_RUBY_ENCODING_H
   binaryEncoding = rb_enc_find("binary");
 #endif

data/ext/mysql2/result.h

@@ -4,4 +4,17 @@
 void init_mysql2_result();
 VALUE rb_mysql_result_to_obj(MYSQL_RES * r);
 
+typedef struct {
+  VALUE fields;
+  VALUE rows;
+  VALUE encoding;
+  unsigned int numberOfFields;
+  unsigned long numberOfRows;
+  unsigned long lastRowProcessed;
+  short int resultFreed;
+  MYSQL_RES *result;
+} mysql2_result_wrapper;
+
+#define GetMysql2Result(obj, sval) (sval = (mysql2_result_wrapper*)DATA_PTR(obj));
+
 #endif

data/lib/active_record/connection_adapters/em_mysql2_adapter.rb

@@ -42,17 +42,21 @@ module Mysql2
       end
 
       def query(sql, opts={})
-        super(sql, opts.merge(:async => true))
-        deferable = ::EM::DefaultDeferrable.new
-        ::EM.watch(self.socket, Watcher, self, deferable).notify_readable = true
-        fiber = Fiber.current
-        deferable.callback do |result|
-          fiber.resume(result)
-        end
-        deferable.errback do |err|
-          fiber.resume(err)
+        if EM.reactor_running?
+          super(sql, opts.merge(:async => true))
+          deferable = ::EM::DefaultDeferrable.new
+          ::EM.watch(self.socket, Watcher, self, deferable).notify_readable = true
+          fiber = Fiber.current
+          deferable.callback do |result|
+            fiber.resume(result)
+          end
+          deferable.errback do |err|
+            fiber.resume(err)
+          end
+          Fiber.yield
+        else
+          super(sql, opts)
         end
-        Fiber.yield
       end
     end
   end

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.1.9"
+  VERSION = "0.2.0"
 end