rubyfb 0.6.4 → 0.6.7

data/ext/TypeMap.h

@@ -35,17 +35,9 @@
       #define RUBY_H_INCLUDED
    #endif
 
-   #ifndef FIRERUBY_DATABASE_H
-      #include "ResultSet.h"
-   #endif
-
 /* Function prototypes. */
-void Init_TypeMap();
-VALUE toArray(VALUE);
+void Init_TypeMap(VALUE);
+VALUE toValue(XSQLVAR *, VALUE, VALUE);
 void setParameters(XSQLDA *, VALUE, VALUE, VALUE);
-VALUE getModule(const char *);
-VALUE getClass(const char *);
-VALUE getClassInModule(const char *, VALUE);
-VALUE getModuleInModule(const char *, VALUE);
 
 #endif /* FIRERUBY_TYPE_MAP_H */

data/lib/active_record/connection_adapters/rubyfb_adapter.rb

@@ -918,25 +918,26 @@ module ActiveRecord
         end
 
         def select_raw(sql, name = nil, binds = [])
-          fields = []
-          rows = []
-          exec_query(sql, name, binds) do |row|
-            array_row = []
-            row.each do |column, value|
-              fields << fb_to_ar_case(column) if row.number == 1
-              case value
-                when Rubyfb::Blob
-                  temp = value.to_s
-                  value.close
-                  value = temp
-                when Time, DateTime
-                  value = create_time_with_default_timezone(value)
+          fields = rows = []
+          exec_result = exec_query(sql, name, binds)
+          if exec_result.instance_of?(Rubyfb::ResultSet)
+            fields = exec_result.statement.metadata.collect{ |m| fb_to_ar_case(m.key) }
+            exec_result.each do |row|
+              rows << row.values.collect do |value|
+                case value
+                  when Rubyfb::Blob
+                    value.to_s.tap do
+                      value.close
+                    end
+                  when Time, DateTime
+                    create_time_with_default_timezone(value)
+                  else
+                    value
+                end
               end
-              array_row << value
             end
-            rows << array_row
           end
-          return fields, rows 
+          return fields, rows
         end
 
         def index_metadata(table_name, pk, name = nil)

data/lib/result_set.rb

@@ -0,0 +1,109 @@
+module Rubyfb
+  class ResultSet
+    include Enumerable
+    attr_reader :statement, :transaction, :row_count
+    
+    def initialize(statement, transaction)
+      @statement = statement
+      @transaction = transaction
+      @active = true
+      @row_count = 0
+      @manage_statement = false
+      @manage_transaction = false
+    end
+    
+    def initialize_copy(o)
+      raise FireRubyException.new("Object cloning is not supported");
+    end
+    
+    def each
+      while row = fetch
+        yield row
+      end
+    ensure
+      close
+    end
+    
+    def fetch
+      row = nil
+      case statement.fetch
+        when Statement::FETCH_MORE
+          @row_count += 1
+          row = Row.new(statement.metadata, statement.current_row(transaction), @row_count)
+        when Statement::FETCH_COMPLETED
+          close
+        when Statement::FETCH_ONE
+          @row_count = 1
+          row = Row.new(statement.metadata, statement.current_row(transaction), @row_count)
+          close
+        else
+          raise FireRubyException.new("Error fetching query row.");
+      end if active?
+      
+      return row
+    end
+    
+    def close
+      return unless active?
+      
+      @active = false
+      statement.close_cursor
+      if @manage_statement && statement.prepared?
+        statement.close
+      end
+      if @manage_transaction && transaction.active?
+        transaction.commit
+      end
+    end
+    
+    def connection
+      statement.connection
+    end
+    
+    def sql
+      statement.sql
+    end
+    
+    def dialect
+      statement.dialect
+    end
+    
+    def column_name(index)
+      with_metadata(index){ |m| m.name }
+    end
+    
+    def column_alias(index)
+      with_metadata(index){ |m| m.alias }
+    end
+    
+    def column_scale(index)
+      with_metadata(index){ |m| m.scale }
+    end
+    
+    def column_table(index)
+      with_metadata(index){ |m| m.relation }
+    end
+    
+    def get_base_type(index)
+      with_metadata(index){ |m| m.type }
+    end
+  
+    def column_count
+      statement.metadata.size
+    end
+    
+    def active?
+      @active
+    end
+    
+    def exhausted?
+      !active?
+    end
+  private
+    def with_metadata(index)
+      if index >= 0 and index < column_count
+        yield statement.metadata[index]
+      end
+    end
+  end
+end

