Move mysql_fetch_fields closer to point of use.

Author: sodabrew

ext/mysql2/result.c

@@ -191,10 +191,11 @@ static unsigned int msec_char_to_uint(char *msec_char, size_t len)
   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, int cast) {
   VALUE rowVal;
   mysql2_result_wrapper * wrapper;
   MYSQL_ROW row;
+  MYSQL_FIELD * fields;
   unsigned int i = 0;
   unsigned long * fieldLengths;
   void * ptr;
@@ -226,6 +227,9 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezo
     wrapper->fields = rb_ary_new2(wrapper->numberOfFields);
   }
 
+  /* get the MySQL field types to convert to Ruby field types */
+  fields = mysql_fetch_fields(wrapper->result);
+
   for (i = 0; i < wrapper->numberOfFields; i++) {
     VALUE field = rb_mysql_result_fetch_field(self, i, symbolizeKeys);
     if (row[i]) {
@@ -447,7 +451,6 @@ static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {
   unsigned long i;
   const char * errstr;
   int symbolizeKeys, asArray, castBool, cacheRows, cast;
-  MYSQL_FIELD * fields = NULL;
 
   GetMysql2Result(self, wrapper);
 
@@ -499,10 +502,8 @@ static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {
     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);
+        row = rb_mysql_result_fetch_row(self, db_timezone, app_timezone, symbolizeKeys, asArray, castBool, cast);
         if (row != Qnil) {
           wrapper->numberOfRows++;
           if (block != Qnil) {
@@ -542,14 +543,13 @@ static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {
     } 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);
+          row = rb_mysql_result_fetch_row(self, db_timezone, app_timezone, symbolizeKeys, asArray, castBool, cast);
           if (cacheRows) {
             rb_ary_store(wrapper->rows, i, row);
           }