Check for vio_is_connected export

Author: csfrancis

ext/mysql2/client.c

@@ -25,11 +25,17 @@ static ID intern_brackets, intern_merge, intern_merge_bang, intern_new_with_args
     rb_raise(cMysql2Error, "MySQL client is not initialized"); \
   }
 
+#if defined(HAVE_VIO_IS_CONNECTED)
+ my_bool vio_is_connected(Vio *vio);
+ #define IO_IS_CONNECTED(wrapper) vio_is_connected(wrapper->client->net.vio)
+#else
+ #define IO_IS_CONNECTED(wrapper)
+#endif
+
 #if defined(HAVE_MYSQL_NET_VIO) || defined(HAVE_ST_NET_VIO)
-  my_bool vio_is_connected(Vio *vio);
-  #define CONNECTED(wrapper) (wrapper->client->net.vio != NULL && wrapper->client->net.fd != -1 && vio_is_connected(wrapper->client->net.vio))
+  #define CONNECTED(wrapper) (wrapper->client->net.vio != NULL && wrapper->client->net.fd != -1 && IO_IS_CONNECTED(wrapper))
 #elif defined(HAVE_MYSQL_NET_PVIO) || defined(HAVE_ST_NET_PVIO)
-  #define CONNECTED(wrapper) (wrapper->client->net.pvio != NULL && wrapper->client->net.fd != -1)
+  #define CONNECTED(wrapper) (wrapper->client->net.pvio != NULL && wrapper->client->net.fd != -1 && IO_IS_CONNECTED(wrapper))
 #endif
 
 #define REQUIRE_CONNECTED(wrapper) \
@@ -1366,6 +1372,14 @@ static VALUE initialize_ext(VALUE self) {
   return self;
 }
 
+static VALUE rb_vio_is_connected(VALUE self) {
+#if defined(HAVE_VIO_IS_CONNECTED)
+  return Qtrue;
+#else
+  return Qfalse;
+#endif
+}
+
 /* call-seq: client.prepare # => Mysql2::Statement
  *
  * Create a new prepared statement.
@@ -1455,6 +1469,8 @@ void init_mysql2_client() {
   rb_define_private_method(cMysql2Client, "connect", rb_mysql_connect, 8);
   rb_define_private_method(cMysql2Client, "_query", rb_mysql_query, 2);
 
+  rb_define_private_method(cMysql2Client, "_vio_is_connected?", rb_vio_is_connected, 0);
+
   sym_id              = ID2SYM(rb_intern("id"));
   sym_version         = ID2SYM(rb_intern("version"));
   sym_header_version  = ID2SYM(rb_intern("header_version"));

ext/mysql2/extconf.rb

@@ -106,6 +106,7 @@ def add_ssl_defines(header)
 add_ssl_defines(mysql_h)
 have_struct_member('MYSQL', 'net.vio', mysql_h)
 have_struct_member('MYSQL', 'net.pvio', mysql_h)
+have_func('vio_is_connected')
 
 # These constants are actually enums, so they cannot be detected by #ifdef in C code.
 have_const('MYSQL_ENABLE_CLEARTEXT_PLUGIN', mysql_h)

spec/mysql2/client_spec.rb

@@ -344,6 +344,7 @@ def run_gc
     end
 
     it "should detect a closed connection" do
+      skip "libmysqlclient does not export vio_is_connected()" unless @client.send(:_vio_is_connected?)
       connection_id = @client.thread_id
       Thread.new do
         sleep(0.1)
@@ -586,7 +587,7 @@ def run_gc
       end
       expect do
         @client.query("SELECT SLEEP(1)")
-      end.to raise_error(Mysql2::Error, 'MySQL client is not connected')
+      end.to raise_error(Mysql2::Error)
 
       if RUBY_PLATFORM !~ /mingw|mswin/
         expect do
@@ -595,19 +596,6 @@ def run_gc
       end
     end
 
-    it "should detect a closed connection" do
-      connection_id = @client.thread_id
-      Thread.new do
-        sleep(0.1)
-        Mysql2::Client.new(DatabaseCredentials['root']).tap do |supervisor|
-          supervisor.query("KILL #{connection_id}")
-        end.close
-      end
-      expect(@client.query("SELECT 1").first["1"]).to eql(1)
-      sleep(0.2)
-      expect(@client.closed?).to be true
-    end
-
     if RUBY_PLATFORM !~ /mingw|mswin/
       it "should not allow another query to be sent without fetching a result first" do
         @client.query("SELECT 1", async: true)