ffi-mysql 0.0.2 → 1.0.0

data/.hgtags

@@ -1 +1,2 @@
 afd66b4b7cda50c08a79f51574d46e49c4dc083b v0.0.1
+2bfcf2ddedd5d9589ecc0dc915d0393e218aa603 v0.0.2

data/History.markdown

@@ -0,0 +1,18 @@
+1.0.0 / 2010-04-21
+------------------
+
+* fix Fixnum size bugs 
+* update to mysql-ruby-2.8.2 test-suite
+
+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
+* mostly compatible to MySQL/Ruby  

data/{README → README.markdown}

@@ -2,45 +2,50 @@ ffi-mysql
     by Frank Fischer
     http://bitbucket.org/lyro/ffi-mysql
 
-== DESCRIPTION:
+DESCRIPTION
+-----------
 
 Pure Ruby FFI interface to MySQL.
 
-== FEATURES/PROBLEMS:
+FEATURES/PROBLEMS
+-----------------
 
-* satisfies almost complete test-suite of MySQL/Ruby
-* prepared statement does not handle Double fields 
-  correctly
+* satisfies complete test-suite of MySQL/Ruby 2.8.1
 
-== SYNOPSIS:
+SYNOPSIS
+--------
 
 Use 
 
- require 'ffi-mysql'
+ `require 'ffi-mysql'`
 
 instead of 
 
