mysql2 0.1.5 → 0.1.6

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.1.6 (May 14th, 2010)
+* more fixes to the AR adapter related to casting
+* add missing index creation override method to AR adapter
+* added sql_state and error_number methods to the Mysql2::Error exception class
+
 ## 0.1.5 (May 12th, 2010)
 * quite a few patches from Eric Wong related to thread-safety, non-blocking I/O and general cleanup
 ** wrap mysql_real_connect with rb_thread_blocking_region

data/README.rdoc

@@ -109,7 +109,7 @@ The specs pass on my system (SL 10.6.3, x86_64) in these rubies:
 * ree-1.8.7-2010.01
 * 1.9.1-p378
 * ruby-trunk
-* rbx-head
+* rbx-head - broken at the moment, working with the rbx team for a solution
 
 The ActiveRecord driver should work on 2.3.5 and 3.0
 
@@ -137,4 +137,8 @@ then iterating over every row using an #each like method yielding a block:
   Mysql
    7.330000   0.350000   7.680000 (  8.013160)
   do_mysql
-   1.740000   0.220000   1.960000 (  2.909290)
+   1.740000   0.220000   1.960000 (  2.909290)
+
+== Special Thanks
+
+* Eric Wong - for the contribution (and informative explanations of) of some thread-safety, non-blocking I/O and cleanup patches. You rock dude

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/ext/mysql2_ext.c

