do_mysql 0.2.3 → 0.2.4

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "do_mysql"
 NAME = "do_mysql"
-VERSION = "0.2.3"
+VERSION = "0.2.4"
 AUTHOR = "Yehuda Katz"
 EMAIL = "wycats@gmail.com"
 HOMEPAGE = "http://dataobjects.devjavu.com"
@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('data_objects')
+  s.add_dependency('data_objects', ["<=0.2.0"])
   s.require_path = 'lib'
   s.autorequire = PLUGIN
   s.extensions = ["ext/extconf.rb"]

data/ext/mysql_c.i

@@ -38,7 +38,7 @@
 %}
 
 %ignore st_mysql_options;
-%include "/usr/local/mysql-5.0.45-osx10.4-i686/include/mysql.h"
+%include "/usr/local/mysql/include/mysql.h"
 
 VALUE mysql_c_fetch_field_names(MYSQL_RES *reader, int count);
 VALUE mysql_c_fetch_field_types(MYSQL_RES *reader, int count);

data/lib/do_mysql.rb

@@ -50,6 +50,10 @@ module DataObject
       def create_command(text)
         Command.new(self, text)
       end
+
+      def begin_transaction
+        Transaction.new(self)
+      end
       
     end
     
@@ -60,6 +64,44 @@ module DataObject
         @name, @type = ptr.name.to_s, ptr.type.to_s
       end
     end
+
+    class Transaction
+
+      attr_reader :connection
+
+      def initialize(conn)
+        @connection = conn
+        exec_sql("BEGIN")
+      end
+
+      # Commits the transaction
+      def commit
+        exec_sql("COMMIT")
+      end
+
+      # Rolls back the transaction
+      def rollback(savepoint = nil)
+        raise NotImplementedError, "MySQL does not support savepoints" if savepoint
+        exec_sql("ROLLBACK")
+      end
+
+      # Creates a savepoint for rolling back later (not commonly supported)
+      def save(name)
+        raise NotImplementedError, "MySQL does not support savepoints"
+      end
+
+      def create_command(*args)
+        @connection.create_command(*args)
+      end
+
+      protected
+
+      def exec_sql(sql)
+        @connection.logger.debug(sql)
+        Mysql_c.mysql_query(@connection.db, sql)
+      end
+
+    end
     
     class Reader < DataObject::Reader
       
@@ -141,15 +183,17 @@ module DataObject
       end
       
       def typecast(val, idx)
-        return nil if val.nil?
+        return nil if val.nil? || val == "NULL"
         field = @native_fields[idx]
         case TYPES[field]
+          when "NULL"
+            nil
           when "TINY"
             val != "0"
           when "BIT"
             val.to_i(2)
           when "SHORT", "LONG", "INT24", "LONGLONG"
-            val.to_i
+            val == '' ? nil : val.to_i
           when "DECIMAL", "NEWDECIMAL", "FLOAT", "DOUBLE", "YEAR"
             val.to_f
           when "TIMESTAMP", "DATETIME"
@@ -158,8 +202,6 @@ module DataObject
             DateTime.parse(val).to_time rescue nil
           when "DATE"
             Date.parse(val) rescue nil
-          when "NULL"
-            nil
           else
             val
         end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: do_mysql
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
-date: 2008-01-01 00:00:00 -08:00
+  version: 0.2.4
+date: 2008-04-17 00:00:00 -07:00
 summary: A DataObject.rb driver for mysql
 require_paths: 
 - lib
@@ -57,7 +57,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - ">"
+    - - <=
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: 0.2.0
     version: