ffi-mysql 1.1.3 → 1.1.4

data/.hgtags

@@ -5,3 +5,4 @@ a8bbc2c818cd66f86fbeb43f59bdb21499d58768 v1.0.0
 9f6397d60c7bf3361ddd23a6aa4ee728879a2d21 v1.1.1
 d30df88c1128073dba7b9ce8953b7699e5b86436 v1.1.2
 57d24846ffe8435fe42d5bf2f8db3eedbc99d8fb v1.1.3
+0d67225c9ea8d8a59d531b0719656959f06597cc v1.1.4

data/History.markdown

@@ -1,3 +1,8 @@
+1.1.4 / 2012-05-10
+------------------
+
+* Add test for nil? whenever testing for null-pointers from ffi
+
 1.1.3 / 2012-04-05
 ------------------
 

data/lib/ffi-mysql/.rbx/27/2727a919685f4938177db9b031075a44d2160d84

@@ -0,0 +1,272 @@
+!RBIX
+8379422121928200206
+18
+M
+1
+n
+n
+x
+10
+__script__
+i
+29
+99
+7
+0
+1
+65
+49
+1
+3
+13
+99
+12
+7
+2
+12
+7
+3
+12
+65
+12
+49
+4
+4
+15
+49
+2
+0
+15
+2
+11
+I
+6
+I
+0
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+5
+Mysql
+x
+10
+open_class
+x
+14
+__class_init__
+M
+1
+n
+n
+x
+5
+Mysql
+i
+62
+5
+66
+65
+7
+0
+79
+49
+1
+2
+15
+65
+7
+2
+79
+49
+1
+2
+15
+65
+7
+3
+4
+4
+49
+1
+2
+15
+65
+7
+4
+45
+0
+5
+45
+2
+6
+45
+3
+7
+35
+3
+7
+8
+64
+49
+9
+1
+49
+1
+2
+15
+99
+7
+10
+7
+11
+65
+5
+49
+12
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+I
+0
+n
+p
+13
+x
+5
+MAJOR
+x
+9
+const_set
+x
+5
+MINOR
+x
+4
+TINY
+x
+7
+VERSION
+n
+n
+n
+s
+E
+0
+
+1
+.
+x
+4
+join
+x
+7
+version
+M
+1
+n
+n
+x
+7
+version
+i
+4
+45
+0
+1
+11
+I
+1
+I
+0
+I
+0
+I
+0
+I
+0
+n
+p
+2
+x
+7
+VERSION
+n
+p
+5
+I
+-1
+I
+e
+I
+0
+I
+f
+I
+4
+x
+60
+/LOCAL/fifr/projekte/ruby/ffi-mysql/lib/ffi-mysql/version.rb
+p
+0
+x
+13
+attach_method
+p
+11
+I
+2
+I
+3
+I
+a
+I
+5
+I
+12
+I
+7
+I
+1b
+I
+a
+I
+33
+I
+e
+I
+3e
+x
+60
+/LOCAL/fifr/projekte/ruby/ffi-mysql/lib/ffi-mysql/version.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+0
+I
+1
+I
+1d
+x
+60
+/LOCAL/fifr/projekte/ruby/ffi-mysql/lib/ffi-mysql/version.rb
+p
+0

data/lib/ffi-mysql/mysql.rb

@@ -282,7 +282,8 @@ class Mysql
 
         ObjectSpace.define_finalizer( self, Mysql.finalizer(@mysql, @mysql_free))
 
-        if C::mysql_real_connect( @mysql, host, user, passwd, db, port, sock, flag ).null?
+        ret = C::mysql_real_connect( @mysql, host, user, passwd, db, port, sock, flag )
+        if ret.nil? or ret.null?
             raise Mysql::Error, error
         end
 
@@ -530,7 +531,7 @@ class Mysql
     # @param [String,nil] wild The pattern the databases must match
     def list_dbs(wild = nil)
         res = C::mysql_list_dbs(@mysql, wild)
-        if res.null?
+        if res.nil? or res.null?
             raise Error.new(error, errno)
         end
         res = Result.new(@mysql, res)
@@ -547,7 +548,7 @@ class Mysql
     # @return [Result] A MySQL result of the field names
     def list_fields(table, wild = nil)
         res = C::mysql_list_fields(@mysql, table, wild)
