rubyfb 0.5.9 → 0.6

data/test/StatementTest.rb

@@ -40,25 +40,19 @@ class StatementTest < Test::Unit::TestCase
       @connections.push(@database.connect(DB_USER_NAME, DB_PASSWORD))
       @transactions.push(@connections.last.start_transaction)
       
-      s1 = Statement.new(@connections[0],
-                         @transactions[0],
-                         "SELECT RDB$FIELD_NAME FROM RDB$FIELDS", 3)
+      s1 = @connections[0].create_statement("SELECT RDB$FIELD_NAME FROM RDB$FIELDS")
       assert(s1 != nil)
       assert(s1.sql == "SELECT RDB$FIELD_NAME FROM RDB$FIELDS")
       assert(s1.connection == @connections[0])
-      assert(s1.transaction == @transactions[0])
       assert(s1.dialect == 3)
       assert(s1.type == Statement::SELECT_STATEMENT)
       s1.close
       
-      s2 = Statement.new(@connections[0],
-                         @transactions[0],
-                         "DELETE FROM RDB$EXCEPTIONS", 1)
+      s2 = @connections[0].create_statement("DELETE FROM RDB$EXCEPTIONS")
       assert(s2 != nil)
       assert(s2.sql == "DELETE FROM RDB$EXCEPTIONS")
       assert(s2.connection == @connections[0])
-      assert(s2.transaction == @transactions[0])
-      assert(s2.dialect == 1)
+      assert(s2.dialect == 3)
       assert(s2.type == Statement::DELETE_STATEMENT)
       s2.close
    end
@@ -67,12 +61,12 @@ class StatementTest < Test::Unit::TestCase
       @connections.push(@database.connect(DB_USER_NAME, DB_PASSWORD))
       @transactions.push(@connections[0].start_transaction)
       
-      s = Statement.new(@connections[0], @transactions[0],
+      s = @connections[0].create_statement(
                         "SELECT RDB$FIELD_NAME FROM RDB$FIELDS "\
-                        "WHERE RDB$FIELD_NAME LIKE ?", 3)
+                        "WHERE RDB$FIELD_NAME LIKE ?")
 
       begin
