rubyfb 0.6 → 0.6.1

data/Rakefile

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

data/ext/TypeMap.c

@@ -57,6 +57,27 @@ void populateDateField(VALUE, XSQLVAR *);
 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);
+    // 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);
+}
+
+VALUE sql_unscale(VALUE value, XSQLVAR *field) {
+  if(field->sqlscale == 0) {
+    return value;
+  }
+  return rb_float_new(
+    NUM2DBL(rb_funcall(value, rb_intern("to_f"), 0)) / pow(10, abs(field->sqlscale))
+  );
+}
+
 /**
  * This function converts a single XSQLVAR entry to a Ruby VALUE type.
  *
@@ -129,38 +150,17 @@ VALUE toValue(XSQLVAR *entry,
       break;
 
     case SQL_INT64:       /* Type: DECIMAL, NUMERIC */
-      if(entry->sqlscale != 0) {
-        double divisor  = pow(10, abs(entry->sqlscale));
-
-        actual = *((long long *)entry->sqldata);
-        rb_ary_push(value, rb_float_new(actual / divisor));
-      } else {
-        rb_ary_push(value, LL2NUM(*((long long *)entry->sqldata)));
-      }
+      rb_ary_push(value, sql_unscale(LL2NUM(*((long long *)entry->sqldata)), entry));
       rb_ary_push(value, getColumnType(entry));
       break;
 
     case SQL_LONG:       /* Type: INTEGER, DECIMAL, NUMERIC */
-      if(entry->sqlscale != 0) {
-        double divisor  = pow(10, abs(entry->sqlscale));
-
-        actual = *((int32_t *)entry->sqldata);
-        rb_ary_push(value, rb_float_new(actual / divisor));
-      } else {
-        rb_ary_push(value, LONG2NUM(*((int32_t *)entry->sqldata)));
-      }
+      rb_ary_push(value, sql_unscale(LONG2NUM(*((int32_t *)entry->sqldata)), entry));
       rb_ary_push(value, getColumnType(entry));
       break;
 
     case SQL_SHORT:       /* Type: SMALLINT, DECIMAL, NUMERIC */
-      if(entry->sqlscale != 0) {
-        double divisor  = pow(10, abs(entry->sqlscale));
-
-        actual = *((short *)entry->sqldata);
-        rb_ary_push(value, rb_float_new(actual / divisor));
-      } else {
-        rb_ary_push(value, INT2NUM(*((short *)entry->sqldata)));
-      }
+      rb_ary_push(value, sql_unscale(INT2NUM(*((short *)entry->sqldata)), entry));
       rb_ary_push(value, getColumnType(entry));
       break;
 
