rubyfb 0.5.9 → 0.6

data/lib/arel/visitors/rubyfb.rb

@@ -3,10 +3,14 @@ module Arel
     class RubyFB < Arel::Visitors::ToSql
     	Arel::Visitors::VISITORS['rubyfb'] = Arel::Visitors::RubyFB
     private
+      def visit_Arel_Nodes_Limit o
+      end
+
+      def visit_Arel_Nodes_Offset o
+      end
+    
       def visit_Arel_Nodes_SelectStatement o
-      	limit = o.limit; o.limit = nil;
-      	offset = o.offset; o.offset = nil;
-      	limit || offset ? "SELECT #{fb_limit(limit)} #{fb_offset(offset)} * FROM (#{super})" : super
+      	o.limit || o.offset ? "SELECT #{fb_limit(o.limit)} #{fb_offset(o.offset)} * FROM (#{super})" : super
       end
 
       def fb_limit limit

data/lib/arel/visitors/rubyfb_15compat.rb

@@ -3,12 +3,16 @@ module Arel
     class RubyFB_15Compat < Arel::Visitors::ToSql
     	Arel::Visitors::VISITORS['rubyfb'] = Arel::Visitors::RubyFB_15Compat
     private
+      def visit_Arel_Nodes_Limit o
+      end
+
+      def visit_Arel_Nodes_Offset o
+      end
+      
       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)} ")
+      	  if o.limit || o.offset  
+      	    s.gsub!(/^\s*select/i, "SELECT #{fb_limit(o.limit)} #{fb_offset(o.offset)} ")
       	  end
       	end
       end

data/lib/src.rb

@@ -360,6 +360,19 @@ module Rubyfb
       def execute_immediate(sql)
          yield(row)
       end
+      
+      #
+      # This function creates a new statement object
+      #
+      # ==== Parameters
+      # sql::  The SQL for the statement.
+      #
+      # ==== Exceptions
+      # Exception::  Generated whenever a problem occurs creating the
+      #              statement object.
+      #
+      def create_statement(sql)
+      end
    end
    
    
@@ -563,13 +576,9 @@ module Rubyfb
       # ==== Parameters
       # connection::   The Connection object that the SQL statement will be
       #                executed through.
-      # transaction::  The Transaction object that the SQL statement will be
-      #                executed under.
       # sql::          The SQL statement to be prepared for execution.
-      # dialect::      The Firebird dialect to be used in preparing the SQL
-      #                statement.
       #
-      def initialize(connection, transaction, sql, dialect)
+      def initialize(connection, sql)
       end
       
       
@@ -580,13 +589,6 @@ module Rubyfb
       end
       
       
-      #
-      # This is the accessor for the transaction attribute.
-      #
-      def transaction
-      end
-      
-      
       #
       # This is the accessor for the SQL statement attribute.
       #
@@ -619,27 +621,28 @@ module Rubyfb
       
       
       #
-      # This method executes the SQL statement within a Statement object. This
-      # method returns a ResultSet object if the statement executed was a SQL
-      # query. For non-query SQL statements (insert, update or delete) it
-      # returns an Integer indicating the number of affected rows. For all other
-      # statements the method returns nil. This method accepts a block taking a
-      # single parameter. If this block is provided and the statement is a query
-      # then the rows returned by the query will be passed, one at a time, to
-      # the block.
+      # This method is used to determine whether a Statement object is prepared
+      #
+      def prepared?
+      end
+
+      #
+      # This method prepares the SQL statement
+      #
+      # ==== Parameters
+      # transaction:: A reference to the transaction object (optional). 
+      #               If this parameter is nil - the statement is prepared within 
+      #               its own (implicit) transaction.
       #
       # ==== Exception
-      # Exception::  Generated if the Statement object actual requires some
-      #              parameters or a problem occurs executing the SQL statement.
+      # Exception::  Generated whenever a problem occurspreparing the SQL statement.
       #
-      def execute
-         yield row
+      def prepare(transaction=nil)
       end
-      
-      
+
       #
-      # This method executes the SQL statement within a Statement object and
-      # passes it a set of parameters. Parameterized statements use question
+      # This method executes the SQL statement within a Statement object optionaly
+      # passing it a set of parameters. Parameterized statements use question
       # marks as place holders for values that may change between calls to
       # execute the statement. This method returns a ResultSet object if the
       # statement executed was a SQL query. If the statement was a non-query SQL
@@ -650,21 +653,54 @@ module Rubyfb
       # returned by the query will be passed, one at a time, to the block.
       #
       # ==== Parameters
-      # parameters::  An array of the parameters for the statement. An effort
+      # parameters::  An array of the parameters (optional) for the statement. An effort
       #               will be made to convert the values passed in to the
       #               appropriate types but no guarantees are made (especially
       #               in the case of text fields, which will simply use to_s
       #               if the object passed is not a String).
       #
+      # transaction:: A reference to the transaction object (optional). 
+      #               If this parameter is nil - the statement is execute within 
+      #               its own (implicit) transaction. For statements that return 
+      #               result set objects - the implicit transaction is resolved
+      #               when the result set object is closed, for the other kind of statements
+      #               the implicit transaction is resolved immediately after the execution
+      #
       # ==== Exception
       # Exception::  Generated whenever a problem occurs translating one of the
       #              input parameters or executing the SQL statement.
       #
-      def execute_for(parameters)
+      def exec(parameters=nil, transaction=nil)
          yield row
       end
       
-      
+      #
+      # This method behaves exactly as the exec() method, except that the statement
+      # is also closed. If no result set is generated the statement is closed immediately,
+      # otherwise the statement close() call thakes place when the resul tset close() is called.
+      #
+      # ==== Parameters
+      # parameters::  An array of the parameters (optional) for the statement. An effort
+      #               will be made to convert the values passed in to the
+      #               appropriate types but no guarantees are made (especially
+      #               in the case of text fields, which will simply use to_s
+      #               if the object passed is not a String).
+      #
+      # transaction:: A reference to the transaction object (optional). 
+      #               If this parameter is nil - the statement is execute within 
+      #               its own (implicit) transaction. For statements that return 
+      #               result set objects - the implicit transaction is resolved
+      #               when the result set object is closed, for the other kind of statements
+      #               the implicit transaction is resolved immediately after the execution
+      #
+      # ==== Exception
+      # Exception::  Generated whenever a problem occurs translating one of the
+      #              input parameters or executing the SQL statement.
+      #
+      def exec_and_close(parameters=nil, transaction=nil)
+         yield row
+      end
+
       #
       # This method releases the database resources associated with a Statement
       # object and should be explicitly called when a Statement object is of
@@ -693,14 +729,9 @@ module Rubyfb
       # This is the constructor for the ResultSet object.
       #
       # ==== Parameters
-      # connection::   A reference to the Connection object that will be used
-      #                to execute the SQL query.
+      # statement::    A reference to the Statement object.
       # transaction::  A reference to the Transaction object that will be used
       #                in executing the SQL query.
-      # sql::          A reference to a String containing the SQL query that
-      #                will be executed.
-      # dialect::      A reference to an integer containing the Firebird dialect
-      #                to be used in executing the SQL statement.
       #
       # ==== Exceptions
       # FireRubyException::  Generated whenever a non-query SQL statement is
@@ -708,7 +739,7 @@ module Rubyfb
       #                      provided or a problem occurs executing the SQL
       #                      against the database.
       #
-      def initialize(connection, transaction, sql, dialect)
+      def initialize(statement, transaction)
       end
       
       
@@ -725,6 +756,11 @@ module Rubyfb
       def transaction
       end
       
+      #
+      # This is the accessor for the statement attribute.
+      #
+      def statement
+      end
       
       #
       # This is the accessor for the sql attribute.
@@ -908,6 +944,7 @@ module Rubyfb
       #
       def column_count
       end
+
       
       
       #
@@ -1151,7 +1188,7 @@ module Rubyfb
       
       #
       # This method loads the segments of a blob one after another. The blob
-      # segments are passed as strings to the block passed to the method.
+      # segments are passed as BINARY strings to the block passed to the method.
       #
       def each
          yield segment

data/rubyfb.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyfb}
-  s.version = "0.5.9"
+  s.version = "0.6"
 
   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-06-06}
+  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/TestSetup.rb}, %q{test/TransactionTest.rb}, %q{test/TypeTest.rb}, %q{rubyfb.gemspec}]
+  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}]

data/test/AddRemoveUserTest.rb

@@ -32,6 +32,13 @@ class AddRemoveUserTest < Test::Unit::TestCase
       sm = ServiceManager.new('localhost')
       sm.connect(DB_USER_NAME, DB_PASSWORD)
 
+      begin
+        ru = RemoveUser.new('newuser')
+        ru.execute(sm)
+        sleep(3)
+      rescue
+      end
+
       au = AddUser.new('newuser', 'password', 'first', 'middle', 'last')
       au.execute(sm)
       sleep(3)

data/test/BackupRestoreTest.rb

@@ -69,7 +69,7 @@ class BackupRestoreTest < Test::Unit::TestCase
             assert([1000, 2000, 3000, 4000, nil].include?(row[0]))
             total += 1
          end
