cast is forced for prepared statements

Author: nyaxt

ext/mysql2/result.c

@@ -294,7 +294,7 @@ static void rb_mysql_result_alloc_result_buffers(VALUE self, MYSQL_FIELD *fields
   }
 }
 
-static VALUE rb_mysql_result_stmt_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_stmt_fetch_row(VALUE self, ID db_timezone, ID app_timezone, int symbolizeKeys, int asArray, int castBool, MYSQL_FIELD * fields) {
   VALUE rowVal;
   mysql2_result_wrapper *wrapper;
   unsigned int i = 0;
@@ -780,12 +780,13 @@ static VALUE rb_mysql_result_each_nonstmt(VALUE self, const result_each_args* ar
           wrapper->numberOfRows++;
           if (args->block_given != Qnil) {
             rb_yield(row);
+            wrapper->lastRowProcessed++;
           }
         }
       } while(row != Qnil);
 
       rb_mysql_result_free_result(wrapper);
-      // wrapper->numberOfRows = wrapper->lastRowProcessed;
+      wrapper->numberOfRows = wrapper->lastRowProcessed;
       wrapper->streamingComplete = 1;
 
       // Check for errors, the connection might have gone out from under us
@@ -864,17 +865,18 @@ static VALUE rb_mysql_result_each_stmt(VALUE self, const result_each_args* args)
       fields = mysql_fetch_fields(wrapper->result);
 
       do {
-        row = rb_mysql_result_stmt_fetch_row(self, args->db_timezone, args->app_timezone, args->symbolizeKeys, args->asArray, args->castBool, args->cast, fields);
+        row = rb_mysql_result_stmt_fetch_row(self, args->db_timezone, args->app_timezone, args->symbolizeKeys, args->asArray, args->castBool, fields);
         if (row != Qnil) {
           wrapper->numberOfRows++;
           if (args->block_given != Qnil) {
             rb_yield(row);
+            wrapper->lastRowProcessed++;
           }
         }
       } while(row != Qnil);
 
       rb_mysql_result_free_result(wrapper);
-      // wrapper->numberOfRows = wrapper->lastRowProcessed;
+      wrapper->numberOfRows = wrapper->lastRowProcessed;
       wrapper->streamingComplete = 1;
 
       // Check for errors, the connection might have gone out from under us
@@ -903,7 +905,7 @@ static VALUE rb_mysql_result_each_stmt(VALUE self, const result_each_args* args)
         if (args->cacheRows && i < rowsProcessed) {
           row = rb_ary_entry(wrapper->rows, i);
         } else {
-          row = rb_mysql_result_stmt_fetch_row(self, args->db_timezone, args->app_timezone, args->symbolizeKeys, args->asArray, args->castBool, args->cast, fields);
+          row = rb_mysql_result_stmt_fetch_row(self, args->db_timezone, args->app_timezone, args->symbolizeKeys, args->asArray, args->castBool, fields);
           if (args->cacheRows) {
             rb_ary_store(wrapper->rows, i, row);
           }
@@ -962,10 +964,14 @@ static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {
     rb_warn("cacheRows is ignored if streaming is true");
   }
 
-  if(wrapper->stmt && !args.cacheRows && !args.streaming) {
+  if (wrapper->stmt && !args.cacheRows && !args.streaming) {
     rb_warn("cacheRows is forced for prepared statements (if not streaming)");
   }
 
+  if (wrapper->stmt && !args.cast) {
+    rb_warn("cast is forced for prepared statements");
+  }
+
   dbTz = rb_hash_aref(opts, sym_database_timezone);
   if (dbTz == sym_local) {
     db_timezone = intern_local;

spec/mysql2/statement_spec.rb

@@ -239,16 +239,6 @@
       @test_result = @client.prepare("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").execute.first
     end
 
-    it "should return nil values for NULL and strings for everything else when :cast is false" do
-      result = @client.query('SELECT null_test, tiny_int_test, bool_cast_test, int_test, date_test, enum_test FROM mysql2_test WHERE bool_cast_test = 1 LIMIT 1', :cast => false).first
-      result["null_test"].should be_nil
-      result["tiny_int_test"].should  == "1"
-      result["bool_cast_test"].should == "1"
-      result["int_test"].should       == "10"
-      result["date_test"].should      == "2010-04-04"
-      result["enum_test"].should      == "val1"
-    end
-
     it "should return nil for a NULL value" do
       @test_result['null_test'].class.should eql(NilClass)
       @test_result['null_test'].should eql(nil)