fb 0.5.9 → 0.5.10

data/fb.c

@@ -1924,8 +1924,7 @@ static VALUE fb_cursor_fetch(struct FbCursor *fb_cursor)
 				case SQL_SHORT:
 					if (var->sqlscale < 0) {
 						ratio = 1;
-						for (scnt = 0; scnt > var->sqlscale; scnt--)
-							ratio *= 10;
+						for (scnt = 0; scnt > var->sqlscale; scnt--) ratio *= 10;
 						dval = (double)*(short*)var->sqldata/ratio;
 						val = rb_float_new(dval);
 					} else {
@@ -1936,8 +1935,7 @@ static VALUE fb_cursor_fetch(struct FbCursor *fb_cursor)
 				case SQL_LONG:
 					if (var->sqlscale < 0) {
 						ratio = 1;
-						for (scnt = 0; scnt > var->sqlscale; scnt--)
-						ratio *= 10;
+						for (scnt = 0; scnt > var->sqlscale; scnt--) ratio *= 10;
 						dval = (double)*(long*)var->sqldata/ratio;
 						val = rb_float_new(dval);
 					} else {
@@ -1954,7 +1952,14 @@ static VALUE fb_cursor_fetch(struct FbCursor *fb_cursor)
 					break;
 #if HAVE_LONG_LONG
 				case SQL_INT64:
-					val = LL2NUM(*(LONG_LONG*)var->sqldata);
+        				if (var->sqlscale < 0) {
+        					ratio = 1;
+        					for (scnt = 0; scnt > var->sqlscale; scnt--) ratio *= 10;
+        					dval = (double)*(long*)var->sqldata/ratio;
+        					val = rb_float_new(dval);
+        				} else {
+        					val = LL2NUM(*(LONG_LONG*)var->sqldata);
+        				}
 					break;
 #endif
 				case SQL_TIMESTAMP:

data/test/DataTypesTestCases.rb

@@ -68,6 +68,34 @@ class DataTypesTestCases < Test::Unit::TestCase
     i * 100
   end
 
+  def sum_i(range)
+    range.inject(0) { |m, i| m + gen_i(i) }
+  end
+  
+  def sum_si(range)
+    range.inject(0) { |m, i| m + gen_si(i) }
+  end
+
+  def sum_bi(range)
+    range.inject(0) { |m, i| m + gen_bi(i) }
+  end
+  
+  def sum_f(range)
+    range.inject(0) { |m, i| m + gen_f(i) }
+  end
+  
+  def sum_d(range)
+    range.inject(0) { |m, i| m + gen_d(i) }
+  end
+  
+  def sum_n92(range)
+    range.inject(0) { |m, i| m + gen_n92(i) }
+  end
+  
+  def sum_d92(range)
+    range.inject(0) { |m, i| m + gen_d92(i) }
+  end
+
   def test_insert_basic_types
     sql_schema = <<-END
       create table TEST (
@@ -94,6 +122,10 @@ class DataTypesTestCases < Test::Unit::TestCase
         (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
       END
     sql_select = "select * from TEST order by I"
+    sql_sum = "select sum(I), sum(SI), sum(BI), sum(F), sum(D), sum(N92), sum(D92) from TEST"
+    sql_avg = "select avg(I), avg(SI), avg(BI), avg(F), avg(D), avg(N92), avg(D92) from TEST"
+    sql_max = "select max(I), max(SI), max(BI), max(F), max(D), max(N92), max(D92) from TEST"
+    sql_min = "select min(I), min(SI), min(BI), min(F), min(D), min(N92), min(D92) from TEST"
     Database.create(@parms) do |connection|
       connection.execute(sql_schema);
       connection.transaction do
@@ -128,6 +160,42 @@ class DataTypesTestCases < Test::Unit::TestCase
           i += 1
         end
       end
+
+      sums = connection.query(sql_sum).first
+      assert_equal sum_i(0...10), sums[0], "INTEGER"
+      assert_equal sum_si(0...10), sums[1], "SMALLINT"
+      assert_equal sum_bi(0...10), sums[2], "BIGINT"
+      assert_equal sum_f(0...10), sums[3], "FLOAT"
+      assert_equal sum_d(0...10), sums[4], "DOUBLE PRECISION"
+      assert_equal sum_n92(0...10), sums[5], "NUMERIC" # 4500.00
+      assert_equal sum_d92(0...10), sums[6], "DECIMAL" # 4500.00
+
+      avgs = connection.query(sql_avg).first
+      assert_equal sum_i(0...10) / 10, avgs[0], "INTEGER"
+      assert_equal sum_si(0...10) / 10, avgs[1], "SMALLINT"
+      assert_equal sum_bi(0...10) / 10, avgs[2], "BIGINT"
+      assert_equal sum_f(0...10) / 10, avgs[3], "FLOAT"
+      assert_equal sum_d(0...10) / 10, avgs[4], "DOUBLE PRECISION"
+      assert_equal sum_n92(0...10) / 10, avgs[5], "NUMERIC" # 450.00
+      assert_equal sum_d92(0...10) / 10, avgs[6], "DECIMAL" # 450.00
+
+      maxs = connection.query(sql_max).first
+      assert_equal gen_i(9), maxs[0], "INTEGER"
+      assert_equal gen_si(9), maxs[1], "SMALLINT"
+      assert_equal gen_bi(9), maxs[2], "BIGINT"
+      assert_equal gen_f(9), maxs[3], "FLOAT"
+      assert_equal gen_d(9), maxs[4], "DOUBLE PRECISION"
+      assert_equal gen_n92(9), maxs[5], "NUMERIC"
+      assert_equal gen_d92(9), maxs[6], "DECIMAL"
+
+      mins = connection.query(sql_min).first
+      assert_equal gen_i(0), mins[0], "INTEGER"
+      assert_equal gen_si(0), mins[1], "SMALLINT"
+      assert_equal gen_bi(0), mins[2], "BIGINT"
+      assert_equal gen_f(0), mins[3], "FLOAT"
+      assert_equal gen_d(0), mins[4], "DOUBLE PRECISION"
+      assert_equal gen_n92(0), mins[5], "NUMERIC"
+      assert_equal gen_d92(0), mins[6], "DECIMAL"
       connection.drop
     end
   end

data/test/FbTestCases.rb

@@ -8,7 +8,7 @@ module FbTestCases
   def setup
     @db_file = case RUBY_PLATFORM
       when /win32/ then 'c:/var/fbdata/drivertest.fdb'
-      when /darwin/ then '/var/fbdata/drivertest.fdb'
+      when /darwin/ then File.join(File.expand_path(File.dirname(__FILE__)), 'drivertest.fdb')
       else '/var/fbdata/drivertest.fdb'
     end
     @db_host = 'localhost'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fb
 version: !ruby/object:Gem::Version 
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors: 
 - Brent Rowland
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-19 00:00:00 -07:00
+date: 2009-05-26 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,8 @@ files:
 - test/TransactionTestCases.rb
 has_rdoc: true
 homepage: http://www.rowlandresearch.com/ruby/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -59,9 +61,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - Firebird client library fbclient.dll
 rubyforge_project: fblib
-rubygems_version: 1.3.1
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Firebird and Interbase driver
 test_files: 
 - test/FbTestSuite.rb