-         assert(total == 5)
+         assert_equal(5, total)
       end
    end
 

data/test/BlobTest.rb

@@ -39,8 +39,8 @@ class BlobTest < Test::Unit::TestCase
          cxn.execute_immediate('create table blob_test (data blob sub_type 0)')
          cxn.start_transaction do |tx|
 
-            s = Statement.new(cxn, tx, 'INSERT INTO BLOB_TEST VALUES(?)', 3)
-            s.execute_for([DATA])
+            s = cxn.create_statement('INSERT INTO BLOB_TEST VALUES(?)')
+            s.exec([DATA], tx)
             
             # Perform a select of the value inserted.
             r = cxn.execute('SELECT * FROM BLOB_TEST', tx)
@@ -62,14 +62,14 @@ class BlobTest < Test::Unit::TestCase
          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])
+            s = cxn.create_statement('INSERT INTO BLOB_TEST VALUES(?)')
+            s.exec([UTF_DATA], tx)
             
             # 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)
+            assert_equal(UTF_DATA, d[0].to_s)
 
             # Clean up.
             s.close

data/test/GeneratorTest.rb

@@ -33,17 +33,17 @@ class GeneratorTest < Test::Unit::TestCase
    end
    
    def test01
-      assert(Generator::exists?('TEST_GEN', @connections[0]) == false)
+      assert(!Generator::exists?('TEST_GEN', @connections[0]))
       g = Generator::create('TEST_GEN', @connections[0])
       assert(Generator::exists?('TEST_GEN', @connections[0]))
-      assert(g.last == 0)
-      assert(g.next(1) == 1)
-      assert(g.last == 1)
-      assert(g.next(10) == 11)
-      assert(g.connection == @connections[0])
-      assert(g.name == 'TEST_GEN')
+      assert_equal(0, g.last)
+      assert_equal(1, g.next(1))
+      assert_equal(1, g.last)
+      assert_equal(11, g.next(10))
+      assert_equal(@connections[0], g.connection)
+      assert_equal('TEST_GEN', g.name)
       
       g.drop
-      assert(Generator::exists?('TEST_GEN', @connections[0]) == false)
+      assert(!Generator::exists?('TEST_GEN', @connections[0]))
    end
 end

data/test/KeyTest.rb

@@ -22,8 +22,7 @@ class KeyTest < Test::Unit::TestCase
       database     = Database::create(DB_FILE, DB_USER_NAME, DB_PASSWORD)
       @connection  = database.connect(DB_USER_NAME, DB_PASSWORD)
       @transaction = @connection.start_transaction
-      @results     = ResultSet.new(@connection, @transaction,
-                                   'SELECT * FROM RDB$FIELDS', 3, nil)
+      @results     = @connection.execute('SELECT * FROM RDB$FIELDS', @transaction)
       @empty       = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                       0, 0, 0, 0, 0, 0, 0, 0, 0]
       

data/test/ResultSetTest.rb

@@ -64,8 +64,8 @@ class ResultSetTest < Test::Unit::TestCase
    end
    
    def test01
-      r = ResultSet.new(@connections[0], @transactions[0],
-                        "SELECT * FROM TEST_TABLE ORDER BY TESTID", 3, nil)
+      r = @connections[0].execute("SELECT * FROM TEST_TABLE ORDER BY TESTID", @transactions[0])
+      assert_equal(Rubyfb::ResultSet, r.class)
       
       assert(r.connection == @connections[0])
       assert(r.transaction == @transactions[0])
@@ -80,8 +80,8 @@ class ResultSetTest < Test::Unit::TestCase
       assert(r.fetch == nil)
       r.close
       
-      r = ResultSet.new(@connections[0], @transactions[0],
-                        "SELECT * FROM TEST_TABLE ORDER BY TESTID", 3, nil)
+      r = @connections[0].execute("SELECT * FROM TEST_TABLE ORDER BY TESTID", @transactions[0])
+      assert_equal(Rubyfb::ResultSet, r.class)
       assert(r.column_count == 2)
       assert(r.column_name(0) == 'TESTID')
       assert(r.column_name(1) == 'TESTINFO')
@@ -97,8 +97,9 @@ class ResultSetTest < Test::Unit::TestCase
       assert(r.column_alias(-1) == nil)
       r.close
       
-      r = ResultSet.new(@connections[0], @transactions[0],
-                        "SELECT * FROM TEST_TABLE ORDER BY TESTID", 3, nil)
+      r = @connections[0].execute("SELECT * FROM TEST_TABLE ORDER BY TESTID", @transactions[0])
+      assert_equal(Rubyfb::ResultSet, r.class)
+      
       total = 0
       r.each do |row|
          total += 1
