Moved/tidied tests. Bug fix in client.c

The bug fix in client.c is less than ideal but there isn't really
another option without some rearchitecting. Basically, wrapper->active
should not be set to 0 when mysql_use_result is being used until we
have iterated through the full result set (as the wrpaper is infact
still active). Unfortunately, we would need to change this within
Mysql2::Result, which isn't possible at the moment unless we pass the
client to the result object (which seems overkill). So, for now, the
query will fail with a "commands out of sync" error.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   ext/mysql2/client.c
#	modified:   spec/mysql2/client_spec.rb
#	modified:   spec/mysql2/result_spec.rb
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	Gemfile.lock

Author: benmcredmond

ext/mysql2/client.c

@@ -281,15 +281,13 @@ static VALUE nogvl_do_result(void *ptr, char use_result) {
   wrapper = (mysql_client_wrapper *)ptr;
   if(use_result) {
     result = mysql_use_result(wrapper->client);
-    // new commands can't be issued until this cursor is read all the way through
   } else {
     result = mysql_store_result(wrapper->client);
-
-    // once our result is stored off, this connection is
-    // ready for another command to be issued
-    wrapper->active = 0;
   }
 
+  // once our result is stored off, this connection is
+  // ready for another command to be issued
+  wrapper->active = 0;
   return (VALUE)result;
 }
 

spec/mysql2/client_spec.rb

@@ -92,6 +92,22 @@ def connect *args
   end
 
   context "#query" do
+    it "should let you query again if iterating is finished when streaming" do
+      @client.query("SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false).each {}
+
+      expect {
+        @client.query("SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false)
+      }.to_not raise_exception(Mysql2::Error)
+    end
+
+    it "should not let you query again if iterating is not finished when streaming" do
+      @client.query("SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false).first
+
+      expect {
+        @client.query("SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false)
+      }.to raise_exception(Mysql2::Error)
+    end
+
     it "should only accept strings as the query parameter" do
       lambda {
         @client.query ["SELECT 'not right'"]

spec/mysql2/result_spec.rb

@@ -86,15 +86,11 @@
 
     it "should throw an exception if we try to iterate twice when streaming is enabled" do
       result = @client.query "SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false
-      expect do
+
+      expect {
         result.each {}
         result.each {}
-      end.to raise_exception(Mysql2::Error)
-    end
-
-    it "should let you query again after iterating completely when streaming" do
-      @client.query("SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false).each {}
-      @client.query("SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false).should_not raise_exception(Mysql2::Error)
+      }.to raise_exception(Mysql2::Error)
     end
   end