@@ -865,21 +865,7 @@ void populateFloatField(VALUE value, XSQLVAR *field) {
  *
  */
 void populateInt64Field(VALUE value, XSQLVAR *field) {
-  VALUE actual = value;
-  long long store  = 0;
-
-  if(TYPE(value) == T_STRING) {
-    if(field->sqlscale != 0) {
-      actual = rb_funcall(value, rb_intern("to_f"), 0);
-    } else {
-      actual = rb_funcall(value, rb_intern("to_i"), 0);
-    }
-  }
-  if(field->sqlscale != 0) {
-    actual = rb_funcall(actual, rb_intern("*"), 1, INT2NUM((long)pow(10, abs(field->sqlscale))));
-  }
-  store = NUM2LL(actual);
-  memcpy(field->sqldata, &store, field->sqllen);
+  *((long long *)field->sqldata) = sql_scale(value, field);
   field->sqltype = SQL_INT64;
 }
 
@@ -893,29 +879,7 @@ void populateInt64Field(VALUE value, XSQLVAR *field) {
  *
  */
 void populateLongField(VALUE value, XSQLVAR *field) {
-  VALUE actual = Qnil;
-  long long full   = 0;
-  long store  = 0;
-
-  if(rb_obj_is_kind_of(value, rb_cInteger)) {
-    actual = value;
-  } else if(TYPE(value) == T_FLOAT) {
-    double number = NUM2DBL(value);
-
-    if(field->sqlscale != 0) {
-      number = number * pow(10, abs(field->sqlscale));
-      actual = INT2NUM((long)number);
-    }
-  } else if(TYPE(value) == T_STRING) {
-    actual = rb_funcall(value, rb_intern("to_i"), 0);
-  } else {
-    rb_fireruby_raise(NULL,
-                      "Error converting input parameter to long integer.");
-  }
-
-  full  = TYPE(actual) == T_FIXNUM ? FIX2INT(actual) : NUM2INT(actual);
-  store = (long)full;
-  memcpy(field->sqldata, &store, field->sqllen);
+  *((long *)field->sqldata) = sql_scale(value, field);
   field->sqltype = SQL_LONG;
 }
 
@@ -929,29 +893,7 @@ void populateLongField(VALUE value, XSQLVAR *field) {
  *
  */
 void populateShortField(VALUE value, XSQLVAR *field) {
-  VALUE actual = Qnil;
-  long long full   = 0;
-  short store  = 0;
-
-  if(rb_obj_is_kind_of(value, rb_cInteger)) {
-    actual = value;
-  } else if(TYPE(value) == T_FLOAT) {
-    double number = NUM2DBL(value);
-
-    if(field->sqlscale != 0) {
-      number = number * pow(10, abs(field->sqlscale));
-      actual = INT2NUM((long)number);
-    }
-  } else if(TYPE(value) == T_STRING) {
-    actual = rb_funcall(value, rb_intern("to_i"), 0);
-  } else {
-    rb_fireruby_raise(NULL,
-                      "Error converting input parameter to short integer.");
-  }
-
-  full  = TYPE(actual) == T_FIXNUM ? FIX2INT(actual) : NUM2INT(actual);
-  store = (short)full;
-  memcpy(field->sqldata, &store, field->sqllen);
+  *((short *)field->sqldata) = sql_scale(value, field);
   field->sqltype = SQL_SHORT;
 }
 

data/lib/active_record/connection_adapters/rubyfb_adapter.rb

@@ -74,7 +74,10 @@ module ActiveRecord
   
   #FIXME ugly - but ... https://github.com/rails/rails/issues/1623
   module FinderMethods
+    alias :rubyfb_exists_save :exists?
     def exists?(id = nil)
+      return rubyfb_exists_save(id) unless ActiveRecord::VERSION::MAJOR >= 3 && (ActiveRecord::VERSION::MINOR > 0 || ActiveRecord::VERSION::TINY >= 9)
+
       id = id.id if ActiveRecord::Base === id
 
       join_dependency = construct_join_dependency_for_association_find

data/rubyfb.gemspec

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{rubyfb}
-  s.version = "0.6"
+  s.name = "rubyfb"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{George Georgiev}]
-  s.date = %q{2011-08-22}
-  s.description = %q{Firebird SQL access library}
-  s.email = %q{georgiev@heatbs.com}
-  s.extensions = [%q{ext/extconf.rb}]
-  s.extra_rdoc_files = [%q{CHANGELOG}, %q{LICENSE}, %q{README}, %q{examples/example01.rb}, %q{ext/extconf.rb}, %q{lib/Connection.rb}, %q{lib/ProcedureCall.rb}, %q{lib/SQLType.rb}, %q{lib/rubyfb.rb}, %q{lib/rubyfb_options.rb}, %q{lib/src.rb}]
-  s.files = [%q{CHANGELOG}, %q{LICENSE}, %q{Manifest}, %q{README}, %q{Rakefile}, %q{examples/example01.rb}, %q{ext/AddUser.c}, %q{ext/AddUser.h}, %q{ext/Backup.c}, %q{ext/Backup.h}, %q{ext/Blob.c}, %q{ext/Blob.h}, %q{ext/Common.c}, %q{ext/Common.h}, %q{ext/Connection.c}, %q{ext/Connection.h}, %q{ext/DataArea.c}, %q{ext/DataArea.h}, %q{ext/Database.c}, %q{ext/Database.h}, %q{ext/FireRuby.c}, %q{ext/FireRuby.h}, %q{ext/FireRubyException.c}, %q{ext/FireRubyException.h}, %q{ext/Generator.c}, %q{ext/Generator.h}, %q{ext/RemoveUser.c}, %q{ext/RemoveUser.h}, %q{ext/Restore.c}, %q{ext/Restore.h}, %q{ext/ResultSet.c}, %q{ext/ResultSet.h}, %q{ext/Row.c}, %q{ext/Row.h}, %q{ext/ServiceManager.c}, %q{ext/ServiceManager.h}, %q{ext/Services.c}, %q{ext/Services.h}, %q{ext/Statement.c}, %q{ext/Statement.h}, %q{ext/Transaction.c}, %q{ext/Transaction.h}, %q{ext/TypeMap.c}, %q{ext/TypeMap.h}, %q{ext/extconf.rb}, %q{ext/rfbint.h}, %q{ext/rfbsleep.h}, %q{ext/rfbstr.c}, %q{ext/rfbstr.h}, %q{ext/uncrustify.cfg}, %q{lib/Connection.rb}, %q{lib/ProcedureCall.rb}, %q{lib/SQLType.rb}, %q{lib/active_record/connection_adapters/rubyfb_adapter.rb}, %q{lib/arel/visitors/rubyfb.rb}, %q{lib/arel/visitors/rubyfb_15compat.rb}, %q{lib/mkdoc}, %q{lib/rubyfb.rb}, %q{lib/rubyfb_lib.so}, %q{lib/rubyfb_options.rb}, %q{lib/src.rb}, %q{mswin32fb/fbclient_mingw.def}, %q{mswin32fb/fbclient_mingw.lib}, %q{mswin32fb/fbclient_ms.lib}, %q{mswin32fb/ibase.h}, %q{mswin32fb/iberror.h}, %q{test/AddRemoveUserTest.rb}, %q{test/BackupRestoreTest.rb}, %q{test/BlobTest.rb}, %q{test/CharacterSetTest.rb}, %q{test/ConnectionTest.rb}, %q{test/DDLTest.rb}, %q{test/DatabaseTest.rb}, %q{test/FieldCharacterSetTest.rb}, %q{test/GeneratorTest.rb}, %q{test/KeyTest.rb}, %q{test/ResultSetTest.rb}, %q{test/RoleTest.rb}, %q{test/RowCountTest.rb}, %q{test/RowTest.rb}, %q{test/SQLTest.rb}, %q{test/SQLTypeTest.rb}, %q{test/ServiceManagerTest.rb}, %q{test/StatementTest.rb}, %q{test/StoredProcedureTest.rb}, %q{test/TestSetup.rb}, %q{test/TransactionTest.rb}, %q{test/TypeTest.rb}, %q{rubyfb.gemspec}]
-  s.homepage = %q{http://rubyforge.org/projects/rubyfb}
-  s.rdoc_options = [%q{--line-numbers}, %q{--inline-source}, %q{--title}, %q{Rubyfb}, %q{--main}, %q{README}]
-  s.require_paths = [%q{lib}, %q{ext}]
-  s.rubyforge_project = %q{rubyfb}
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{Firebird SQL access library}
+  s.authors = ["George Georgiev"]
+  s.date = "2011-10-16"
+  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.homepage = "http://rubyforge.org/projects/rubyfb"
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rubyfb", "--main", "README"]
+  s.require_paths = ["lib", "ext"]
+  s.rubyforge_project = "rubyfb"
+  s.rubygems_version = "1.8.10"
+  s.summary = "Firebird SQL access library"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/SQLTest.rb

@@ -90,11 +90,11 @@ class SQLTest < Test::Unit::TestCase
       r = @transactions[0].execute("SELECT * FROM TEST_TABLE WHERE TESTID IN "\
                                    "(2, 4, 6, 8, 10) ORDER BY TESTID ASCENDING")
       a = r.fetch
-      assert(a[0] == 2)
-      assert(a[1] == '3.0')
-      assert(a[2] == 3.0)
-      assert(a[3] == nil)
-      assert(a[4] == nil)
+      assert_equal(2, a[0])
+      assert_equal('3.0', a[1])
+      assert_equal(3.0, a[2])
+      assert_nil(a[3])
+      assert_nil(a[4])
 
       a = r.fetch
       assert(a[0] == 4)
@@ -155,14 +155,15 @@ class SQLTest < Test::Unit::TestCase
          s.close
          
          # Fetch the record and check the data.
-         r = tx.execute("SELECT TESTTEXT, TESTFLOAT, TESTSTAMP FROM "\
+         r = tx.execute("SELECT TESTTEXT, TESTFLOAT, TESTSTAMP, cast(TESTFLOAT as varchar(20)) as TESTFLOAT_TXT FROM "\
                         "TEST_TABLE WHERE TESTID = 25000")
          a = r.fetch
          r.close
       end
-      assert(a[0] == 'La la la')
-      assert(a[1] == 3.14)
-      assert(a[2].to_i == t.to_i)
+      assert_equal('3.14', a[3])
+      assert_equal('La la la', a[0])
+      assert_equal(3.14, a[1])
+      assert_equal(t.to_i, a[2].to_i)
       
       @connections[0].execute_immediate("DELETE FROM TEST_TABLE WHERE TESTID "\
                                         "IN (1, 3, 5, 7, 9, 12, 14, 16, 18, 20)")

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyfb
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 6
-  version: "0.6"
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - George Georgiev
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 Z
+date: 2011-10-16 00:00:00 Z
 dependencies: []
 
 description: Firebird SQL access library
@@ -161,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubyfb
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Firebird SQL access library