data/lib/row.rb

@@ -0,0 +1,149 @@
+module Rubyfb
+  class Row
+    include Enumerable
+    attr_reader :number
+    
+    def initialize(metadata, data, row_number)
+      @number = row_number
+      @metadata = metadata
+      @data = data
+    end
+    
+    def column_count
+      @metadata.size
+    end
+    
+    def column_name(idx)
+      @metadata[get_index(idx)].name
+    end
+    
+    def column_alias(idx)
+      @metadata[get_index(idx)].alias
+    end
+    
+    def column_scale(idx)
+      @metadata[get_index(idx)].scale
+    end
+    
+    def get_base_type(idx)
+      @metadata[get_index(idx)].type
+    end
+    
+    def each
+      @metadata.each_with_index do |c, i|
+        yield c.key, @data[i]
+      end if block_given?
+    end
+    
+    def each_key
+      @metadata.each do |c|
+        yield c.key
+      end if block_given?
+    end
+
+    def each_value
+      @data.each do |v|
+        yield v
+      end if block_given?
+    end
+    
+    def [](idx)
+      @data[get_index(idx)]
+    end
+    
+    def fetch(index, default=nil)
+      soft_value(index) || default || (
+        if block_given?
+          yield index
+        else
+          raise IndexError.new("Column identifier #{index} not found in row.")
+        end
+      )
+    end
+    
+    def has_key?(key)
+      !!@metadata.find{ |col| col.key == key }
+    end
+
+    def has_column?(name)
+      !!@metadata.find{ |col| col.name == name }
+    end
+    
+    def has_alias?(column_alias)
+      !!@metadata.find{ |col| col.alias == column_alias }
+    end
+    
+    def has_value?(value)
+      !!@data.find{ |v| v == value }
+    end
+
+    def keys
+      @metadata.collect{ |col| col.key }
+    end
+
+    def names
+      @metadata.collect{ |col| col.name }
+    end
+
+    def aliases
+      @metadata.collect{ |col| col.alias }
+    end
+
+    def values
+      @data
+    end
+
+    def select
+      block_given? || (raise StandardError.new("No block specified in call to Row#select."))
+      
+      [].tap do |a|
+        @metadata.each_with_index do |c, i|
+          a << [c.key, @data[i]] if yield c.key, @data[i]
+        end
+      end 
+    end
+    
+    def to_a
+      select{ true }
+    end
+    
+    def to_hash
+      {}.tap do |map|
+        @metadata.each_with_index do |c, i|
+          map[c.key] = @data[i]
+        end
+      end
+    end
+    
+    def values_at(*columns)
+      columns.collect{ |key| soft_value(key) }
+    end
+
+    alias_method :each_pair, :each
+    alias_method :include?, :has_key?
+    alias_method :key?, :has_key?
+    alias_method :member?, :has_key?
+    alias_method :value?, :has_value?
+    alias_method :length, :column_count
+    alias_method :size, :column_count
+  private
+    def soft_value(key)
+      if index = find_index(key)
+        @data[index]
+      end
+    end
+    
+    def find_index(key)
+      if key.kind_of?(String)
+        @metadata.find_index{ |c| c.key == key }
+      else
+        key < 0 ? size + key : key
+      end
+    end
+    
+    def get_index(key)
+      find_index(key) || (raise IndexError.new("Column identifier #{key} not found in row."))
+    end
+  end
+end
+

