sqlite3-ruby 1.2.1-mswin32 → 1.2.2-mswin32

data/lib/sqlite3/statement.rb

@@ -1,35 +1,3 @@
-#--
-# =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-#     * Redistributions of source code must retain the above copyright notice,
-#       this list of conditions and the following disclaimer.
-# 
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-# 
-#     * The names of its contributors may not be used to endorse or promote
-#       products derived from this software without specific prior written
-#       permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# =============================================================================
-#++
-
 require 'sqlite3/errors'
 require 'sqlite3/resultset'
 
@@ -122,7 +90,11 @@ module SQLite3
           when Bignum then
             @driver.bind_int64( @handle, param, value )
           when Integer then
-            @driver.bind_int( @handle, param, value )
+            if value >= (2 ** 31)
+              @driver.bind_int64( @handle, param, value )
+            else
+              @driver.bind_int( @handle, param, value )
+            end
           when Numeric then
             @driver.bind_double( @handle, param, value.to_f )
           when Blob then

data/lib/sqlite3/translator.rb

@@ -1,36 +1,5 @@
-#--
-# =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-#     * Redistributions of source code must retain the above copyright notice,
-#       this list of conditions and the following disclaimer.
-# 
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-# 
-#     * The names of its contributors may not be used to endorse or promote
-#       products derived from this software without specific prior written
-#       permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# =============================================================================
-#++
-
 require 'time'
+require 'date'
 
 module SQLite3
 
@@ -48,6 +17,7 @@ module SQLite3
     # translators for most SQL data types.
     def initialize
       @translators = Hash.new( proc { |type,value| value } )
+      @type_name_cache = {}
       register_default_translators
     end
 
@@ -81,18 +51,22 @@ module SQLite3
     # A convenience method for working with type names. This returns the "base"
     # type name, without any parenthetical data.
     def type_name( type )
