rdo-mysql 0.0.4 → 0.0.5

data/ext/rdo_mysql/driver.c

@@ -134,10 +134,22 @@ static VALUE rdo_mysql_driver_quote(VALUE self, VALUE obj) {
   return rb_str_new2(quoted);
 }
 
+/** Find any Set arguments and ensure they are formatted as Strings */
+static void rdo_mysql_driver_normalize_sets_bang(VALUE * args, int argc) {
+  int i = 0;
+  for (; i < argc; ++i) {
+    if (rb_funcall(args[i], rb_intern("kind_of?"), 1, rb_path2class("Set")))
+      args[i] = rb_funcall(args[i], rb_intern("to_a"), 0);
+
+    if (rb_funcall(args[i], rb_intern("kind_of?"), 1, rb_cArray))
+      args[i] = rb_funcall(args[i], rb_intern("join"), 1, rb_str_new2(","));
+  }
+}
+
 /** Find any Time/DateTime arguments and ensure they use the system time zone */
 static void rdo_mysql_driver_normalize_date_times_bang(VALUE * args, int argc) {
-  int i;
-  for (i = 0; i < argc; ++i) {
+  int i = 0;
+  for (; i < argc; ++i) {
     if (rb_funcall(args[i], rb_intern("kind_of?"), 1, rb_path2class("DateTime"))) {
       VALUE offset = rb_funcall(
           rb_funcall(rb_path2class("DateTime"), rb_intern("now"), 0),
@@ -167,6 +179,7 @@ static VALUE rdo_mysql_driver_execute(int argc, VALUE * args, VALUE self) {
   }
 
   rdo_mysql_driver_normalize_date_times_bang(&args[1], argc - 1);
+  rdo_mysql_driver_normalize_sets_bang(&args[1], argc - 1);
 
   VALUE stmt = RDO_INTERPOLATE(self, args, argc);
 
@@ -186,6 +199,7 @@ static VALUE rdo_mysql_driver_execute(int argc, VALUE * args, VALUE self) {
 void Init_rdo_mysql_driver(void) {
   rb_require("rdo/mysql/driver");
   rb_require("date");
+  rb_require("set");
 
   VALUE cMySQL = rb_path2class("RDO::MySQL::Driver");
 

data/ext/rdo_mysql/tuples.c

@@ -27,6 +27,13 @@ static void rdo_mysql_tuple_list_free(RDOMySQLTupleList * list) {
   free(list);
 }
 
+/** Parse the string as a Set */
+static VALUE rdo_mysql_parse_set(char * v, unsigned long len, int enc) {
+  return rb_funcall(rb_path2class("Set"),
+      rb_intern("new"), 1, rb_funcall(RDO_STRING(v, len, enc),
+        rb_intern("split"), 1, rb_str_new2(",")));
+}
+
 /** Constructor to create a new TupleList for the given result */
 VALUE rdo_mysql_tuple_list_new(MYSQL_RES * res, int encoding) {
   RDOMySQLTupleList * list = malloc(sizeof(RDOMySQLTupleList));
@@ -59,8 +66,13 @@ static VALUE rdo_mysql_cast_value(char * v, unsigned long len, MYSQL_FIELD f, in
 
     case MYSQL_TYPE_STRING:
     case MYSQL_TYPE_VAR_STRING:
+    case MYSQL_TYPE_MEDIUM_BLOB:
+    case MYSQL_TYPE_TINY_BLOB:
+    case MYSQL_TYPE_LONG_BLOB:
     case MYSQL_TYPE_BLOB:
-      if (f.charsetnr == RDO_MYSQL_BINARY_ENC)
+      if (f.flags & SET_FLAG)
+        return rdo_mysql_parse_set(v, len, enc);
+      else if (f.charsetnr == RDO_MYSQL_BINARY_ENC)
         return RDO_BINARY_STRING(v, len);
       else
         return RDO_STRING(v, len, enc);
@@ -74,6 +86,7 @@ static VALUE rdo_mysql_cast_value(char * v, unsigned long len, MYSQL_FIELD f, in
       return RDO_FLOAT(v);
 
     case MYSQL_TYPE_DATE:
+    case MYSQL_TYPE_NEWDATE:
       return RDO_DATE(v);
 
     case MYSQL_TYPE_TIMESTAMP:
@@ -120,6 +133,7 @@ static VALUE rdo_mysql_tuple_list_each(VALUE self) {
 /** Initializer for the TupleList class */
 void Init_rdo_mysql_tuples(void) {
   rb_require("rdo/mysql");
+  rb_require("set");
 
   VALUE mMySQL = rb_path2class("RDO::MySQL");
 

data/lib/rdo/mysql/version.rb

@@ -7,6 +7,6 @@
 
 module RDO
   module MySQL
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/spec/mysql/bind_params_spec.rb

@@ -1,6 +1,7 @@
 require "spec_helper"
 require "date"
 require "bigdecimal"
+require "set"
 
 describe RDO::MySQL::Driver, "bind params" do
   let(:options)    { connection_uri }
@@ -678,4 +679,28 @@ describe RDO::MySQL::Driver, "bind params" do
       end
     end
   end
+
+  describe "Set param" do
+    context "against a set field" do
+      let(:table) do
+        <<-SQL
+        CREATE TABLE test (
+          id   INT PRIMARY KEY AUTO_INCREMENT,
+          pets SET('cat', 'dog', 'mouse')
+        )
+        SQL
+      end
+
+      let(:insert) do
+        [
+          "INSERT INTO test (pets) VALUES (?)",
+          Set["cat", "mouse"]
+        ]
+      end
+
+      it "is inferred correctly" do
+        tuple.should == {id: 1, pets: Set["cat", "mouse"]}
+      end
+    end
+  end
 end

data/spec/mysql/type_cast_spec.rb

@@ -2,6 +2,7 @@ require "spec_helper"
 require "bigdecimal"
 require "date"
 require "uri"
+require "set"
 
 describe RDO::MySQL::Driver, "type casting" do
   let(:options)    { connection_uri }
@@ -267,4 +268,17 @@ describe RDO::MySQL::Driver, "type casting" do
       value.should == DateTime.new(2012, 9, 30, 19, 4, 36, DateTime.now.zone)
     end
   end
+
+  describe "set cast" do
+    before(:each) do
+      connection.execute("CREATE TEMPORARY TABLE test (s SET('cat', 'dog', 'mouse'))")
+      connection.execute("INSERT INTO test (s) VALUES ('cat,mouse')")
+    end
+
+    let(:sql) { "SELECT s FROM test" }
+
+    it "returns a Set" do
+      value.should == Set["cat", "mouse"]
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdo-mysql
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdo