rubyfb 0.5.4 → 0.5.5

data/ext/TypeMap.c

@@ -34,14 +34,7 @@
 #include "ResultSet.h"
 #include "Statement.h"
 #include "FireRuby.h"
-
-#ifdef OS_UNIX
-   #include <inttypes.h>
-#else
-   typedef short     int16_t;
-   typedef long      int32_t;
-   typedef long long int64_t;
-#endif
+#include "rfbint.h"
 
 /* Function prototypes. */
 VALUE createDate(const struct tm *);
@@ -553,30 +546,30 @@ VALUE createSafeTime(const struct tm *datetime)
  */
 VALUE getConstant(const char *name, VALUE module)
 {
-   VALUE owner = module,
-         constants,
-         string,
-         exists,
-         entry;
-
-   /* Check that we've got somewhere to look. */
-   if(owner == Qnil)
-   {
-      owner = rb_cModule;
-   }
-   constants = rb_funcall(owner, rb_intern("constants"), 0),
-   string    = rb_str_new2(name),
-   exists    = rb_funcall(constants, rb_intern("include?"), 1, string);
-
-   if(exists != Qfalse)
-   {
-      ID    id     = rb_intern(name);
-      VALUE symbol = ID2SYM(id);
-
-      entry = rb_funcall(owner, rb_intern("const_get"), 1, symbol);
-   }
-
-   return(entry);
+  VALUE owner = module,
+    constants,
+    exists,
+    entry = Qnil,
+    symbol = ID2SYM(rb_intern(name));
+
+  /* Check that we've got somewhere to look. */
+  if(owner == Qnil)
+  {
+    owner = rb_cModule;
+  }
+
+  constants = rb_funcall(owner, rb_intern("constants"), 0),
+  exists = rb_funcall(constants, rb_intern("include?"), 1, symbol);
+  if(exists == Qfalse)
+  {
+    /* 1.8 style lookup */
+    exists = rb_funcall(constants, rb_intern("include?"), 1, rb_str_new2(name));
+  }
+  if(exists != Qfalse)
+  {
+    entry = rb_funcall(owner, rb_intern("const_get"), 1, symbol);
+  }
+  return(entry);
 }
 
 
@@ -755,13 +748,17 @@ VALUE toDateTime(VALUE value)
  */
 VALUE rescueConvert(VALUE arguments, VALUE error)
 {
-   VALUE message;
+   VALUE message,
+         tmp_str1 = Qnil,
+         tmp_str2 = Qnil;
    char  text[512];
 
+   tmp_str1 = rb_ary_entry(arguments, 1);
+   tmp_str2 = rb_ary_entry(arguments, 2);
    sprintf(text, "Error converting input column %d from a %s to a %s.",
            FIX2INT(rb_ary_entry(arguments, 0)),
-           STR2CSTR(rb_ary_entry(arguments, 1)),
-           STR2CSTR(rb_ary_entry(arguments, 2)));
+           StringValuePtr(tmp_str1),
+           StringValuePtr(tmp_str2));
    message = rb_str_new2(text);
 
    return(rb_funcall(rb_eException, rb_intern("exception"), 1, &message));
@@ -792,7 +789,7 @@ void storeBlob(VALUE info,
    ISC_QUAD        *blobId = (ISC_QUAD *)field->sqldata;
    VALUE           number  = rb_funcall(info, rb_intern("length"), 0);
    long            length  = 0;
-   char            *data   = STR2CSTR(info);
+   char            *data   = StringValuePtr(info);
 
    length = TYPE(number) == T_FIXNUM ? FIX2INT(number) : NUM2INT(number);
    field->sqltype = SQL_BLOB;
@@ -877,7 +874,7 @@ void populateDateField(VALUE value, XSQLVAR *field)
    if(TYPE(value) != T_ARRAY)
    {
       VALUE message = rb_funcall(value, rb_intern("message"), 0);
-      rb_fireruby_raise(NULL, STR2CSTR(message));
+      rb_fireruby_raise(NULL, StringValuePtr(message));
    }
    datetime.tm_year = FIX2INT(rb_ary_entry(value, 0));
    datetime.tm_mon  = FIX2INT(rb_ary_entry(value, 1));
@@ -1107,7 +1104,7 @@ void populateTextField(VALUE value, XSQLVAR *field)
       actual = rb_funcall(value, rb_intern("to_s"), 0);
    }
 
