fb 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56b7ad010f318291b4148cebb5414df0b7c1a79c
-  data.tar.gz: 5ca9b16f94542bbf38d4242c4bafd7006bf2053f
+  metadata.gz: 7d8e0d820f068703a7427f675e1e40bf5202287c
+  data.tar.gz: 280d0ae8ceb2eaf63ff07ff049986c53d45bd7d5
 SHA512:
-  metadata.gz: 942287471507083b6dc9f79afa188442c32b3d397eb1119b9fd48f6fabf45e576dcab4f8d7282593d9a7f788692636a8534d9901ae60d6189142d75c8118da4b
-  data.tar.gz: 5f576f90e7cb59f5aeaa3bff5cb1471200b3d1a08bef3f0f1c3dd218ed79c6a89a0cc3e8de0c222c300ff4a5ccde6c6f7f36e4ae98c5469f597772232f397931
+  metadata.gz: 41569151e53743c4f48178f848ec884125c3c2a8bee7d23b098626e8ddc2f0c1f5354bc59526738e7b0f042b68526b283e942a1b26cc0f296c72d321a67bc992
+  data.tar.gz: aaa348851b9b97b6c2508cbe7e6495bb0f7aaf521949171b5f7fa29db9053bf14d082e8367c63d9d157d86f0fcc7f708af7844c82d6e10af5cd3ff7d50018208

data/extconf.rb