@@ -140,8 +140,7 @@ static VALUE rb_mysql_client_new(int argc, VALUE * argv, VALUE klass) {
 
   if (rb_thread_blocking_region(nogvl_init, &args, RUBY_UBF_IO, 0) == Qfalse) {
     // TODO: warning - not enough memory?
-    rb_raise(cMysql2Error, "%s", mysql_error(args.mysql));
-    return Qnil;
+    return rb_raise_mysql2_error(args.mysql);
   }
 
   // set default reconnect behavior
@@ -168,8 +167,7 @@ static VALUE rb_mysql_client_new(int argc, VALUE * argv, VALUE klass) {
 
   if (rb_thread_blocking_region(nogvl_connect, &args, RUBY_UBF_IO, 0) == Qfalse) {
     // unable to connect
-    rb_raise(cMysql2Error, "%s", mysql_error(args.mysql));
-    return Qnil;
+    return rb_raise_mysql2_error(args.mysql);;
   }
 
   client->client = args.mysql;
@@ -268,10 +266,13 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
   Check_Type(args.sql, T_STRING);
 
   GetMysql2Client(self, args.mysql);
-  if (rb_thread_blocking_region(nogvl_send_query, &args, RUBY_UBF_IO, 0) == Qfalse) {
-    rb_raise(cMysql2Error, "%s", mysql_error(args.mysql));
+  if (!args.mysql) {
+    rb_raise(cMysql2Error, "closed MySQL connection");
     return Qnil;
   }
+  if (rb_thread_blocking_region(nogvl_send_query, &args, RUBY_UBF_IO, 0) == Qfalse) {
+    return rb_raise_mysql2_error(args.mysql);;
+  }
 
   if (!async) {
     // the below code is largely from do_mysql
@@ -308,7 +309,10 @@ static VALUE rb_mysql_client_escape(VALUE self, VALUE str) {
   char escaped[(oldLen*2)+1];
 
   GetMysql2Client(self, client);
-
+  if (!client) {
+    rb_raise(cMysql2Error, "closed MySQL connection");
+    return Qnil;
+  }
   newLen = mysql_real_escape_string(client, escaped, RSTRING_PTR(str), RSTRING_LEN(str));
   if (newLen == oldLen) {
     // no need to return a new ruby string if nothing changed
@@ -334,6 +338,10 @@ static VALUE rb_mysql_client_server_info(VALUE self) {
   VALUE version;
 
   GetMysql2Client(self, client);
+  if (!client) {
+    rb_raise(cMysql2Error, "closed MySQL connection");
+    return Qnil;
+  }
   version = rb_hash_new();
   rb_hash_aset(version, sym_id, LONG2FIX(mysql_get_server_version(client)));
   rb_hash_aset(version, sym_version, rb_str_new2(mysql_get_server_info(client)));
@@ -341,7 +349,11 @@ static VALUE rb_mysql_client_server_info(VALUE self) {
 }
 
 static VALUE rb_mysql_client_socket(VALUE self) {
-  MYSQL * client = GetMysql2Client(self, client);;
+  MYSQL * client = GetMysql2Client(self, client);
+  if (!client) {
+    rb_raise(cMysql2Error, "closed MySQL connection");
+    return Qnil;
+  }
   return INT2NUM(client->net.fd);
 }
 
@@ -369,16 +381,18 @@ static VALUE rb_mysql_client_async_result(VALUE self) {
   MYSQL * client;
   MYSQL_RES * result;
   GetMysql2Client(self, client);
-
-  if (rb_thread_blocking_region(nogvl_read_query_result, client, RUBY_UBF_IO, 0) == Qfalse) {
-    rb_raise(cMysql2Error, "%s", mysql_error(client));
+  if (!client) {
+    rb_raise(cMysql2Error, "closed MySQL connection");
     return Qnil;
   }
+  if (rb_thread_blocking_region(nogvl_read_query_result, client, RUBY_UBF_IO, 0) == Qfalse) {
+    return rb_raise_mysql2_error(client);
+  }
 
   result = (MYSQL_RES *)rb_thread_blocking_region(nogvl_store_result, client, RUBY_UBF_IO, 0);
   if (result == NULL) {
     if (mysql_field_count(client) != 0) {
-      rb_raise(cMysql2Error, "%s", mysql_error(client));
+      rb_raise_mysql2_error(client);
     }
     return Qnil;
   }
@@ -389,14 +403,20 @@ static VALUE rb_mysql_client_async_result(VALUE self) {
 static VALUE rb_mysql_client_last_id(VALUE self) {
   MYSQL * client;
   GetMysql2Client(self, client);
-
+  if (!client) {
+    rb_raise(cMysql2Error, "closed MySQL connection");
+    return Qnil;
+  }
   return ULL2NUM(mysql_insert_id(client));
 }
 
 static VALUE rb_mysql_client_affected_rows(VALUE self) {
   MYSQL * client;
   GetMysql2Client(self, client);
-
+  if (!client) {
+    rb_raise(cMysql2Error, "closed MySQL connection");
+    return Qnil;
+  }
   return ULL2NUM(mysql_affected_rows(client));
 }
 
@@ -542,6 +562,7 @@ static VALUE rb_mysql_result_fetch_row(int argc, VALUE * argv, VALUE self) {
           } else {
             if (month < 1 || day < 1) {
               rb_raise(cMysql2Error, "Invalid date: %s", row[i]);
+              val = Qnil;
             } else {
               val = rb_funcall(rb_cTime, intern_local, 6, INT2NUM(year), INT2NUM(month), INT2NUM(day), INT2NUM(hour), INT2NUM(min), INT2NUM(sec));
             }
@@ -557,6 +578,7 @@ static VALUE rb_mysql_result_fetch_row(int argc, VALUE * argv, VALUE self) {
           } else {
             if (month < 1 || day < 1) {
               rb_raise(cMysql2Error, "Invalid date: %s", row[i]);
+              val = Qnil;
             } else {
               val = rb_funcall(cDate, intern_new, 3, INT2NUM(year), INT2NUM(month), INT2NUM(day));
             }
@@ -648,6 +670,22 @@ static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {
   return wrapper->rows;
 }
 
+static VALUE rb_mysql_error_error_number(VALUE obj) {
+    return rb_iv_get(obj, "error_number");
+}
+
+static VALUE rb_mysql_error_sql_state(VALUE obj) {
+    return rb_iv_get(obj, "sql_state");
+}
+
+static VALUE rb_raise_mysql2_error(MYSQL *client) {
+  VALUE e = rb_exc_new2(cMysql2Error, mysql_error(client));
+  rb_iv_set(e, "error_number", INT2FIX(mysql_errno(client)));
+  rb_iv_set(e, "sql_state", rb_tainted_str_new2(mysql_sqlstate(client)));
+  rb_exc_raise(e);
+  return Qnil;
+}
+
 /* Ruby Extension initializer */
 void Init_mysql2_ext() {
   rb_require("date");
@@ -673,6 +711,8 @@ void Init_mysql2_ext() {
   rb_define_method(cMysql2Client, "affected_rows", rb_mysql_client_affected_rows, 0);
 
   cMysql2Error = rb_define_class_under(mMysql2, "Error", rb_eStandardError);
+  rb_define_method(cMysql2Error, "error_number", rb_mysql_error_error_number, 0);
+  rb_define_method(cMysql2Error, "sql_state", rb_mysql_error_sql_state, 0);
 
   cMysql2Result = rb_define_class_under(mMysql2, "Result", rb_cObject);
   rb_define_method(cMysql2Result, "each", rb_mysql_result_each, -1);

data/ext/mysql2_ext.h

@@ -70,6 +70,11 @@ static void rb_mysql_result_free(void * wrapper);
 static void rb_mysql_result_mark(void * wrapper);
 static void rb_mysql_result_free_result(mysql2_result_wrapper * wrapper);
 
+/* Mysql2::Error */
+static VALUE rb_raise_mysql2_error(MYSQL *client);
+static VALUE rb_mysql_error_error_number(VALUE obj);
+static VALUE rb_mysql_error_sql_state(VALUE obj);
+
 /*
  * used to pass all arguments to mysql_real_connect while inside
  * rb_thread_blocking_region

data/lib/active_record/connection_adapters/mysql2_adapter.rb

@@ -52,26 +52,33 @@ module ActiveRecord
       def type_cast(value)
         return nil if value.nil?
         case type
-          when :string    then value
-          when :text      then value
-          when :integer   then value.is_a?(Fixnum) ? value : (value.to_i rescue value ? 1 : 0)
-          when :float     then value.class == Float ? value : value.to_f
-          when :decimal   then value.class == BigDecimal ? value : self.class.value_to_decimal(value)
-          when :datetime  then value.class == Time ? value : self.class.string_to_time(value)
-          when :timestamp then value.class == Time ? value : self.class.string_to_time(value)
-          when :time      then value.class == Time ? value : self.class.string_to_dummy_time(value)
-          when :date      then value.class == Date ? value : self.class.string_to_date(value)
-          when :binary    then value
-          when :boolean   then self.class.value_to_boolean(value)
+          when :string                then value
+          when :text                  then value
+          when :integer               then value.to_i rescue value ? 1 : 0
+          when :float                 then value.to_f # returns self if it's already a Float
+          when :decimal               then self.class.value_to_decimal(value)
+          when :datetime, :timestamp  then value.class == Time ? value : self.class.string_to_time(value)
+          when :time                  then value.class == Time ? value : self.class.string_to_dummy_time(value)
+          when :date                  then value.class == Date ? value : self.class.string_to_date(value)
+          when :binary                then value
+          when :boolean               then self.class.value_to_boolean(value)
           else value
         end
       end
 
       def type_cast_code(var_name)
         case type
-        when :boolean then "#{self.class.name}.value_to_boolean(#{var_name})"
-        else
-          nil
+          when :string                then nil
+          when :text                  then nil
+          when :integer               then "#{var_name}.to_i rescue #{var_name} ? 1 : 0"
+          when :float                 then "#{var_name}.to_f"
+          when :decimal               then "#{self.class.name}.value_to_decimal(#{var_name})"
+          when :datetime, :timestamp  then "#{var_name}.class == Time ? #{var_name} : #{self.class.name}.string_to_time(#{var_name})"
+          when :time                  then "#{var_name}.class == Time ? #{var_name} : #{self.class.name}.string_to_dummy_time(#{var_name})"
+          when :date                  then "#{var_name}.class == Date ? #{var_name} : #{self.class.name}.string_to_date(#{var_name})"
+          when :binary                then nil
+          when :boolean               then "#{self.class.name}.value_to_boolean(#{var_name})"
+          else nil
         end
       end
 
@@ -234,10 +241,11 @@ module ActiveRecord
       end
 
       def disconnect!
-        @connection = nil
+        @connection.close
       end
 
       def reset!
+        disconnect!
         @connection = Mysql2::Client.new(@config)
       end
 
@@ -523,6 +531,19 @@ module ActiveRecord
       end
 
       protected
+        def quoted_columns_for_index(column_names, options = {})
+          length = options[:length] if options.is_a?(Hash)
+
+          quoted_column_names = case length
+          when Hash
+            column_names.map {|name| length[name] ? "#{quote_column_name(name)}(#{length[name]})" : quote_column_name(name) }
+          when Fixnum
+            column_names.map {|name| "#{quote_column_name(name)}(#{length})"}
+          else
+            column_names.map {|name| quote_column_name(name) }
+          end
+        end
+
         # TODO: implement error_number method on Mysql2::Exception
         def translate_exception(exception, message)
           return super unless exception.respond_to?(:error_number)

data/lib/mysql2.rb

@@ -5,5 +5,5 @@ require 'mysql2_ext'
 #
 # A modern, simple and very fast Mysql library for Ruby - binding to libmysql
 module Mysql2
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/sequel/adapters/mysql2.rb

@@ -150,12 +150,12 @@ module Sequel
 
       # Closes given database connection.
       def disconnect_connection(c)
-        c = nil
+        c.close
       end
 
       # Convert tinyint(1) type to boolean if convert_tinyint_to_bool is true
       def schema_column_type(db_type)
-        Sequel::MySQL.convert_tinyint_to_bool && db_type == 'tinyint(1)' ? :boolean : super
+        Sequel::Mysql2.convert_tinyint_to_bool && db_type == 'tinyint(1)' ? :boolean : super
       end
     end
 
@@ -204,12 +204,12 @@ module Sequel
 
       # Insert a new value into this dataset
       def insert(*values)
-        execute_dui(insert_sql(*values)){|c| return c.insert_id}
+        execute_dui(insert_sql(*values)){|c| return c.last_id}
       end
 
       # Replace (update or insert) the matching row.
       def replace(*args)
-        execute_dui(replace_sql(*args)){|c| return c.insert_id}
+        execute_dui(replace_sql(*args)){|c| return c.last_id}
       end
 
       # Update the matching rows.
@@ -229,9 +229,9 @@ module Sequel
         super(sql, {:type=>:dui}.merge(opts), &block)
       end
 
-      # Handle correct quoting of strings using ::MySQL.quote.
+      # Handle correct quoting of strings using ::Mysql2#escape.
       def literal_string(v)
-        db.synchronize{|c| "'#{c.quote(v)}'"}
+        db.synchronize{|c| "'#{c.escape(v)}'"}
       end
     end
   end

data/mysql2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mysql2}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Lopez"]
-  s.date = %q{2010-05-12}
+  s.date = %q{2010-05-14}
   s.email = %q{seniorlopez@gmail.com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
      "spec/active_record/active_record_spec.rb",
      "spec/em/em_spec.rb",
      "spec/mysql2/client_spec.rb",
+     "spec/mysql2/error_spec.rb",
      "spec/mysql2/result_spec.rb",
      "spec/rcov.opts",
      "spec/spec.opts",
@@ -55,6 +56,7 @@ Gem::Specification.new do |s|
     "spec/active_record/active_record_spec.rb",
      "spec/em/em_spec.rb",
      "spec/mysql2/client_spec.rb",
+     "spec/mysql2/error_spec.rb",
      "spec/mysql2/result_spec.rb",
      "spec/spec_helper.rb",
      "examples/eventmachine.rb"

data/spec/mysql2/client_spec.rb

@@ -6,11 +6,6 @@ describe Mysql2::Client do
     @client = Mysql2::Client.new
   end
 
-  after(:each) do
-    # forcefully clean up old connections
-    GC.start
-  end
-
   it "should be able to connect via SSL options" do
     pending("DON'T WORRY, THIS TEST PASSES :) - but is machine-specific. You need to have MySQL running with SSL configured and enabled. Then update the paths in this test to your needs and remove the pending state.")
     ssl_client = nil

data/spec/mysql2/error_spec.rb

@@ -0,0 +1,16 @@
+# encoding: UTF-8
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
+
+describe Mysql2::Error do
+  before(:each) do
+    @error = Mysql2::Error.new "testing"
+  end
+  
+  it "should respond to #error_number" do
+    @error.should respond_to(:error_number)
+  end
+  
+  it "should respond to #sql_state" do
+    @error.should respond_to(:sql_state)
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Brian Lopez
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-12 00:00:00 -07:00
+date: 2010-05-14 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -52,6 +52,7 @@ files:
 - spec/active_record/active_record_spec.rb
 - spec/em/em_spec.rb
 - spec/mysql2/client_spec.rb
+- spec/mysql2/error_spec.rb
 - spec/mysql2/result_spec.rb
 - spec/rcov.opts
 - spec/spec.opts
@@ -91,6 +92,7 @@ test_files:
 - spec/active_record/active_record_spec.rb
 - spec/em/em_spec.rb
 - spec/mysql2/client_spec.rb
+- spec/mysql2/error_spec.rb
 - spec/mysql2/result_spec.rb
 - spec/spec_helper.rb
 - examples/eventmachine.rb