Tests for capturing query options in the Statement object

Author: sodabrew

ext/mysql2/statement.c

@@ -111,7 +111,7 @@ VALUE rb_mysql_stmt_new(VALUE rb_client, VALUE sql, VALUE options) {
   }
 
   rb_obj_call_init(rb_stmt, 0, NULL);
-  rb_iv_set(rb_stmt, "@query_options", options);
+  rb_iv_set(rb_stmt, "@query_options", rb_hash_dup(options));
 
   // instantiate stmt
   {
@@ -364,7 +364,7 @@ static VALUE rb_mysql_stmt_execute(int argc, VALUE *argv, VALUE self) {
 
   is_streaming = (Qtrue == rb_hash_aref(current, sym_stream));
   if (!is_streaming) {
-    // recieve the whole result set from the server
+    // Receive the whole result set from the server
     if (rb_thread_call_without_gvl(nogvl_stmt_store_result, stmt, RUBY_UBF_IO, 0) == Qfalse) {
       mysql_free_result(metadata);
       rb_raise_mysql2_stmt_error(stmt_wrapper);

spec/mysql2/statement_spec.rb

@@ -59,6 +59,31 @@
     expect(rows).to eq([{ "1" => 1 }])
   end
 
+  it "should keep query options per prepared statement" do
+    stmt1 = @client.prepare 'SELECT 1 AS a', :as => :hash
+    stmt2 = @client.prepare 'SELECT 1 AS a', :as => :array
+
+    expect(stmt1.execute.first).to eq("a" => 1)
+    expect(stmt2.execute.first).to eq([1])
+
+    expect(stmt1.query_options).to include(:as => :hash)
+    expect(stmt2.query_options).to include(:as => :array)
+  end
+
+  it "should capture query options when preparing the statement" do
+    @client.query_options.merge!(:as => :hash)
+    stmt1 = @client.prepare 'SELECT 1 AS a'
+
+    @client.query_options.merge!(:as => :array)
+    stmt2 = @client.prepare 'SELECT 1 AS a'
+
+    expect(stmt1.execute.first).to eq("a" => 1)
+    expect(stmt2.execute.first).to eq([1])
+
+    expect(stmt1.query_options).to include(:as => :hash)
+    expect(stmt2.query_options).to include(:as => :array)
+  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)'
@@ -180,14 +205,14 @@
     # note: The current impl. of prepared statement requires results to be cached on #execute except for streaming queries
     #       The drawback of this is that args of Result#each is ignored...
 
-    it "should yield rows as hash's" do
+    it "should yield rows as hashes" do
       result = @client.prepare("SELECT 1").execute
       result.each do |row|
         expect(row).to be_an_instance_of(Hash)
       end
     end
 
-    it "should yield rows as hash's with symbol keys if :symbolize_keys was set to true" do
+    it "should yield rows as hashes with symbol keys if :symbolize_keys was set to true" do
       result = @client.prepare("SELECT 1", :symbolize_keys => true).execute
       result.each do |row|
         expect(row.keys.first).to be_an_instance_of(Symbol)