rubyfb 0.5.7 → 0.5.8

data/lib/Connection.rb

@@ -4,5 +4,30 @@ module Rubyfb
     def prepare_call(procedure_name)
       Rubyfb::ProcedureCall.new(self, procedure_name)
     end
+    
+    def force_encoding(fb_str, sqlsubtype)
+      fb_str
+    end
+  private
+    def init_m17n
+      return unless String.method_defined?(:force_encoding)
+      
+      @charset_map= Hash.new(Rubyfb::Options.charset_name_map.default)
+      start_transaction do |tr|
+        execute("SELECT RDB$CHARACTER_SET_NAME, RDB$CHARACTER_SET_ID FROM RDB$CHARACTER_SETS", tr) do |row|
+          @charset_map[row['RDB$CHARACTER_SET_ID']]=Rubyfb::Options.charset_name_map[row['RDB$CHARACTER_SET_NAME'].strip]
+        end
+      end
+      instance_eval do 
+        def force_encoding(fb_str, sqlsubtype)
+          fb_str.tap do |s|
+            s.force_encoding(@charset_map[sqlsubtype])
+          end
+        end
+      end
+    end
   end
 end
+
+
+

data/lib/active_record/connection_adapters/rubyfb_adapter.rb

@@ -3,7 +3,11 @@ require 'active_record/connection_adapters/abstract_adapter'
 require 'active_support/core_ext/kernel/requires'
 
 if defined?(Arel) then
-  require 'arel/visitors/rubyfb'
+  if Rubyfb::Options.fb15_compat
+    require 'arel/visitors/rubyfb_15compat'
+  else
+    require 'arel/visitors/rubyfb'
+  end
 end
 
 module Rubyfb # :nodoc: all

data/lib/arel/visitors/rubyfb_15compat.rb

@@ -0,0 +1,25 @@
+module Arel
+  module Visitors
+    class RubyFB_15Compat < Arel::Visitors::ToSql
+    	Arel::Visitors::VISITORS['rubyfb'] = Arel::Visitors::RubyFB_15Compat
+    private
+      def visit_Arel_Nodes_SelectStatement o
+      	limit = o.limit; o.limit = nil;
+      	offset = o.offset; o.offset = nil;
+      	super.tap do |s|
+      	  if limit || offset  
+      	    s.gsub!(/^\s*select/i, "SELECT #{fb_limit(limit)} #{fb_offset(offset)} ")
+      	  end
+      	end
+      end
+
+      def fb_limit limit
+      	"first #{limit.expr}" if limit
+      end
+
+      def fb_offset offset
+      	"skip #{offset.expr}" if offset
+      end
+    end
+  end
+end

data/lib/rubyfb.rb

@@ -1,3 +1,4 @@
+require 'rubyfb_options'
 require 'rubyfb_lib'
 require 'SQLType'
 require 'ProcedureCall'

data/lib/rubyfb_options.rb

@@ -0,0 +1,51 @@
+module Rubyfb
+  class Options
+    @@fb15_compat = false
+    def self.fb15_compat
+      @@fb15_compat
+    end
+    def self.fb15_compat=(value)
+      @@fb15_compat = value
+    end
+    @@charset_name_map = {
+      'BIG_5' =>           'Big5',
+      'GB_2312' =>         'GB2312',
+      'GBK' =>            'GBK',
+      'KOI8U' =>           'KOI8-U',
+      'ISO8859_1' =>         'ISO-8859-1',
+      'ISO8859_2' =>         'ISO-8859-2',
+      'ISO8859_3' =>         'ISO-8859-3',
+      'ISO8859_4' =>         'ISO-8859-4',
+      'ISO8859_5' =>         'ISO-8859-5',
+      'ISO8859_6' =>         'ISO-8859-6',
+      'ISO8859_7' =>         'ISO-8859-7',
+      'ISO8859_8' =>         'ISO-8859-8',
+      'ISO8859_9' =>         'ISO-8859-9',
+      'ISO8859_10' =>        'ISO-8859-10',
+      'ISO8859_11' =>        'ISO-8859-11',
+      'ISO8859_12' =>        'ISO-8859-12',
+      'ISO8859_13' =>        'ISO-8859-13',
+      'SJIS' =>           'Windows-31J',
+      'UTF8' =>           'UTF-8',
+      'UNICODE_FSS' =>    'UTF-8',
+      'DOS866' =>         'IBM866',
+      'WIN874' =>         'Windows-874',
+      'WIN1250' =>        'Windows-1250',
+      'WIN1251' =>        'Windows-1251',
+      'WIN1252' =>        'Windows-1252',
+      'WIN1253' =>        'Windows-1253',
+      'WIN1254' =>        'Windows-1254',
+      'WIN1255' =>        'Windows-1255',
+      'WIN1256' =>        'Windows-1256',
+      'WIN1257' =>        'Windows-1257',
+      'WIN1258' =>        'Windows-1258'
+    }.tap do |h|
+      h.default = 'ASCII-8BIT'
+    end
+    
+    def self.charset_name_map
+      @@charset_name_map
+    end
+  end
+end
+

data/rubyfb.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyfb}
-  s.version = "0.5.7"
+  s.version = "0.5.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["George Georgiev"]
-  s.date = %q{2011-02-14}
+  s.date = %q{2011-04-03}
   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/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", "lib/Connection.rb", "lib/ProcedureCall.rb", "lib/SQLType.rb", "lib/active_record/connection_adapters/rubyfb_adapter.rb", "lib/arel/visitors/rubyfb.rb", "lib/mkdoc", "lib/rubyfb.rb", "lib/rubyfb_lib.so", "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.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.homepage = %q{http://rubyforge.org/projects/rubyfb}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rubyfb", "--main", "README"]
   s.require_paths = ["lib", "ext"]

data/test/AddRemoveUserTest.rb

@@ -8,8 +8,7 @@ require 'rubyfb'
 include Rubyfb
 
 class AddRemoveUserTest < Test::Unit::TestCase
-   CURDIR      = "#{Dir.getwd}"
-   DB_FILE     = "#{CURDIR}#{File::SEPARATOR}add_remove_user_unit_test.fdb"
+   DB_FILE     = File.join(DB_DIR, "add_remove_user_unit_test.fdb")
 
    def setup
       puts "#{self.class.name} started." if TEST_LOGGING

data/test/BackupRestoreTest.rb

@@ -8,20 +8,27 @@ require 'rubyfb'
 include Rubyfb
 
 class BackupRestoreTest < Test::Unit::TestCase
-   CURDIR      = "#{Dir.getwd}"
-   DB_FILE     = "#{CURDIR}#{File::SEPARATOR}backup_restore_unit_test.fdb"
-   BACKUP_FILE = "#{CURDIR}#{File::SEPARATOR}database.bak"
+   DB_FILE     = File.join(DB_DIR, "backup_restore_unit_test.fdb")
+   BACKUP_FILE = File.join(DB_DIR, "database.bak")
+
+  def cleanup
+    # Remove existing database files.
+    if File.exist?(DB_FILE)
+      db = Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
+    end
+
+    if File.exist?(BACKUP_FILE)
+      begin
+        File.delete(BACKUP_FILE)
+      rescue
+        # ignore file permissions may cause this
+      end
+    end
+  end
 
    def setup
       puts "#{self.class.name} started." if TEST_LOGGING
-      # Remove existing database files.
-      if File.exist?(DB_FILE)
-         db = Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
-      end
-
-      if File.exist?(BACKUP_FILE)
-         File.delete(BACKUP_FILE)
-      end
+      cleanup
 
       # Create and populate the database files.
       @database = Database.create(DB_FILE, DB_USER_NAME, DB_PASSWORD)
@@ -35,17 +42,10 @@ class BackupRestoreTest < Test::Unit::TestCase
       end
    end
 
-   def teardown
-      # Remove existing database files.
-      if File.exist?(DB_FILE)
-         db = Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
-      end
-
-      if File.exist?(BACKUP_FILE)
-         File.delete(BACKUP_FILE)
-      end
-      puts "#{self.class.name} finished." if TEST_LOGGING
-   end
+  def teardown
+    cleanup
+    puts "#{self.class.name} finished." if TEST_LOGGING
+  end
 
    def test01
       sm = ServiceManager.new('localhost')

data/test/BlobTest.rb

@@ -8,9 +8,8 @@ require 'rubyfb'
 include Rubyfb
 
 class BlobTest < Test::Unit::TestCase
-   CURDIR      = "#{Dir.getwd}"
-   DB_FILE     = "#{CURDIR}#{File::SEPARATOR}blob_unit_test.fdb"
-   TXT_FILE    = "#{CURDIR}#{File::SEPARATOR}data.txt"
+   DB_FILE     = File.join(DB_DIR, "blob_unit_test.fdb")
+   TXT_FILE    = File.join(DB_DIR, "data.txt")
    DATA        = "aasdfjakhdsfljkashdfslfhaslhasyhfawyufalwuhlhsdlkfhasljlkshflalksjhasjhalsjhdf\nasdflkajshdfjkahsdfjajdfalsdfasdf\nasdfasdfasdkljfhajdfhkjasdfagdsflalkjfgagsdflasdf\nasdfasdfasdf"
 
    def setup

data/test/CharacterSetTest.rb

@@ -9,56 +9,51 @@ require 'rubyfb'
 include Rubyfb
 
 class CharacterSetTest < Test::Unit::TestCase
-   CURDIR   = "#{Dir.getwd}"
-   DB_FILE  = "#{CURDIR}#{File::SEPARATOR}cxnarset_unit_test.fdb"
-   CHAR_SET = 'WIN1251'
-   
-   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)
+  DB_FILE  = File.join(DB_DIR, "cxnarset_unit_test.fdb")
+  CHAR_SET = 'WIN1251'
+
+  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, 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, CHAR_SET)
+
+    assert(db.character_set = CHAR_SET)
+
+    db.character_set = 'ASCII'
+    assert(db.character_set == 'ASCII')
+  end
+
+  def test02
+    db   = Database.new(DB_FILE, CHAR_SET)
+
+    win1251_str = '���������'
+    db.connect("SYSDBA", "masterkey") 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 ('#{win1251_str}')", tr)
+        row_count = 0
+        cxn.execute("SELECT * FROM SAMPLE_TABLE WHERE SAMPLE_FIELD = '#{win1251_str}'", tr) do |row|
+          assert(row['SAMPLE_FIELD']==win1251_str, "Database encoding failed")
+          row_count += 1
+        end
+        assert(1==row_count)
       end
