Factor out result @query_options into a separate function.

Author: sodabrew

ext/mysql2/result.c

@@ -417,72 +417,76 @@ static VALUE rb_mysql_result_fetch_fields(VALUE self) {
   return wrapper->fields;
 }
 
-static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {
-  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, cacheRows = 1, cast = 1, streaming = 0;
-  MYSQL_FIELD * fields = NULL;
-
-  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 {
-    opts = defaults;
-  }
+static void rb_mysql_row_query_options(VALUE opts, ID *db_timezone, ID *app_timezone, int *symbolizeKeys, int *asArray, int *castBool, int *cast, int *streaming, int *cacheRows) {
+  ID dbTz, appTz;
 
   if (rb_hash_aref(opts, sym_symbolize_keys) == Qtrue) {
-    symbolizeKeys = 1;
+    *symbolizeKeys = 1;
   }
 
   if (rb_hash_aref(opts, sym_as) == sym_array) {
-    asArray = 1;
+    *asArray = 1;
   }
 
   if (rb_hash_aref(opts, sym_cast_booleans) == Qtrue) {
-    castBool = 1;
+    *castBool = 1;
   }
 
-  if (rb_hash_aref(opts, sym_cache_rows) == Qfalse) {
-    cacheRows = 0;
+  if (rb_hash_aref(opts, sym_cast) == Qfalse) {
+    *cast = 0;
   }
 
-  if (rb_hash_aref(opts, sym_cast) == Qfalse) {
-    cast = 0;
+  if (rb_hash_aref(opts, sym_cache_rows) == Qfalse) {
+    *cacheRows = 0;
   }
 
   if(rb_hash_aref(opts, sym_stream) == Qtrue) {
-    streaming = 1;
+    *streaming = 1;
   }
 
-  if(streaming && cacheRows) {
+  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;
+    *db_timezone = intern_local;
   } else if (dbTz == sym_utc) {
-    db_timezone = intern_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;
+    *db_timezone = intern_local;
   }
 
   appTz = rb_hash_aref(opts, sym_application_timezone);
   if (appTz == sym_local) {
-    app_timezone = intern_local;
+    *app_timezone = intern_local;
   } else if (appTz == sym_utc) {
-    app_timezone = intern_utc;
+    *app_timezone = intern_utc;
+  } else {
+    *app_timezone = Qnil;
+  }
+}
+
+static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {
+  VALUE defaults, opts, block;
+  ID db_timezone, app_timezone;
+  mysql2_result_wrapper * wrapper;
+  unsigned long i;
+  int symbolizeKeys = 0, asArray = 0, castBool = 0, cacheRows = 1, cast = 1, streaming = 0;
+
+  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 {
-    app_timezone = Qnil;
+    opts = defaults;
   }
+  rb_mysql_row_query_options(opts, &db_timezone, &app_timezone, &symbolizeKeys, &asArray, &castBool, &cast, &streaming, &cacheRows);
 
   if (wrapper->lastRowProcessed == 0) {
     if(streaming) {