mysql2 0.5.0-x86-mingw32 → 0.5.1-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ce601ff484e3a0ac07963a51f25a644c9a2f4f7659ca9a4fe2894042b8c4675
-  data.tar.gz: 165988fe0c044664f4e2d97c8b4f666c08fe690e14219cef7baec7aa0beeb39e
+  metadata.gz: b22531a4167fc8f203ecf0bc350964e919f297359b82d26024f562534184a66a
+  data.tar.gz: 5dd9267a3c8b147b48d686a7db578cc9b465481d6c16b68614c1419f0ea425b3
 SHA512:
-  metadata.gz: c148714e7b2028dd78a14b69da0abfecc82022329cebe23e6802d5114d1f4f22795e600b54a0c848a7f0f1ab739cc71cc71fbed4a597d803be8ca9cc9c69d82d
-  data.tar.gz: b7b099215f24ef639d2515f761b6bdc1c3937e5d52598101f349f4f5255f93d9d89365c50d66a9108cf55e4787f331bacf8298e47edd1aa4d17b3151f7cc2c8b
+  metadata.gz: 964e6efd16b1cb22c9ff916d428a0734c4c5efcd1d499e5a3dad708cb9641a188738fa3df1e720b5325154bf2cef15586a9410a08a650b064ef48f1fcc3923cd
+  data.tar.gz: cefb886890d8942deffd4a7cdb79d9aff8eb58e8dd3edfb6f80fd2883af6e7175b02d776019774f9cf0bc644174148790121a60433092e897933a42255a79209

data/README.md

@@ -178,6 +178,9 @@ Pass your arguments to the execute method in the same number and order as the
 question marks in the statement. Query options can be passed as keyword arguments
 to the execute method.
 
+Be sure to read about the known limitations of prepared statements at
+https://dev.mysql.com/doc/refman/5.6/en/c-api-prepared-statement-problems.html
+
 ``` ruby
 statement = @client.prepare("SELECT * FROM users WHERE login_count = ?")
 result1 = statement.execute(1)
@@ -534,6 +537,7 @@ This gem is tested with the following MySQL and MariaDB versions:
 
 ### Ruby on Rails / Active Record
 
+ * mysql2 0.5.x works with Rails / Active Record 5.0.7, 5.1.6, and higher.
  * mysql2 0.4.x works with Rails / Active Record 4.2.5 - 5.0 and higher.
  * mysql2 0.3.x works with Rails / Active Record 3.1, 3.2, 4.x, 5.0.
  * mysql2 0.2.x works with Rails / Active Record 2.3 - 3.0.

data/ext/mysql2/extconf.rb

@@ -63,6 +63,7 @@ if inc && lib
   abort "-----\nCannot find library dir(s) #{lib}\n-----" unless lib && lib.split(File::PATH_SEPARATOR).any? { |dir| File.directory?(dir) }
   warn "-----\nUsing --with-mysql-dir=#{File.dirname inc}\n-----"
   rpath_dir = lib
+  have_library('mysqlclient')
 elsif (mc = (with_config('mysql-config') || Dir[GLOB].first))
   # If the user has provided a --with-mysql-config argument, we must respect it or fail.
   # If the user gave --with-mysql-config with no argument means we should try to find it.

data/ext/mysql2/statement.c

@@ -403,6 +403,39 @@ static VALUE rb_mysql_stmt_execute(int argc, VALUE *argv, VALUE self) {
     }
   }
 
+  // Duplicate the options hash, merge! extra opts, put the copy into the Result object
+  current = rb_hash_dup(rb_iv_get(stmt_wrapper->client, "@query_options"));
+  (void)RB_GC_GUARD(current);
+  Check_Type(current, T_HASH);
+
+  // Merge in hash opts/keyword arguments
+  if (!NIL_P(opts)) {
+    rb_funcall(current, intern_merge_bang, 1, opts);
+  }
+
+  is_streaming = (Qtrue == rb_hash_aref(current, sym_stream));
+
+  // From stmt_execute to mysql_stmt_result_metadata to stmt_store_result, no
+  // Ruby API calls are allowed so that GC is not invoked. If the connection is
+  // in results-streaming-mode for Statement A, and in the middle Statement B
+  // gets garbage collected, a message will be sent to the server notifying it
+  // to release Statement B, resulting in the following error:
+  //   Commands out of sync; you can't run this command now
+  //
+  // In streaming mode, statement execute must return a cursor because we
+  // cannot prevent other Statement objects from being garbage collected
+  // between fetches of each row of the result set. The following error
+  // occurs if cursor mode is not set:
+  //   Row retrieval was canceled by mysql_stmt_close
+
+  if (is_streaming) {
+    unsigned long type = CURSOR_TYPE_READ_ONLY;
+    if (mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, &type)) {
+      FREE_BINDS;
+      rb_raise(cMysql2Error, "Unable to stream prepared statement, could not set CURSOR_TYPE_READ_ONLY");
+    }
+  }
+
   if ((VALUE)rb_thread_call_without_gvl(nogvl_stmt_execute, stmt, RUBY_UBF_IO, 0) == Qfalse) {
     FREE_BINDS;
     rb_raise_mysql2_stmt_error(stmt_wrapper);
@@ -421,17 +454,6 @@ static VALUE rb_mysql_stmt_execute(int argc, VALUE *argv, VALUE self) {
     return Qnil;
   }
 
-  // Duplicate the options hash, merge! extra opts, put the copy into the Result object
-  current = rb_hash_dup(rb_iv_get(stmt_wrapper->client, "@query_options"));
-  (void)RB_GC_GUARD(current);
-  Check_Type(current, T_HASH);
-
-  // Merge in hash opts/keyword arguments
-  if (!NIL_P(opts)) {
-    rb_funcall(current, intern_merge_bang, 1, opts);
-  }
-
-  is_streaming = (Qtrue == rb_hash_aref(current, sym_stream));
   if (!is_streaming) {
     // recieve the whole result set from the server
     if (mysql_stmt_store_result(stmt)) {

data/lib/mysql2/mysql2.rb

@@ -0,0 +1,2 @@
+RUBY_VERSION =~ /(\d+.\d+)/
+require "mysql2/#{$1}/mysql2"

data/lib/mysql2/version.rb

@@ -1,3 +1,3 @@
 module Mysql2
-  VERSION = "0.5.0".freeze
+  VERSION = "0.5.1".freeze
 end

data/spec/mysql2/statement_spec.rb

@@ -6,6 +6,10 @@ RSpec.describe Mysql2::Statement do
   end
 
   def stmt_count
+    # Use the performance schema in MySQL 5.7 and above
+    @client.query("SELECT COUNT(1) AS count FROM performance_schema.prepared_statements_instances").first['count'].to_i
+  rescue Mysql2::Error
+    # Fall back to the global prepapred statement counter
     @client.query("SHOW STATUS LIKE 'Prepared_stmt_count'").first['Value'].to_i
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql2
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: x86-mingw32
 authors:
 - Brian Lopez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-04-11 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: