rubyfb 0.6.1 → 0.6.2

data/CHANGELOG

@@ -1,3 +1,13 @@
+v0.6.2 ==
+Update arel visitors
+Use round() when scaling fixed parameter values
+
+v0.6.1 ==
+Fix incorrect parameter scaling for fixed precision decimals stored in int32, int16 fields
+http://rubyforge.org/tracker/index.php?func=detail&aid=29406&group_id=9658&atid=37369
+Restore pre 3.0.7 rails compatibility
+http://rubyforge.org/tracker/index.php?func=detail&aid=29398&group_id=9658&atid=37369
+
 v0.6.0 ==
 API changes:
 !!WARNING!!

data/Manifest

@@ -52,8 +52,8 @@ 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/arel/visitors/rubyfb_15compat.rb
 lib/mkdoc
 lib/rubyfb.rb
 lib/rubyfb_lib.so

data/Rakefile

@@ -1,5 +1,5 @@
 require 'echoe'
-e = Echoe.new('rubyfb', '0.6.1') do |p|
+e = Echoe.new('rubyfb', '0.6.2') do |p|
   p.description    = "Firebird SQL access library"
   p.url            = "http://rubyforge.org/projects/rubyfb"
   p.author         = "George Georgiev"

data/ext/TypeMap.c

@@ -58,15 +58,13 @@ void populateTimeField(VALUE, XSQLVAR *);
 void populateTimestampField(VALUE, XSQLVAR *);
 
 long long sql_scale(VALUE value, XSQLVAR *field) {
-  if(field->sqlscale == 0) {
-    value = rb_funcall(value, rb_intern("to_i"), 0);
-  } else {
-    value = rb_funcall(value, rb_intern("to_f"), 0);
+  value = rb_funcall(value, rb_intern("to_f"), 0);
+  if(field->sqlscale) {
     // this requires special care - decimal point shift can cause type overflow
     // the easyest way is to use ruby arithmetics (although it's not the fastes)
     value = rb_funcall(value, rb_intern("*"), 1, LONG2NUM((long)pow(10, abs(field->sqlscale))));
   }
-  return NUM2LL(value);
+  return NUM2LL(rb_funcall(value, rb_intern("round"), 0));
 }
 
 VALUE sql_unscale(VALUE value, XSQLVAR *field) {

data/lib/active_record/connection_adapters/rubyfb_adapter.rb

@@ -6,10 +6,11 @@ require 'rubyfb_options'
 
 if defined?(Arel) then
   if Rubyfb::Options.fb15_compat
-    require 'arel/visitors/rubyfb_15compat'
+    require 'arel/visitors/fb15/rubyfb'
   else
     require 'arel/visitors/rubyfb'
   end
+ 	Arel::Visitors::VISITORS['rubyfb'] = Arel::Visitors::RubyFB if defined?(Arel::Visitors::VISITORS)
 end
 
 module Rubyfb # :nodoc: all
@@ -333,6 +334,10 @@ module ActiveRecord
         @statements = {}
       end
 
+      def self.visitor_for(pool) # :nodoc:
+        Arel::Visitors::RubyFB.new(pool)
+      end
+
       ADAPTER_NAME = 'Rubyfb'.freeze
       
       def adapter_name #:nodoc:

data/lib/arel/visitors/{rubyfb_15compat.rb → fb15/rubyfb.rb}

@@ -1,7 +1,6 @@
 module Arel
   module Visitors
-    class RubyFB_15Compat < Arel::Visitors::ToSql
-    	Arel::Visitors::VISITORS['rubyfb'] = Arel::Visitors::RubyFB_15Compat
+    class RubyFB < Arel::Visitors::ToSql
     private
       def visit_Arel_Nodes_Limit o
       end

data/lib/arel/visitors/rubyfb.rb

@@ -1,7 +1,6 @@
 module Arel
   module Visitors
     class RubyFB < Arel::Visitors::ToSql
-    	Arel::Visitors::VISITORS['rubyfb'] = Arel::Visitors::RubyFB
     private
       def visit_Arel_Nodes_Limit o
       end

data/rubyfb.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = "rubyfb"
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["George Georgiev"]
-  s.date = "2011-10-16"
+  s.date = "2012-01-04"
   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/rubyfb.rb", "lib/arel/visitors/rubyfb_15compat.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.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.homepage = "http://rubyforge.org/projects/rubyfb"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rubyfb", "--main", "README"]
   s.require_paths = ["lib", "ext"]

data/test/TypeTest.rb

@@ -23,15 +23,15 @@ class TypeTest < Test::Unit::TestCase
          tx.execute("create table types_table (COL01 integer, "\
                     "COL02 float, COL03 decimal(10,2), "\
                     "COL04 numeric(5,3), COL05 date, COL06 timestamp, "\
-                    "COL07 char(10), COL08 time, COL09 varchar(30))")
+                    "COL07 char(10), COL08 time, COL09 varchar(30), COL10 decimal(9,2))")
       end
          
       cxn.start_transaction do |tx|
          stmt = cxn.create_statement("insert into types_table values "\
-                                       "(?, ?, ?, ?, ?, ?, ?, ?, ?)")
+                                       "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
          stmt.exec([10, 100.2, 2378.65, 192.345,
                            Date.new(2005, 10, 21), Time.new, 'La la la',
-                           Time.new, "Oobly Joobly"], tx)
+                           Time.new, "Oobly Joobly", "2530.70".to_f], tx)
          stmt.close
       end
       cxn.close
@@ -59,6 +59,7 @@ class TypeTest < Test::Unit::TestCase
          assert(row[6].instance_of?(String))
          assert(row[7].instance_of?(Time))
          assert(row[8].instance_of?(String))
+         assert_equal("2530.70".to_f, row[9])
       ensure
          rows.close if rows != nil
          cxn.close if cxn != nil
@@ -81,6 +82,7 @@ class TypeTest < Test::Unit::TestCase
          assert(row[6].instance_of?(String))
          assert(row[7].instance_of?(Time))
          assert(row[8].instance_of?(String))
+         assert_equal("2530.70".to_f, row[9])
       ensure
          rows.close if rows != nil
          cxn.close if cxn != nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyfb
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - George Georgiev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-16 00:00:00 Z
+date: 2012-01-04 00:00:00 Z
 dependencies: []
 
 description: Firebird SQL access library
@@ -91,8 +91,8 @@ files:
 - 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/arel/visitors/rubyfb_15compat.rb
 - lib/mkdoc
 - lib/rubyfb.rb
 - lib/rubyfb_lib.so