fb 0.6.3 → 0.6.5

data/fb.c

@@ -1453,6 +1453,7 @@ static void fb_cursor_set_inputparams(struct FbCursor *fb_cursor, int argc, VALU
 	short dtp;
 	VALUE obj;
 	long lvalue;
+	ISC_INT64 llvalue;
 	long alignment;
 	double ratio;
 	double dvalue;
@@ -1590,8 +1591,20 @@ static void fb_cursor_set_inputparams(struct FbCursor *fb_cursor, int argc, VALU
 				case SQL_INT64 :
 					offset = FB_ALIGN(offset, alignment);
 					var->sqldata = (char *)(fb_cursor->i_buffer + offset);
-					obj = ll_from_obj(obj);
-					*(ISC_INT64 *)var->sqldata = NUM2LL(obj);
+
+					if (var->sqlscale < 0) {
+						ratio = 1;
+						for (scnt = 0; scnt > var->sqlscale; scnt--)
+							ratio *= 10;
+						obj = double_from_obj(obj);
+						dvalue = NUM2DBL(obj) * ratio;
+						llvalue = (ISC_INT64)(dvalue + 0.5);
+					} else {
+						obj = ll_from_obj(obj);
+						llvalue = NUM2LL(obj);
+					}
+
+					*(ISC_INT64 *)var->sqldata = llvalue;
 					offset += alignment;
 					break;
 #endif
@@ -2887,7 +2900,7 @@ static VALUE hash_from_connection_string(VALUE cs)
 
 static void check_page_size(int page_size)
 {
-	if (page_size != 1024 && page_size != 2048 && page_size != 4096 && page_size != 8192) {
+	if (page_size != 1024 && page_size != 2048 && page_size != 4096 && page_size != 8192 && page_size != 16384) {
 		rb_raise(rb_eFbError, "Invalid page size: %d", page_size);
 	}
 }

data/test/DataTypesTestCases.rb

@@ -113,19 +113,20 @@ class DataTypesTestCases < Test::Unit::TestCase
         TM TIME,
         TS TIMESTAMP,
         N92 NUMERIC(9,2),
-        D92 DECIMAL(9,2));
+        D92 DECIMAL(9,2),
+        N154 NUMERIC(15,4));
       END
     sql_insert = <<-END
       insert into test 
-        (I, SI, BI, F, D, C, C10, VC, VC10, VC10000, DT, TM, TS, N92, D92) 
+        (I, SI, BI, F, D, C, C10, VC, VC10, VC10000, DT, TM, TS, N92, D92, N154) 
         values
-        (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
+        (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
       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"
+    sql_sum = "select sum(I), sum(SI), sum(BI), sum(F), sum(D), sum(N92), sum(D92), sum(N154) from TEST"
+    sql_avg = "select avg(I), avg(SI), avg(BI), avg(F), avg(D), avg(N92), avg(D92), avg(N154) from TEST"
+    sql_max = "select max(I), max(SI), max(BI), max(F), max(D), max(N92), max(D92), max(N154) from TEST"
+    sql_min = "select min(I), min(SI), min(BI), min(F), min(D), min(N92), min(D92), min(N154) from TEST"
     Database.create(@parms) do |connection|
       connection.execute(sql_schema);
       connection.transaction do
@@ -136,7 +137,7 @@ class DataTypesTestCases < Test::Unit::TestCase
             gen_f(i), gen_d(i),
             gen_c(i), gen_c10(i), gen_vc(i), gen_vc10(i), gen_vc10000(i), 
             gen_dt(i), gen_tm(i), gen_ts(i),
-            gen_n92(i), gen_d92(i))
+            gen_n92(i), gen_d92(i), gen_n92(i))
         end
       end
       connection.execute(sql_select) do |cursor|
@@ -157,6 +158,7 @@ class DataTypesTestCases < Test::Unit::TestCase
           assert_equal gen_ts(i), row["TS"], "TIMESTAMP"
           assert_equal gen_n92(i), row["N92"], "NUMERIC"
           assert_equal gen_d92(i), row["D92"], "DECIMAL"
+          assert_equal gen_n92(i), row["N154"], "NUMERIC"
           i += 1
         end
       end
@@ -169,6 +171,7 @@ class DataTypesTestCases < Test::Unit::TestCase
       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
+      assert_equal sum_n92(0...10), sums[7], "NUMERIC" # 4500.00
 
       avgs = connection.query(sql_avg).first
       assert_equal sum_i(0...10) / 10, avgs[0], "INTEGER"
@@ -178,6 +181,7 @@ class DataTypesTestCases < Test::Unit::TestCase
       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
+      assert_equal sum_n92(0...10) / 10, avgs[7], "NUMERIC" # 450.00
 
       maxs = connection.query(sql_max).first
       assert_equal gen_i(9), maxs[0], "INTEGER"
@@ -187,6 +191,7 @@ class DataTypesTestCases < Test::Unit::TestCase
       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"
+      assert_equal gen_n92(9), maxs[7], "NUMERIC"
 
       mins = connection.query(sql_min).first
       assert_equal gen_i(0), mins[0], "INTEGER"
@@ -196,6 +201,7 @@ class DataTypesTestCases < Test::Unit::TestCase
       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"
+      assert_equal gen_n92(0), mins[7], "NUMERIC"
       connection.drop
     end
   end
@@ -380,8 +386,8 @@ class DataTypesTestCases < Test::Unit::TestCase
   end
 
   def test_insert_correct_types
-    cols = %w{ I SI BI F D C C10 VC VC10 VC10000 DT TM TS N92 D92 }
-    types = %w{ INTEGER SMALLINT BIGINT FLOAT DOUBLE\ PRECISION CHAR CHAR(10) VARCHAR(1) VARCHAR(10) VARCHAR(10000) DATE TIME TIMESTAMP NUMERIC(9,2) DECIMAL(9,2) }
+    cols = %w{ I SI BI F D C C10 VC VC10 VC10000 DT TM TS N92 D92 N154 }
+    types = %w{ INTEGER SMALLINT BIGINT FLOAT DOUBLE\ PRECISION CHAR CHAR(10) VARCHAR(1) VARCHAR(10) VARCHAR(10000) DATE TIME TIMESTAMP NUMERIC(9,2) DECIMAL(9,2) NUMERIC(15,4) }
     sql_schema = "";
     assert_equal cols.size, types.size
     cols.size.times do |i|
@@ -488,6 +494,13 @@ class DataTypesTestCases < Test::Unit::TestCase
           # puts vals.inspect
           assert_equal 12345.12, vals[0][0], "DECIMAL (decimal)"
           assert_equal 12345.12, vals[1][0], "DECIMAL (string)"
+        elsif cols[i] == 'N154'
+          connection.execute(sql_insert, 12345.12)
+          connection.execute(sql_insert, "12345.12")
+          vals = connection.query(sql_select)
+          # puts vals.inspect
+          assert_equal 12345.12, vals[0][0], "NUMERIC (decimal)"
+          assert_equal 12345.12, vals[1][0], "NUMERIC (string)"
         end
       end
       connection.drop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fb
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.5
 platform: ruby
 authors: 
 - Brent Rowland
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-10 00:00:00 -07:00
+date: 2009-09-26 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -35,6 +35,8 @@ files:
 - test/TransactionTestCases.rb
 has_rdoc: true
 homepage: http://github.com/rowland/fb
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -60,9 +62,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - Firebird client library fbclient.dll, libfbclient.so or Firebird.framework.
 rubyforge_project: fblib
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Firebird and Interbase driver
 test_files: 
 - test/FbTestSuite.rb