sqlite3 1.3.5-x86-mswin32-60 → 1.3.6-x86-mswin32-60

data/CHANGELOG.rdoc

@@ -1,3 +1,35 @@
+=== 1.3.6 / 2012-04-16
+
+* Enhancements
+  * Windows: build against SQLite 3.7.11
+  * Added SQLite3::ResultSet#each_hash for fetching each row as a hash.
+  * Added SQLite3::ResultSet#next_hash for fetching one row as a hash.
+
+* Bugfixes
+  * Support both UTF-16LE and UTF-16BE encoding modes on PPC. Closes #63
+  * Protect parameters to custom functions from being garbage collected too
+    soon. Fixes #60. Thanks hirataya!
+  * Fix backwards compatibility with 1.2.5 with bind vars and `query` method.
+    Fixes #35.
+  * Fix double definition error caused by defining sqlite3_int64/uint64.
+  * Fix suspicious version regexp.
+
+* Deprecations
+  * ArrayWithTypesAndFields#types is deprecated and the class will be removed
+    in version 2.0.0.  Please use the `types` method on the ResultSet class
+    that created this object.
+  * ArrayWithTypesAndFields#fields is deprecated and the class will be removed
+    in version 2.0.0.  Please use the `columns` method on the ResultSet class
+    that created this object.
+  * The ArrayWithTypesAndFields class will be removed in 2.0.0
+  * The ArrayWithTypes class will be removed in 2.0.0
+  * HashWithTypesAndFields#types is deprecated and the class will be removed
+    in version 2.0.0.  Please use the `types` method on the ResultSet class
+    that created this object.
+  * HashWithTypesAndFields#fields is deprecated and the class will be removed
+    in version 2.0.0.  Please use the `columns` method on the ResultSet class
+    that created this object.
+
 === 1.3.5 / 2011-12-03 - ZOMG Holidays are here Edition!
 
 * Enhancements

data/ext/sqlite3/database.c

@@ -44,7 +44,9 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
   VALUE file;
   VALUE opts;
   VALUE zvfs;
+#ifdef HAVE_SQLITE3_OPEN_V2
   int mode = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
+#endif
   int status;
 
   Data_Get_Struct(self, sqlite3Ruby, ctx);
@@ -60,7 +62,7 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
   else Check_Type(opts, T_HASH);
 
 #ifdef HAVE_RUBY_ENCODING_H