- require 'mysql'
+ `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:
+REQUIREMENTS
+------------
 
 * ffi >= 0.6.2
 
-== INSTALL:
+INSTALL
+-------
 
-gem install ffi-ruby
+`gem install ffi-ruby`
 
-== ACKNOWLEDGEMENTS:
+ACKNOWLEDGEMENTS
+----------------
 
 Tomita Masahiro for his MySQL/Ruby and Ruby/MySQL gems from which some
 of the code has been stolen.
 
-== LICENSE:
+LICENSE
+-------
 
 (The MIT License)
 

data/Rakefile

@@ -9,7 +9,7 @@ ensure_in_path 'lib'
 require 'ffi-mysql/version'
 
 task :default => 'test:run'
-task 'gem:release' => 'test:run'
+#task 'gem:release' => 'test:run'
 
 Bones {
     name  'ffi-mysql'
@@ -17,11 +17,12 @@ Bones {
     email  'frank.fischer@mathematik.tu-chemnitz.de'
     url  'http://bitbucket.org/lyro/ffi-mysql'
     ignore_file '.hgignore'
-    readme_file 'README.rdoc'
-    history_file 'History.rdoc'
+    readme_file 'README.markdown'
+    history_file 'History.markdown'
     version  Mysql::VERSION
     gem.extras = { :has_rdoc => 'yard' }
-    depend_on 'ffi', '>= 0.6.2'
+    yard.opts = %w(--no-private)
+    depend_on 'ffi', '~> 1.0'
 }
 
 # EOF

data/lib/ffi-mysql/field.rb

@@ -1,6 +1,6 @@
 class Mysql
     # Information about one column.
-    class Field 
+    class Field
         attr_reader :name
         attr_reader :org_name
         attr_reader :table
@@ -21,7 +21,7 @@ class Mysql
         attr_reader :decimals
         attr_reader :charsetnr
         attr_reader :type
-        
+
         def initialize(c_field)
             @name =             c_field[:name]
             @org_name =         c_field[:org_name]
@@ -65,14 +65,14 @@ class Mysql
         # @return [Hash] this field as a hash
         def hash
             h = {}
-            h['name'] = @name             
-            h['table'] = @table            
-            h['def'] = @def              
-            h['length'] = @length           
-            h['max_length'] = @max_length       
-            h['flags'] = @flags            
-            h['decimals'] = @decimals         
-            h['type'] = @type             
+            h['name'] = @name
+            h['table'] = @table
+            h['def'] = @def
+            h['length'] = @length
+            h['max_length'] = @max_length
+            h['flags'] = @flags
+            h['decimals'] = @decimals
+            h['type'] = @type
             h
         end
 

data/lib/ffi-mysql/mysql.rb

@@ -3,13 +3,12 @@ require 'ffi'
 # Basic MySQL class, provides interface to a server.
 # @author Frank Fischer
 class Mysql
-    
+
     # FFI interface.
     module C
         extend FFI::Library
-        #ffi_lib ["mysqlclient", "libmysqlclient.so.15"]
         ffi_lib ["mysqlclient", "libmysqlclient.so.15", "libmysqlclient.so.16"]
-        
+
 #        FieldType = enum(:decimal,     Mysql::Field::TYPE_DECIMAL,
 #                         :tiny,        Mysql::Field::TYPE_TINY,
 #                         :short,       Mysql::Field::TYPE_SHORT,
@@ -129,7 +128,7 @@ class Mysql
     # Creates a new MySQL connector and opens a connection.
     def self.new( host = nil, user = nil, passwd = nil, db = nil, port = 0, sock = nil, flag = 0)
         mysql = allocate
-        mysql.send :initialize 
+        mysql.send :initialize
         mysql.real_connect( host, user, passwd, db, port, sock, flag )
         mysql
     end
@@ -148,7 +147,7 @@ class Mysql
     def self.client_info
         C::mysql_get_client_info
     end
-    
+
     # Escape special character in MySQL.
     # === Note
     # In Ruby 1.8, this is not safe for multibyte charset such as 'SJIS'.
@@ -164,7 +163,7 @@ class Mysql
             end
         end
     end
-    
+
     class << self
         alias :real_connect :new
         alias :connect :new
@@ -173,7 +172,7 @@ class Mysql
         alias quote escape_string
     end
 
-    
+
     # if true (the default), query return the first result
     attr_accessor :query_with_result
 
@@ -185,17 +184,18 @@ class Mysql
         @mysql = C::mysql_init( nil )
         @connected = false
         @query_with_result = true
+        @reconnect = false
     end
 
-    # internal finalizer 
+    # internal finalizer
     def self.finalizer(mysql, mysql_free)
         Proc.new do |*args|
             unless mysql_free[0]
-                C::mysql_close(mysql) 
+                C::mysql_close(mysql)
             end
         end
     end
-    
+
     # Opens a new connection to a MySQL server.
     #
     # @param [String] host the MySQL server
@@ -208,11 +208,11 @@ class Mysql
         raise Error, "Already connected to a MySQL server" if @connected
 
         ObjectSpace.define_finalizer( self, Mysql.finalizer(@mysql, @mysql_free))
-        
+
         if C::mysql_real_connect( @mysql, host, user, passwd, db, port, sock, flag ).null?
             raise Mysql::Error, error_msg
         end
-        
+
         @connected = true
         self
     end
@@ -242,8 +242,8 @@ class Mysql
     def sqlstate
         C::mysql_sqlstate(@mysql)
     end
-    
-    
+
+
     # Sets extra connection options.
     #
     # @param [Integer] option the option to set
@@ -276,7 +276,21 @@ class Mysql
         self
     end
 
-    
+
+    # Sets the auto-reconnect flag of mysql
+    #
+    # @param [true,false] The new reconnect state.
+    def reconnect= flag
+        options OPT_RECONNECT, flag
+        @reconnect = flag
+    end
+
+    # Returns the current state of the reconnect flag
+    # @return [true,false] true if auto-reconnection is enabled.
+    def reconnect
+        @reconnect
+    end
+
     # Execute a query statement.
     #
     # @param [String] sql the SQL statement

data/lib/ffi-mysql/result.rb

@@ -1,9 +1,9 @@
 class Mysql
-    
+
     # Result set.
     class Result
         include Enumerable
-        
+
         attr_reader :fields
 
         # Create the next result object.
@@ -89,7 +89,7 @@ class Mysql
                    else
                        @colnames ||= fetch_fields.map{|f| f.name}
                    end
-            
+
             hash = {}
             row.each_with_index do |value, i|
                 hash[keys[i]] = value
@@ -106,7 +106,7 @@ class Mysql
                 yield row
             end
         end
-            
+
         # @return [Integer] The position of the field cursor after the last fetch_field.
         def field_tell
             raise Error, "Result has been freed" unless @result
@@ -165,5 +165,5 @@ class Mysql
             end
         end
     end
-    
+
 end

data/lib/ffi-mysql/stmt.rb

@@ -12,28 +12,29 @@ class Mysql
                    :neg,         :uchar,
                    :time_type,   :int)
         end
-        
+
         class C::Bind < FFI::Struct
-            layout(:length,            :pointer,   # output length pointer 
-                   :is_null,           :pointer,   # Pointer to null indicator 
+            layout(:length,            :pointer,   # output length pointer
+                   :is_null,           :pointer,   # Pointer to null indicator
                    :buffer,            :pointer,   # buffer to get/put data
-                   # set this if you want to track data truncations happened during fetch 
+                   # set this if you want to track data truncations happened during fetch
                    :error,             :pointer,
-                   :buffer_type,       :int, # buffer type 
-                   # output buffer length, must be set when fetching str/binary 
+                   :row_ptr,           :pointer,   # for the current data position
+                   :store_param_func,  :pointer,
+                   :fetch_result,      :pointer,
+                   :skip_result,       :pointer,
+                   # output buffer length, must be set when fetching str/binary
                    :buffer_length,     :ulong,
-                   :row_ptr,           :pointer,   # for the current data position 
-                   :offset,            :ulong,     # offset position for char/binary fetch 
+                   :offset,            :ulong,     # offset position for char/binary fetch
                    :length_value,      :ulong,     # Used if length is 0
                    :param_number,      :uint,      # For null count and error messages
                    :pack_length,       :uint,      # Internal length for packed data
+                   :buffer_type,       :int,       # buffer type
                    :error_value,       :char,      # used if error is 0
                    :is_unsigned,       :char,      # set if integer type is unsigned
                    :long_data_used,    :char,      # If used with mysql_send_long_data
                    :is_null_value,     :char,      # Used if is_null is 0
-                   :store_param_func,  :pointer,
-                   :fetch_result,      :pointer,
-                   :skip_result,       :pointer)
+                   :extension,         :pointer)
 
             def prepare_result( field )
                 self[:buffer_type] = field.type
@@ -78,19 +79,21 @@ class Mysql
                     raise TypeError, "unrecognized class: #{arg.class}"
                 end
             end
-            
+
             def set_param( arg )
                 case arg
                 when nil
                     self[:buffer_type] = Field::TYPE_NULL
-                when Fixnum
-                    self[:buffer_type] = Field::TYPE_LONG
-                    self[:buffer] = @buf = FFI::MemoryPointer.new( :long )
-                    @buf.write_int(arg)
-                when Bignum
-                    self[:buffer_type] = Field::TYPE_LONGLONG
-                    self[:buffer] = @buf = FFI::MemoryPointer.new( :long_long )
-                    @buf.write_long_long(arg)
+                when Integer
+                    if arg.size == 4
+                        self[:buffer_type] = Field::TYPE_LONG
+                        self[:buffer] = @buf = FFI::MemoryPointer.new( :long )
+                        @buf.write_long(arg)
+                    else
+                        self[:buffer_type] = Field::TYPE_LONGLONG
+                        self[:buffer] = @buf = FFI::MemoryPointer.new( :long_long )
+                        @buf.write_long_long(arg)
+                    end
                 when Float
                     self[:buffer_type] = Field::TYPE_DOUBLE
                     self[:buffer] = @buf = FFI::MemoryPointer.new( :double )
@@ -98,9 +101,9 @@ class Mysql
                 when String
                     self[:buffer_type] = Field::TYPE_STRING
                     self[:buffer] = @buf = FFI::MemoryPointer::from_string(arg)
-                    self[:buffer_length] = arg.size
+                    self[:buffer_length] = arg.bytesize
                     self[:length] = @buflen = FFI::MemoryPointer.new( :ulong )
-                    @buflen.write_long( arg.size )
+                    @buflen.write_long( arg.bytesize )
                 when ::Time, Mysql::Time
                     self[:buffer_type] = Field::TYPE_DATETIME
                     self[:buffer] = @buf = FFI::MemoryPointer.new( C::Time, 1, true )
@@ -162,14 +165,14 @@ class Mysql
                 end
             end
         end
-        
+
         def initialize( mysql )
             @mysql = mysql
             @stmt = C::mysql_stmt_init(mysql)
             @params = []
             raise Error, error_msg if @stmt.null?
             ObjectSpace.define_finalizer( self, Stmt.finalizer(@stmt) )
-            
+
             _true = FFI::MemoryPointer.new(:int)
             _true.write_int(1)
             if C::mysql_stmt_attr_set(@stmt, :update_max_length, _true) != 0
@@ -179,11 +182,11 @@ class Mysql
 
         # Closes the statement.
         def close
-            C::mysql_stmt_close(@stmt) 
+            C::mysql_stmt_close(@stmt)
             @stmt = nil
             ObjectSpace.undefine_finalizer(self)
         end
-        
+
         # Preparse the statement
         # @param [String] stmt the SQL statement
         # @return [self]
@@ -198,7 +201,7 @@ class Mysql
             @param_binds = (0...nparams).map {|i|
                 C::Bind.new(FFI::Pointer.new(C::Bind, @param_binds_ary.address + i * C::Bind.size))
             }
-            
+
             if @result = result_metadata
                 fields = @result.fetch_fields
                 @result_binds_ary = FFI::MemoryPointer.new C::Bind, fields.size, true
@@ -211,7 +214,7 @@ class Mysql
                 @result_binds_ary = nil
                 @result_binds = []
             end
-            
+
             self
         end
 
@@ -221,9 +224,9 @@ class Mysql
         def execute(*args)
             raise Error, "Statment already closed" unless @stmt
             if args.size != @param_binds.size
-                raise Error, "param_count(#{@param_binds.size}) != number of arguments(#{args.size})" 
+                raise Error, "param_count(#{@param_binds.size}) != number of arguments(#{args.size})"
             end
-            
+
             free_result
             unless @param_binds.empty?
                 @param_binds.each_with_index do |bind, i|
@@ -233,7 +236,7 @@ class Mysql
                     raise Error, error_msg
                 end
             end
-            
+
             if C::mysql_stmt_execute(@stmt) != 0
                 raise Error, error_msg
             end
@@ -252,7 +255,7 @@ class Mysql
                     raise Error, error_msg
                 end
             end
-            
+
             self
         end
 
@@ -290,7 +293,7 @@ class Mysql
                 @result_binds.map{|bind| bind.value}
             end
         end
-        
+
         # Iterates over all rows in this result set.
         # @yield [Array] Called once for each row in this result set
         # @see fetch_row
@@ -331,7 +334,7 @@ class Mysql
                 raise Error, error_msg
             end
         end
-            
+
         # @return [Integer] the number of rows of this statement
         def num_rows
             raise Error, "Statment already closed" unless @stmt
@@ -392,7 +395,7 @@ class Mysql
 
         def self.finalizer(stmt)
             Proc.new do |*args|
-                C::mysql_stmt_close(stmt) 
+                C::mysql_stmt_close(stmt)
             end
         end
     end

data/lib/ffi-mysql/version.rb

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

data/test/test_mysql.rb

@@ -29,9 +29,9 @@ class TC_Mysql < Test::Unit::TestCase
   def teardown()
   end
 
-#   def test_version()
-#     assert_equal("0.1.0", Mysql::VERSION)
-#   end
+  def test_version()
+    assert_equal("1.0.0", Mysql::VERSION)
+  end
 
   def test_init()
     assert_nothing_raised{@m = Mysql.init}
@@ -205,15 +205,11 @@ class TC_Mysql2 < Test::Unit::TestCase
 
   def test_sqlstate()
     if @m.server_version >= 40100 then
-      if RUBY_PLATFORM !~ /mingw|mswin/ then
-        assert_equal("00000", @m.sqlstate)
-      else
-        assert_equal("HY000", @m.sqlstate)
-      end
+      assert_equal("00000", @m.sqlstate)
       assert_raises(Mysql::Error){@m.query("hogehoge")}
       assert_equal("42000", @m.sqlstate)
     end
-  end
+  end if Mysql.client_version >= 40100
 
   def test_query_with_result()
     assert_equal(true, @m.query_with_result)
@@ -222,6 +218,14 @@ class TC_Mysql2 < Test::Unit::TestCase
     assert_equal(true, @m.query_with_result = true)
     assert_equal(true, @m.query_with_result)
   end
+
+  def test_reconnect()
+    assert_equal(false, @m.reconnect)
+    assert_equal(true, @m.reconnect = true)
+    assert_equal(true, @m.reconnect)
+    assert_equal(false, @m.reconnect = false)
+    assert_equal(false, @m.reconnect)
+  end
 end
 
 class TC_MysqlRes < Test::Unit::TestCase
@@ -1297,12 +1301,16 @@ class TC_MysqlStmt2 < Test::Unit::TestCase
 
   def test_insert_id()
     if @m.server_version >= 40100 then
-      @m.query("create temporary table t (i int auto_increment, unique(i))")
-      @s.prepare("insert into t values (0)")
-      @s.execute()
+      @m.query("create temporary table t (i bigint auto_increment, unique(i))")
+      @s.prepare("insert into t values (?)")
+      @s.execute(0)
       assert_equal(1, @s.insert_id())
-      @s.execute()
+      @s.execute(0)
       assert_equal(2, @s.insert_id())
+      @s.execute(2**32)
+      assert_equal(2**32, @s.insert_id())
+      @s.execute(0)
+      assert_equal(2**32+1, @s.insert_id())
     end
   end