rubyfb 0.5.8 → 0.5.9

data/Manifest

@@ -45,6 +45,8 @@ 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
@@ -69,6 +71,7 @@ test/CharacterSetTest.rb
 test/ConnectionTest.rb
 test/DDLTest.rb
 test/DatabaseTest.rb
+test/FieldCharacterSetTest.rb
 test/GeneratorTest.rb
 test/KeyTest.rb
 test/ResultSetTest.rb

data/Rakefile

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

data/ext/Blob.c

@@ -27,6 +27,7 @@
 #include "Blob.h"
 #include <limits.h>
 #include "Common.h"
+#include "rfbstr.h"
 
 /* Function prototypes. */
 static VALUE allocateBlob(VALUE);
@@ -67,12 +68,14 @@ static VALUE allocateBlob(VALUE klass) {
 /**
  * This function provides the initialize method for the Blob class.
  *
- * @param  self  A reference to the Blob object to be initialized.
+ * @param  self       A reference to the Blob object to be initialized.
+ * @param  connection A reference to the Connection object owning the blob.
  *
  * @return  A reference to the newly initialized Blob object.
  *
  */
-VALUE initializeBlob(VALUE self) {
+VALUE initializeBlob(VALUE self, VALUE connection) {
+  rb_iv_set(self, "@connection", connection);
   rb_iv_set(self, "@data", Qnil);
   return(self);
 }
@@ -89,6 +92,7 @@ VALUE initializeBlob(VALUE self) {
  */
 static VALUE getBlobData(VALUE self) {
   VALUE data = rb_iv_get(self, "@data");
+  VALUE connection = rb_iv_get(self, "@connection");
 
   if(data == Qnil) {
     BlobHandle *blob   = NULL;
@@ -98,7 +102,7 @@ static VALUE getBlobData(VALUE self) {
       char *buffer = loadBlobData(blob);
 
       if(buffer != NULL) {
-        data = rb_str_new(buffer, blob->size);
+        data = rfbstr(connection, blob->charset, buffer, blob->size);
       }
       free(buffer);
     }
@@ -154,6 +158,7 @@ static VALUE eachBlobSegment(VALUE self) {
   VALUE result = Qnil;
 
   if(rb_block_given_p()) {
+    VALUE connection = rb_iv_get(self, "@connection");
     BlobHandle     *blob    = NULL;
     char           *segment = NULL;
     unsigned short size     = 0;
@@ -161,7 +166,7 @@ static VALUE eachBlobSegment(VALUE self) {
     Data_Get_Struct(self, BlobHandle, blob);
     segment = loadBlobSegment(blob, &size);
     while(segment != NULL) {
-      result = rb_yield(rb_str_new(segment, size));
+      result = rb_yield(rfbstr(connection, blob->charset, segment, size));
       free(segment);
       segment = loadBlobSegment(blob, &size);
     }
@@ -175,7 +180,7 @@ static VALUE eachBlobSegment(VALUE self) {
  * This function allocates a BlobHandle structure and opens the structure for
  * use.
  *
- * @param  blobId       The unique identifier for the blob to be opened.
+ * @param  blobEntry    The blob SQLVAR data.
  * @param  table        The name of the table containing the blob being opened.
  * @param  column       The name of the column in the table that contains the
  *                      blob.
@@ -185,7 +190,7 @@ static VALUE eachBlobSegment(VALUE self) {
  * @return  A pointer to an allocated and opened BlobHandle structure.
  *
  */
-BlobHandle *openBlob(ISC_QUAD blobId,
+BlobHandle *openBlob(XSQLVAR *blobEntry,
                      char *table,
                      char *column,
                      VALUE connection,
@@ -194,6 +199,7 @@ BlobHandle *openBlob(ISC_QUAD blobId,
   TransactionHandle *tHandle    = NULL;
   Data_Get_Struct(connection, ConnectionHandle, cHandle);
   Data_Get_Struct(transaction, TransactionHandle, tHandle);
+  ISC_QUAD blobId = *(ISC_QUAD *)blobEntry->sqldata;
                      
   BlobHandle *blob = ALLOC(BlobHandle);
 
@@ -202,6 +208,7 @@ BlobHandle *openBlob(ISC_QUAD blobId,
 
     /* Extract the blob details and open it. */
     blob->handle = 0;
+    blob->charset = blobEntry->sqlscale;
     isc_blob_default_desc(&blob->description,
                           (unsigned char *)table,
                           (unsigned char *)column);
@@ -365,7 +372,7 @@ void blobFree(void *blob) {
 void Init_Blob(VALUE module) {
   cBlob = rb_define_class_under(module, "Blob", rb_cObject);
   rb_define_alloc_func(cBlob, allocateBlob);
-  rb_define_method(cBlob, "initialize", initializeBlob, 0);
+  rb_define_method(cBlob, "initialize", initializeBlob, 1);
   rb_define_method(cBlob, "initialize_copy", forbidObjectCopy, 1);
   rb_define_method(cBlob, "to_s", getBlobData, 0);
   rb_define_method(cBlob, "close", closeBlob, 0);

data/ext/Blob.h

@@ -42,25 +42,27 @@
   #include "Connection.h"
   #include "Transaction.h"
 
+#include "rfbint.h"
 /* Type definitions. */
 typedef struct {
   ISC_BLOB_DESC description;
   ISC_LONG segments,
            size;
   isc_blob_handle handle;
+  short charset;
 } BlobHandle;
 
 /* Data elements. */
 extern VALUE cBlob;
 
 /* Function prototypes. */
-BlobHandle *openBlob(ISC_QUAD,
+BlobHandle *openBlob(XSQLVAR *,
                      char *,
                      char *,
                      VALUE,
                      VALUE);
 void Init_Blob(VALUE);
 void blobFree(void *);
-VALUE initializeBlob(VALUE);
+VALUE initializeBlob(VALUE, VALUE);
 
 #endif /* FIRERUBY_BLOB_H */

data/ext/TypeMap.c

@@ -35,6 +35,7 @@
 #include "Statement.h"
 #include "FireRuby.h"
 #include "rfbint.h"
+#include "rfbstr.h"
 
 /* Function prototypes. */
 VALUE createDate(const struct tm *);
@@ -56,32 +57,6 @@ void populateDateField(VALUE, XSQLVAR *);
 void populateTimeField(VALUE, XSQLVAR *);
 void populateTimestampField(VALUE, XSQLVAR *);
 
-
-/**
- * This function converts a sql data into ruby string
- * respecting data encoding
- *
- * @param connection  The connection object relating to the data
- * @param sqlsubtype  SQL subtype of the field (fot character types - used to hold encoding information)
- * @param data  A pointer to the sql data
- * @param length  Length of the sql data
- *
- * @return  A Ruby String object with correct encoding
- *
- */
-VALUE createString(VALUE connection, short sqlsubtype, const char *data, short length) {
-  VALUE value = Qnil;
-  if (length >= 0) {
-    char *array  = ALLOC_N(char, length + 1);
-    memcpy(array, data, length);
-    array[length] = 0;
-    value = rb_str_new2(array);
-    free(array);
-    value = rb_funcall(connection, rb_intern("force_encoding"), 2, value, INT2FIX(sqlsubtype));
-  }
-  return value;
-}
-
 /**
  * This function converts a single XSQLVAR entry to a Ruby VALUE type.
  *
@@ -122,10 +97,10 @@ VALUE toValue(XSQLVAR *entry,
       memset(table, 0, 256);
       memcpy(column, entry->sqlname, entry->sqlname_length);
       memcpy(table, entry->relname, entry->relname_length);
-      blob = openBlob(*(ISC_QUAD *)entry->sqldata, column, table, connection,
+      blob = openBlob(entry, column, table, connection,
                       transaction);
       working = Data_Wrap_Struct(cBlob, NULL, blobFree, blob);
-      rb_ary_push(value, initializeBlob(working));
+      rb_ary_push(value, initializeBlob(working, connection));
       rb_ary_push(value, getColumnType(entry));
       break;
 
@@ -190,7 +165,7 @@ VALUE toValue(XSQLVAR *entry,
       break;
 
     case SQL_TEXT:       /* Type: CHAR */
-      rb_ary_push(value, createString(connection, entry->sqlsubtype, entry->sqldata, entry->sqllen));
+      rb_ary_push(value, rfbstr(connection, entry->sqlsubtype, entry->sqldata, entry->sqllen));
       rb_ary_push(value, getColumnType(entry));
       break;
 
@@ -211,7 +186,7 @@ VALUE toValue(XSQLVAR *entry,
 
     case SQL_VARYING:
       memcpy(&length, entry->sqldata, 2);
-      rb_ary_push(value, createString(connection, entry->sqlsubtype, &entry->sqldata[2], length));
+      rb_ary_push(value, rfbstr(connection, entry->sqlsubtype, &entry->sqldata[2], length));
       rb_ary_push(value, getColumnType(entry));
       break;
 
@@ -731,21 +706,23 @@ void storeBlob(VALUE info,
   ISC_STATUS status[ISC_STATUS_LENGTH];
   isc_blob_handle handle  = 0;
   ISC_QUAD        *blobId = (ISC_QUAD *)field->sqldata;
+  char *data   = StringValuePtr(info);
   VALUE number  = rb_funcall(info, rb_intern("length"), 0);
-  long length  = 0;
-  char            *data   = StringValuePtr(info);
-
-  length = TYPE(number) == T_FIXNUM ? FIX2INT(number) : NUM2INT(number);
+  long charLength = TYPE(number) == T_FIXNUM ? FIX2INT(number) : NUM2INT(number);
+  long byteLength = strlen(data);
+  short charSize = byteLength/charLength;
   field->sqltype = SQL_BLOB;
+
   if(isc_create_blob(status, &connection->handle, &transaction->handle,
                      &handle, blobId) == 0) {
     long offset = 0;
     unsigned short size   = 0;
 
-    while(offset < length) {
+    while(offset < byteLength) {
       char *buffer = &data[offset];
 
-      size = (length - offset) > USHRT_MAX ? USHRT_MAX : length - offset;
+      size = (byteLength - offset) > USHRT_MAX ? USHRT_MAX : byteLength - offset;
+      size = (size/charSize)*charSize; // align
       if(isc_put_segment(status, &handle, size, buffer) != 0) {
         ISC_STATUS other[20];
 
@@ -991,7 +968,7 @@ void populateTextField(VALUE value, XSQLVAR *field) {
   char  *text  = NULL;
   short length = 0;
 
-  if(TYPE(value) != T_STRING) {
+  if(TYPE(value) == T_STRING) {
     actual = value;
   } else {
     actual = rb_funcall(value, rb_intern("to_s"), 0);

data/ext/rfbstr.c

@@ -0,0 +1,28 @@
+/*------------------------------------------------------------------------------
+ * rfbstr.c
+ *----------------------------------------------------------------------------*/
+
+/* Includes. */
+#include "rfbstr.h"
+
+/**
+ * This function converts a sql data into ruby string
+ * respecting data encoding
+ *
+ * @param connection  The connection object relating to the data
+ * @param sqlsubtype  SQL subtype of the field (fot character types - used to hold encoding information)
+ * @param data  A pointer to the sql data
+ * @param length  Length of the sql data
+ *
+ * @return  A Ruby String object with correct encoding
+ *
+ */
+VALUE rfbstr(VALUE connection, short sqlsubtype, const char *data, short length) {
+  VALUE value = Qnil;
+  if (length >= 0) {
+    value = rb_str_new(data, length);
+    value = rb_funcall(connection, rb_intern("force_encoding"), 2, value, INT2FIX(sqlsubtype));
+  }
+  return value;
+}
+

data/ext/rfbstr.h

@@ -0,0 +1,12 @@
+#ifndef RFB_STR_H
+#define RFB_STR_H
+
+#ifndef RUBY_H_INCLUDED
+  #include "ruby.h"
+  #define RUBY_H_INCLUDED
+#endif
+#include "rfbint.h"
+
+VALUE rfbstr(VALUE, short, const char *, short);
+
+#endif /* RFB_STR_H */

data/rubyfb.gemspec

@@ -2,25 +2,24 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyfb}
-  s.version = "0.5.8"
+  s.version = "0.5.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["George Georgiev"]
-  s.date = %q{2011-04-03}
+  s.authors = [%q{George Georgiev}]
+  s.date = %q{2011-06-06}
   s.description = %q{Firebird SQL access library}
   s.email = %q{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/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/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/TestSetup.rb", "test/TransactionTest.rb", "test/TypeTest.rb", "rubyfb.gemspec"]
+  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/TestSetup.rb}, %q{test/TransactionTest.rb}, %q{test/TypeTest.rb}, %q{rubyfb.gemspec}]
   s.homepage = %q{http://rubyforge.org/projects/rubyfb}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rubyfb", "--main", "README"]
-  s.require_paths = ["lib", "ext"]
+  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.3.7}
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{Firebird SQL access library}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/BlobTest.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
 require './TestSetup'
 require 'test/unit'
@@ -11,6 +12,7 @@ class BlobTest < Test::Unit::TestCase
    DB_FILE     = File.join(DB_DIR, "blob_unit_test.fdb")
    TXT_FILE    = File.join(DB_DIR, "data.txt")
    DATA        = "aasdfjakhdsfljkashdfslfhaslhasyhfawyufalwuhlhsdlkfhasljlkshflalksjhasjhalsjhdf\nasdflkajshdfjkahsdfjajdfalsdfasdf\nasdfasdfasdkljfhajdfhkjasdfagdsflalkjfgagsdflasdf\nasdfasdfasdf"
+   UTF_DATA        = "ред с utf кирилица"
 
    def setup
       puts "#{self.class.name} started." if TEST_LOGGING
@@ -53,4 +55,28 @@ class BlobTest < Test::Unit::TestCase
          cxn.execute_immediate('DROP TABLE BLOB_TEST')
       end
    end
+
+   def test02
+      d = nil
+      @database.connect(DB_USER_NAME, DB_PASSWORD) do |cxn|
+         cxn.execute_immediate('create table blob_test (data blob sub_type 1 segment size 10 CHARACTER SET UTF8)')
+         cxn.start_transaction do |tx|
+
+            s = Statement.new(cxn, tx, 'INSERT INTO BLOB_TEST VALUES(?)', 3)
+            s.execute_for([UTF_DATA])
+            
+            # Perform a select of the value inserted.
+            r = cxn.execute('SELECT * FROM BLOB_TEST', tx)
+            d = r.fetch
+            
+            assert_equal(d[0].to_s, UTF_DATA)
+
+            # Clean up.
+            s.close
+            r.close
+         end
+         cxn.execute_immediate('DROP TABLE BLOB_TEST')
+      end
+   end
+   
 end

data/test/FieldCharacterSetTest.rb

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require './TestSetup'
+require 'test/unit'
+require 'rubygems'
+require 'rubyfb'
+
+include Rubyfb
+
+class FieldCharacterSetTest < Test::Unit::TestCase
+  DB_FILE  = File.join(DB_DIR, "cxnarset_unit_test.fdb")
+  DB_CHAR_SET = 'NONE'
+
+  def setup
+    puts "#{self.class.name} started." if TEST_LOGGING
+    if File::exist?(DB_FILE)
+      Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
+    end
+    @database = Database.create(DB_FILE, DB_USER_NAME, DB_PASSWORD, 1024, DB_CHAR_SET)
+  end
+
+  def teardown
+    if File::exist?(DB_FILE)
+      Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
+    end
+    puts "#{self.class.name} finished." if TEST_LOGGING
+  end
+
+  def test01
+    db   = Database.new(DB_FILE, DB_CHAR_SET)
+    utf8_str = "Малко utf8 кирилица"
+    db.connect(DB_USER_NAME, DB_PASSWORD) do |cxn|
+      cxn.start_transaction do |tr|
+        cxn.execute("CREATE TABLE SAMPLE_TABLE(SAMPLE_FIELD VARCHAR(100) CHARACTER SET UTF8)", tr)
+      end  
+      cxn.start_transaction do |tr|
+        cxn.execute("INSERT INTO SAMPLE_TABLE VALUES ('#{utf8_str}')", tr)
+        row_count = 0
+        cxn.execute("SELECT * FROM SAMPLE_TABLE WHERE SAMPLE_FIELD = '#{utf8_str}'", tr) do |row|
+          assert(row['SAMPLE_FIELD'] == utf8_str, "Field encoding failed")
+          row_count += 1
+        end
+        assert(1==row_count)
+      end
+    end
+  end
+end

data/test/StatementTest.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
 require './TestSetup'
 require 'test/unit'
@@ -131,4 +132,27 @@ class StatementTest < Test::Unit::TestCase
          cxn.execute_immediate('DROP TABLE STRING_TEST')
       end
    end
+   
+   def test04
+      d = nil
+      @database.connect(DB_USER_NAME, DB_PASSWORD) do |cxn|
+         utf_str = 'utf кирилица';
+         cxn.execute_immediate('CREATE TABLE STRING_TEST(TEXT VARCHAR(100) CHARACTER SET UTF8)')
+         cxn.start_transaction do |tx|
+            # Perform an truncated insert.
+            s = Statement.new(cxn, tx, 'INSERT INTO STRING_TEST VALUES(?)', 3)
+            s.execute_for([utf_str])
+            
+            # Perform a select of the value inserted.
+            r = cxn.execute('SELECT * FROM STRING_TEST', tx)
+            d = r.fetch
+            
+            # Clean up.
+            s.close
+            r.close
+         end
+         assert(d[0] == utf_str)
+         cxn.execute_immediate('DROP TABLE STRING_TEST')
+      end
+   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyfb
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 5
-  - 8
-  version: 0.5.8
+  - 9
+  version: 0.5.9
 platform: ruby
 authors: 
 - George Georgiev
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-03 00:00:00 +03:00
-default_executable: 
+date: 2011-06-06 00:00:00 Z
 dependencies: []
 
 description: Firebird SQL access library
@@ -85,6 +84,8 @@ files:
 - ext/extconf.rb
 - ext/rfbint.h
 - ext/rfbsleep.h
+- ext/rfbstr.c
+- ext/rfbstr.h
 - ext/uncrustify.cfg
 - lib/Connection.rb
 - lib/ProcedureCall.rb
@@ -109,6 +110,7 @@ files:
 - test/ConnectionTest.rb
 - test/DDLTest.rb
 - test/DatabaseTest.rb
+- test/FieldCharacterSetTest.rb
 - test/GeneratorTest.rb
 - test/KeyTest.rb
 - test/ResultSetTest.rb
@@ -123,7 +125,6 @@ files:
 - test/TransactionTest.rb
 - test/TypeTest.rb
 - rubyfb.gemspec
-has_rdoc: true
 homepage: http://rubyforge.org/projects/rubyfb
 licenses: []
 
@@ -160,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubyfb
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Firebird SQL access library