-  if(UTF16_LE_P(file)) {
+  if(UTF16_LE_P(file) || UTF16_BE_P(file)) {
     status = sqlite3_open16(utf16_string_value_ptr(file), &ctx->db);
   } else {
 #endif
@@ -76,14 +78,25 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
 #endif
 
       if (Qtrue == rb_hash_aref(opts, ID2SYM(rb_intern("readonly")))) {
+#ifdef HAVE_SQLITE3_OPEN_V2
         mode = SQLITE_OPEN_READONLY;
+#else
+        rb_raise(rb_eNotImpError, "sqlite3-ruby was compiled against a version of sqlite that does not support readonly databases");
+#endif
       }
+#ifdef HAVE_SQLITE3_OPEN_V2
       status = sqlite3_open_v2(
           StringValuePtr(file),
           &ctx->db,
           mode,
           NIL_P(zvfs) ? NULL : StringValuePtr(zvfs)
       );
+#else
+      status = sqlite3_open(
+          StringValuePtr(file),
+          &ctx->db
+      );
+#endif
     }
 
 #ifdef HAVE_RUBY_ENCODING_H
@@ -100,7 +113,11 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
   rb_iv_set(self, "@functions", rb_hash_new());
   rb_iv_set(self, "@results_as_hash", rb_hash_aref(opts, sym_results_as_hash));
   rb_iv_set(self, "@type_translation", rb_hash_aref(opts, sym_type_translation));
+#ifdef HAVE_SQLITE3_OPEN_V2
   rb_iv_set(self, "@readonly", mode == SQLITE_OPEN_READONLY ? Qtrue : Qfalse);
+#else
+  rb_iv_set(self, "@readonly", Qfalse);
+#endif
 
   if(rb_block_given_p()) {
     rb_yield(self);
@@ -319,7 +336,9 @@ static void rb_sqlite3_func(sqlite3_context * ctx, int argc, sqlite3_value **arg
     params = xcalloc((size_t)argc, sizeof(VALUE *));
 
     for(i = 0; i < argc; i++) {
-      params[i] = sqlite3val2rb(argv[i]);
+      VALUE param = sqlite3val2rb(argv[i]);
+      RB_GC_GUARD(param);
+      params[i] = param;
     }
   }
 
@@ -625,13 +644,12 @@ static VALUE collation(VALUE self, VALUE name, VALUE comparator)
   Data_Get_Struct(self, sqlite3Ruby, ctx);
   REQUIRE_OPEN_DB(ctx);
 
-  CHECK(ctx->db, sqlite3_create_collation_v2(
+  CHECK(ctx->db, sqlite3_create_collation(
         ctx->db,
         StringValuePtr(name),
         SQLITE_UTF8,
         (void *)comparator,
-        NIL_P(comparator) ? NULL : rb_comparator_func,
-        NULL));
+        NIL_P(comparator) ? NULL : rb_comparator_func));
 
   /* Make sure our comparator doesn't get garbage collected. */
   rb_hash_aset(rb_iv_get(self, "@collations"), name, comparator);
@@ -639,10 +657,11 @@ static VALUE collation(VALUE self, VALUE name, VALUE comparator)
   return self;
 }
 
+#ifdef HAVE_SQLITE3_LOAD_EXTENSION
 /* call-seq: db.load_extension(file)
  *
  * Loads an SQLite extension library from the named file. Extension
- * loading must be enabled using db.enable_load_extension(1) prior
+ * loading must be enabled using db.enable_load_extension(true) prior
  * to calling this API.
  */
 static VALUE load_extension(VALUE self, VALUE file)
@@ -664,7 +683,9 @@ static VALUE load_extension(VALUE self, VALUE file)
 
   return self;
 }
+#endif
 
