ffi-mysql 0.0.1 → 0.0.2

data/.hgtags

@@ -0,0 +1 @@
+afd66b4b7cda50c08a79f51574d46e49c4dc083b v0.0.1

data/History.rdoc

@@ -1,3 +1,9 @@
+== 0.0.2 / 2010-03-08
+
+* support double and float fields
+* improve performance of fetch_row
+
+
 == 0.0.1 / 2010-03-03
 
 * 1 major enhancement

data/README

@@ -14,7 +14,18 @@ Pure Ruby FFI interface to MySQL.
 
 == SYNOPSIS:
 
-  See MySQL/Ruby for examples.
+Use 
+
+ require 'ffi-mysql'
+
+instead of 
+
+ require 'mysql'
+
+ffi-mysql should be compatible with MySQL/Ruby, so have a look at
+* http://www.tmtm.org/en/mysql/ruby and
+* http://www.kitebird.com/articles/ruby-mysql.html
+for examples.
 
 == REQUIREMENTS:
 

data/README.rdoc

@@ -14,7 +14,18 @@ Pure Ruby FFI interface to MySQL.
 
 == SYNOPSIS:
 
-  See MySQL/Ruby for examples.
+Use 
+
+ require 'ffi-mysql'
+
+instead of 
+
+ require 'mysql'
+
+ffi-mysql should be compatible with MySQL/Ruby, so have a look at
+* http://www.tmtm.org/en/mysql/ruby and
+* http://www.kitebird.com/articles/ruby-mysql.html
+for examples.
 
 == REQUIREMENTS:
 

data/Rakefile

@@ -6,7 +6,7 @@ rescue LoadError
 end
 
 ensure_in_path 'lib'
-require 'ffi-mysql'
+require 'ffi-mysql/version'
 
 task :default => 'test:run'
 task 'gem:release' => 'test:run'
@@ -15,7 +15,7 @@ Bones {
     name  'ffi-mysql'
     authors  'Frank Fischer'
     email  'frank.fischer@mathematik.tu-chemnitz.de'
-    url  'http://bitbucket.org/lyro/ffi-mysql/wiki'
+    url  'http://bitbucket.org/lyro/ffi-mysql'
     ignore_file '.hgignore'
     readme_file 'README.rdoc'
     history_file 'History.rdoc'

data/lib/{mysql → ffi-mysql}/constants.rb

@@ -1,6 +1,3 @@
-# Copyright (C) 2003-2008 TOMITA Masahiro
-# mailto:tommy@tmtm.org
-
 class Mysql
     # Command
     COM_SLEEP               = 0

data/lib/{mysql → ffi-mysql}/mysql.rb

@@ -1,8 +1,7 @@
 require 'ffi'
 
-# @author Frank Fischer
-#
 # Basic MySQL class, provides interface to a server.
+# @author Frank Fischer
 class Mysql
     
     # FFI interface.

data/lib/{mysql → ffi-mysql}/result.rb

@@ -45,13 +45,14 @@ class Mysql
         def fetch_row
             raise Error, "Result has been freed" unless @result
             row = C::mysql_fetch_row(@result)
-            if row.null?
+            if row.nil? or row.null?
                 nil
             else
                 lengths = fetch_lengths
-                row = row.read_array_of_pointer(lengths.size)
-                (0...lengths.size).map{|i|
-                    row[i].null? ? nil : row[i].read_string(lengths[i])
+                ptrs = row.get_array_of_pointer(0, lengths.size)
+                (0...lengths.size).map {|i|
+                    ptr = ptrs[i]
+                    ptr.nil? or ptr.null? ? nil : ptr.read_string(lengths[i])
                 }
             end
         end

data/lib/{mysql → ffi-mysql}/stmt.rb

@@ -136,34 +136,17 @@ class Mysql
                 else
                     case self[:buffer_type]
                     when Field::TYPE_TINY
-                        b = @buf.read_long
-                        if self[:is_unsigned] == 0 and b >= 2**7
-                            b -= 2**8
-                        end
-                        b
+                        self[:is_unsigned] == 0 ? @buf.get_int8(0) : @buf.get_uint8(0)
                     when Field::TYPE_SHORT, Field::TYPE_YEAR
-                        b = @buf.read_long
-                        if self[:is_unsigned] == 0 and b >= 2**15
-                            b -= 2**16
-                        end
-                        b
+                        self[:is_unsigned] == 0 ? @buf.get_int16(0) : @buf.get_uint16(0)
                     when Field::TYPE_INT24, Field::TYPE_LONG
-                        if self[:is_unsigned] != 0
-                            @buf.read_long % (2**32)
-                        else
-                            @buf.read_long
-                        end
+                        self[:is_unsigned] == 0 ? @buf.get_int32(0) : @buf.get_uint32(0)
                     when Field::TYPE_LONGLONG
-                        if self[:is_unsigned] != 0
-                            @buf.read_long_long % (2**64)
-                        else
-                            @buf.read_long_long
-                        end
+                        self[:is_unsigned] == 0 ? @buf.get_int64(0) : @buf.get_uint64(0)
                     when Field::TYPE_FLOAT
-                        @buf.read_float
+                        @buf.get_float(0)
                     when Field::TYPE_DOUBLE
-                        # FIXME currently not supported
-                        @buf.read_double
+                        @buf.get_double(0)
                     when Field::TYPE_TIME, Field::TYPE_DATE, Field::TYPE_DATETIME, Field::TYPE_TIMESTAMP
                         time = C::Time.new(@buf)
                         Time.new( time[:year], time[:month], time[:day],
@@ -172,7 +155,7 @@ class Mysql
                     when Field::TYPE_DECIMAL, Field::TYPE_STRING, Field::TYPE_VAR_STRING,
                          Field::TYPE_TINY_BLOB, Field::TYPE_BLOB, Field::TYPE_MEDIUM_BLOB,
                          Field::TYPE_LONG_BLOB, Field::TYPE_NEWDECIMAL, Field::TYPE_BIT
-                        @buf.read_string( @buflen.read_long % (2**32) )
+                        @buf.read_string( @buflen.get_ulong(0) )
                     else
                         raise TypeError, "unknown buffer type: #{self[:buffer_type]}"
                     end

data/lib/ffi-mysql/version.rb

@@ -0,0 +1,17 @@
+class Mysql
+    # Major version
+    MAJOR = 0
+    # Minor version
+    MINOR = 0
+    # Tiny version
+    TINY = 2
+    
+    # Version string
+    VERSION = [MAJOR, MINOR, TINY].join('.')
+    
+    # Returns the version string for the library.
+    #
+    def self.version
+        VERSION
+    end
+end

data/lib/ffi-mysql.rb

@@ -1,49 +1,41 @@
-
 class Mysql
 
-  # :stopdoc:
-  VERSION = '0.0.1'
-  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
-  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
-  # :startdoc:
-
-  # Returns the version string for the library.
-  #
-  def self.version
-    VERSION
-  end
-
-  # Returns the library path for the module. If any arguments are given,
-  # they will be joined to the end of the libray path using
-  # <tt>File.join</tt>.
-  #
-  def self.libpath( *args )
-    args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
-  end
-
-  # Returns the lpath for the module. If any arguments are given,
-  # they will be joined to the end of the path using
-  # <tt>File.join</tt>.
-  #
-  def self.path( *args )
-    args.empty? ? PATH : ::File.join(PATH, args.flatten)
-  end
-
-  # Utility method used to require all files ending in .rb that lie in the
-  # directory below this file that has the same name as the filename passed
-  # in. Optionally, a specific _directory_ name can be passed in such that
-  # the _filename_ does not have to be equivalent to the directory.
-  #
-  def self.require_all_libs_relative_to( fname, dir = nil )
-    dir ||= ::File.basename(fname, '.*')
-    search_me = ::File.expand_path(
-        ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
-
-    Dir.glob(search_me).sort.each {|rb| require rb}
-  end
+    # @private
+    LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
+    # @private
+    PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
+
+    # Returns the library path for the module. If any arguments are given,
+    # they will be joined to the end of the libray path using
+    # <tt>File.join</tt>.
+    #
+    def self.libpath( *args )
+        args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
+    end
+
+    # Returns the lpath for the module. If any arguments are given,
+    # they will be joined to the end of the path using
+    # <tt>File.join</tt>.
+    #
+    def self.path( *args )
+        args.empty? ? PATH : ::File.join(PATH, args.flatten)
+    end
+
+    # Utility method used to require all files ending in .rb that lie in the
+    # directory below this file that has the same name as the filename passed
+    # in. Optionally, a specific _directory_ name can be passed in such that
+    # the _filename_ does not have to be equivalent to the directory.
+    #
+    def self.require_all_libs_relative_to( fname, dir = nil )
+        dir ||= ::File.basename(fname, '.*')
+        search_me = ::File.expand_path(
+                                       ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
+
+        Dir.glob(search_me).sort.each {|rb| require rb}
+    end
 
 end  # class Mysql
 
-Mysql.require_all_libs_relative_to(__FILE__, "mysql")
+Mysql.require_all_libs_relative_to(__FILE__)
 
 

data/test/test_mysql.rb

@@ -522,18 +522,17 @@ class TC_MysqlStmt2 < Test::Unit::TestCase
   end
 =end
 
-# FIXME
-#   def test_bind_result_nil()
-#     if @m.server_version >= 40100 then
-#       @m.query("create temporary table t (i int, c char(10), d double, t datetime)")
-#       @m.query("insert into t values (123, '9abcdefg', 1.2345, 20050802235011)")
-#       @s.prepare("select * from t")
-#       @s.bind_result(nil,nil,nil,nil)
-#       @s.execute
-#       a = @s.fetch
-#       assert_equal([123, "9abcdefg", 1.2345, Mysql::Time.new(2005,8,2,23,50,11)], a)
-#     end
-#   end
+  def test_bind_result_nil()
+    if @m.server_version >= 40100 then
+      @m.query("create temporary table t (i int, c char(10), d double, t datetime)")
+      @m.query("insert into t values (123, '9abcdefg', 1.2345, 20050802235011)")
+      @s.prepare("select * from t")
+      @s.bind_result(nil,nil,nil,nil)
+      @s.execute
+      a = @s.fetch
+      assert_equal([123, "9abcdefg", 1.2345, Mysql::Time.new(2005,8,2,23,50,11)], a)
+    end
+  end
 
   def test_bind_result_numeric()
     if @m.server_version >= 40100 then
@@ -595,22 +594,21 @@ class TC_MysqlStmt2 < Test::Unit::TestCase
     end
   end
 
-# FIXME
-#   def test_bind_result_float()
-#     if @m.server_version >= 40100 then
-#       @m.query("create temporary table t (i int, c char(10), d double, t datetime)")
-#       @m.query("insert into t values (123, '9abcdefg', 1.2345, 20050802235011)")
-#       @s.prepare("select * from t")
-#       @s.bind_result(Float, Float, Float, Float)
-#       @s.execute
-#       a = @s.fetch
-#       if Mysql.client_version < 50000 then
-#         assert_equal([123.0, 9.0, 1.2345, 2005.0], a)
-#       else
-#         assert_equal([123.0, 9.0, 1.2345, 20050802235011.0], a)
-#       end
-#     end
-#   end
+  def test_bind_result_float()
+    if @m.server_version >= 40100 then
+      @m.query("create temporary table t (i int, c char(10), d double, t datetime)")
+      @m.query("insert into t values (123, '9abcdefg', 1.2345, 20050802235011)")
+      @s.prepare("select * from t")
+      @s.bind_result(Float, Float, Float, Float)
+      @s.execute
+      a = @s.fetch
+      if Mysql.client_version < 50000 then
+        assert_equal([123.0, 9.0, 1.2345, 2005.0], a)
+      else
+        assert_equal([123.0, 9.0, 1.2345, 20050802235011.0], a)
+      end
+    end
+  end
 
   def test_bind_result_mysqltime()
     if @m.server_version >= 40100 then
@@ -961,34 +959,33 @@ class TC_MysqlStmt2 < Test::Unit::TestCase
     end
   end
 
-# FIXME
-#   def test_fetch_double()
-#     if @m.server_version >= 40100 then
-#       @m.query("create temporary table t (i double)")
-#       @m.query("insert into t values (0),(-1.7976931348623157E+308),(-2.2250738585072014E-308),(2.2250738585072014E-308),(1.7976931348623157E+308)")
-#       @s.prepare("select i from t")
-#       @s.execute
-#       assert_equal([0], @s.fetch)
-#       assert_in_delta(-Float::MAX, @s.fetch[0], Float::EPSILON)
-#       assert_in_delta(-Float::MIN, @s.fetch[0], Float::EPSILON)
-#       assert_in_delta(Float::MIN, @s.fetch[0], Float::EPSILON)
-#       assert_in_delta(Float::MAX, @s.fetch[0], Float::EPSILON)
-#     end
-#   end
-#
-#   def test_fetch_double_unsigned()
-#     if @m.server_version >= 40100 then
-#       @m.query("create temporary table t (i double unsigned)")
-#       @m.query("insert into t values (0),(-1.7976931348623157E+308),(-2.2250738585072014E-308),(2.2250738585072014E-308),(1.7976931348623157E+308)")
-#       @s.prepare("select i from t")
-#       @s.execute
-#       assert_equal([0], @s.fetch)
-#       assert_equal([0], @s.fetch)
-#       assert_equal([0], @s.fetch)
-#       assert_in_delta(Float::MIN, @s.fetch[0], Float::EPSILON)
-#       assert_in_delta(Float::MAX, @s.fetch[0], Float::EPSILON)
-#     end
-#   end
+  def test_fetch_double()
+    if @m.server_version >= 40100 then
+      @m.query("create temporary table t (i double)")
+      @m.query("insert into t values (0),(-1.7976931348623157E+308),(-2.2250738585072014E-308),(2.2250738585072014E-308),(1.7976931348623157E+308)")
+      @s.prepare("select i from t")
+      @s.execute
+      assert_equal([0], @s.fetch)
+      assert_in_delta(-Float::MAX, @s.fetch[0], Float::EPSILON)
+      assert_in_delta(-Float::MIN, @s.fetch[0], Float::EPSILON)
+      assert_in_delta(Float::MIN, @s.fetch[0], Float::EPSILON)
+      assert_in_delta(Float::MAX, @s.fetch[0], Float::EPSILON)
+    end
+  end
+
+  def test_fetch_double_unsigned()
+    if @m.server_version >= 40100 then
+      @m.query("create temporary table t (i double unsigned)")
+      @m.query("insert into t values (0),(-1.7976931348623157E+308),(-2.2250738585072014E-308),(2.2250738585072014E-308),(1.7976931348623157E+308)")
+      @s.prepare("select i from t")
+      @s.execute
+      assert_equal([0], @s.fetch)
+      assert_equal([0], @s.fetch)
+      assert_equal([0], @s.fetch)
+      assert_in_delta(Float::MIN, @s.fetch[0], Float::EPSILON)
+      assert_in_delta(Float::MAX, @s.fetch[0], Float::EPSILON)
+    end
+  end
 
   def test_fetch_decimal()
     if (@m.server_version >= 50000 and Mysql.client_version >= 50000) or (@m.server_version >= 40100 and @m.server_version < 50000) then

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Frank Fischer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-07 00:00:00 +01:00
+date: 2010-03-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,21 +55,23 @@ extra_rdoc_files:
 - History.rdoc
 - README.rdoc
 files: 
+- .hgtags
 - History.rdoc
 - README
 - README.rdoc
 - Rakefile
 - lib/ffi-mysql.rb
-- lib/mysql/constants.rb
-- lib/mysql/error.rb
-- lib/mysql/field.rb
-- lib/mysql/mysql.rb
-- lib/mysql/result.rb
-- lib/mysql/stmt.rb
-- lib/mysql/time.rb
+- lib/ffi-mysql/constants.rb
+- lib/ffi-mysql/error.rb
+- lib/ffi-mysql/field.rb
+- lib/ffi-mysql/mysql.rb
+- lib/ffi-mysql/result.rb
+- lib/ffi-mysql/stmt.rb
+- lib/ffi-mysql/time.rb
+- lib/ffi-mysql/version.rb
 - test/test_mysql.rb
 has_rdoc: yard
-homepage: http://bitbucket.org/lyro/ffi-mysql/wiki
+homepage: http://bitbucket.org/lyro/ffi-mysql
 licenses: []
 
 post_install_message: