rubyfb 0.5.5 → 0.5.6

data/ext/TypeMap.h

@@ -3,20 +3,20 @@
  *----------------------------------------------------------------------------*/
 /**
  * Copyright � Peter Wood, 2005
- * 
+ *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at 
+ * License. You may obtain a copy of the License at
  *
  * http://www.mozilla.org/MPL/
- * 
+ *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
  * the specificlanguage governing rights and  limitations under the License.
- * 
+ *
  * The Original Code is the FireRuby extension for the Ruby language.
- * 
- * The Initial Developer of the Original Code is Peter Wood. All Rights 
+ *
+ * The Initial Developer of the Original Code is Peter Wood. All Rights
  * Reserved.
  *
  * @author  Peter Wood
@@ -29,23 +29,23 @@
       #include "ibase.h"
       #define IBASE_H_INCLUDED
    #endif
-   
+
    #ifndef RUBY_H_INCLUDED
       #include "ruby.h"
       #define RUBY_H_INCLUDED
    #endif
-   
+
    #ifndef FIRERUBY_DATABASE_H
       #include "ResultSet.h"
    #endif
-   
-   /* Function prototypes. */
-   VALUE toValue(XSQLVAR *, isc_db_handle *, isc_tr_handle *);
-   VALUE toArray(VALUE);
-   void setParameters(XSQLDA *, VALUE, VALUE);
-   VALUE getModule(const char *);
-   VALUE getClass(const char *);
-   VALUE getClassInModule(const char *, VALUE);
-   VALUE getModuleInModule(const char *, VALUE);
+
+/* Function prototypes. */
+VALUE toValue(XSQLVAR *, isc_db_handle *, isc_tr_handle *);
+VALUE toArray(VALUE);
+void setParameters(XSQLDA *, 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/ext/rfbint.h

@@ -5,9 +5,9 @@
   #include <inttypes.h>
 #else
   #ifndef __GNUC__
-    typedef short     int16_t;
-    typedef long      int32_t;
-    typedef long long int64_t;
+typedef short int16_t;
+typedef long int32_t;
+typedef long long int64_t;
   #endif
 #endif
 

data/lib/active_record/connection_adapters/rubyfb_adapter.rb

@@ -12,7 +12,7 @@ module Rubyfb # :nodoc: all
         raise ArgumentError, "No database specified. Missing argument: database."
       end
       host_string = config.values_at(:host, :service, :port).compact.first(2).join("/") if config[:host]
-      [host_string, config[:database]].join(":")
+      [host_string, config[:database]].compact.join(":")
     end
 
     def self.new_from_config(config)

data/lib/src.rb

@@ -772,6 +772,26 @@ module Rubyfb
       end
       
       
+      #
+      # This method fetches the scale associated with a specified column for a
+      # ResultSet object.  Firebird implements some floating point types with
+      # integral storage and a negative scale.  For example, depending on
+      # your platform
+      #
+      #    SELECT 1.003 FROM RDB$DATABASE
+      #
+      # may return a ResultSet, the first and only column of which has
+      # a base type of :BIGINT but a scale of -3.  (Fetches of the actual
+      # value will correctly return a ruby Float.)
+      #
+      # ==== Parameters
+      # column::  A reference to the column number to fetch the details for.
+      #           Column numbers start at zero.
+      #
+      def column_scale(column)
+      end
+
+
       #
       # This method fetches the table name associated with a specified column
       # for a ResultSet object.
@@ -910,6 +930,19 @@ module Rubyfb
       #
       def column_alias(index)
       end
+
+
+      #
+      # This method fetches the scale associated with a specified column
+      # within a row of data.  See the documentation of
+      # ResultSet#column_scale for details.
+      #
+      # ==== Parameters
+      # column::  A reference to the column number to fetch the details for.
+      #           Column numbers start at zero.
+      #
+      def column_scale(column)
+      end
       
       
       #

data/rubyfb.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyfb}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["George Georgiev"]
-  s.date = %q{2011-01-06}
+  s.date = %q{2011-01-29}
   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", "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.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", "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"]

data/test/ResultSetTest.rb

@@ -159,4 +159,17 @@ class ResultSetTest < Test::Unit::TestCase
          results.close if results != nil
       end
    end
+   def test05
+      results = @transactions[0].execute(<<-EOSQL)
+                SELECT CAST(5.01 AS DECIMAL(6,5)) AS "COL01",
+                       2.2                        AS "COL02",
+                       CAST(3 AS INTEGER)         AS "COL03"
+                  FROM RDB$DATABASE
+                EOSQL
+      assert_equal(-5, results.column_scale(0))
+      assert_equal(-1, results.column_scale(1))
+      assert_equal(0, results.column_scale(2))
+   ensure
+      results.close if results
+   end
 end

data/test/RowTest.rb

@@ -200,4 +200,20 @@ class RowTest < Test::Unit::TestCase
          results.close if results != nil
       end
    end
+
+   def test04
+      results = @transaction.execute(<<-EOSQL)
+                SELECT CAST(5.01 AS DECIMAL(6,5)) AS "COL01",
+                       2.2                        AS "COL02",
+                       CAST(3 AS INTEGER)         AS "COL03"
+                  FROM RDB$DATABASE
+                EOSQL
+      row     = results.fetch
+
+      assert_equal(-5, row.column_scale(0))
+      assert_equal(-1, row.column_scale(1))
+      assert_equal(0, row.column_scale(2))
+   ensure
+      results.close if results
+   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyfb
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - George Georgiev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 +02:00
+date: 2011-01-29 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -118,7 +118,6 @@ files:
 - test/TestSetup.rb
 - test/TransactionTest.rb
 - test/TypeTest.rb
-- test/UnitTest.rb
 - rubyfb.gemspec
 has_rdoc: true
 homepage: http://rubyforge.org/projects/rubyfb

data/test/UnitTest.rb

@@ -1,65 +0,0 @@
-#!/usr/bin/env ruby
-
-#-------------------------------------------------------------------------------
-# Old Unit Test Suite
-#
-# This code has been dropped for two reasons. First, adding new tests requires
-# that this code be updated. Second, running the tests in a single Ruby
-# interpreter seems to cause issues as the tests create, use and drop a lot of
-# database files and this seems to cause intermittent problems with one or more
-# of the test scripts that doesn't occur when the script is run on its own.
-# Changing the number of scripts run also seemed to cause the problems to go
-# away. It didn't seem to matter which scripts where left out which leads me
-# to believe that the problem is related to timing issues.
-#
-# The new unit test suite, below, searches the directory for unit test files
-# and executes each in their own interpreter. I have left this code here for
-# reference purposes.
-#-------------------------------------------------------------------------------
-#require 'DatabaseTest'
-#require 'ConnectionTest'
-#require 'TransactionTest'
-#require 'StatementTest'
-#require 'ResultSetTest'
-#require 'RowCountTest'
-#require 'RowTest'
-#require 'GeneratorTest'
-#require 'DDLTest'
-#require 'SQLTest'
-#require 'ServiceManagerTest'
-#require 'CharacterSetTest'
-#require 'KeyTest'
-#require 'TypeTest'
-#require 'SQLTypeTest'
-#if PLATFORM.include?('powerpc-darwin') == false
-#   require 'BackupRestoreTest'
-#   require 'AddRemoveUserTest'
-#end
-#-------------------------------------------------------------------------------
-SPECIALS = ['AddRemoveUserTest',
-            'BackupRestoreTest',
-            'ServiceManagerTest',
-            'RoleTest']
-begin
-   files = Dir.entries(".")
-   files.reject! do |name|
-                    ['.', '..', 'UnitTest.rb'].include?(name) or
-                    name[-7,7] != 'Test.rb'
-                 end
-   files.each do |name|
-      execute = true
-      if SPECIALS.include?(name)
-         execute = !(PLATFORM.include?('powerpc-darwin'))
-      end
-      
-      if execute
-         system("ruby #{name}")
-         
-         if $? != 0
-            raise StandardError.new("Error executing '#{name}'. Testing terminated.")
-         end
-      end
-   end
-rescue => error
-   puts "\n\nERROR: #{error.message}"
-end