test pass

Author: nyaxt

ext/mysql2/statement.c

@@ -2,7 +2,7 @@
 
 VALUE cMysql2Statement;
 extern VALUE mMysql2, cMysql2Error, cBigDecimal, cDateTime, cDate;
-static VALUE sym_stream, intern_error_number_eql, intern_sql_state_eql;
+static VALUE sym_stream, intern_error_number_eql, intern_sql_state_eql, intern_each;
 
 #define GET_STATEMENT(self) \
   mysql_stmt_wrapper *stmt_wrapper; \
@@ -365,6 +365,11 @@ static VALUE execute(int argc, VALUE *argv, VALUE self) {
   }
 #endif
 
+  if (!is_streaming) {
+    // cache all result
+    rb_funcall(resultObj, intern_each, 0);
+  }
+
   return resultObj;
 }
 
@@ -428,4 +433,5 @@ void init_mysql2_statement() {
 
   intern_error_number_eql = rb_intern("error_number=");
   intern_sql_state_eql = rb_intern("sql_state=");
+  intern_each = rb_intern("each");
 }

spec/mysql2/statement_spec.rb

@@ -58,6 +58,18 @@
     rows.should == [{"1"=>1}]
   end
 
+  it "should keep its result after other query" do
+    @client.query 'USE test'
+    @client.query 'CREATE TABLE IF NOT EXISTS mysql2_stmt_q(a int)'
+    @client.query 'INSERT INTO mysql2_stmt_q (a) VALUES (1), (2)'
+    stmt = @client.prepare('SELECT a FROM mysql2_stmt_q WHERE a = ?')
+    result1 = stmt.execute(1)
+    result2 = stmt.execute(2)
+    result2.first.should == {"a"=>2}
+    result1.first.should == {"a"=>1}
+    @client.query 'DROP TABLE IF EXISTS mysql2_stmt_q'
+  end
+
   it "should select dates" do
     statement = @client.prepare 'SELECT NOW()'
     result = statement.execute