fireruby 0.3.2-i586-linux → 0.4.0-i586-linux

data/lib/src.rb

@@ -682,6 +682,8 @@ module FireRuby
    # and can no longer be used.
    #
    class ResultSet
+      include Enumerable
+      
       #
       # This is the constructor for the ResultSet object.
       #
@@ -833,6 +835,18 @@ module FireRuby
       #
       def close
       end
+      
+      #
+      # This method retrieves the base SQL type for a column of data within a
+      # ResultSet object. The method returns one of the base types defined in
+      # the SQLType class but does not return an actual SQLType object.
+      #
+      # ==== Parameters
+      # index::  The offset from the ResultSet first column of the column to
+      #          return the type information for.
+      #
+      def get_base_type(index)
+      end
    end
    
    
@@ -840,6 +854,8 @@ module FireRuby
    # This class models a row of data fetched as part of a SQL query.
    #
    class Row
+      include Enumerable
+      
       #
       # This is the constructor for the Row class. This method shouldn't really
       # be used as Row objects are automatically created by ResultSets.
@@ -897,7 +913,7 @@ module FireRuby
       #
       # ==== Parameters
       # index::  Either the offset of the column to retrieve the value of or
-      #          the name of the column to retrieve the value of (column name
+      #          the alias of the column to retrieve the value of (column alias
       #          comparisons are case sensitive).
       #
       def [](index)
@@ -907,7 +923,7 @@ module FireRuby
       #
       # This method iterates over the contents of a Row object. The block
       # specified for the method should accept two parameters; one for the
-      # column name and one for the column value.
+      # column alias and one for the column value.
       #
       def each
          yield column, vlaue
@@ -936,7 +952,7 @@ module FireRuby
       # for the alternative parameter is specified.
       #
       # ==== Parameters
-      # key::          A string containing the column name to retrieve.
+      # key::          A string containing the column alias to retrieve.
       # alternative::  A reference to the alternative value to be returned if
       #                the keyed value is not found. Defaults to nil.
       #
@@ -947,7 +963,7 @@ module FireRuby
       
       #
       # This method is used to determine whether a Row object contains a given
-      # column name.
+      # column alias.
       #
       # ==== Parameters
       # name::  A String containing the column name to check for.
@@ -956,6 +972,17 @@ module FireRuby
       end
       
       
+      #
+      # This method is used to determine whether a Row object contains a given
+      # column name.
+      #
+      # ==== Parameters
+      # name::  A String containing the column name to check for.
+      #
+      def has_column?(name)
+      end
+      
+      
       #
       # This method is used to determine whether a Row object contains a given
       # column alias.
@@ -979,12 +1006,19 @@ module FireRuby
       
       
       #
-      # This method retrieves an array of column names for a Row object.
+      # This method retrieves an array of column aliases for a Row object.
       #
       def keys
       end
       
       
+      #
+      # This method retrieves an array of column names for a Row object.
+      #
+      def names
+      end
+      
+      
       #
       # This method retrieves an array of column aliases for a Row object.
       #
@@ -1027,7 +1061,7 @@ module FireRuby
       
       #
       # This method returns an array of column values based on a list of column
-      # names.
+      # aliases.
       #
       # ==== Parameters
       # names::  One or more Strings containing the names of the columns to
@@ -1035,6 +1069,18 @@ module FireRuby
       #
       def values_at(*names)
       end
+      
+      #
+      # This method retrieves the base SQL type for a column of data within a
+      # Row object. The method returns one of the base types defined in the
+      # SQLType class but does not return an actual SQLType object.
+      #
+      # ==== Parameters
+      # index::  The offset from the Row first column of the column to return
+      #          the type information for.
+      #
+      def get_base_type(index)
+      end
    end
    
    #

data/test/AddRemoveUserTest.rb

@@ -3,7 +3,7 @@
 require 'TestSetup'
 require 'test/unit'
 require 'rubygems'
-require_gem 'fireruby'
+require 'fireruby'
 
 include FireRuby
 
@@ -12,6 +12,7 @@ class AddRemoveUserTest < Test::Unit::TestCase
    DB_FILE     = "#{CURDIR}#{File::SEPARATOR}add_remove_user_unit_test.fdb"
 
    def setup
+      puts "#{self.class.name} started." if TEST_LOGGING
       # Remove existing database files.
       @database = Database.new(DB_FILE)
       if File.exist?(DB_FILE)
