fb 0.7.2 → 0.7.3

data/fb.c

@@ -22,23 +22,6 @@
 
 #include "ruby.h"
 
-/* Ensure compatibility with early releases of Ruby 1.8.5 */
-#ifndef RSTRING_PTR
-#  define RSTRING_PTR(v) RSTRING(v)->ptr
-#endif
-
-#ifndef RSTRING_LEN
-#  define RSTRING_LEN(v) RSTRING(v)->len
-#endif
-
-#ifndef RARRAY_PTR
-#  define RARRAY_PTR(v) RARRAY(v)->ptr
-#endif
-
-#ifndef RARRAY_LEN
-#  define RARRAY_LEN(v) RARRAY(v)->len
-#endif
-
 #ifdef HAVE_RUBY_REGEX_H
 #  include "ruby/re.h"
 #else
@@ -48,18 +31,8 @@
 // this sucks. but for some reason these moved around between 1.8 and 1.9
 #ifdef ONIGURUMA_H
 #define IGNORECASE ONIG_OPTION_IGNORECASE
-#define MULTILINE ONIG_OPTION_MULTILINE
-#define EXTENDED ONIG_OPTION_EXTEND
 #else
 #define IGNORECASE RE_OPTION_IGNORECASE
-#define MULTILINE RE_OPTION_MULTILINE
-#define EXTENDED RE_OPTION_EXTENDED
-#endif
-
-// this sucks too.
-#ifndef RREGEXP_SRC_PTR
-#define RREGEXP_SRC_PTR(r) RREGEXP(r)->str
-#define RREGEXP_SRC_LEN(r) RREGEXP(r)->len
 #endif
 
 #include <stdio.h>
@@ -1645,7 +1618,7 @@ static void fb_cursor_set_inputparams(struct FbCursor *fb_cursor, long argc, VAL
 					*(double *)var->sqldata = dvalue;
 					offset += alignment;
 					break;
-#if HAVE_LONG_LONG
+
 				case SQL_INT64 :
 					offset = FB_ALIGN(offset, alignment);
 					var->sqldata = (char *)(fb_cursor->i_buffer + offset);
@@ -1669,7 +1642,7 @@ static void fb_cursor_set_inputparams(struct FbCursor *fb_cursor, long argc, VAL
 					*(ISC_INT64 *)var->sqldata = llvalue;
 					offset += alignment;
 					break;
-#endif
+
 				case SQL_BLOB :
 					offset = FB_ALIGN(offset, alignment);
 					var->sqldata = (char *)(fb_cursor->i_buffer + offset);
@@ -2062,18 +2035,18 @@ static VALUE fb_cursor_fetch(struct FbCursor *fb_cursor)
 				case SQL_DOUBLE:
 					val = rb_float_new(*(double*)var->sqldata);
 					break;
-#if HAVE_LONG_LONG
+
 				case SQL_INT64:
         				if (var->sqlscale < 0) {
         					ratio = 1;
         					for (scnt = 0; scnt > var->sqlscale; scnt--) ratio *= 10;
-        					dval = (double)*(long*)var->sqldata/ratio;
+        					dval = (double)*(ISC_INT64*)var->sqldata/ratio;
         					val = rb_float_new(dval);
         				} else {
-        					val = LL2NUM(*(LONG_LONG*)var->sqldata);
+        					val = LL2NUM(*(ISC_INT64*)var->sqldata);
         				}
 					break;
-#endif
+
 				case SQL_TIMESTAMP:
 					isc_decode_timestamp((ISC_TIMESTAMP *)var->sqldata, &tms);
 					val = fb_mktime(&tms, "local");

data/test/DataTypesTestCases.rb

@@ -65,7 +65,7 @@ class DataTypesTestCases < Test::Unit::TestCase
   end
 
   def gen_d92(i)
-    i * 100
+    i * 10000
   end
 
   def sum_i(range)
@@ -114,13 +114,14 @@ class DataTypesTestCases < Test::Unit::TestCase
         TS TIMESTAMP,
         N92 NUMERIC(9,2),
         D92 DECIMAL(9,2),
-        N154 NUMERIC(15,4));
+        N154 NUMERIC(15,4),
+	D185 DECIMAL(18,5));
       END
     sql_insert = <<-END
       insert into test 
-        (I, SI, BI, F, D, C, C10, VC, VC10, VC10000, DT, TM, TS, N92, D92, N154) 
+        (I, SI, BI, F, D, C, C10, VC, VC10, VC10000, DT, TM, TS, N92, D92, N154, D185)
         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), sum(N154) from TEST"
@@ -137,7 +138,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_n92(i), gen_d92(i), gen_n92(i), gen_d92(i))
         end
       end
       connection.execute(sql_select) do |cursor|
@@ -159,6 +160,7 @@ class DataTypesTestCases < Test::Unit::TestCase
           assert_equal gen_n92(i), row["N92"], "NUMERIC"
           assert_equal gen_d92(i), row["D92"], "DECIMAL"
           assert_equal gen_n92(i), row["N154"], "NUMERIC"
+          assert_equal gen_d92(i), row["D185"], "DECIMAL"
           i += 1
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fb
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies: []
 description: Ruby Firebird Extension Library
 email: rowland@rowlandresearch.com