Move all args to Mysql2::Error to a separate method

Author: sodabrew

ext/mysql2/client.c

@@ -17,8 +17,7 @@
 VALUE cMysql2Client;
 extern VALUE mMysql2, cMysql2Error;
 static VALUE sym_id, sym_version, sym_header_version, sym_async, sym_symbolize_keys, sym_as, sym_array, sym_stream;
-static ID intern_merge, intern_merge_bang, intern_error_number_eql, intern_sql_state_eql;
-static ID intern_brackets, intern_new;
+static ID intern_brackets, intern_new, intern_merge, intern_merge_bang, intern_new_with_args;
 
 #ifndef HAVE_RB_HASH_DUP
 VALUE rb_hash_dup(VALUE other) {
@@ -124,7 +123,7 @@ static VALUE rb_raise_mysql2_error(mysql_client_wrapper *wrapper) {
   rb_enc_associate(rb_sql_state, rb_usascii_encoding());
 #endif
 
-  e = rb_funcall(cMysql2Error, intern_new, 4,
+  e = rb_funcall(cMysql2Error, intern_new_with_args, 4,
                  rb_error_msg,
                  LONG2FIX(wrapper->server_version),
                  UINT2NUM(mysql_errno(wrapper->client)),
@@ -1303,8 +1302,7 @@ void init_mysql2_client() {
   intern_new = rb_intern("new");
   intern_merge = rb_intern("merge");
   intern_merge_bang = rb_intern("merge!");
-  intern_error_number_eql = rb_intern("error_number=");
-  intern_sql_state_eql = rb_intern("sql_state=");
+  intern_new_with_args = rb_intern("new_with_args");
 
 #ifdef CLIENT_LONG_PASSWORD
   rb_const_set(cMysql2Client, rb_intern("LONG_PASSWORD"),

lib/mysql2/error.rb

@@ -9,20 +9,26 @@ class Error < StandardError
     }.freeze
 
     attr_reader :error_number, :sql_state
-    attr_writer :server_version
 
     # Mysql gem compatibility
     alias_method :errno, :error_number
     alias_method :error, :message
 
-    def initialize(msg, server_version=nil, error_number=nil, sql_state=nil)
-      self.server_version = server_version
-      self.error_number = error_number
-      self.sql_state = sql_state.respond_to?(:encode) ? sql_state.encode(ENCODE_OPTS) : sql_state
+    def initialize(msg)
+      @server_version ||= nil
 
       super(clean_message(msg))
     end
 
+    def self.new_with_args(msg, server_version, error_number, sql_state)
+      err = allocate
+      err.instance_variable_set('@server_version', server_version)
+      err.instance_variable_set('@error_number', error_number)
+      err.instance_variable_set('@sql_state', sql_state.respond_to?(:encode) ? sql_state.encode(ENCODE_OPTS) : sql_state)
+      err.send(:initialize, msg)
+      err
+    end
+
     private
 
     # In MySQL 5.5+ error messages are always constructed server-side as UTF-8