@@ -25,6 +26,7 @@ class AddRemoveUserTest < Test::Unit::TestCase
       if File.exist?(DB_FILE)
          @database.drop(DB_USER_NAME, DB_PASSWORD)
       end
+      puts "#{self.class.name} finished." if TEST_LOGGING
    end
 
    def test01
@@ -33,12 +35,15 @@ class AddRemoveUserTest < Test::Unit::TestCase
 
       au = AddUser.new('newuser', 'password', 'first', 'middle', 'last')
       au.execute(sm)
+      sleep(3)
 
       cxn = @database.connect('newuser', 'password')
       cxn.close
 
       ru = RemoveUser.new('newuser')
       ru.execute(sm)
+      
+      sm.disconnect
 
       begin
          cxn = @database.connect('newuser', 'password')
@@ -47,4 +52,4 @@ class AddRemoveUserTest < Test::Unit::TestCase
       rescue FireRubyException
       end
    end
-end
+end

data/test/BackupRestoreTest.rb

@@ -3,7 +3,7 @@
 require 'TestSetup'
 require 'test/unit'
 require 'rubygems'
-require_gem 'fireruby'
+require 'fireruby'
 
 include FireRuby
 
@@ -13,6 +13,7 @@ class BackupRestoreTest < Test::Unit::TestCase
    BACKUP_FILE = "#{CURDIR}#{File::SEPARATOR}database.bak"
 
    def setup
+      puts "#{self.class.name} started." if TEST_LOGGING
       # Remove existing database files.
       if File.exist?(DB_FILE)
          db = Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
@@ -43,6 +44,7 @@ class BackupRestoreTest < Test::Unit::TestCase
       if File.exist?(BACKUP_FILE)
          File.delete(BACKUP_FILE)
       end
+      puts "#{self.class.name} finished." if TEST_LOGGING
    end
 
    def test01

data/test/CVS/Entries

@@ -0,0 +1,20 @@
+/AddRemoveUserTest.rb/1.2/Sat Oct 22 09:32:00 2005//
+/BackupRestoreTest.rb/1.2/Sat Oct 22 08:23:48 2005//
+/CharacterSetTest.rb/1.2/Sat Oct 22 08:07:40 2005//
+/ConnectionTest.rb/1.6/Sat Oct 22 08:09:00 2005//
+/DDLTest.rb/1.6/Sat Oct 22 08:09:42 2005//
+/DatabaseTest.rb/1.4/Sat Oct 22 08:21:18 2005//
+/GeneratorTest.rb/1.4/Sat Oct 22 08:21:10 2005//
+/RowCountTest.rb/1.3/Sat Oct 22 08:20:44 2005//
+/SQLTest.rb/1.5/Sat Oct 22 08:27:06 2005//
+/ServiceManagerTest.rb/1.2/Sat Oct 22 08:23:22 2005//
+/StatementTest.rb/1.5/Sat Oct 22 08:22:58 2005//
+/TestSetup.rb/1.2/Sat Oct 22 08:16:26 2005//
+/TransactionTest.rb/1.6/Sat Oct 22 08:22:38 2005//
+/KeyTest.rb/1.1/Sat Oct 22 09:26:20 2005//
+/SQLTypeTest.rb/1.1/Thu Oct 27 19:22:34 2005//
+/ResultSetTest.rb/1.4/Sat Oct 29 17:00:14 2005//
+/RowTest.rb/1.3/Sat Oct 29 14:49:14 2005//
+/TypeTest.rb/1.1/Sat Oct 29 16:58:34 2005//
+/UnitTest.rb/1.10/Fri Nov 11 21:42:29 2005//
+D

data/test/CVS/Repository

@@ -0,0 +1 @@
+fireruby/test

data/test/CVS/Root

@@ -0,0 +1 @@
+:ext:paw220470@rubyforge.org:/var/cvs/fireruby

data/test/CharacterSetTest.rb

@@ -3,7 +3,7 @@
 require 'TestSetup'
 require 'test/unit'
 require 'rubygems'
-require_gem 'fireruby'
+require 'fireruby'
 
 include FireRuby
 
@@ -13,6 +13,7 @@ class CharacterSetTest < Test::Unit::TestCase
    CHAR_SET = 'WIN1251'
    
    def setup
+      puts "#{self.class.name} started." if TEST_LOGGING
       if File::exist?(DB_FILE)
          Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