-
-      @database = Database.create(DB_FILE, DB_USER_NAME, DB_PASSWORD, 1024,
-                                  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, CHAR_SET)
-
-      assert(db.character_set = CHAR_SET)
-
-      db.character_set = 'ASCII'
-      assert(db.character_set == 'ASCII')
-   end
-
-   def test02
-      db   = Database.new(DB_FILE, CHAR_SET)
-
-      begin
-         win1251_str = '���������'
-         db.connect("SYSDBA", "masterkey") do |cxn|
-            cxn.start_transaction do |tr|
-               cxn.execute("CREATE TABLE SAMPLE_TABLE(SAMPLE_FIELD VARCHAR(100))",tr)
-            end  
-            cxn.start_transaction do |tr|
-               cxn.execute("INSERT INTO SAMPLE_TABLE VALUES ('#{win1251_str}')",tr)
-               cxn.execute("SELECT * FROM SAMPLE_TABLE WHERE SAMPLE_FIELD = "\
-                           "'#{win1251_str}'",tr) do |row|
-                  # here we have an exception:
-                  some_var = row['SAMPLE_FIELD']
-               end
-            end
-         end
-#      rescue => error
-#         assert("Character set unit test failure.", false)
-      end
-   end
+    end
+  end
 end
+

data/test/ConnectionTest.rb

@@ -8,8 +8,7 @@ require 'rubyfb'
 include Rubyfb
 
 class ConnectionTest < Test::Unit::TestCase
-   CURDIR  = "#{Dir.getwd}"
-   DB_FILE = "#{CURDIR}#{File::SEPARATOR}con_unit_test.fdb"
+   DB_FILE = File.join(DB_DIR, "con_unit_test.fdb")
    
    def setup
       puts "#{self.class.name} started." if TEST_LOGGING

data/test/DDLTest.rb

@@ -8,8 +8,7 @@ require 'rubyfb'
 include Rubyfb
 
 class DDLTest < Test::Unit::TestCase
