ibruby 0.5.4-mswin32 → 0.5.5-mswin32

data/lib/ibmeta.rb

@@ -1,7 +1,7 @@
 #-------------------------------------------------------------------------------
 # ibmeta.rb
 #-------------------------------------------------------------------------------
-# Copyright � Peter Wood, 2005; Richard Vowles, 2006
+# Copyright � Peter Wood, 2005; Richard Vowles, 2006
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with the
@@ -287,7 +287,7 @@ module IBRuby
     
     def self.quote( value, column_meta_data )
       if column_meta_data.expects_quoting
-        '#{value}'
+        "\'#{value}\'"
       elsif ((column_meta_data.type == InterBaseColumn::BLOB) && (column_meta_data.sub_type != 1 ) )
         raise IBRubyException.new("'#{value}' is not a valid default for this column #{column_meta_data.name}.")
       else
@@ -504,7 +504,7 @@ module IBRuby
     # allow these to be overriden
     @@default_precision = 10
     @@default_scale = 2
-    @@default_length = 255
+    @@default_length = 252  #so string indexes work by default
   
     # A definition for a base SQL type.
     BOOLEAN                          = :BOOLEAN

data/test/ConnectionTest.rb

@@ -3,7 +3,7 @@
 require 'TestSetup'
 require 'test/unit'
 #require 'rubygems'
-require 'ibruby'
+require 'ib_lib'
 
 include IBRuby
 

data/test/GeneratorTest.rb

@@ -36,7 +36,7 @@ class GeneratorTest < Test::Unit::TestCase
    def test01
       assert(Generator::exists?('TEST_GEN', @connections[0]) == false)
       g = Generator::create('TEST_GEN', @connections[0])
-      assert(Generator::exists?('TEST_GEN', @connections[0]))
+      10.times() { assert(Generator::exists?('TEST_GEN', @connections[0])) }
       assert(g.last == 0)
       assert(g.next(1) == 1)
       assert(g.last == 1)
@@ -46,5 +46,14 @@ class GeneratorTest < Test::Unit::TestCase
       
       g.drop
       assert(Generator::exists?('TEST_GEN', @connections[0]) == false)
-   end
+    end
+    
+    def test02
+      4.times() do 
+        assert(Generator::exists?('SAMPLE_GEN', @connections[0]) == false)
+        g = Generator::create('SAMPLE_GEN', @connections[0])
+        g.drop
+        trans.commit
+      end
+    end
 end

data/test/KeyTest.rb

@@ -9,7 +9,7 @@ include IBRuby
 
 class KeyTest < Test::Unit::TestCase
    CURDIR  = "#{Dir.getwd}"
-   DB_FILE = "#{CURDIR}#{File::SEPARATOR}key_unit_test.fdb"
+   DB_FILE = "#{CURDIR}#{File::SEPARATOR}key_unit_test.ib"
    
    def setup
       puts "#{self.class.name} started." if TEST_LOGGING

data/test/MetaTest.rb

@@ -0,0 +1,99 @@
+#!/usr/bin/env ruby
+
+require 'TestSetup'
+require 'test/unit'
+#require 'rubygems'
+require 'ibruby'
+
+include IBRuby
+
+class MetaTest < Test::Unit::TestCase
+   CURDIR  = "#{Dir.getwd}"
+   DB_FILE = "#{CURDIR}#{File::SEPARATOR}meta_unit_test.ib"
+   
+   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)
+      @connection = @database.connect(DB_USER_NAME, DB_PASSWORD)
+      
+      @creation_sql = "create table mtest (id integer not null, "\
+        "bool1 boolean default false, bool2 boolean, bool3 boolean default true, bool4 boolean default true not null,"\
+        " blob1 blob sub_type 1 not null, blob2 blob sub_type 1, blob3 blob sub_type 0,"\
+        " char1 char(10) default 'fred', char2 char(10) default 'fred' not null, char3 char(10), char4 char(20) default 'wil''ma',"\
+        " date1 date default current_date, date2 date not null, date3 date default current_date not null,"\
+        " decimal1 decimal(18,5) default 1.345, decimal2 decimal(15,5) default 20.22 not null, decimal3 decimal(12,6) not null"\
+        ")"
+      #puts sql
+      @connection.execute_immediate( @creation_sql );
+      @connection.execute_immediate( "create table pk_table(id integer not null primary key)" )
+      @connection.execute_immediate( "create table fk_table(id integer not null primary key, "\
+        "fk_id integer references pk_table(id))" )
+      @pk_sql = "alter table mtest "
+      
+   end
+   
+  
+   def teardown
+      @connection.close
+
+      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
+     table = InterBaseTable.new('mtest')
+     assert_nothing_thrown( "failed to load table mtest" ) { table.load(@connection) }
+     sql = []
+     assert_nothing_thrown( "unable to build sql!" ) { sql = table.to_sql }
+     assert_not_nil sql, "sql returned nil for create table"
+     assert_equal sql.size > 0, true, "sql returned has nothing in it for table creation!"
+     #assert_equal @creation_sql.upcase, sql[0].upcase
+     #they ARE the same, but shows false and don't know why
+     puts sql
+   end
+   
+   def test02
+    col = InterBaseMetaFunctions.table_fields( @connection, "mtest", true, "decimal2" )
+    new_col = col.dup
+    new_col.precision = 16
+    new_col.scale = 2
+    col.change_column(@connection,new_col)
+    new_col = InterBaseMetaFunctions.table_fields( @connection, "mtest", true, "decimal2" )
+    
+    assert_equal false, new_col == col, "column decimal2 not changed"
+    assert_equal new_col.precision, 16, "column decimal2 precision not 16!"
+    assert_equal new_col.scale, 2, "column scale should be 2!"
+   end
+   
+   def test03
+     col = InterBaseMetaFunctions.table_fields( @connection, "mtest", true, "decimal2" )
+     col.rename_column( @connection, "decimal_rename" )
+     ren_col = InterBaseMetaFunctions.table_fields( @connection, "mtest", true, "decimal2" )
+     assert_equal nil, ren_col, "column not renamed!"
+     new_col = InterBaseMetaFunctions.table_fields( @connection, "mtest", true, "decimal_rename" )
+     assert_equal new_col, col, "column types not identical after rename"
+     new_col.rename_column( @connection, "decimal2" )
+   end
+
+   def test04
+     table = InterBaseTable.new('fk_table')
+     table.load(@connection)
+     assert_nothing_thrown( "unable build sql for table fk_table! " ) do
+       table.to_sql.each() {|sql| puts "table creation sql: #{sql}" }
+     end
+     assert_nothing_thrown( "unable to rename table" ) do
+       table.rename_table( @connection, 'new_fk_table' )
+     end
+     table = InterBaseTable.new('new_fk_table')
+     table.load(@connection)
+     assert_nothing_thrown( "unable build sql for table fk_table! " ) do
+       table.to_sql.each() {|sql| puts "table creation sql: #{sql}" }
+     end
+   end   
+ end

