make sure we return error message and sql state in Encoding.default_internal if set

Author: brianmario

lib/mysql2/error.rb

@@ -17,6 +17,12 @@ def initialize(msg, server_version=nil)
       super(clean_message(msg))
     end
 
+    if "".respond_to? :encode
+      def sql_state=(state)
+        @sql_state = state.encode
+      end
+    end
+
     private
 
     # In MySQL 5.5+ error messages are always constructed server-side as UTF-8
@@ -50,10 +56,10 @@ def clean_message(message)
       return message if !message.respond_to?(:encoding)
 
       if @server_version && @server_version > 50500
-        message
+        message.encode
       else
         if message.respond_to? :scrub
-          message.scrub
+          message.scrub.encode
         else
           # This is ugly as hell but Ruby 1.9 doesn't provide a way to clean a string
           # and retain it's valid UTF-8 characters, that I know of.
@@ -66,7 +72,7 @@ def clean_message(message)
               new_message << REPLACEMENT_CHAR
             end
           end
-          new_message
+          new_message.encode
         end
       end
     end

spec/mysql2/error_spec.rb

@@ -67,5 +67,18 @@
       error.sql_state.encoding.should eql(Encoding::US_ASCII)
       error.sql_state.valid_encoding?
     end
+
+    it "returns error messages and sql state in Encoding.default_internal if set" do
+      interal_before = Encoding.default_internal
+      Encoding.default_internal = 'UTF-16'
+
+      error.message.encoding.should eql(Encoding.default_internal)
+      error.message.valid_encoding?
+
+      bad_err.message.encoding.should eql(Encoding.default_internal)
+      bad_err.message.valid_encoding?
+
+      Encoding.default_internal = interal_before
+    end
   end
 end