@@ -18,23 +18,42 @@ def unquote(string)
   string.sub(/\A(['"])?(.*?)\1?\z/m, '\2') unless string.nil?
 end
 
+def key_exists?(path)
+  begin
+    Win32::Registry::HKEY_LOCAL_MACHINE.open(path, ::Win32::Registry::KEY_READ)
+    return true
+  rescue
+    return false
+  end
+end
+
 def read_firebird_registry
   require 'win32/registry'
-  Win32::Registry::HKEY_LOCAL_MACHINE.open('SOFTWARE\Firebird Project\Firebird Server\Instances', Win32::Registry::Constants::KEY_READ) do |reg|
-    return reg.read_s('DefaultInstance') rescue nil
+  if key_exists?('SOFTWARE\Firebird Project\Firebird Server\Instances')
+    Win32::Registry::HKEY_LOCAL_MACHINE.open('SOFTWARE\Firebird Project\Firebird Server\Instances', Win32::Registry::Constants::KEY_READ) do |reg|
+      return reg.read_s('DefaultInstance') rescue nil
+    end
+  else
+    return false
   end
 end
 
 def search_firebird_path
   program_files = ENV['ProgramFiles'].gsub('\\', '/').gsub(/(\w+\s+[\w\s]+)/) { |s| s.size > 8 ? s[0,6] + '~1' : s }
-  Dir["#{program_files}/Firebird/Firebird_*"].sort.last
+  program_files_x86 = ENV['ProgramFiles'].gsub('\\', '/').gsub(/(\w+\s+[\w\s]+)/) { |s| s.size > 8 ? s[0,6] + '~2' : s }
+  result = Dir["#{program_files}/Firebird/Firebird_*"].sort.last || Dir["#{program_files_x86}/Firebird/Firebird_*"].sort.last
 end
 
 if RUBY_PLATFORM =~ /(mingw32|mswin32)/ and ARGV.grep(/^--with-opt-dir=/).empty?
   opt = unquote(ENV['FIREBIRD'])    
   opt = opt || read_firebird_registry
   opt = opt || search_firebird_path
-  ARGV << "--with-opt-dir=#{opt}" if opt
+  if opt
+    ARGV << "--with-opt-dir=#{opt}"
+  else
+    puts "No any Firebird instances found in system."
+    exit
+  end   
 end
 
 require 'mkmf'

data/fb.c

@@ -41,6 +41,7 @@
 #include <ibase.h>
 #include <float.h>
 #include <time.h>
+#include <stdbool.h>
 
 
 #define	SQLDA_COLSINIT	50
@@ -403,6 +404,12 @@ static VALUE fb_sql_type_from_code(int code, int subtype)
 		case SQL_ARRAY:
 			sql_type = "ARRAY";
 			break;
+#if (FB_API_VER >= 30)
+                case SQL_BOOLEAN:
+                case blr_boolean:
+                        sql_type = "BOOLEAN";
+                        break;
+#endif
 		case SQL_QUAD:
 		case blr_quad:
 			sql_type = "DECIMAL";
@@ -1520,6 +1527,14 @@ static void fb_cursor_set_inputparams(struct FbCursor *fb_cursor, long argc, VAL
 					break;
 #endif
 
+#if (FB_API_VER >= 30)
+                                case SQL_BOOLEAN:
+                                        offset = FB_ALIGN(offset, alignment);
+					var->sqldata = (char *)(fb_cursor->i_buffer + offset);
+					*(bool *)var->sqldata = obj;
+					offset += alignment;					
+                                        break;
+#endif
 				default :
 					rb_raise(rb_eFbError, "Specified table includes unsupported datatype (%d)", dtp);
 			}
@@ -1611,6 +1626,9 @@ static VALUE precision_from_sqlvar(XSQLVAR *sqlvar)
 		case SQL_TIMESTAMP:	return Qnil;
 		case SQL_BLOB:		return Qnil;
 		case SQL_ARRAY:		return Qnil;
+#if (FB_API_VER >= 30)
+                case SQL_BOOLEAN: return Qnil;
+#endif
 		case SQL_QUAD:		return Qnil;
 		case SQL_TYPE_TIME:	return Qnil;
 		case SQL_TYPE_DATE:	return Qnil;
@@ -1791,6 +1809,7 @@ static VALUE fb_cursor_fetch(struct FbCursor *fb_cursor)
 		dtp = var->sqltype & ~1;
 
 		/* Check if column is null */
+    
 
 		if ((var->sqltype & 1) && (*var->sqlind < 0)) {
 			val = Qnil;
@@ -1906,6 +1925,12 @@ static VALUE fb_cursor_fetch(struct FbCursor *fb_cursor)
 					val = Qnil;
 					break;
 
+#if (FB_API_VER >= 30)
+                                case SQL_BOOLEAN:
+					val = ((*(int*)var->sqldata) == 1) ? Qtrue : Qfalse;
+                                        break;
+#endif
+
 				default:
 					rb_raise(rb_eFbError, "Specified table includes unsupported datatype (%ld)", dtp);
 					break;

data/test/ConnectionTestCases.rb

@@ -20,27 +20,43 @@ class ConnectionTestCases < FbTestCase
   def test_query_select
     sql_select = "SELECT * FROM RDB$DATABASE"
     Database.create(@parms) do |connection|
+    
       d = connection.query(sql_select)
       assert_instance_of Array, d
       assert_equal 1, d.size
       assert_instance_of Array, d.first
-      assert_equal 4, d.first.size
-
+      if @fb_version == 3
+        assert_equal 5, d.first.size
+      else
+        assert_equal 4, d.first.size
+      end
+  
       a = connection.query(:array, sql_select)
       assert_instance_of Array, a
       assert_equal 1, a.size
       assert_instance_of Array, a.first
-      assert_equal 4, a.first.size
+      if @fb_version == 3
+        assert_equal 5, a.first.size
+      else
+        assert_equal 4, a.first.size
+      end
 
       h = connection.query(:hash, sql_select)
       assert_instance_of Array, h
       assert_equal 1, h.size
       assert_instance_of Hash, h.first
-      assert_equal 4, h.first.keys.size
+      if @fb_version == 3
+        assert_equal 5, h.first.keys.size
+      else
+        assert_equal 4, h.first.keys.size
+      end
       assert h.first.keys.include?("RDB$DESCRIPTION")
       assert h.first.keys.include?("RDB$RELATION_ID")
       assert h.first.keys.include?("RDB$SECURITY_CLASS")
       assert h.first.keys.include?("RDB$CHARACTER_SET_NAME")
+      if @fb_version == 3
+        assert h.first.keys.include?("RDB$LINGER")
+      end
     end
   end
   

data/test/CursorTestCases.rb

@@ -9,13 +9,17 @@ class CursorTestCases < FbTestCase
         assert_instance_of Cursor, cursor
         row = cursor.fetch :array
         assert_instance_of Array, row
-        assert_equal 4, row.size
+        if @fb_version == 3
+          assert_equal 5, row.size
+        else
+          assert_equal 4, row.size
+        end
       end
       connection.execute("select * from rdb$database where rdb$description = 'bogus'") do |cursor|
         assert_instance_of Cursor, cursor
         row = cursor.fetch :array
         assert_instance_of NilClass, row
-        assert_equal nil, row
+        assert_nil row
       end
       connection.drop
     end
@@ -27,13 +31,17 @@ class CursorTestCases < FbTestCase
         assert_instance_of Cursor, cursor
         row = cursor.fetch :hash
         assert_instance_of Hash, row
-        assert_equal 4, row.size
+        if @fb_version == 3
+          assert_equal 5, row.size
+        else
+          assert_equal 4, row.size
+        end
       end
       connection.execute("select * from rdb$database where rdb$description = 'bogus'") do |cursor|
         assert_instance_of Cursor, cursor
         row = cursor.fetch :hash
         assert_instance_of NilClass, row
-        assert_equal nil, row
+        assert_nil row
       end
       connection.drop
     end
@@ -47,7 +55,11 @@ class CursorTestCases < FbTestCase
         assert_instance_of Array, rows
         assert_equal 1, rows.size
         assert_instance_of Array, rows[0]
-        assert_equal 4, rows[0].size
+        if @fb_version == 3
+          assert_equal 5, rows[0].size
+        else
+          assert_equal 4, rows[0].size
+        end
       end
       connection.drop
     end
@@ -61,7 +73,11 @@ class CursorTestCases < FbTestCase
         assert_instance_of Array, rows
         assert_equal 1, rows.size
         assert_instance_of Hash, rows[0]
-        assert_equal 4, rows[0].size
+        if @fb_version == 3
+          assert_equal 5, rows[0].size
+        else
+          assert_equal 4, rows[0].size
+        end
       end
       connection.drop
     end
@@ -73,11 +89,18 @@ class CursorTestCases < FbTestCase
         fields = cursor.fields
         fields_ary = cursor.fields :array
         assert_equal fields, fields_ary
-        assert_equal 4, fields.size
+        if @fb_version == 3
+          assert_equal 5, fields.size
+        else
+          assert_equal 4, fields.size
+        end
         assert_equal "RDB$DESCRIPTION", fields[0].name;
         assert_equal "RDB$RELATION_ID", fields[1].name;
         assert_equal "RDB$SECURITY_CLASS", fields[2].name;
         assert_equal "RDB$CHARACTER_SET_NAME", fields[3].name;
+        if @fb_version == 3
+          assert_equal "RDB$LINGER", fields[4].name;
+        end
       end
       connection.drop
     end
@@ -89,11 +112,18 @@ class CursorTestCases < FbTestCase
         fields = cursor.fields
         fields_ary = cursor.fields :array
         assert_equal fields, fields_ary
-        assert_equal 4, fields.size
+        if @fb_version == 3
+          assert_equal 5, fields.size
+        else
+          assert_equal 4, fields.size
+        end
         assert_equal "rdb$description", fields[0].name;
         assert_equal "rdb$relation_id", fields[1].name;
         assert_equal "rdb$security_class", fields[2].name;
         assert_equal "rdb$character_set_name", fields[3].name;
+        if @fb_version == 3
+          assert_equal "rdb$linger", fields[4].name;
+        end
       end
       connection.drop
     end
@@ -103,11 +133,18 @@ class CursorTestCases < FbTestCase
     Database.create(@parms) do |connection|
       connection.execute("select * from rdb$database") do |cursor|
         fields = cursor.fields :hash
-        assert_equal 4, fields.size
+        if @fb_version == 3
+          assert_equal 5, fields.size
+        else
+          assert_equal 4, fields.size
+        end
         assert_equal 520, fields["RDB$DESCRIPTION"].type_code
         assert_equal 500, fields["RDB$RELATION_ID"].type_code
         assert_equal 452, fields["RDB$SECURITY_CLASS"].type_code
         assert_equal 452, fields["RDB$CHARACTER_SET_NAME"].type_code
+        if @fb_version == 3
+          assert_equal 496, fields["RDB$LINGER"].type_code
+        end
       end
       connection.drop
     end
@@ -117,11 +154,18 @@ class CursorTestCases < FbTestCase
     Database.create(@parms.merge(:downcase_names => true)) do |connection| # xxx true
       connection.execute("select * from rdb$database") do |cursor|
         fields = cursor.fields :hash
-        assert_equal 4, fields.size
+        if @fb_version == 3
+          assert_equal 5, fields.size
+        else
+          assert_equal 4, fields.size
+        end
         assert_equal 520, fields["rdb$description"].type_code
         assert_equal 500, fields["rdb$relation_id"].type_code
         assert_equal 452, fields["rdb$security_class"].type_code
         assert_equal 452, fields["rdb$character_set_name"].type_code
+        if @fb_version == 3
+          assert_equal 496, fields["rdb$linger"].type_code
+        end
       end
       connection.drop
     end
@@ -134,7 +178,11 @@ class CursorTestCases < FbTestCase
         cursor.each :array do |row|
           count += 1
           assert_instance_of Array, row
-          assert_equal 4, row.size
+          if @fb_version == 3
+            assert_equal 5, row.size
+          else
+            assert_equal 4, row.size
+          end
         end
         assert_equal 1, count
       end
@@ -149,7 +197,11 @@ class CursorTestCases < FbTestCase
         cursor.each :hash do |row|
           count += 1
           assert_instance_of Hash, row
-          assert_equal 4, row.size
+          if @fb_version == 3
+            assert_equal 5, row.size
+          else
+            assert_equal 4, row.size
+          end
         end
         assert_equal 1, count
       end

data/test/DataTypesTestCases.rb

@@ -511,4 +511,55 @@ class DataTypesTestCases < FbTestCase
       connection.drop
     end
   end
+
+  def test_boolean_type
+    if @fb_version == 3
+
+      sql_schema = "create table testboolean (id int generated by default as identity primary key, bval boolean)"
+      sql_insert = "insert into testboolean (bval) values (?)"
+      sql_select = "select * from testboolean order by id"
+      
+      Database.create(@parms) do |connection|
+      
+        connection.execute(sql_schema);
+        
+        connection.transaction do
+          
+          connection.execute(sql_insert, nil);
+
+          connection.execute(sql_insert, false);
+
+          connection.execute(sql_insert, true);
+          
+          5.times do |i|
+            connection.execute(sql_insert, i.even?);
+          end
+        
+        end
+
+        connection.execute(sql_select) do |cursor|
+
+          i = 0
+        
+          cursor.each :hash do |row|
+            case i
+            when 0
+              assert_nil row["BVAL"]
+            when 1
+              assert_equal false, row["BVAL"]
+            when 2
+              assert_equal true, row["BVAL"]
+            else
+            end
+            i += 1
+          end
+        
+        end
+        
+        connection.drop
+
+      end
+    end
+  end
+
 end

data/test/FbTestCases.rb

@@ -40,8 +40,21 @@ module FbTestCases
       :charset => 'NONE',
       :role => 'READER' }
     @parms_s = "database = #{@db_host}:#{@db_file}; username = #{@username}; password = #{@password}; charset = NONE; role = READER;"
+    @fb_version = -1
+    rm_rf @db_file
+
+    Database.create(@parms) do |connection|
+      
+      d = connection.query("SELECT substring(rdb$get_context('SYSTEM', 'ENGINE_VERSION') from 1 for 1) from rdb$database")
+      
+      @fb_version = Integer(d.first[0])
+
+      connection.drop
+    end
+
     rm_rf @db_file
   end
+
 end
 
 class Fb::Connection

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fb
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Brent Rowland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies: []
 description: Ruby Firebird Extension Library
 email: rowland@rowlandresearch.com