+#ifdef HAVE_SQLITE3_ENABLE_LOAD_EXTENSION
 /* call-seq: db.enable_load_extension(onoff)
  *
  * Enable or disable extension loading.
@@ -672,13 +693,23 @@ static VALUE load_extension(VALUE self, VALUE file)
 static VALUE enable_load_extension(VALUE self, VALUE onoff)
 {
   sqlite3RubyPtr ctx;
+  int onoffparam;
   Data_Get_Struct(self, sqlite3Ruby, ctx);
   REQUIRE_OPEN_DB(ctx);
 
-  CHECK(ctx->db, sqlite3_enable_load_extension(ctx->db, (int)NUM2INT(onoff)));
+  if (Qtrue == onoff) {
+    onoffparam = 1;
+  } else if (Qfalse == onoff) {
+    onoffparam = 0;
+  } else {
+    onoffparam = (int)NUM2INT(onoff);
+  }
+
+  CHECK(ctx->db, sqlite3_enable_load_extension(ctx->db, onoffparam));
 
   return self;
 }
+#endif
 
 #ifdef HAVE_RUBY_ENCODING_H
 static int enc_cb(void * _self, int UNUSED(columns), char **data, char **UNUSED(names))

data/ext/sqlite3/extconf.rb

@@ -43,5 +43,9 @@ have_func('sqlite3_backup_init')
 have_func('sqlite3_column_database_name')
 have_func('sqlite3_enable_load_extension')
 have_func('sqlite3_load_extension')
+have_func('sqlite3_open_v2')
+have_func('sqlite3_prepare_v2')
+have_type('sqlite3_int64', 'sqlite3.h')
+have_type('sqlite3_uint64', 'sqlite3.h')
 
 create_makefile('sqlite3/sqlite3_native')

data/ext/sqlite3/sqlite3_ruby.h

@@ -21,6 +21,7 @@
 
 #define UTF8_P(_obj) (rb_enc_get_index(_obj) == rb_utf8_encindex())
 #define UTF16_LE_P(_obj) (rb_enc_get_index(_obj) == rb_enc_find_index("UTF-16LE"))
+#define UTF16_BE_P(_obj) (rb_enc_get_index(_obj) == rb_enc_find_index("UTF-16BE"))
 #define SQLITE3_UTF8_STR_NEW2(_obj) \
     (rb_enc_associate_index(rb_str_new2(_obj), rb_utf8_encindex()))
 
@@ -33,6 +34,14 @@
 
 #include <sqlite3.h>
 
+#ifndef HAVE_TYPE_SQLITE3_INT64
+typedef sqlite_int64 sqlite3_int64;
+#endif
+
+#ifndef HAVE_TYPE_SQLITE3_UINT64
+typedef sqlite_uint64 sqlite3_uint64;
+#endif
+
 extern VALUE mSqlite3;
 extern VALUE cSqlite3Blob;
 

data/ext/sqlite3/statement.c

@@ -49,7 +49,11 @@ static VALUE initialize(VALUE self, VALUE db, VALUE sql)
   }
 #endif
 
+#ifdef HAVE_SQLITE3_PREPARE_V2
   status = sqlite3_prepare_v2(
+#else
+  status = sqlite3_prepare(
+#endif
       db_ctx->db,
       (const char *)StringValuePtr(sql),
       (int)RSTRING_LEN(sql),
@@ -359,7 +363,7 @@ static VALUE column_name(VALUE self, VALUE index)
 
   name = sqlite3_column_name(ctx->st, (int)NUM2INT(index));
 
-  if(name) return rb_str_new2(name);
+  if(name) return SQLITE3_UTF8_STR_NEW2(name);
   return Qnil;
 }
 

data/lib/sqlite3.rb

@@ -1,6 +1,6 @@
 # support multiple ruby version (fat binaries under windows)
 begin
-  RUBY_VERSION =~ /(\d+.\d+)/
+  RUBY_VERSION =~ /(\d+\.\d+)/
   require "sqlite3/#{$1}/sqlite3_native"
 rescue LoadError
   require 'sqlite3/sqlite3_native'

data/lib/sqlite3/database.rb

@@ -236,7 +236,7 @@ Support for this behavior will be removed in version 2.0.0.
     # This is a convenience method for creating a statement, binding
     # paramters to it, and calling execute:
     #
-    #   result = db.query( "select * from foo where a=?", 5 )
+    #   result = db.query( "select * from foo where a=?", [5])
     #   # is the same as
     #   result = db.prepare( "select * from foo where a=?" ).execute( 5 )
     #
@@ -250,7 +250,7 @@ Support for this behavior will be removed in version 2.0.0.
         if args.empty?
           bind_vars = []
         else
-          bind_vars = [nil] + args
+          bind_vars = [bind_vars] + args
         end
 
         warn(<<-eowarn) if $VERBOSE

data/lib/sqlite3/resultset.rb

@@ -10,23 +10,61 @@ module SQLite3
   class ResultSet
     include Enumerable
 
-    # The class of which we return an object in case we want an Array as
-    # result. (ArrayFields is installed.)
-    class ArrayWithTypes < Array
+    class ArrayWithTypes < Array # :nodoc:
       attr_accessor :types
     end
 
-    # The class of which we return an object in case we want an Array as
-    # result. (ArrayFields is not installed.)
-    class ArrayWithTypesAndFields < Array
-      attr_accessor :types
-      attr_accessor :fields
+    class ArrayWithTypesAndFields < Array # :nodoc:
+      attr_writer :types
+      attr_writer :fields
+
+      def types
+        warn(<<-eowarn) if $VERBOSE
+#{caller[0]} is calling #{self.class}#types.  This method will be removed in
+sqlite3 version 2.0.0, please call the `types` method on the SQLite3::ResultSet
+object that created this object
+        eowarn
+        @types
+      end
+
+      def fields
+        warn(<<-eowarn) if $VERBOSE
+#{caller[0]} is calling #{self.class}#fields.  This method will be removed in
+sqlite3 version 2.0.0, please call the `columns` method on the SQLite3::ResultSet
+object that created this object
+        eowarn
+        @fields
+      end
     end
 
     # The class of which we return an object in case we want a Hash as
     # result.
-    class HashWithTypes < Hash
-      attr_accessor :types
+    class HashWithTypesAndFields < Hash # :nodoc:
+      attr_writer :types
+      attr_writer :fields
+
+      def types
+        warn(<<-eowarn) if $VERBOSE
+#{caller[0]} is calling #{self.class}#types.  This method will be removed in
+sqlite3 version 2.0.0, please call the `types` method on the SQLite3::ResultSet
+object that created this object
+        eowarn
+        @types
+      end
+
+      def fields
+        warn(<<-eowarn) if $VERBOSE
+#{caller[0]} is calling #{self.class}#fields.  This method will be removed in
+sqlite3 version 2.0.0, please call the `columns` method on the SQLite3::ResultSet
+object that created this object
+        eowarn
+        @fields
+      end
+
+      def [] key
+        key = fields[key] if key.is_a? Numeric
+        super key
+      end
     end
 
     # Create a new ResultSet attached to the given database, using the
@@ -63,6 +101,10 @@ module SQLite3
     # For hashes, the column names are the keys of the hash, and the column
     # types are accessible via the +types+ property.
     def next
+      if @db.results_as_hash
+        return next_hash
+      end
+
       row = @stmt.step
       return nil if @stmt.done?
 
@@ -72,33 +114,39 @@ module SQLite3
         end
       end
 
-      if @db.results_as_hash
-        new_row = HashWithTypes[*@stmt.columns.zip(row).flatten]
-        row.each_with_index { |value,idx|
-          new_row[idx] = value
-        }
-        row = new_row
+      if row.respond_to?(:fields)
+        # FIXME: this can only happen if the translator returns something
+        # that responds to `fields`.  Since we're removing the translator
+        # in 2.0, we can remove this branch in 2.0.
+        row = ArrayWithTypes.new(row)
       else
-        if row.respond_to?(:fields)
-          row = ArrayWithTypes.new(row)
-        else
-          row = ArrayWithTypesAndFields.new(row)
-        end
-        row.fields = @stmt.columns
+        # FIXME: the `fields` and `types` methods are deprecated on this
+        # object for version 2.0, so we can safely remove this branch
+        # as well.
+        row = ArrayWithTypesAndFields.new(row)
       end
 
+      row.fields = @stmt.columns
       row.types = @stmt.types
       row
     end
 
     # Required by the Enumerable mixin. Provides an internal iterator over the
     # rows of the result set.
-    def each( &block )
+    def each
       while node = self.next
         yield node
       end
     end
 
+    # Provides an internal iterator over the rows of the result set where
+    # each row is yielded as a hash.
+    def each_hash
+      while node = next_hash
+        yield node
+      end
+    end
+
     # Closes the statement that spawned this result set.
     # <em>Use with caution!</em> Closing a result set will automatically
     # close any other result sets that were spawned from the same statement.
@@ -121,6 +169,27 @@ module SQLite3
       @stmt.columns
     end
 
-  end
+    # Return the next row as a hash
+    def next_hash
+      row = @stmt.step
+      return nil if @stmt.done?
+
+      # FIXME: type translation is deprecated, so this can be removed
+      # in 2.0
+      if @db.type_translation
+        row = @stmt.types.zip(row).map do |type, value|
+          @db.translator.translate( type, value )
+        end
+      end
+
+      # FIXME: this can be switched to a regular hash in 2.0
+      row = HashWithTypesAndFields[*@stmt.columns.zip(row).flatten]
 
+      # FIXME: these methods are deprecated for version 2.0, so we can remove
+      # this code in 2.0
+      row.fields = @stmt.columns
+      row.types = @stmt.types
+      row
+    end
+  end
 end

data/lib/sqlite3/statement.rb

@@ -120,23 +120,6 @@ module SQLite3
       @types
     end
 
-    # A convenience method for obtaining the metadata about the query. Note
-    # that this will actually execute the SQL, which means it can be a
-    # (potentially) expensive operation.
-    def get_metadata
-      @columns = []
-      @types = []
-
-      column_count.times do |column|
-        @columns << column_name(column)
-        @types << column_decltype(column)
-      end
-
-      @columns.freeze
-      @types.freeze
-    end
-    private :get_metadata
-
     # Performs a sanity check to ensure that the statement is not
     # closed. If it is, an exception is raised.
     def must_be_open! # :nodoc:
@@ -144,5 +127,18 @@ module SQLite3
         raise SQLite3::Exception, "cannot use a closed statement"
       end
     end
+
+    private
+    # A convenience method for obtaining the metadata about the query. Note
+    # that this will actually execute the SQL, which means it can be a
+    # (potentially) expensive operation.
+    def get_metadata
+      @columns = Array.new(column_count) do |column|
+        column_name column
+      end
+      @types = Array.new(column_count) do |column|
+        column_decltype column
+      end
+    end
   end
 end

data/lib/sqlite3/version.rb

@@ -1,12 +1,12 @@
 module SQLite3
 
-  VERSION = '1.3.5'
+  VERSION = '1.3.6'
 
   module VersionProxy
 
     MAJOR = 1
     MINOR = 3
-    TINY  = 4
+    TINY  = 6
     BUILD = nil
 
     STRING = [ MAJOR, MINOR, TINY, BUILD ].compact.join( "." )

data/tasks/native.rake

@@ -4,8 +4,8 @@ require 'rake/extensiontask'
 # NOTE: version used by cross compilation of Windows native extension
 # It do not affect compilation under other operating systems
 # The version indicated is the minimum DLL suggested for correct functionality
-BINARY_VERSION = "3.7.9"
-URL_VERSION    = "3070900"
+BINARY_VERSION = "3.7.11"
+URL_VERSION    = "3071100"
 
 # build sqlite3_native C extension
 Rake::ExtensionTask.new('sqlite3_native', HOE.spec) do |ext|

data/test/helper.rb

@@ -1,3 +1,14 @@
 require 'sqlite3'
 require 'test/unit'
-require 'iconv'
+
+unless RUBY_VERSION >= "1.9"
+  require 'iconv'
+end
+
+module SQLite3
+  class TestCase < Test::Unit::TestCase
+    unless RUBY_VERSION >= '1.9'
+      undef :default_test
+    end
+  end
+end

data/test/test_backup.rb

@@ -1,7 +1,7 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require 'helper'
 
 module SQLite3
-  class TestBackup < Test::Unit::TestCase
+  class TestBackup < SQLite3::TestCase
     def setup
       @sdb = SQLite3::Database.new(':memory:')
       @ddb = SQLite3::Database.new(':memory:')

data/test/test_collation.rb

@@ -3,7 +3,7 @@
 require 'helper'
 
 module SQLite3
-  class TestCollation < Test::Unit::TestCase
+  class TestCollation < SQLite3::TestCase
     class Comparator
       attr_reader :calls
       def initialize

data/test/test_database.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 module SQLite3
-  class TestDatabase < Test::Unit::TestCase
+  class TestDatabase < SQLite3::TestCase
     attr_reader :db
 
     def setup
@@ -77,8 +77,12 @@ module SQLite3
       # determine if Ruby is running on Big Endian platform
       utf16 = ([1].pack("I") == [1].pack("N")) ? "UTF-16BE" : "UTF-16LE"
 
-      db = SQLite3::Database.new(Iconv.conv(utf16, 'UTF-8', ':memory:'),
-                                 :utf16 => true)
+      if RUBY_VERSION >= "1.9"
+        db = SQLite3::Database.new(':memory:'.encode(utf16), :utf16 => true)
+      else
+        db = SQLite3::Database.new(Iconv.conv(utf16, 'UTF-8', ':memory:'),
+                                   :utf16 => true)
+      end
       assert db
     end
 

data/test/test_database_readonly.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 module SQLite3
-  class TestDatabaseReadonly < Test::Unit::TestCase
+  class TestDatabaseReadonly < SQLite3::TestCase
     def setup
       File.unlink 'test-readonly.db' if File.exists?('test-readonly.db')
       @db = SQLite3::Database.new('test-readonly.db')

data/test/test_deprecated.rb

@@ -1,12 +1,15 @@
 require 'helper'
 
 module SQLite3
-  class TestDeprecated < Test::Unit::TestCase
+  class TestDeprecated < SQLite3::TestCase
+    attr_reader :db
+
     def setup
       super
       @warn_before = $-w
       $-w = false
       @db = SQLite3::Database.new(':memory:')
+      @db.execute 'CREATE TABLE test_table (name text, age int)'
     end
 
     def teardown
@@ -14,6 +17,10 @@ module SQLite3
       $-w = @warn_before
     end
 
+    def test_query_with_many_bind_params_not_nil
+      assert_equal [[1, 2]], db.query('select ?, ?', 1, 2).to_a
+    end
+
     def test_execute_with_many_bind_params_not_nil
       assert_equal [[1, 2]], @db.execute("select ?, ?", 1, 2).to_a
     end

data/test/test_encoding.rb

@@ -3,7 +3,7 @@
 require 'helper'
 
 module SQLite3
-  class TestEncoding < Test::Unit::TestCase
+  class TestEncoding < SQLite3::TestCase
     def setup
       @db = SQLite3::Database.new(':memory:')
       @create = "create table ex(id int, data string)"

data/test/test_integration.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TC_Database_Integration < Test::Unit::TestCase
+class TC_Database_Integration < SQLite3::TestCase
   def setup
     @db = SQLite3::Database.new(":memory:")
     @db.transaction do

data/test/test_integration_open_close.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TC_OpenClose < Test::Unit::TestCase
+class TC_OpenClose < SQLite3::TestCase
   def test_create_close
     begin
       db = SQLite3::Database.new( "test-create.db" )

data/test/test_integration_pending.rb

@@ -3,7 +3,7 @@ require 'helper'
 require 'thread'
 require 'benchmark'
 
-class TC_Integration_Pending < Test::Unit::TestCase
+class TC_Integration_Pending < SQLite3::TestCase
   def setup
     @db = SQLite3::Database.new("test.db")
     @db.transaction do

data/test/test_integration_resultset.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TC_ResultSet < Test::Unit::TestCase
+class TC_ResultSet < SQLite3::TestCase
   def setup
     @db = SQLite3::Database.new(":memory:")
     @db.transaction do
@@ -98,8 +98,11 @@ class TC_ResultSet < Test::Unit::TestCase
   def test_next_results_as_hash
     @db.results_as_hash = true
     @result.reset( 1 )
-    assert_equal( { "a" => 1, "b" => "foo", 0 => 1, 1 => "foo" },
-      @result.next )
+    hash = @result.next
+    assert_equal( { "a" => 1, "b" => "foo" },
+      hash )
+    assert_equal hash[0], 1
+    assert_equal hash[1], "foo"
   end
 
   def test_tainted_results_as_hash

data/test/test_integration_statement.rb

@@ -1,6 +1,6 @@
-require File.join(File.dirname(__FILE__), 'helper')
+require 'helper'
 
-class TC_Statement < Test::Unit::TestCase
+class TC_Statement < SQLite3::TestCase
   def setup
     @db = SQLite3::Database.new(":memory:")
     @db.transaction do

data/test/test_result_set.rb

@@ -0,0 +1,37 @@
+require 'helper'
+
+module SQLite3
+  class TestResultSet < SQLite3::TestCase
+    def test_each_hash
+      db = SQLite3::Database.new ':memory:'
+      db.execute "create table foo ( a integer primary key, b text )"
+      list = ('a'..'z').to_a
+      list.each do |t|
+        db.execute "insert into foo (b) values (\"#{t}\")"
+      end
+
+      rs = db.prepare('select * from foo').execute
+      rs.each_hash do |hash|
+        assert_equal list[hash['a'] - 1], hash['b']
+      end
+    end
+
+    def test_next_hash
+      db = SQLite3::Database.new ':memory:'
+      db.execute "create table foo ( a integer primary key, b text )"
+      list = ('a'..'z').to_a
+      list.each do |t|
+        db.execute "insert into foo (b) values (\"#{t}\")"
+      end
+
+      rs = db.prepare('select * from foo').execute
+      rows = []
+      while row = rs.next_hash
+        rows << row
+      end
+      rows.each do |hash|
+        assert_equal list[hash['a'] - 1], hash['b']
+      end
+    end
+  end
+end

data/test/test_sqlite3.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 module SQLite3
-  class TestSQLite3 < Test::Unit::TestCase
+  class TestSQLite3 < SQLite3::TestCase
     def test_libversion
       assert_not_nil SQLite3.libversion
     end

data/test/test_statement.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 module SQLite3
-  class TestStatement < Test::Unit::TestCase
+  class TestStatement < SQLite3::TestCase
     def setup
       @db   = SQLite3::Database.new(':memory:')
       @stmt = SQLite3::Statement.new(@db, "select 'foo'")

data/test/test_statement_execute.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 module SQLite3
-  class TestStatementExecute < Test::Unit::TestCase
+  class TestStatementExecute < SQLite3::TestCase
     def setup
       @db   = SQLite3::Database.new(':memory:')
       @db.execute_batch(

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sqlite3
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 3
-  - 5
-  version: 1.3.5
+  - 6
+  version: 1.3.6
 platform: x86-mswin32-60
 authors: 
 - Jamis Buck
@@ -17,68 +17,68 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-03 00:00:00 Z
+date: 2012-04-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake-compiler
+  name: rdoc
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
-        - 0
-        - 7
-        - 0
-        version: 0.7.0
+        - 3
+        - 10
+        version: "3.10"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mini_portile
+  name: rake-compiler
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 3
         segments: 
         - 0
-        - 2
-        - 2
-        version: 0.2.2
+        - 7
+        - 0
+        version: 0.7.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: mini_portile
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 19
         segments: 
+        - 0
+        - 2
         - 2
-        - 12
-        version: "2.12"
+        version: 0.2.2
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: hoe
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 7
         segments: 
         - 3
-        - 10
-        version: "3.10"
+        - 0
+        version: "3.0"
   type: :development
   version_requirements: *id004
 description: |-
@@ -96,15 +96,15 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- API_CHANGES.rdoc
+- CHANGELOG.rdoc
 - Manifest.txt
 - README.rdoc
-- CHANGELOG.rdoc
-- API_CHANGES.rdoc
-- ext/sqlite3/sqlite3.c
 - ext/sqlite3/backup.c
-- ext/sqlite3/statement.c
 - ext/sqlite3/database.c
 - ext/sqlite3/exception.c
+- ext/sqlite3/sqlite3.c
+- ext/sqlite3/statement.c
 files: 
 - API_CHANGES.rdoc
 - CHANGELOG.rdoc
@@ -156,6 +156,7 @@ files:
 - test/test_sqlite3.rb
 - test/test_statement.rb
 - test/test_statement_execute.rb
+- test/test_result_set.rb
 - .gemtest
 - lib/sqlite3/1.8/sqlite3_native.so
 - lib/sqlite3/1.9/sqlite3_native.so
@@ -193,22 +194,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sqlite3
-rubygems_version: 1.8.12
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: This module allows Ruby programs to interface with the SQLite3 database engine (http://www.sqlite.org)
 test_files: 
+- test/test_backup.rb
+- test/test_collation.rb
 - test/test_database.rb
-- test/test_integration_open_close.rb
 - test/test_database_readonly.rb
-- test/test_statement.rb
-- test/test_integration_resultset.rb
 - test/test_deprecated.rb
-- test/test_backup.rb
 - test/test_encoding.rb
-- test/test_sqlite3.rb
-- test/test_collation.rb
 - test/test_integration.rb
-- test/test_statement_execute.rb
-- test/test_integration_statement.rb
+- test/test_integration_open_close.rb
 - test/test_integration_pending.rb
+- test/test_integration_resultset.rb
+- test/test_integration_statement.rb
+- test/test_result_set.rb
+- test/test_sqlite3.rb
+- test/test_statement.rb
+- test/test_statement_execute.rb