@@ -25,6 +26,7 @@ class CharacterSetTest < Test::Unit::TestCase
       if File::exist?(DB_FILE)
          Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
+      puts "#{self.class.name} finished." if TEST_LOGGING
    end
 
    def test01
@@ -47,7 +49,8 @@ class CharacterSetTest < Test::Unit::TestCase
             end  
             cxn.start_transaction do |tr|
                cxn.execute("INSERT INTO SAMPLE_TABLE VALUES ('#{win1251_str}')",tr)
-               cxn.execute("SELECT * FROM SAMPLE_TABLE WHERE SAMPLE_FIELD = '#{win1251_str}'",tr) do |row|
+               cxn.execute("SELECT * FROM SAMPLE_TABLE WHERE SAMPLE_FIELD = "\
+                           "'#{win1251_str}'",tr) do |row|
                   # here we have an exception:
                   some_var = row['SAMPLE_FIELD']
                end

data/test/ConnectionTest.rb

@@ -3,7 +3,7 @@
 require 'TestSetup'
 require 'test/unit'
 require 'rubygems'
-require_gem 'fireruby'
+require 'fireruby'
 
 include FireRuby
 
@@ -12,6 +12,7 @@ class ConnectionTest < Test::Unit::TestCase
    DB_FILE = "#{CURDIR}#{File::SEPARATOR}con_unit_test.fdb"
    
    def setup
+      puts "#{self.class.name} started." if TEST_LOGGING
       if File::exist?(DB_FILE)
          Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
@@ -27,6 +28,7 @@ class ConnectionTest < Test::Unit::TestCase
       if File::exist?(DB_FILE)
          Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
+      puts "#{self.class.name} finished." if TEST_LOGGING
    end
    
    def test01

data/test/DDLTest.rb

@@ -3,7 +3,7 @@
 require 'TestSetup'
 require 'test/unit'
 require 'rubygems'
-require_gem 'fireruby'
+require 'fireruby'
 
 include FireRuby
 
@@ -12,6 +12,7 @@ class DDLTest < Test::Unit::TestCase
    DB_FILE = "#{CURDIR}#{File::SEPARATOR}ddl_unit_test.fdb"
    
    def setup
+      puts "#{self.class.name} started." if TEST_LOGGING
       if File::exist?(DB_FILE)
          Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
@@ -22,6 +23,7 @@ class DDLTest < Test::Unit::TestCase
       if File::exist?(DB_FILE)
          Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
+      puts "#{self.class.name} finished." if TEST_LOGGING
    end
    
    def test01

data/test/DatabaseTest.rb

@@ -3,7 +3,7 @@
 require 'TestSetup'
 require 'test/unit'
 require 'rubygems'
-require_gem 'fireruby'
+require 'fireruby'
 
 include FireRuby
 
@@ -13,6 +13,7 @@ class DatabaseTest < Test::Unit::TestCase
    CREATE_FILE = "#{CURDIR}#{File::SEPARATOR}db_create_test.fdb"
    
    def setup
+      puts "#{self.class.name} started." if TEST_LOGGING
       if File.exist?(DB_FILE)
          db = Database.new(DB_FILE)
          db.drop
@@ -34,6 +35,7 @@ class DatabaseTest < Test::Unit::TestCase
          db = Database.new(CREATE_FILE)
          db.drop(DB_USER_NAME, DB_PASSWORD)
       end
+      puts "#{self.class.name} finished." if TEST_LOGGING
    end
    
    

data/test/GeneratorTest.rb

@@ -3,7 +3,7 @@
 require 'TestSetup'
 require 'test/unit'
 require 'rubygems'
-require_gem 'fireruby'
+require 'fireruby'
 
 include FireRuby
 
@@ -12,6 +12,7 @@ class GeneratorTest < Test::Unit::TestCase
    DB_FILE = "#{CURDIR}#{File::SEPARATOR}generator_unit_test.fdb"
    
    def setup
+      puts "#{self.class.name} started." if TEST_LOGGING
       if File::exist?(DB_FILE)
          Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
@@ -29,6 +30,7 @@ class GeneratorTest < Test::Unit::TestCase
       if File::exist?(DB_FILE)
          Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
+      puts "#{self.class.name} finished." if TEST_LOGGING
    end
    
    def test01

data/test/KeyTest.rb