-   text   = STR2CSTR(actual);
+   text   = StringValuePtr(actual);
    length = strlen(text) > field->sqllen ? field->sqllen : strlen(text);
 
    if((field->sqltype & ~1) == SQL_TEXT)
@@ -1142,7 +1139,7 @@ void populateTimeField(VALUE value, XSQLVAR *field)
    if(TYPE(value) != T_ARRAY)
    {
       VALUE message = rb_funcall(value, rb_intern("message"), 0);
-      rb_fireruby_raise(NULL, STR2CSTR(message));
+      rb_fireruby_raise(NULL, StringValuePtr(message));
    }
    datetime.tm_hour = FIX2INT(rb_ary_entry(value, 3));
    datetime.tm_min  = FIX2INT(rb_ary_entry(value, 4));
@@ -1169,7 +1166,7 @@ void populateTimestampField(VALUE value, XSQLVAR *field)
    if(TYPE(value) != T_ARRAY)
    {
       VALUE message = rb_funcall(value, rb_intern("message"), 0);
-      rb_fireruby_raise(NULL, STR2CSTR(message));
+      rb_fireruby_raise(NULL, StringValuePtr(message));
    }
    datetime.tm_year = FIX2INT(rb_ary_entry(value, 0));
    datetime.tm_mon  = FIX2INT(rb_ary_entry(value, 1));

data/ext/extconf.rb

@@ -18,6 +18,11 @@ elsif RUBY_PLATFORM.include?("win32")
    dir_config("dotnet")
    firebird_include="../mswin32fb"
    firebird_lib="../mswin32fb"
+elsif RUBY_PLATFORM.include?("mingw32")
+   $LIBS = $LIBS + " ../mswin32fb/fbclient_mingw.def -lfbclient_mingw"
+   $DLDFLAGS = "--enable-stdcall-fixup,"+$DLDFLAGS
+   firebird_include="../mswin32fb"
+   firebird_lib="../mswin32fb"
 elsif RUBY_PLATFORM.include?("linux")
    $LDFLAGS = $LDFLAGS + " -lfbclient -lpthread"
    $CFLAGS  = $CFLAGS + " -DOS_UNIX"

data/ext/rfbint.h

@@ -0,0 +1,14 @@
+#ifndef RFB_INT_H
+#define RFB_INT_H
+
+#ifdef OS_UNIX
+  #include <inttypes.h>
+#else
+  #ifndef __GNUC__
+    typedef short     int16_t;
+    typedef long      int32_t;
+    typedef long long int64_t;
+  #endif
+#endif
+
+#endif /* RFB_INT_H */

data/ext/rfbsleep.h

@@ -0,0 +1,15 @@
+#ifndef RFB_SLEEP_H
+#define RFB_SLEEP_H
+
+#define rfb_sleep(v) sleep((v))
+
+#ifndef OS_UNIX
+#ifdef __GNUC__
+
+#undef rfb_sleep
+#define rfb_sleep(v) Sleep((v))
+
+#endif
+#endif
+
+#endif /* RFB_SLEEP_H */

data/lib/active_record/connection_adapters/rubyfb_adapter.rb

@@ -1,5 +1,8 @@
 # Author: Ken Kunz <kennethkunz@gmail.com>
 require 'active_record/connection_adapters/abstract_adapter'
+if defined?(Arel) then
+  require 'arel/visitors/rubyfb'
+end
 
 module Rubyfb # :nodoc: all
   NON_EXISTENT_DOMAIN_ERROR = "335544569"
@@ -476,6 +479,16 @@ module ActiveRecord
         select_rows(sql, name).collect { |row| row[0].rstrip.downcase }
       end
 