@@ -108,9 +109,9 @@ class ResultSetTest < Test::Unit::TestCase
    end
 
    def test02
-      r = ResultSet.new(@connections[0], @transactions[0],
-                        'select * from test_table where testid between ? and ?',
-                        3, [20, 40])
+      r = @connections[0].execute_for('select * from test_table where testid between ? and ?',
+                        [20, 40], @transactions[0])
+      assert_equal(Rubyfb::ResultSet, r.class)
       assert(r.exhausted? == false)
       total = 0
       r.each {|row| total += 1}
@@ -120,17 +121,14 @@ class ResultSetTest < Test::Unit::TestCase
 
    def test03
       begin
-         ResultSet.new(@connections[0], @transactions[0],
-                       "insert into test_table values(?, ?)", 3,
-                       [100, 'Should fail.'])
-         assert(false, "Created result set with non-query SQL statement.")
+         r = @connections[0].execute_for("insert into test_table values(?, ?)",
+                       [100, 'Should fail.'], @transactions[0])
+         assert_not_equal(Rubyfb::ResultSet, r.class, "Created result set with non-query SQL statement.")
       rescue FireRubyException
       end
 
       begin
-         ResultSet.new(@connections[0], @transactions[0],
-                       "select * from test_table where testid = ?", 3,
-                       [])
+         r = @connections[0].execute_for("select * from test_table where testid = ?", [], @transactions[0])
          assert(false, 'Created result set with insufficient parameters.')
       rescue FireRubyException
       end

data/test/RoleTest.rb

@@ -52,7 +52,7 @@ class RoleTest < Test::Unit::TestCase
       cxn = @database.connect('user1', 'password')      
       assert_raise FireRubyException do
         t1 = cxn.start_transaction
-        r = ResultSet.new(cxn, t1, "select * from test", 3, nil)
+        r = cxn.execute("select * from test", t1)
         r.fetch
         r.close
         t1.commit
@@ -62,7 +62,7 @@ class RoleTest < Test::Unit::TestCase
       cxn = @database.connect('user1', 'password', {Connection::SQL_ROLE_NAME => "myrole"})
       assert_nothing_raised do
         t1 = cxn.start_transaction
-        r = ResultSet.new(cxn, t1, "select * from test", 3, nil)
+        r = cxn.execute("select * from test", t1)
         r.fetch
         r.close
         t1.commit

data/test/RowCountTest.rb

@@ -35,29 +35,29 @@ class RowCountTest < Test::Unit::TestCase
    def test01
       @database.connect(DB_USER_NAME, DB_PASSWORD) do |cxn|
          cxn.start_transaction do |tx|
-            assert(cxn.execute_immediate('insert into test values (1000)') == 1)
-            assert(cxn.execute_immediate('insert into test values (1000)') == 1)
-            assert(cxn.execute('insert into test values (2000)', tx) == 1)
-            assert(cxn.execute('insert into test values (2000)', tx) == 1)
-            assert(tx.execute('insert into test values (3000)') == 1)
-            assert(tx.execute('insert into test values (3000)') == 1)
-            assert(tx.execute('insert into test values (4000)') == 1)
-            assert(tx.execute('insert into test values (4000)') == 1)
+            assert_equal(1, cxn.execute_immediate('insert into test values (1000)'))
+            assert_equal(1, cxn.execute_immediate('insert into test values (1000)'))
+            assert_equal(1, cxn.execute('insert into test values (2000)', tx))
+            assert_equal(1, cxn.execute('insert into test values (2000)', tx))
+            assert_equal(1, tx.execute('insert into test values (3000)'))
+            assert_equal(1, tx.execute('insert into test values (3000)'))
+            assert_equal(1, tx.execute('insert into test values (4000)'))
+            assert_equal(1, tx.execute('insert into test values (4000)'))
             
-            assert(cxn.execute_immediate('update test set id = 10000 where '\
-                                         'id = 1000') == 2)
-            assert(cxn.execute('update test set id = 20000 where id = 2000',
-                               tx) == 2)
-            assert(tx.execute('update test set id = 30000 where id = 3000') == 2)
+            assert_equal(2, cxn.execute_immediate('update test set id = 10000 where '\
+                                         'id = 1000'))
+            assert_equal(2, cxn.execute('update test set id = 20000 where id = 2000',
+                               tx))
+            assert_equal(2, tx.execute('update test set id = 30000 where id = 3000'))
             