data/test/RoleTest.rb

@@ -71,10 +71,10 @@ class DatabaseTest < Test::Unit::TestCase
       dropRole
       dropUser
       
-      #~ if File::exist?(DB_FILE)
-         #~ db = Database.new(DB_FILE)
-         #~ db.drop(DB_USER_NAME, DB_PASSWORD)
-      #~ end
+      if File::exist?(DB_FILE)
+         db = Database.new(DB_FILE)
+         db.drop(DB_USER_NAME, DB_PASSWORD)
+      end
       puts "#{self.class.name} finished." if TEST_LOGGING
    end
       

data/test/SQLTypeTest.rb

@@ -9,7 +9,7 @@ include IBRuby
 
 class SQLTypeTest < Test::Unit::TestCase
    CURDIR  = "#{Dir.getwd}"
-   DB_FILE = "#{CURDIR}#{File::SEPARATOR}sql_type_test.fdb"
+   DB_FILE = "#{CURDIR}#{File::SEPARATOR}sql_type_test.ib"
 
    def setup
       puts "#{self.class.name} started." if TEST_LOGGING

data/test/StatementTest.rb

@@ -9,7 +9,7 @@ include IBRuby
 
 class StatementTest < Test::Unit::TestCase
    CURDIR  = "#{Dir.getwd}"
-   DB_FILE = "#{CURDIR}#{File::SEPARATOR}stmt_unit_test.fdb"
+   DB_FILE = "#{CURDIR}#{File::SEPARATOR}stmt_unit_test.ib"
    
    def setup
       puts "#{self.class.name} started." if TEST_LOGGING

data/test/TypeTest.rb

@@ -53,8 +53,8 @@ class TypeTest < Test::Unit::TestCase
          row  = rows.fetch
          assert(row[0].kind_of?(Integer))
          assert(row[1].instance_of?(Float))
-         assert(row[2].instance_of?(Float))
-         assert(row[3].instance_of?(Float))
+         assert(row[2].kind_of?(Numeric))
+         assert(row[3].kind_of?(Numeric))
          assert(row[4].instance_of?(Date))
          assert(row[5].instance_of?(Time))
          assert(row[6].instance_of?(String))
@@ -75,8 +75,8 @@ class TypeTest < Test::Unit::TestCase
          row  = rows.fetch
          assert(row[0].kind_of?(Integer))
          assert(row[1].instance_of?(Float))
-         assert(row[2].instance_of?(Float))
-         assert(row[3].instance_of?(Float))
+         assert(row[2].kind_of?(Numeric))
+         assert(row[3].kind_of?(Numeric))
          assert(row[4].instance_of?(Time))
          assert(row[5].instance_of?(Time))
          assert(row[6].instance_of?(String))

data/test/UnitTest.rb

@@ -32,8 +32,8 @@
 #require 'TypeTest'
 #require 'SQLTypeTest'
 #if PLATFORM.include?('powerpc-darwin') == false
-#   require 'BackupRestoreTest'
-#   require 'AddRemoveUserTest'
+   #require 'BackupRestoreTest'
+   #require 'AddRemoveUserTest'
 #end
 #-------------------------------------------------------------------------------
 SPECIALS = ['AddRemoveUserTest',

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: ibruby
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
-date: 2007-01-12 00:00:00 +13:00
+  version: 0.5.5
+date: 2007-09-08 00:00:00 +12:00
 summary: Ruby interface library for the InterBase database.
 require_paths: 
 - lib
@@ -43,6 +43,7 @@ files:
 - test/DDLTest.rb
 - test/GeneratorTest.rb
 - test/KeyTest.rb
+- test/MetaTest.rb
 - test/ResultSetTest.rb
 - test/RoleTest.rb
 - test/RowCountTest.rb