-      return "" if type.nil?
-      type = $1 if type =~ /^(.*?)\(/
-      type.upcase
+      @type_name_cache[type] ||= begin
+        type = "" if type.nil?
+        type = $1 if type =~ /^(.*?)\(/
+        type.upcase
+      end
     end
     private :type_name
 
     # Register the default translators for the current Translator instance.
     # This includes translators for most major SQL data types.
     def register_default_translators
-      [ "date",
-        "datetime",
-        "time" ].each { |type| add_translator( type ) { |t,v| Time.parse( v ) } }
+      [ "time",
+        "timestamp" ].each { |type| add_translator( type ) { |t, v| Time.parse( v ) } }
+
+      add_translator( "date" ) { |t,v| Date.parse(v) }
+      add_translator( "datetime" ) { |t,v| DateTime.parse(v) }
 
       [ "decimal",
         "float",
@@ -120,7 +94,6 @@ module SQLite3
         end
       end
 
-      add_translator( "timestamp" ) { |type, value| Time.at( value.to_i ) }
       add_translator( "tinyint" ) do |type, value|
         if type =~ /\(\s*1\s*\)/
           value.to_i == 1

data/lib/sqlite3/value.rb

@@ -1,35 +1,3 @@
-#--
-# =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-#     * Redistributions of source code must retain the above copyright notice,
-#       this list of conditions and the following disclaimer.
-# 
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-# 
-#     * The names of its contributors may not be used to endorse or promote
-#       products derived from this software without specific prior written
-#       permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# =============================================================================
-#++
-
 require 'sqlite3/constants'
 
 module SQLite3

data/lib/sqlite3/version.rb

@@ -1,42 +1,10 @@
-#--
-# =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-#     * Redistributions of source code must retain the above copyright notice,
-#       this list of conditions and the following disclaimer.
-# 
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-# 
-#     * The names of its contributors may not be used to endorse or promote
-#       products derived from this software without specific prior written
-#       permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# =============================================================================
-#++
-
 module SQLite3
 
   module Version
 
     MAJOR = 1
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     STRING = [ MAJOR, MINOR, TINY ].join( "." )
     #:beta-tag:

data/test/driver/dl/tc_driver.rb

@@ -1,35 +1,3 @@
-#--
-# =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-#     * Redistributions of source code must retain the above copyright notice,
-#       this list of conditions and the following disclaimer.
-# 
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-# 
-#     * The names of its contributors may not be used to endorse or promote
-#       products derived from this software without specific prior written
-#       permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# =============================================================================
-#++
-
 if (ENV["SQLITE3_DRIVERS"] || "Native").split(/,/).include?("DL")
   $:.unshift "../../../lib"
 

data/test/mocks.rb

@@ -1,102 +1,45 @@
-#--
-# =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-#     * Redistributions of source code must retain the above copyright notice,
-#       this list of conditions and the following disclaimer.
-# 
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-# 
-#     * The names of its contributors may not be used to endorse or promote
-#       products derived from this software without specific prior written
-#       permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# =============================================================================
-#++
-
 require 'rubygems'
-gem 'flexmock', '< 0.1.0'
-
-require 'flexmock'
+gem 'mocha'
 
-class FlexMockWithArgs < FlexMock
-  attr_reader :mock_args
-  attr_reader :mock_blocks
+require 'mocha'
 
+class Driver < Mocha::Mock
   def initialize
     super
-    @mock_args = Hash.new { |h,k| h[k] = [] }
-    @mock_blocks = Hash.new { |h,k| h[k] = [] }
-  end
-
-  def method_missing( sym, *args, &block )
-    @mock_args[sym] << args
-    @mock_blocks[sym] << block
-    super
+    stubs( :open ).returns([0, 'cookie'])
+    stubs( :close ).returns(0)
+    stubs( :complete? ).returns(0)
+    stubs( :errmsg ).returns('')
+    stubs( :errcode ).returns(0)
+    stubs( :trace ).returns(nil)
+    stubs( :set_authorizer ).returns(0)
+    stubs( :prepare ).returns([0, 'stmt', 'remainder'])
+    stubs( :finalize ).returns(0)
+    stubs( :changes ).returns(14)
+    stubs( :total_changes ).returns(28)
+    stubs( :interrupt ).returns(0)
   end
 end
 
-class Driver < FlexMockWithArgs
-  def self.instance
-    @@instance
-  end
-
+class MockResultSet < Mocha::Mock
   def initialize
     super
-    @@instance = self
-    mock_handle( :open ) { [0,"cookie"] }
-    mock_handle( :close ) { 0 }
-    mock_handle( :complete? ) { 0 }
-    mock_handle( :errmsg ) { "" }
-    mock_handle( :errcode ) { 0 }
-    mock_handle( :trace ) { nil }
-    mock_handle( :set_authorizer ) { 0 }
-    mock_handle( :prepare ) { [0,"stmt", "remainder"] }
-    mock_handle( :finalize ) { 0 }
-    mock_handle( :changes ) { 14 }
-    mock_handle( :total_changes ) { 28 }
-    mock_handle( :interrupt ) { 0 }
+    stubs( :each ).yields(['foo'])
+    stubs( :columns ).returns(['name'])
   end
 end
 
-class Statement < FlexMockWithArgs
-  def self.instance
-    @@instance
-  end
-
+class Statement < Mocha::Mock
   attr_reader :handle
   attr_reader :sql
   attr_reader :last_result
 
   def initialize( handle, sql )
     super()
-    @@instance = self
     @handle = handle
     @sql = sql
-    mock_handle( :close ) { 0 }
-    mock_handle( :remainder ) { "" }
-    mock_handle( :execute ) do
-      @last_result = FlexMockWithArgs.new
-      @last_result.mock_handle( :each ) { @last_result.mock_blocks[:each].last.call ["foo"] }
-      @last_result.mock_handle( :inject ) { |a,| @last_result.mock_blocks[:inject].last.call a, ["foo"] }
-      @last_result.mock_handle( :columns ) { ["name"] }
-      @last_result
-    end
+    stubs( :close ).returns(0)
+    stubs( :remainder ).returns('')
+    stubs( :execute ).returns(MockResultSet.new)
   end
 end

data/test/tc_database.rb

@@ -1,35 +1,3 @@
-#--
-# =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-#     * Redistributions of source code must retain the above copyright notice,
-#       this list of conditions and the following disclaimer.
-# 
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-# 
-#     * The names of its contributors may not be used to endorse or promote
-#       products derived from this software without specific prior written
-#       permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# =============================================================================
-#++
-
 $:.unshift "../lib"
 
 require 'sqlite3/database'
@@ -39,19 +7,22 @@ require 'mocks'
 
 class TC_Database_Init < Test::Unit::TestCase
   def test_new
-    db = SQLite3::Database.new( "foo.db", :driver => Driver )
-    assert_equal 1, Driver.instance.mock_count(:open)
+    # any_instance fails here...
+    driver = Driver.new
+    driver.expects(:open).once.with('foo.db', false).returns([0, 'cookie'])
+    Driver.stubs(:new).returns(driver)
+    db = SQLite3::Database.new( 'foo.db', :driver => Driver )
     assert !db.closed?
-    assert_equal [["foo.db",false]], Driver.instance.mock_args[:open]
     assert !db.results_as_hash
     assert !db.type_translation
   end
 
   def test_open
+    driver = Driver.new
+    driver.expects(:open).once.with('foo.db', false).returns([0, 'cookie'])
+    Driver.stubs(:new).returns(driver)
     db = SQLite3::Database.open( "foo.db", :driver => Driver )
-    assert_equal 1, Driver.instance.mock_count(:open)
     assert !db.closed?
-    assert_equal [["foo.db",false]], Driver.instance.mock_args[:open]
     assert !db.results_as_hash
     assert !db.type_translation
   end
@@ -89,18 +60,18 @@ class TC_Database < Test::Unit::TestCase
   end
 
   def test_complete
+    Driver.any_instance.expects(:complete?)
     @db.complete? "foo"
-    assert_equal 1, Driver.instance.mock_count( :complete? )
   end
 
   def test_errmsg
+    Driver.any_instance.expects(:errmsg)
     @db.errmsg
-    assert_equal 1, Driver.instance.mock_count( :errmsg )
   end
 
   def test_errcode
+    Driver.any_instance.expects(:errcode)
     @db.errcode
-    assert_equal 1, Driver.instance.mock_count( :errcode )
   end
 
   def test_translator
@@ -109,84 +80,95 @@ class TC_Database < Test::Unit::TestCase
   end
 
   def test_close
+    Driver.any_instance.expects(:close).returns(0)
     @db.close
-    assert_equal 1, Driver.instance.mock_count( :close )
     assert @db.closed?
+    Driver.any_instance.expects(:close).never
     @db.close
-    assert_equal 1, Driver.instance.mock_count( :close )
   end
 
   def test_trace
+    Driver.any_instance.expects(:trace).with('cookie', 15)
     @db.trace( 15 ) { "foo" }
-    driver = Driver.instance
-    assert_equal 1, driver.mock_count( :trace )
-    assert_equal [[ "cookie", 15 ]], driver.mock_args[:trace]
-    assert_equal 1, driver.mock_blocks[:trace].length
+    # assert_equal 1, driver.mock_blocks[:trace].length
   end
 
   def test_authorizer
+    Driver.any_instance.expects(:set_authorizer).with('cookie', 15).returns(0)
     @db.authorizer( 15 ) { "foo" }
-    driver = Driver.instance
-    assert_equal 1, driver.mock_count( :set_authorizer )
-    assert_equal [[ "cookie", 15 ]], driver.mock_args[:set_authorizer]
-    assert_equal 1, driver.mock_blocks[:set_authorizer].length
+    # assert_equal 1, driver.mock_blocks[:set_authorizer].length
   end
 
   def test_prepare_no_block
+    Statement.any_instance.expects(:close).never
     assert_nothing_raised { @db.prepare( "foo" ) }
-    assert_equal 0, Statement.instance.mock_count( :close )
   end
 
   def test_prepare_with_block
     called = false
+    # any_instance fails here...
+    statement = Statement.new('cookie', 'foo')
+    statement.expects(:close).once
+    Statement.stubs(:new).returns(statement)
     @db.prepare( "foo" ) { |stmt| called = true }
     assert called
-    assert_equal 1, Statement.instance.mock_count( :close )
   end
 
   def test_execute_no_block
+    # any_instance fails here...
+    statement = Statement.new('cookie', 'foo')
+    statement.expects(:execute).with('bar', 'baz').returns(MockResultSet.new)
+    Statement.stubs(:new).returns(statement)
+    MockResultSet.any_instance.stubs(:inject).returns([['foo']])
     result = @db.execute( "foo", "bar", "baz" )
-    stmt = Statement.instance
     assert_equal [["foo"]], result
-    assert_equal [["bar", "baz"]], stmt.mock_args[:execute]
   end
 
   def test_execute_with_block
     called = false
+    # any_instance fails here...
+    statement = Statement.new('cookie', 'foo')
+    statement.expects(:execute).with('bar', 'baz').returns(MockResultSet.new)
+    Statement.stubs(:new).returns(statement)
     @db.execute( "foo", "bar", "baz" ) do |row|
       called = true
       assert_equal ["foo"], row
     end
 
-    stmt = Statement.instance
     assert called
-    assert_equal [["bar", "baz"]], stmt.mock_args[:execute]
   end
 
   def test_execute2_no_block
+    # any_instance fails here...
+    statement = Statement.new('cookie', 'foo')
+    statement.expects(:execute).with('bar', 'baz').returns(MockResultSet.new)
+    Statement.stubs(:new).returns(statement)
+    MockResultSet.any_instance.stubs(:inject).returns([['name'], ['foo']])
     result = @db.execute2( "foo", "bar", "baz" )
-    stmt = Statement.instance
     assert_equal [["name"],["foo"]], result
-    assert_equal [["bar", "baz"]], stmt.mock_args[:execute]
   end
 
   def test_execute2_with_block
     called = false
     parts = [ ["name"],["foo"] ]
+    # any_instance fails here...
+    statement = Statement.new('cookie', 'foo')
+    statement.expects(:execute).with('bar', 'baz').returns(MockResultSet.new)
+    Statement.stubs(:new).returns(statement)
     @db.execute2( "foo", "bar", "baz" ) do |row|
       called = true
       assert_equal parts.shift, row
     end
 
-    stmt = Statement.instance
     assert called
-    assert_equal [["bar", "baz"]], stmt.mock_args[:execute]
   end
 
   def test_execute_batch
+    # any_instance fails here...
+    statement = Statement.new('cookie', 'foo')
+    statement.expects(:execute).with('bar', 'baz').returns(MockResultSet.new)
+    Statement.stubs(:new).returns(statement)
     @db.execute_batch( "foo", "bar", "baz" )
-    stmt = Statement.instance
-    assert_equal [["bar", "baz"]], stmt.mock_args[:execute]
   end
 
   def test_get_first_row
@@ -200,17 +182,17 @@ class TC_Database < Test::Unit::TestCase
   end
 
   def test_changes
+    Driver.any_instance.expects(:changes).returns(14)
     assert_equal 14, @db.changes
-    assert_equal 1, Driver.instance.mock_count(:changes)
   end
 
   def test_total_changes
+    Driver.any_instance.expects(:total_changes).returns(28)
     assert_equal 28, @db.total_changes
-    assert_equal 1, Driver.instance.mock_count(:total_changes)
   end
 
   def test_interrupt
+    Driver.any_instance.expects(:interrupt)
     @db.interrupt
-    assert_equal 1, Driver.instance.mock_count(:interrupt)
   end
 end