-         r = s.execute
+         r = s.execute(@transactions[0])
          r.close
          assert(false,
                 "Executed statement that required parameter without the "\
@@ -81,7 +75,7 @@ class StatementTest < Test::Unit::TestCase
       end
       
       begin
-         r = s.execute_for([])
+         r = s.exec([], @transactions[0])
          r.close
          assert(false,
                 "Executed statement that required a parameter with an empty "\
@@ -90,7 +84,7 @@ class StatementTest < Test::Unit::TestCase
       end
       
       begin
-         r = s.execute_for(['LALALA', 25])
+         r = s.exec(['LALALA', 25], @transactions[0])
          r.close
          assert(false,
                 "Executed statement that required a parameter with too many "\
@@ -98,16 +92,16 @@ class StatementTest < Test::Unit::TestCase
       rescue Exception => error
       end
       
-      r = s.execute_for(['LALALA'])
-      assert(r != nil)
-      assert(r.class == ResultSet)
+      r = s.exec(['LALALA'], @transactions[0])
+      assert_not_nil(r)
+      assert_equal(ResultSet, r.class)
       r.close
       
       total = 0
-      s.execute_for(["%"]) do |row|
-         total = total + 1
+      s.exec(["%"], @transactions[0]) do |row|
+         total += 1
       end
-      assert(total = 88)
+      assert_equal(88, total)
       s.close
    end
    
@@ -117,8 +111,8 @@ class StatementTest < Test::Unit::TestCase
          cxn.execute_immediate('CREATE TABLE STRING_TEST(TEXT VARCHAR(10))')
          cxn.start_transaction do |tx|
             # Perform an truncated insert.
-            s = Statement.new(cxn, tx, 'INSERT INTO STRING_TEST VALUES(?)', 3)
-            s.execute_for(['012345678901234'])
+            s = cxn.create_statement('INSERT INTO STRING_TEST VALUES(?)')
+            s.exec(['012345678901234'], tx)
             
             # Perform a select of the value inserted.
             r = cxn.execute('SELECT * FROM STRING_TEST', tx)
@@ -140,8 +134,8 @@ class StatementTest < Test::Unit::TestCase
          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])
+            s = cxn.create_statement('INSERT INTO STRING_TEST VALUES(?)')
+            s.exec([utf_str], tx)
             
             # Perform a select of the value inserted.
             r = cxn.execute('SELECT * FROM STRING_TEST', tx)

data/test/StoredProcedureTest.rb

@@ -0,0 +1,80 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require './TestSetup'
+require 'test/unit'
+require 'rubygems'
+require 'rubyfb'
+
+include Rubyfb
+
+class StoredProcedureTest < Test::Unit::TestCase
+   DB_FILE = File.join(DB_DIR, "sp_unit_test.fdb")
+   
+   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)
+      @connections  = []
+      @transactions = []
+   end
+   
+   def teardown
+      @transactions.each do |tx|
+         tx.rollback if tx.active?
+      end
+      @transactions.clear
+      @connections.each do |cxn|
+         cxn.close if cxn.open?
+      end
+      @connections.clear
+      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
+      d = nil
+      @database.connect(DB_USER_NAME, DB_PASSWORD) do |cxn|
+         cxn.execute_immediate('
+            create procedure SP1 (
+              SP_IN_1 VARCHAR(10),
+              SP_IN_2 integer
+            )
+            returns (
+              SP_OUT_1 VARCHAR(20),
+              SP_OUT_2 INTEGER
+            )
+            as
+            begin
+              SP_OUT_1 = :SP_IN_1;
+              SP_OUT_2 = SP_IN_2;
+            end
+         ')
+         cxn.start_transaction do |tx|
+            # Perform an truncated insert.
+            test_data = ["SP1", 7]
+            
+            s = cxn.create_statement('execute procedure SP1(?, ?)')
+            result = s.exec(test_data, tx)
+            
+            assert_equal(Rubyfb::ResultSet, result.class)
+            row = result.fetch
+            assert_not_nil(row)
+            assert_nil(result.fetch)
+            assert_equal(result.exhausted?, true)
+
+            assert_equal(test_data[0], row[0])
+            assert_equal(test_data[1], row[1])
+            
+            # Clean up.
+            result.close
+            s.close
+         end
+         cxn.execute_immediate('DROP PROCEDURE SP1')
+      end
+   end
+end

data/test/TransactionTest.rb

@@ -96,7 +96,7 @@ class TransactionTest < Test::Unit::TestCase
       sql.push("SELECT * FROM RDB$DATABASE")
       @transactions.push(Transaction.new(@connections[0]))
       
-      assert(@transactions[0].execute(sql[0]) == 0)
+      assert_equal(0, @transactions[0].execute(sql[0]))
       r = @transactions[0].execute(sql[1])
       assert(r != nil)
       assert(r.class == ResultSet)

data/test/TypeTest.rb

@@ -27,11 +27,11 @@ class TypeTest < Test::Unit::TestCase
       end
          
       cxn.start_transaction do |tx|
-         stmt = Statement.new(cxn, tx, "insert into types_table values "\
-                                       "(?, ?, ?, ?, ?, ?, ?, ?, ?)", 3)
-         stmt.execute_for([10, 100.2, 2378.65, 192.345,
+         stmt = cxn.create_statement("insert into types_table values "\
+                                       "(?, ?, ?, ?, ?, ?, ?, ?, ?)")
+         stmt.exec([10, 100.2, 2378.65, 192.345,
                            Date.new(2005, 10, 21), Time.new, 'La la la',
-                           Time.new, "Oobly Joobly"])
+                           Time.new, "Oobly Joobly"], tx)
          stmt.close
       end
       cxn.close
@@ -81,7 +81,6 @@ class TypeTest < Test::Unit::TestCase
          assert(row[6].instance_of?(String))
          assert(row[7].instance_of?(Time))
          assert(row[8].instance_of?(String))
-         rows.close
       ensure
          rows.close if rows != nil
          cxn.close if cxn != nil

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rubyfb
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 9
-  version: 0.5.9
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
 - George Georgiev
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 Z
+date: 2011-08-22 00:00:00 Z
 dependencies: []
 
 description: Firebird SQL access library
@@ -121,6 +120,7 @@ files:
 - test/SQLTypeTest.rb
 - test/ServiceManagerTest.rb
 - test/StatementTest.rb
+- test/StoredProcedureTest.rb
 - test/TestSetup.rb
 - test/TransactionTest.rb
 - test/TypeTest.rb