-        if res.null?
+        if res.nil? or res.null?
             raise Error.new(error, errno)
         end
         Result.new(@mysql, res)
@@ -557,7 +558,7 @@ class Mysql
     # @return [Result] A MySQL result of the current server threads
     def list_processes
         res = C::mysql_list_processes(@mysql)
-        if res.null?
+        if res.nil? or res.null?
             raise Error.new(error, errno)
         end
         Result.new(@mysql, res)
@@ -568,7 +569,7 @@ class Mysql
     # @return [Array<String>] The table names
     def list_tables(wild = nil)
         res = C::mysql_list_tables(@mysql, wild)
-        if res.null?
+        if res.nil? or res.null?
             raise Error.new(error, errno)
         end
         res = Result.new(@mysql, res)
@@ -639,7 +640,7 @@ class Mysql
     # @return [Result] the result set
     def store_result
         res = C::mysql_store_result(@mysql)
-        if res.null?
+        if res.nil? or res.null?
             raise Error.new(error, errno)
         end
         Result.new(@mysql, res)
@@ -649,7 +650,7 @@ class Mysql
     # @return [Result] the result set
     def use_result
         res = C::mysql_use_result(@mysql)
-        if res.null?
+        if res.nil? or res.null?
             raise Error.new(error, errno)
         end
         Result.new(@mysql, res)

data/lib/ffi-mysql/result.rb

@@ -38,7 +38,7 @@ class Mysql
         def fetch_lengths
             raise Error, "Result has been freed" unless @result
             lengths = C::mysql_fetch_lengths(@result)
-            lengths.null? ? nil : lengths.read_array_of_long(num_fields)
+            (lengths.nil? or lengths.null?) ? nil : lengths.read_array_of_long(num_fields)
         end
 
         # @return [Array<String>] Ary of elements of the next row.
@@ -125,7 +125,7 @@ class Mysql
         def fetch_field
             raise Error, "Result has been freed" unless @result
             field_ptr = C::mysql_fetch_field(@result)
-            if field_ptr.null?
+            if field_ptr.nil? or field_ptr.null?
                 nil
             else
                 Field.new(C::Field.new(field_ptr))

data/lib/ffi-mysql/stmt.rb

@@ -170,7 +170,7 @@ class Mysql
             @mysql = mysql
             @stmt = C::mysql_stmt_init(mysql)
             @params = []
-            raise Error, error_msg if @stmt.null?
+            raise Error, error_msg if @stmt.nil? or @stmt.null?
             ObjectSpace.define_finalizer( self, Stmt.finalizer(@stmt) )
 
             _true = FFI::MemoryPointer.new(:int)
@@ -365,7 +365,7 @@ class Mysql
         def result_metadata
             raise Error, "Statment already closed" unless @stmt
             result = C::mysql_stmt_result_metadata(@stmt)
-            if result.null?
+            if result.nil? or result.null?
                 if C::mysql_stmt_errno(@stmt) != 0
                     raise Error, error_msg
                 end

data/lib/ffi-mysql/version.rb

@@ -4,7 +4,7 @@ class Mysql
     # Minor version
     MINOR = 1
     # Tiny version
-    TINY = 3
+    TINY = 4
 
     # Version string
     VERSION = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-mysql
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -47,7 +47,10 @@ description: Pure Ruby FFI interface to MySQL.
 email: frank.fischer@mathematik.tu-chemnitz.de
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- !binary |-
+  bGliL2ZmaS1teXNxbC8ucmJ4LzI3LzI3MjdhOTE5Njg1ZjQ5MzgxNzdkYjli
+  MDMxMDc1YTQ0ZDIxNjBkODQ=
 files:
 - !binary |-
   LmhnaWdub3Jl
@@ -61,6 +64,9 @@ files:
   UmFrZWZpbGU=
 - !binary |-
   bGliL2ZmaS1teXNxbC5yYg==
+- !binary |-
+  bGliL2ZmaS1teXNxbC8ucmJ4LzI3LzI3MjdhOTE5Njg1ZjQ5MzgxNzdkYjli
+  MDMxMDc1YTQ0ZDIxNjBkODQ=
 - !binary |-
   bGliL2ZmaS1teXNxbC9jb25zdGFudHMucmI=
 - !binary |-