Add a setter method for init_command rather than a connect arg

Author: sodabrew

ext/mysql2/client.c

@@ -67,7 +67,6 @@ struct nogvl_connect_args {
   const char *user;
   const char *passwd;
   const char *db;
-  const char *init_command;
   unsigned int port;
   const char *unix_socket;
   unsigned long client_flag;
@@ -157,10 +156,6 @@ static void *nogvl_connect(void *ptr) {
   struct nogvl_connect_args *args = ptr;
   MYSQL *client;
 
-  if (args->init_command != NULL) {
-    mysql_options(args->mysql, MYSQL_INIT_COMMAND, args->init_command);
-  }
-
   client = mysql_real_connect(args->mysql, args->host,
                               args->user, args->passwd,
                               args->db, args->port, args->unix_socket,
@@ -327,7 +322,7 @@ static VALUE rb_mysql_info(VALUE self) {
   return rb_str;
 }
 
-static VALUE rb_connect(VALUE self, VALUE user, VALUE pass, VALUE host, VALUE port, VALUE database, VALUE socket, VALUE flags, VALUE init_command) {
+static VALUE rb_connect(VALUE self, VALUE user, VALUE pass, VALUE host, VALUE port, VALUE database, VALUE socket, VALUE flags) {
   struct nogvl_connect_args args;
   VALUE rv;
   GET_CLIENT(self);
@@ -340,7 +335,6 @@ static VALUE rb_connect(VALUE self, VALUE user, VALUE pass, VALUE host, VALUE po
   args.db = NIL_P(database) ? NULL : StringValuePtr(database);
   args.mysql = wrapper->client;
   args.client_flag = NUM2ULONG(flags);
-  args.init_command = NIL_P(init_command) ? NULL : StringValuePtr(init_command);
 
   rv = (VALUE) rb_thread_call_without_gvl(nogvl_connect, &args, RUBY_UBF_IO, 0);
   if (rv == Qfalse) {
@@ -786,6 +780,11 @@ static VALUE _mysql_client_options(VALUE self, int opt, VALUE value) {
       retval  = charval;
       break;
 
+    case MYSQL_INIT_COMMAND:
+      charval = (const char *)StringValuePtr(value);
+      retval  = charval;
+      break;
+
     default:
       return Qfalse;
   }
@@ -1170,6 +1169,10 @@ static VALUE set_read_default_group(VALUE self, VALUE value) {
   return _mysql_client_options(self, MYSQL_READ_DEFAULT_GROUP, value);
 }
 
+static VALUE set_init_command(VALUE self, VALUE value) {
+  return _mysql_client_options(self, MYSQL_INIT_COMMAND, value);
+}
+
 static VALUE initialize_ext(VALUE self) {
   GET_CLIENT(self);
 
@@ -1241,9 +1244,10 @@ void init_mysql2_client() {
   rb_define_private_method(cMysql2Client, "secure_auth=", set_secure_auth, 1);
   rb_define_private_method(cMysql2Client, "default_file=", set_read_default_file, 1);
   rb_define_private_method(cMysql2Client, "default_group=", set_read_default_group, 1);
+  rb_define_private_method(cMysql2Client, "init_command=", set_init_command, 1);
   rb_define_private_method(cMysql2Client, "ssl_set", set_ssl_options, 5);
   rb_define_private_method(cMysql2Client, "initialize_ext", initialize_ext, 0);
-  rb_define_private_method(cMysql2Client, "connect", rb_connect, 8);
+  rb_define_private_method(cMysql2Client, "connect", rb_connect, 7);
 
   sym_id              = ID2SYM(rb_intern("id"));
   sym_version         = ID2SYM(rb_intern("version"));

lib/mysql2/client.rb

@@ -23,7 +23,7 @@ def initialize(opts = {})
 
       initialize_ext
 
-      [:reconnect, :connect_timeout, :local_infile, :read_timeout, :write_timeout, :default_file, :default_group, :secure_auth].each do |key|
+      [:reconnect, :connect_timeout, :local_infile, :read_timeout, :write_timeout, :default_file, :default_group, :secure_auth, :init_command].each do |key|
         next unless opts.key?(key)
         case key
         when :reconnect, :local_infile, :secure_auth
@@ -55,7 +55,6 @@ def initialize(opts = {})
       database = opts[:database] || opts[:dbname] || opts[:db]
       socket   = opts[:socket] || opts[:sock]
       flags    = opts[:flags] ? opts[:flags] | @query_options[:connect_flags] : @query_options[:connect_flags]
-      init_command = opts[:init_command]
 
       # Correct the data types before passing these values down to the C level
       user = user.to_s unless user.nil?
@@ -64,9 +63,8 @@ def initialize(opts = {})
       port = port.to_i unless port.nil?
       database = database.to_s unless database.nil?
       socket = socket.to_s unless socket.nil?
-      init_command = init_command.to_s unless init_command.nil?
 
-      connect user, pass, host, port, database, socket, flags, init_command
+      connect user, pass, host, port, database, socket, flags
     end
 
     def self.default_query_options

spec/mysql2/client_spec.rb

@@ -74,19 +74,6 @@ def connect *args
                                      Mysql2::Client::SECURE_CONNECTION)).should be_true
   end
 
-  it "should accept init_command" do
-    klient = Class.new(Mysql2::Client) do
-      attr_reader :connect_args
-      def connect *args
-        @connect_args ||= []
-        @connect_args << args
-      end
-    end
-    command = "SET @@session.something = 1"
-    client = klient.new :init_command => command
-    client.connect_args.last[7].should eq(command)
-  end
-
   it "should execute init command" do
     options = DatabaseCredentials['root'].dup
     options[:init_command] = "SET @something = 'setting_value';"