-            s = Statement.new(cxn, tx, 'update test set id = 40000 where id = ?',
-                              3)
-            assert(s.execute_for([4000]) == 2)
+            s = cxn.create_statement('update test set id = 40000 where id = ?')
+            
+            assert_equal(2, s.exec([4000], tx))
 
             
-            assert(cxn.execute_immediate('delete from test where id = 10000') == 2)
-            assert(cxn.execute('delete from test where id = 20000', tx) == 2)
-            assert(tx.execute('delete from test where id = 30000') == 2)
+            assert_equal(2, cxn.execute_immediate('delete from test where id = 10000'))
+            assert_equal(2, cxn.execute('delete from test where id = 20000', tx))
+            assert_equal(2, tx.execute('delete from test where id = 30000'))
          end
       end
    end

data/test/RowTest.rb

@@ -19,8 +19,7 @@ class RowTest < Test::Unit::TestCase
       database     = Database::create(DB_FILE, DB_USER_NAME, DB_PASSWORD)
       @connection  = database.connect(DB_USER_NAME, DB_PASSWORD)
       @transaction = @connection.start_transaction
-      @results     = ResultSet.new(@connection, @transaction,
-                                   'SELECT * FROM RDB$FIELDS', 3, nil)
+      @results     = @connection.execute('SELECT * FROM RDB$FIELDS', @transaction)
       @empty       = [[0, SQLType::INTEGER], [0, SQLType::INTEGER],
                       [0, SQLType::INTEGER], [0, SQLType::INTEGER],
                       [0, SQLType::INTEGER], [0, SQLType::INTEGER],
@@ -48,14 +47,14 @@ class RowTest < Test::Unit::TestCase
       @connection.start_transaction do |tx|
          tx.execute("insert into rowtest values (1, 'Two', 3)")
          
-         stmt = Statement.new(@connection, tx,
+         stmt = @connection.create_statement(
                               "insert into all_types values(?, ?, ?, ?, ?, ?, "\
-                              "?, ?, ?, ?, ?, ?, ?)",
-                              3)
-         #stmt.execute_for([nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil])
-         stmt.execute_for([100000, nil, 'La la la', Date.new(2005, 10, 29),
+                              "?, ?, ?, ?, ?, ?, ?)"
+         )
+         #stmt.exec([nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil])
+         stmt.exec([100000, nil, 'La la la', Date.new(2005, 10, 29),
                            10.23, 100.751, 56.25, 12345, 19863.21, 123,
-                           Time.new, Time.new, 'The End!'])
+                           Time.new, Time.new, 'The End!'], tx)
       end
    end
    

data/test/SQLTest.rb

@@ -48,14 +48,14 @@ class SQLTest < Test::Unit::TestCase
    def test01
       @database.connect(DB_USER_NAME, DB_PASSWORD) do |cxn|
          cxn.start_transaction do |tx|
-            s = Statement.new(cxn, tx, INSERT_SQL, 3)
+            s = cxn.create_statement(INSERT_SQL)
             f = 0.0
             t = Time.new
             
             1.upto(ITERATIONS) do |i|
                f += 0.321
                t = Time.at(t.to_i + 5)
-               s.execute_for([i, i.to_s, f, t, nil, t])
+               s.exec([i, i.to_s, f, t, nil, t], tx)
             end
 
             s.close
@@ -129,9 +129,8 @@ class SQLTest < Test::Unit::TestCase
       @transactions[0].commit
       
       @connections[0].start_transaction do |tx|
-         s = Statement.new(@connections[0], tx,
-                           "UPDATE TEST_TABLE SET TESTSTAMP = NULL", 3)
-         s.execute()
+         s = @connections[0].create_statement("UPDATE TEST_TABLE SET TESTSTAMP = NULL")
+         s.exec(nil, tx)
          s.close
          
          r = tx.execute("SELECT TESTSTAMP FROM TEST_TABLE")
@@ -148,11 +147,11 @@ class SQLTest < Test::Unit::TestCase
       t = nil
       @connections[0].start_transaction do |tx|
          # Perform an insert via a parameterized statement.
-         s = Statement.new(@connections[0], tx,
+         s = @connections[0].create_statement(
                            "INSERT INTO TEST_TABLE (TESTID, TESTTEXT, "\
-                           "TESTFLOAT, TESTSTAMP) VALUES(?, ?, ?, ?)", 3)
+                           "TESTFLOAT, TESTSTAMP) VALUES(?, ?, ?, ?)")
          t = Time.new
-         s.execute_for([25000, 'La la la', 3.14, t])
+         s.exec([25000, 'La la la', 3.14, t], tx)
          s.close
          
          # Fetch the record and check the data.