+      def table_exists?(table_name)
+        super(table_name.to_s.downcase)
+      end
+
+      def primary_key(table_name)
+        if pk_row = index_metadata(table_name, true).to_a.first
+      		pk_row[2].rstrip.downcase
+ 	    	end
+      end
+
       def indexes(table_name, name = nil) # :nodoc:
         index_metadata(table_name, false, name).inject([]) do |indexes, row|
           if indexes.empty? or indexes.last.name != row[0]
@@ -696,12 +709,6 @@ module ActiveRecord
           return fields, rows 
         end
 
-        def primary_key(table_name)
-          if pk_row = index_metadata(table_name, true).to_a.first
-            pk_row[2].rstrip.downcase
-          end
-        end
-
         def index_metadata(table_name, pk, name = nil)
           sql = <<-end_sql
             SELECT i.rdb$index_name, i.rdb$unique_flag, s.rdb$field_name

data/lib/arel/visitors/rubyfb.rb

@@ -0,0 +1,21 @@
+module Arel
+  module Visitors
+    class RubyFB < Arel::Visitors::ToSql
+    	Arel::Visitors::VISITORS['rubyfb'] = Arel::Visitors::RubyFB
+    private
+      def visit_Arel_Nodes_SelectStatement o
+      	limit = o.limit; o.limit = nil;
+      	offset = o.offset; o.offset = nil;
+      	limit || offset ? "SELECT #{fb_limit(limit)} #{fb_offset(offset)} * FROM (#{super})" : super
+      end
+
+      def fb_limit limit
+      	"first #{limit}" if limit
+      end
+
+      def fb_offset offset
+      	"skip #{offset}" if offset
+      end
+    end
+  end
+end

data/lib/rubyfb.rb

@@ -1,5 +1,5 @@
-require 'rubyfb_lib'
-require 'SQLType'
-require 'ProcedureCall'
-require 'Connection'
-
+require 'rubyfb_lib'
+require 'SQLType'
+require 'ProcedureCall'
+require 'Connection'
+

data/mswin32fb/fbclient_mingw.def

@@ -0,0 +1,86 @@
+LIBRARY fbclient.dll
+EXPORTS
+isc_encode_timestamp
+isc_encode_sql_time
+isc_encode_sql_date
+isc_close_blob
+isc_put_segment
+isc_decode_timestamp
+isc_put_segment
+isc_decode_sql_date
+isc_decode_sql_date
+isc_decode_sql_time
+isc_create_blob
+isc_start_multiple
+isc_rollback_transaction
+isc_commit_transaction
+isc_dsql_free_statement
+isc_dsql_execute
+isc_vax_integer
+isc_dsql_sql_info
+isc_dsql_execute2
+isc_dsql_describe_bind
+isc_dsql_prepare
+isc_dsql_allocate_statement
+isc_service_query
+isc_service_attach
+isc_service_detach
+isc_dsql_fetch
+isc_service_start
+isc_dsql_exec_immed2
+isc_start_transaction
+isc_sql_interprete
+fb_interpret
+isc_sqlcode
+isc_detach_database
+isc_attach_database
+isc_dsql_execute_immediate
+isc_drop_database
+isc_dsql_describe
+isc_get_segment
+isc_blob_info
+isc_open_blob2
+isc_blob_default_desc
+LIBRARY fbclient.dll
+EXPORTS
+isc_encode_timestamp
+isc_encode_sql_time
+isc_encode_sql_date
+isc_close_blob
+isc_put_segment
+isc_decode_timestamp
+isc_put_segment
+isc_decode_sql_date
+isc_decode_sql_date
+isc_decode_sql_time
+isc_create_blob
+isc_start_multiple
+isc_rollback_transaction
+isc_commit_transaction
+isc_dsql_free_statement
+isc_dsql_execute
+isc_vax_integer
+isc_dsql_sql_info
+isc_dsql_execute2
+isc_dsql_describe_bind
+isc_dsql_prepare
+isc_dsql_allocate_statement
+isc_service_query
+isc_service_attach
+isc_service_detach
+isc_dsql_fetch
+isc_service_start
+isc_dsql_exec_immed2
+isc_start_transaction
+isc_sql_interprete
+fb_interpret
+isc_sqlcode
+isc_detach_database
+isc_attach_database
+isc_dsql_execute_immediate
+isc_drop_database
+isc_dsql_describe
+isc_get_segment
+isc_blob_info
+isc_open_blob2
+isc_blob_default_desc