@@ -0,0 +1,140 @@
+#!/usr/bin/env ruby
+
+require 'TestSetup'
+require 'test/unit'
+require 'rubygems'
+require 'fireruby'
+
+include FireRuby
+
+class KeyTest < Test::Unit::TestCase
+   CURDIR  = "#{Dir.getwd}"
+   DB_FILE = "#{CURDIR}#{File::SEPARATOR}key_unit_test.fdb"
+   
+   def setup
+      puts "#{self.class.name} started." if TEST_LOGGING
+      if File::exist?(DB_FILE)
+         Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
+      end
+      
+      # Switch to the old way of keying.
+      $FireRubySettings[:ALIAS_KEYS] = false
+      
+      database     = Database::create(DB_FILE, DB_USER_NAME, DB_PASSWORD)
+      @connection  = database.connect(DB_USER_NAME, DB_PASSWORD)
+      @transaction = @connection.start_transaction
+      @results     = ResultSet.new(@connection, @transaction,
+                                   'SELECT * FROM RDB$FIELDS', 3, nil)
+      @empty       = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                      0, 0, 0, 0, 0, 0, 0, 0, 0]
+      
+      @connection.execute_immediate('create table keytest (COL01 integer, '\
+                                    'COL02 varchar(10), COL03 integer)')
+      @connection.execute_immediate("insert into keytest values (1, 'Two', 3)")
+   end
+   
+   def teardown
+      @results.close
+      @transaction.rollback
+      @connection.close
+      if File::exist?(DB_FILE)
+         Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
+      end
+      $FireRubySettings[:ALIAS_KEYS] = true
+      puts "#{self.class.name} finished." if TEST_LOGGING
+   end
+   
+   def test_01
+      sql  = 'select COL01 one, COL02 two, COL03 three from keytest'
+      rows = @connection.execute_immediate(sql)
+      data = rows.fetch
+      
+      count = 0
+      data.each do |name, value|
+         assert(['COL01', 'COL02', 'COL03'].include?(name))
+         assert([1, 'Two', 3].include?(value))
+         count += 1
+      end
+      assert(count == 3)
+      
+      count = 0
+      data.each_key do |name|
+         assert(['COL01', 'COL02', 'COL03'].include?(name))
+         count += 1
+      end
+      assert(count == 3)
+      
+      count = 0
+      data.each_value do |value|
+         assert([1, 'Two', 3].include?(value))
+         count += 1
+      end
+      assert(count == 3)
+      
+      assert(data.fetch('COL02') == 'Two')
+      assert(data.fetch('COL04', 'LALALA') == 'LALALA')
+      assert(data.fetch('COL00') {'NOT FOUND'} == 'NOT FOUND')
+      begin
+         data.fetch('COL05')
+         assert(false, 'Row#fetch succeeded for non-existent column name.')
+      rescue IndexError
+      end
+      
+      assert(data.has_key?('COL01'))
+      assert(data.has_key?('COL10') == false)
+      
+      assert(data.has_column?('COL02'))
+      assert(data.has_column?('COL22') == false)
+      
+      assert(data.has_alias?('TWO'))
+      assert(data.has_alias?('FOUR') == false)
+      
+      assert(data.has_value?(3))
+      assert(data.has_value?('LALALA') == false)
+      
+      assert(data.keys.size == 3)
+      data.keys.each do |name|
+         assert(['COL01', 'COL02', 'COL03'].include?(name))
+      end
+      
+      assert(data.names.size == 3)
+      data.names.each do |name|
+         assert(['COL01', 'COL02', 'COL03'].include?(name))
+      end
+
+      assert(data.aliases.size == 3)
+      data.aliases.each do |name|
+         assert(['ONE', 'TWO', 'THREE'].include?(name))
+      end
+      
+      assert(data.values.size == 3)
+      data.values.each do |value|
+         assert([1, 'Two', 3].include?(value))
+      end
+      
+      array = data.select {|name, value| name == 'COL02'}
+      assert(array.size == 1)
+      assert(array[0][0] == 'COL02')
+      assert(array[0][1] == 'Two')
+      
+      array = data.to_a
+      assert(array.size == 3)
+      assert(array.include?(['COL01', 1]))
+      assert(array.include?(['COL02', 'Two']))
+      assert(array.include?(['COL03', 3]))
+      
+      hash = data.to_hash
+      assert(hash.length == 3)
+      assert(hash['COL01'] == 1)
+      assert(hash['COL02'] == 'Two')
+      assert(hash['COL03'] == 3)
+      
+      array = data.values_at('COL10', 'COL02', 'COL03')
+      assert(array.size == 3)
+      assert(array.include?('Two'))
+      assert(array.include?(3))
+      assert(array.include?(nil))
+      
+      rows.close
+   end
+end

