streaming works!

Author: nyaxt

ext/mysql2/statement.c

@@ -193,7 +193,7 @@ static void *nogvl_stmt_store_result(void *ptr) {
 
 /* call-seq: stmt.execute
  *
- * Executes the current prepared statement, returns +stmt+.
+ * Executes the current prepared statement, returns +result+.
  */
 static VALUE execute(int argc, VALUE *argv, VALUE self) {
   MYSQL_BIND *bind_buffers = NULL;
@@ -345,9 +345,7 @@ static VALUE execute(int argc, VALUE *argv, VALUE self) {
   current = rb_hash_dup(rb_iv_get(stmt_wrapper->client, "@query_options"));
   GET_CLIENT(stmt_wrapper->client);
 
-  if(is_streaming) {
-    rb_raise(cMysql2Error, "TODO: streaming stmt execute not yet impl.");
-  } else {
+  if (!is_streaming) {
     // recieve the whole result set from the server
     if (rb_thread_call_without_gvl(nogvl_stmt_store_result, stmt, RUBY_UBF_IO, 0) == Qfalse) {
       rb_raise_mysql2_stmt_error(self);

spec/mysql2/result_spec.rb

@@ -128,9 +128,10 @@
     end
 
     it "#count should be zero for rows after streaming when there were no results" do
+      @client.query "USE test"
       result = @client.query("SELECT * FROM mysql2_test WHERE null_test IS NOT NULL", :stream => true, :cache_rows => false)
       result.count.should eql(0)
-      result.each.to_a
+      result.each {|r|  }
       result.count.should eql(0)
     end
 

spec/mysql2/statement_spec.rb

@@ -147,6 +147,26 @@
 
       result.to_a.should == [{"整数"=>1}]
     end
+  end
 
+  context "streaming result" do
+    it "should be able to stream query result" do
+      n = 1
+      stmt = @client.prepare("SELECT 1 UNION SELECT 2")
+
+      @client.query_options.merge!({:stream => true, :cache_rows => false, :as => :array})
+
+      stmt.execute.each do |r|
+        case n
+        when 1
+          r.should == [1]
+        when 2
+          r.should == [2]
+        else
+          violated "returned more than two rows"
+        end
+        n += 1
+      end
+    end
   end
 end