data/rubyfb.gemspec

@@ -2,28 +2,28 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyfb}
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["George Georgiev"]
-  s.date = %q{2010-10-15}
+  s.date = %q{2011-01-06}
   s.description = %q{Firebird SQL access library}
   s.email = %q{georgiev@heatbs.com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "examples/example01.rb", "ext/extconf.rb", "lib/Connection.rb", "lib/ProcedureCall.rb", "lib/SQLType.rb", "lib/rubyfb.rb", "lib/src.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "examples/example01.rb", "ext/AddUser.c", "ext/AddUser.h", "ext/Backup.c", "ext/Backup.h", "ext/Blob.c", "ext/Blob.h", "ext/Common.c", "ext/Common.h", "ext/Connection.c", "ext/Connection.h", "ext/DataArea.c", "ext/DataArea.h", "ext/Database.c", "ext/Database.h", "ext/FireRuby.c", "ext/FireRuby.h", "ext/FireRubyException.c", "ext/FireRubyException.h", "ext/Generator.c", "ext/Generator.h", "ext/RemoveUser.c", "ext/RemoveUser.h", "ext/Restore.c", "ext/Restore.h", "ext/ResultSet.c", "ext/ResultSet.h", "ext/Row.c", "ext/Row.h", "ext/ServiceManager.c", "ext/ServiceManager.h", "ext/Services.c", "ext/Services.h", "ext/Statement.c", "ext/Statement.h", "ext/Transaction.c", "ext/Transaction.h", "ext/TypeMap.c", "ext/TypeMap.h", "ext/extconf.rb", "lib/Connection.rb", "lib/ProcedureCall.rb", "lib/SQLType.rb", "lib/active_record/connection_adapters/rubyfb_adapter.rb", "lib/mkdoc", "lib/rubyfb.rb", "lib/rubyfb_lib.so", "lib/src.rb", "mswin32fb/fbclient_ms.lib", "mswin32fb/ibase.h", "mswin32fb/iberror.h", "test/AddRemoveUserTest.rb", "test/BackupRestoreTest.rb", "test/BlobTest.rb", "test/CharacterSetTest.rb", "test/ConnectionTest.rb", "test/DDLTest.rb", "test/DatabaseTest.rb", "test/GeneratorTest.rb", "test/KeyTest.rb", "test/ResultSetTest.rb", "test/RoleTest.rb", "test/RowCountTest.rb", "test/RowTest.rb", "test/SQLTest.rb", "test/SQLTypeTest.rb", "test/ServiceManagerTest.rb", "test/StatementTest.rb", "test/TestSetup.rb", "test/TransactionTest.rb", "test/TypeTest.rb", "test/UnitTest.rb", "rubyfb.gemspec"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "examples/example01.rb", "ext/AddUser.c", "ext/AddUser.h", "ext/Backup.c", "ext/Backup.h", "ext/Blob.c", "ext/Blob.h", "ext/Common.c", "ext/Common.h", "ext/Connection.c", "ext/Connection.h", "ext/DataArea.c", "ext/DataArea.h", "ext/Database.c", "ext/Database.h", "ext/FireRuby.c", "ext/FireRuby.h", "ext/FireRubyException.c", "ext/FireRubyException.h", "ext/Generator.c", "ext/Generator.h", "ext/RemoveUser.c", "ext/RemoveUser.h", "ext/Restore.c", "ext/Restore.h", "ext/ResultSet.c", "ext/ResultSet.h", "ext/Row.c", "ext/Row.h", "ext/ServiceManager.c", "ext/ServiceManager.h", "ext/Services.c", "ext/Services.h", "ext/Statement.c", "ext/Statement.h", "ext/Transaction.c", "ext/Transaction.h", "ext/TypeMap.c", "ext/TypeMap.h", "ext/extconf.rb", "ext/rfbint.h", "ext/rfbsleep.h", "lib/Connection.rb", "lib/ProcedureCall.rb", "lib/SQLType.rb", "lib/active_record/connection_adapters/rubyfb_adapter.rb", "lib/arel/visitors/rubyfb.rb", "lib/mkdoc", "lib/rubyfb.rb", "lib/rubyfb_lib.so", "lib/src.rb", "mswin32fb/fbclient_mingw.def", "mswin32fb/fbclient_mingw.lib", "mswin32fb/fbclient_ms.lib", "mswin32fb/ibase.h", "mswin32fb/iberror.h", "test/AddRemoveUserTest.rb", "test/BackupRestoreTest.rb", "test/BlobTest.rb", "test/CharacterSetTest.rb", "test/ConnectionTest.rb", "test/DDLTest.rb", "test/DatabaseTest.rb", "test/GeneratorTest.rb", "test/KeyTest.rb", "test/ResultSetTest.rb", "test/RoleTest.rb", "test/RowCountTest.rb", "test/RowTest.rb", "test/SQLTest.rb", "test/SQLTypeTest.rb", "test/ServiceManagerTest.rb", "test/StatementTest.rb", "test/TestSetup.rb", "test/TransactionTest.rb", "test/TypeTest.rb", "test/UnitTest.rb", "rubyfb.gemspec"]
   s.homepage = %q{http://rubyforge.org/projects/rubyfb}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rubyfb", "--main", "README"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = %q{rubyfb}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Firebird SQL access library}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/test/AddRemoveUserTest.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require 'TestSetup'
+require './TestSetup'
 require 'test/unit'
 require 'rubygems'
-require 'fireruby'
+require 'rubyfb'
 
-include FireRuby
+include Rubyfb
 
 class AddRemoveUserTest < Test::Unit::TestCase
    CURDIR      = "#{Dir.getwd}"

data/test/BackupRestoreTest.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require 'TestSetup'
+require './TestSetup'
 require 'test/unit'
 require 'rubygems'
-require 'fireruby'
+require 'rubyfb'
 
-include FireRuby
+include Rubyfb
 
 class BackupRestoreTest < Test::Unit::TestCase
    CURDIR      = "#{Dir.getwd}"

data/test/BlobTest.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require 'TestSetup'
+require './TestSetup'
 require 'test/unit'
 require 'rubygems'
-require 'fireruby'
+require 'rubyfb'
 
-include FireRuby
+include Rubyfb
 
 class BlobTest < Test::Unit::TestCase
    CURDIR      = "#{Dir.getwd}"

data/test/CharacterSetTest.rb

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
+# encoding: windows-1251
 
-require 'TestSetup'
+require './TestSetup'
 require 'test/unit'
 require 'rubygems'
-require 'fireruby'
+require 'rubyfb'
 
-include FireRuby
+include Rubyfb
 
 class CharacterSetTest < Test::Unit::TestCase
    CURDIR   = "#{Dir.getwd}"
@@ -39,10 +40,10 @@ class CharacterSetTest < Test::Unit::TestCase
    end
 
    def test02
-      text = "�?����"
       db   = Database.new(DB_FILE, CHAR_SET)
 
       begin
+         win1251_str = '���������'
          db.connect("SYSDBA", "masterkey") do |cxn|
             cxn.start_transaction do |tr|
                cxn.execute("CREATE TABLE SAMPLE_TABLE(SAMPLE_FIELD VARCHAR(100))",tr)
@@ -56,8 +57,8 @@ class CharacterSetTest < Test::Unit::TestCase
                end
             end
          end
-      rescue => error
-         assert("Character set unit test failure.", false)
+#      rescue => error
+#         assert("Character set unit test failure.", false)
       end
    end
 end

data/test/ConnectionTest.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require 'TestSetup'
+require './TestSetup'
 require 'test/unit'
 require 'rubygems'
-require 'fireruby'
+require 'rubyfb'
 
-include FireRuby
+include Rubyfb
 
 class ConnectionTest < Test::Unit::TestCase
    CURDIR  = "#{Dir.getwd}"
@@ -79,17 +79,17 @@ class ConnectionTest < Test::Unit::TestCase
       @connections.push(@database.connect(DB_USER_NAME, DB_PASSWORD))
       tx    = @connections[0].start_transaction
       total = 0
-      @connections[0].execute("SELECT RDB$FIELD_NAME FROM RDB$FIELDS", tx) do |row|
+      @connections[0].execute("SELECT * FROM RDB$DATABASE", tx) do |row|
          total = total + 1
       end
-      assert(total == 88)
+      assert(total == 1)
       tx.commit
 
       total = 0      
-      @connections[0].execute_immediate("SELECT RDB$FIELD_NAME FROM RDB$FIELDS") do |row|
+      @connections[0].execute_immediate("SELECT * FROM RDB$DATABASE") do |row|
          total = total + 1
       end
-      assert(total == 88)
+      assert(total == 1)
    end
 
    def test04

data/test/DDLTest.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require 'TestSetup'
+require './TestSetup'
 require 'test/unit'
 require 'rubygems'
-require 'fireruby'
+require 'rubyfb'
 
-include FireRuby
+include Rubyfb
 
 class DDLTest < Test::Unit::TestCase
    CURDIR  = "#{Dir.getwd}"

data/test/DatabaseTest.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require 'TestSetup'
+require './TestSetup'
 require 'test/unit'
 require 'rubygems'
-require 'fireruby'
+require 'rubyfb'
 
-include FireRuby
+include Rubyfb
 
 class DatabaseTest < Test::Unit::TestCase
    CURDIR      = "#{Dir.getwd}"

data/test/GeneratorTest.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require 'TestSetup'
+require './TestSetup'
 require 'test/unit'
 require 'rubygems'
-require 'fireruby'
+require 'rubyfb'
 
-include FireRuby
+include Rubyfb
 
 class GeneratorTest < Test::Unit::TestCase
    CURDIR  = "#{Dir.getwd}"

data/test/KeyTest.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require 'TestSetup'
+require './TestSetup'
 require 'test/unit'
 require 'rubygems'
-require 'fireruby'
+require 'rubyfb'
 
-include FireRuby
+include Rubyfb
 
 class KeyTest < Test::Unit::TestCase
    CURDIR  = "#{Dir.getwd}"

data/test/ResultSetTest.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require 'TestSetup'
+require './TestSetup'
 require 'test/unit'
 require 'rubygems'
-require 'fireruby'
+require 'rubyfb'
 
-include FireRuby
+include Rubyfb
 
 class ResultSetTest < Test::Unit::TestCase
    CURDIR  = "#{Dir.getwd}"

data/test/RoleTest.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require 'TestSetup'
+require './TestSetup'
 require 'test/unit'
 require 'rubygems'
-require 'fireruby'
+require 'rubyfb'
 
-include FireRuby
+include Rubyfb
 
 class RoleTest < Test::Unit::TestCase
    CURDIR      = "#{Dir.getwd}"

data/test/RowCountTest.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require 'TestSetup'
+require './TestSetup'
 require 'test/unit'
 require 'rubygems'
-require 'fireruby'
+require 'rubyfb'
 
-include FireRuby
+include Rubyfb
 
 class RowCountTest < Test::Unit::TestCase
    CURDIR      = "#{Dir.getwd}"

data/test/RowTest.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require 'TestSetup'
+require './TestSetup'
 require 'test/unit'
 require 'rubygems'
-require 'fireruby'
+require 'rubyfb'
 
-include FireRuby
+include Rubyfb
 
 class RowTest < Test::Unit::TestCase
    CURDIR  = "#{Dir.getwd}"

data/test/SQLTest.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require 'TestSetup'
+require './TestSetup'
 require 'test/unit'
 require 'rubygems'
-require 'fireruby'
+require 'rubyfb'
 
-include FireRuby
+include Rubyfb
 
 class SQLTest < Test::Unit::TestCase
    CURDIR      = "#{Dir.getwd}"

data/test/SQLTypeTest.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require 'TestSetup'
+require './TestSetup'
 require 'test/unit'
 require 'rubygems'
-require 'fireruby'
+require 'rubyfb'
 
-include FireRuby
+include Rubyfb
 
 class SQLTypeTest < Test::Unit::TestCase
    CURDIR  = "#{Dir.getwd}"