data/test/ResultSetTest.rb

@@ -3,7 +3,7 @@
 require 'TestSetup'
 require 'test/unit'
 require 'rubygems'
-require_gem 'fireruby'
+require 'fireruby'
 
 include FireRuby
 
@@ -12,6 +12,7 @@ class ResultSetTest < Test::Unit::TestCase
    DB_FILE = "#{CURDIR}#{File::SEPARATOR}result_set_unit_test.fdb"
    
    def setup
+      puts "#{self.class.name} started." if TEST_LOGGING
       if File::exist?(DB_FILE)
          Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
@@ -24,6 +25,11 @@ class ResultSetTest < Test::Unit::TestCase
       @connections[0].start_transaction do |tx|
          tx.execute("CREATE TABLE TEST_TABLE (TESTID INTEGER NOT NULL "\
                     "primary KEY, TESTINFO VARCHAR(100))")
+         tx.execute('create table all_types (col01 bigint, col02 blob, '\
+                    'col03 char(100), col04 date, col05 decimal(5,2), '\
+                    'col06 double precision, col07 float, col08 integer, '\
+                    'col09 numeric(10,3), col10 smallint, col11 time, '\
+                    'col12 timestamp, col13 varchar(23))')
       end
       
       @connections[0].start_transaction do |tx|
@@ -55,6 +61,7 @@ class ResultSetTest < Test::Unit::TestCase
       if File::exist?(DB_FILE)
          Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
+      puts "#{self.class.name} finished." if TEST_LOGGING
    end
    
    def test01
@@ -98,7 +105,7 @@ class ResultSetTest < Test::Unit::TestCase
          total += 1
       end
       assert(total == 5)
-      r.close
+      assert(r.exhausted?)
    end
 
    def test02
@@ -108,7 +115,8 @@ class ResultSetTest < Test::Unit::TestCase
       assert(r.exhausted? == false)
       total = 0
       r.each {|row| total += 1}
-      assert(total ==3)
+      assert(total == 3)
+      assert(r.exhausted?)
    end
 
    def test03
@@ -128,4 +136,27 @@ class ResultSetTest < Test::Unit::TestCase
       rescue FireRubyException
       end
    end
+   
+   def test04
+      results = nil
+      begin
+         results = @transactions[0].execute('select * from all_types')
+        
+         assert(results.get_base_type(0) == SQLType::BIGINT)
+         assert(results.get_base_type(1) == SQLType::BLOB)
+         assert(results.get_base_type(2) == SQLType::CHAR)
+         assert(results.get_base_type(3) == SQLType::DATE)
+         assert(results.get_base_type(4) == SQLType::DECIMAL)
+         assert(results.get_base_type(5) == SQLType::DOUBLE)
+         assert(results.get_base_type(6) == SQLType::FLOAT)
+         assert(results.get_base_type(7) == SQLType::INTEGER)
+         assert(results.get_base_type(8) == SQLType::NUMERIC)
+         assert(results.get_base_type(9) == SQLType::SMALLINT)
+         assert(results.get_base_type(10) == SQLType::TIME)
+         assert(results.get_base_type(11) == SQLType::TIMESTAMP)
+         assert(results.get_base_type(12) == SQLType::VARCHAR)
+      ensure
+         results.close if results != nil
+      end
+   end
 end

data/test/RowCountTest.rb

@@ -3,7 +3,7 @@
 require 'TestSetup'
 require 'test/unit'
 require 'rubygems'
-require_gem 'fireruby'
+require 'fireruby'
 
 include FireRuby
 
@@ -12,6 +12,7 @@ class RowCountTest < Test::Unit::TestCase
    DB_FILE     = "#{CURDIR}#{File::SEPARATOR}row_count_test.fdb"
 
    def setup
+      puts "#{self.class.name} started." if TEST_LOGGING
       # Create the database for use in testing.
       if File.exist?(DB_FILE)
          Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
@@ -29,6 +30,7 @@ class RowCountTest < Test::Unit::TestCase
       if File.exist?(DB_FILE)
          @database.drop(DB_USER_NAME, DB_PASSWORD)
       end
+      puts "#{self.class.name} finished." if TEST_LOGGING
    end
    
    def test01