Merge branch '0.2.x'

Author: brianmario

ext/mysql2/result.c

@@ -464,6 +464,14 @@ static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {
   return wrapper->rows;
 }
 
+static VALUE rb_mysql_result_count(VALUE self) {
+  mysql2_result_wrapper *wrapper;
+
+  GetMysql2Result(self, wrapper);
+
+  return INT2FIX(mysql_num_rows(wrapper->result));
+}
+
 /* Mysql2::Result */
 VALUE rb_mysql_result_to_obj(MYSQL_RES * r) {
   VALUE obj;
@@ -489,6 +497,8 @@ void init_mysql2_result() {
   cMysql2Result = rb_define_class_under(mMysql2, "Result", rb_cObject);
   rb_define_method(cMysql2Result, "each", rb_mysql_result_each, -1);
   rb_define_method(cMysql2Result, "fields", rb_mysql_result_fetch_fields, 0);
+  rb_define_method(cMysql2Result, "count", rb_mysql_result_count, 0);
+  rb_define_alias(cMysql2Result, "size", "count");
 
   intern_encoding_from_charset = rb_intern("encoding_from_charset");
   intern_encoding_from_charset_code = rb_intern("encoding_from_charset_code");

lib/mysql2.rb

@@ -5,9 +5,9 @@
 
 require 'mysql2/version' unless defined? Mysql2::VERSION
 require 'mysql2/error'
+require 'mysql2/result'
 require 'mysql2/mysql2'
 require 'mysql2/client'
-require 'mysql2/result'
 
 # = Mysql2
 #

spec/mysql2/result_spec.rb

@@ -28,6 +28,18 @@
     }.should_not raise_error(Mysql2::Error)
   end
 
+  it "should respond to #count, which is aliased as #size" do
+    r = @client.query "SELECT 1"
+    r.should respond_to :count
+    r.should respond_to :size
+  end
+
+  it "should be able to return the number of rows in the result set" do
+    r = @client.query "SELECT 1"
+    r.count.should eql(1)
+    r.size.should eql(1)
+  end
+
   context "metadata queries" do
     it "should show tables" do
       @result = @client.query "SHOW TABLES"