-   CURDIR  = "#{Dir.getwd}"
-   DB_FILE = "#{CURDIR}#{File::SEPARATOR}ddl_unit_test.fdb"
+   DB_FILE = File.join(DB_DIR, "ddl_unit_test.fdb")
    
    def setup
       puts "#{self.class.name} started." if TEST_LOGGING

data/test/DatabaseTest.rb

@@ -8,9 +8,8 @@ require 'rubyfb'
 include Rubyfb
 
 class DatabaseTest < Test::Unit::TestCase
-   CURDIR      = "#{Dir.getwd}"
-   DB_FILE     = "#{CURDIR}#{File::SEPARATOR}db_unit_test.fdb"
-   CREATE_FILE = "#{CURDIR}#{File::SEPARATOR}db_create_test.fdb"
+   DB_FILE     = File.join(DB_DIR, "db_unit_test.fdb")
+   CREATE_FILE = File.join(DB_DIR, "db_create_test.fdb")
    
    def setup
       puts "#{self.class.name} started." if TEST_LOGGING

data/test/GeneratorTest.rb

@@ -8,8 +8,7 @@ require 'rubyfb'
 include Rubyfb
 
 class GeneratorTest < Test::Unit::TestCase
-   CURDIR  = "#{Dir.getwd}"
-   DB_FILE = "#{CURDIR}#{File::SEPARATOR}generator_unit_test.fdb"
+   DB_FILE = File.join(DB_DIR, "generator_unit_test.fdb")
    
    def setup
       puts "#{self.class.name} started." if TEST_LOGGING

data/test/KeyTest.rb

@@ -8,8 +8,7 @@ require 'rubyfb'
 include Rubyfb
 
 class KeyTest < Test::Unit::TestCase
-   CURDIR  = "#{Dir.getwd}"
-   DB_FILE = "#{CURDIR}#{File::SEPARATOR}key_unit_test.fdb"
+   DB_FILE = File.join(DB_DIR, "key_unit_test.fdb")
    
    def setup
       puts "#{self.class.name} started." if TEST_LOGGING

data/test/ResultSetTest.rb

@@ -8,8 +8,7 @@ require 'rubyfb'
 include Rubyfb
 
 class ResultSetTest < Test::Unit::TestCase
-   CURDIR  = "#{Dir.getwd}"
-   DB_FILE = "#{CURDIR}#{File::SEPARATOR}result_set_unit_test.fdb"
+   DB_FILE = File.join(DB_DIR, "result_set_unit_test.fdb")
    
    def setup
       puts "#{self.class.name} started." if TEST_LOGGING
@@ -172,4 +171,17 @@ class ResultSetTest < Test::Unit::TestCase
    ensure
       results.close if results
    end
+
+   def test06
+      results = @transactions.first.execute(<<-EOSQL)
+                SELECT * FROM RDB$DATABASE WHERE 1=0
+                EOSQL
+
+      assert_nil(results.fetch,
+                 'Initial #fetch of empty result set was not nil')
+          assert(results.exhausted?,
+                 'Completely fetched ResultSet was not #exhausted?')
+      assert_nil(results.fetch,
+                 '#fetch after exhaustion was not nil')
+   end
 end

data/test/RoleTest.rb

@@ -8,8 +8,7 @@ require 'rubyfb'
 include Rubyfb
 
 class RoleTest < Test::Unit::TestCase
-   CURDIR      = "#{Dir.getwd}"
-   DB_FILE     = "#{CURDIR}#{File::SEPARATOR}role_unit_test.fdb"
+   DB_FILE     = File.join(DB_DIR, "role_unit_test.fdb")
 
    def setup
       puts "#{self.class.name} started." if TEST_LOGGING

data/test/RowCountTest.rb

@@ -8,8 +8,7 @@ require 'rubyfb'
 include Rubyfb
 
 class RowCountTest < Test::Unit::TestCase
-   CURDIR      = "#{Dir.getwd}"
-   DB_FILE     = "#{CURDIR}#{File::SEPARATOR}row_count_test.fdb"
+   DB_FILE     = File.join(DB_DIR, "row_count_test.fdb")
 
    def setup
       puts "#{self.class.name} started." if TEST_LOGGING