data/lib/rubyfb.rb

@@ -1,6 +1,10 @@
+require 'date'
 require 'rubyfb_options'
+require 'result_set'
 require 'rubyfb_lib'
-require 'SQLType'
-require 'ProcedureCall'
-require 'Connection'
+require 'sql_type'
+require 'procedure_call'
+require 'row'
+require 'statement'
+require 'connection'
 

data/lib/statement.rb

@@ -0,0 +1,17 @@
+module Rubyfb
+  class Statement
+    attr_reader :metadata
+    
+    class ColumnMetadata
+      attr_reader :name, :alias, :key, :type, :scale, :relation
+    end
+    
+    def create_column_metadata
+      ColumnMetadata.new
+    end
+    
+    def create_result_set(transaction)
+      ResultSet.new(self, transaction)
+    end
+  end
+end

data/rubyfb.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = "rubyfb"
-  s.version = "0.6.4"
+  s.version = "0.6.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["George Georgiev"]
-  s.date = "2012-03-23"
+  s.date = "2012-03-29"
   s.description = "Firebird SQL access library"
   s.email = "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/rubyfb_options.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", "ext/rfbint.h", "ext/rfbsleep.h", "ext/rfbstr.c", "ext/rfbstr.h", "ext/uncrustify.cfg", "lib/Connection.rb", "lib/ProcedureCall.rb", "lib/SQLType.rb", "lib/active_record/connection_adapters/rubyfb_adapter.rb", "lib/arel/visitors/fb15/rubyfb.rb", "lib/arel/visitors/rubyfb.rb", "lib/mkdoc", "lib/rubyfb.rb", "lib/rubyfb_lib.so", "lib/rubyfb_options.rb", "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/FieldCharacterSetTest.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/StoredProcedureTest.rb", "test/TestSetup.rb", "test/TransactionTest.rb", "test/TypeTest.rb", "rubyfb.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "examples/example01.rb", "ext/extconf.rb", "lib/connection.rb", "lib/procedure_call.rb", "lib/result_set.rb", "lib/row.rb", "lib/rubyfb.rb", "lib/rubyfb_options.rb", "lib/sql_type.rb", "lib/src.rb", "lib/statement.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/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", "ext/rfbstr.c", "ext/rfbstr.h", "ext/uncrustify.cfg", "lib/active_record/connection_adapters/rubyfb_adapter.rb", "lib/arel/visitors/fb15/rubyfb.rb", "lib/arel/visitors/rubyfb.rb", "lib/connection.rb", "lib/mkdoc", "lib/procedure_call.rb", "lib/result_set.rb", "lib/row.rb", "lib/rubyfb.rb", "lib/rubyfb_lib.so", "lib/rubyfb_options.rb", "lib/sql_type.rb", "lib/src.rb", "lib/statement.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/FieldCharacterSetTest.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/StoredProcedureTest.rb", "test/TestSetup.rb", "test/TransactionTest.rb", "test/TypeTest.rb", "rubyfb.gemspec"]
   s.homepage = "http://rubyforge.org/projects/rubyfb"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rubyfb", "--main", "README"]
   s.require_paths = ["lib", "ext"]

data/test/ResultSetTest.rb

@@ -66,15 +66,18 @@ class ResultSetTest < Test::Unit::TestCase
    def test01
       r = @connections[0].execute("SELECT * FROM TEST_TABLE ORDER BY TESTID", @transactions[0])
       assert_equal(Rubyfb::ResultSet, r.class)
+      assert(r.kind_of?(Enumerable), "ResultSet should be Enumerable")
       
       assert(r.connection == @connections[0])
       assert(r.transaction == @transactions[0])
       assert(r.sql == "SELECT * FROM TEST_TABLE ORDER BY TESTID")
       assert(r.dialect == 3)
       
-      assert(r.fetch != nil)
-      assert(r.fetch.class == Row)
-      assert(r.fetch[0] == 30)
+      first_row = r.fetch
+      assert(first_row != nil)
+      assert_equal(1, first_row.number)
+      assert_equal(Row, r.fetch.class)
+      assert_equal(30, r.fetch[0])
       assert(r.fetch[1] == 'Record Four.')
       r.fetch
       assert(r.fetch == nil)
@@ -83,7 +86,7 @@ class ResultSetTest < Test::Unit::TestCase
       r = @connections[0].execute("SELECT * FROM TEST_TABLE ORDER BY TESTID", @transactions[0])
       assert_equal(Rubyfb::ResultSet, r.class)
       assert(r.column_count == 2)
-      assert(r.column_name(0) == 'TESTID')
+      assert_equal('TESTID', r.column_name(0))
       assert(r.column_name(1) == 'TESTINFO')
       assert(r.column_name(3) == nil)
       assert(r.column_name(-1) == nil)

data/test/RowTest.rb

@@ -58,6 +58,9 @@ class RowTest < Test::Unit::TestCase
       sql  = 'select COL01 one, COL02 two, COL03 three from rowtest'
       rows = @connection.execute_immediate(sql)
       data = rows.fetch
+      assert_equal(Rubyfb::Row, data.class)
+      assert(data.kind_of?(Enumerable), "Row should be Enumerable")
+
       
       count = 0
       data.each do |name, value|
@@ -91,7 +94,7 @@ class RowTest < Test::Unit::TestCase
       end
       
       assert(data.has_key?('ONE'))
-      assert(data.has_key?('TEN') == false)
+      assert_equal(false, data.has_key?('TEN'))
       
       assert(data.has_column?('COL02'))
       assert(data.has_column?('COL22') == false)

data/test/TypeTest.rb

@@ -77,7 +77,7 @@ class TypeTest < Test::Unit::TestCase
          assert(row[1].instance_of?(Float))
          assert(row[2].instance_of?(Float))
          assert(row[3].instance_of?(Float))
-         assert(row[4].instance_of?(Time))
+         assert(row[4].instance_of?(Time), "Time expected but #{row[4].class.name} found")
          assert(row[5].instance_of?(Time))
          assert(row[6].instance_of?(String))
          assert(row[7].instance_of?(Time))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyfb
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000 Z
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies: []
 description: Firebird SQL access library
 email: georgiev@heatbs.com
@@ -22,12 +22,15 @@ extra_rdoc_files:
 - README
 - examples/example01.rb
 - ext/extconf.rb
-- lib/Connection.rb
-- lib/ProcedureCall.rb
-- lib/SQLType.rb
+- lib/connection.rb
+- lib/procedure_call.rb
+- lib/result_set.rb
+- lib/row.rb
 - lib/rubyfb.rb
 - lib/rubyfb_options.rb
+- lib/sql_type.rb
 - lib/src.rb
+- lib/statement.rb
 files:
 - CHANGELOG
 - LICENSE
@@ -59,10 +62,6 @@ files:
 - 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
@@ -79,17 +78,20 @@ files:
 - ext/rfbstr.c
 - ext/rfbstr.h
 - ext/uncrustify.cfg
-- lib/Connection.rb
-- lib/ProcedureCall.rb
-- lib/SQLType.rb
 - lib/active_record/connection_adapters/rubyfb_adapter.rb
 - lib/arel/visitors/fb15/rubyfb.rb
 - lib/arel/visitors/rubyfb.rb
+- lib/connection.rb
 - lib/mkdoc
+- lib/procedure_call.rb
+- lib/result_set.rb
+- lib/row.rb
 - lib/rubyfb.rb
 - lib/rubyfb_lib.so
 - lib/rubyfb_options.rb
+- lib/sql_type.rb
 - lib/src.rb
+- lib/statement.rb
 - mswin32fb/fbclient_mingw.def
 - mswin32fb/fbclient_mingw.lib
 - mswin32fb/fbclient_ms.lib