sqlite3-ruby 1.3.1-x86-mingw32 → 1.3.2-x86-mingw32

data/API_CHANGES.rdoc

@@ -1,5 +1,7 @@
 = API Changes
 
+* SQLite3::Database#execute only accepts an array for bind parameters.
+
 * SQLite3::ResultSet used to query the database for the first row, regardless
   of whether the user asked for it or not.  I have removed that so that rows
   will not be returned until the user asks for them.  This is a subtle but

data/CHANGELOG.rdoc

@@ -1,3 +1,24 @@
+=== 1.3.2 / 2010-10-30 / RubyConf Uruguay Edition!
+
+* Enhancements:
+  * Windows: build against 3.7.3 version of SQLite3
+  * SQLite3::Database can now be open as readonly
+
+      db = SQLite3::Database.new('my.db', :readonly => true)
+
+  * Added SQLite3::SQLITE_VERSION and SQLite3::SQLITE_VERSION_NUMBER [nurse]
+
+* Bugfixes
+  * type_translation= works along with Database#execute and a block
+  * defined functions are kept in a hash to prevent GC. #7
+  * Removed GCC specific flags from extconf.
+
+* DEPRECATIONS
+  * SQLite3::Database#type_translation= will be deprecated in the future with
+    no replacement.
+  * SQlite3::Version will be deprecated in 2.0.0 with SQLite3::VERSION as the
+    replacement.
+
 === 1.3.1 / 2010-07-09
 
 * Enhancements

data/Manifest.txt

@@ -5,6 +5,8 @@ LICENSE
 Manifest.txt
 README.rdoc
 Rakefile
+ext/sqlite3/backup.c
+ext/sqlite3/backup.h
 ext/sqlite3/database.c
 ext/sqlite3/database.h
 ext/sqlite3/exception.c
@@ -32,8 +34,10 @@ tasks/gem.rake
 tasks/native.rake
 tasks/vendor_sqlite3.rake
 test/helper.rb
+test/test_backup.rb
 test/test_collation.rb
 test/test_database.rb
+test/test_database_readonly.rb
 test/test_deprecated.rb
 test/test_encoding.rb
 test/test_integration.rb

data/ext/sqlite3/backup.c

@@ -0,0 +1,164 @@
+#include <sqlite3_ruby.h>
+
+#define REQUIRE_OPEN_BACKUP(_ctxt) \
+  if(!_ctxt->p) \
+    rb_raise(rb_path2class("SQLite3::Exception"), "cannot use a closed backup");
+
+VALUE cSqlite3Backup;
+
+static void deallocate(void * ctx)
+{
+  sqlite3BackupRubyPtr c = (sqlite3BackupRubyPtr)ctx;
+  xfree(c);
+}
+
+static VALUE allocate(VALUE klass)
+{
+  sqlite3BackupRubyPtr ctx = xcalloc((size_t)1, sizeof(sqlite3BackupRuby));
+  return Data_Wrap_Struct(klass, NULL, deallocate, ctx);
+}
+
+/* call-seq: SQLite3::Backup.new(dstdb, dstname, srcdb, srcname)
+ *
+ * Initialize backup the backup.
+ *
+ * dstdb:
+ *   the destination SQLite3::Database object.
+ * dstname:
+ *   the destination's database name.
+ * srcdb:
+ *   the source SQLite3::Database object.
+ * srcname:
+ *   the source's database name.
+ *
+ * The database name is "main", "temp", or the name specified in an
+ * ATTACH statement.
+ *
+ * This feature requires SQLite 3.6.11 or later.
+ *
+ *   require 'sqlite3'
+ *   sdb = SQLite3::Database.new('src.sqlite3')
+ *
+ *   ddb = SQLite3::Database.new(':memory:')
+ *   b = SQLite3::Backup.new(ddb, 'main', sdb, 'main')
+ *   p [b.remaining, b.pagecount] # invalid value; for example [0, 0]
+ *   begin
+ *     p b.step(1) #=> OK or DONE
+ *     p [b.remaining, b.pagecount]
+ *   end while b.remaining > 0
+ *   b.finish
+ *
+ *   ddb = SQLite3::Database.new(':memory:')
+ *   b = SQLite3::Backup.new(ddb, 'main', sdb, 'main')
+ *   b.step(-1) #=> DONE
+ *   b.finish
+ *
+ */
+static VALUE initialize(VALUE self, VALUE dstdb, VALUE dstname, VALUE srcdb, VALUE srcname)
+{
+  sqlite3BackupRubyPtr ctx;
+  sqlite3RubyPtr ddb_ctx, sdb_ctx;
+  sqlite3_backup *pBackup;
+
+  Data_Get_Struct(self, sqlite3BackupRuby, ctx);
+  Data_Get_Struct(dstdb, sqlite3Ruby, ddb_ctx);
+  Data_Get_Struct(srcdb, sqlite3Ruby, sdb_ctx);
+
+  if(!sdb_ctx->db)
+    rb_raise(rb_eArgError, "cannot backup from a closed database");
+  if(!ddb_ctx->db)
+    rb_raise(rb_eArgError, "cannot backup to a closed database");
+
+  pBackup = sqlite3_backup_init(ddb_ctx->db, StringValuePtr(dstname),
+    sdb_ctx->db, StringValuePtr(srcname));
+  if( pBackup ){
+    ctx->p = pBackup;
+  }
+  else {
+    CHECK(ddb_ctx->db, sqlite3_errcode(ddb_ctx->db));
+  }
+
+  return self;
+}
+
+/* call-seq: SQLite3::Backup#step(nPage)
+ *
+ * Copy database pages up to +nPage+.
+ * If negative, copy all remaining source pages.
+ *
+ * If all pages are copied, it returns SQLite3::Constants::ErrorCode::DONE.
+ * When coping is not done, it returns SQLite3::Constants::ErrorCode::OK.
+ * When some errors occur, it returns the error code.
+ */
+static VALUE step(VALUE self, VALUE nPage)
+{
+  sqlite3BackupRubyPtr ctx;
+  int status;
+
+  Data_Get_Struct(self, sqlite3BackupRuby, ctx);
+  REQUIRE_OPEN_BACKUP(ctx);
+  status = sqlite3_backup_step(ctx->p, NUM2INT(nPage));
+  return INT2NUM(status);
+}
+
+/* call-seq: SQLite3::Backup#finish
+ *
+ * Destroy the backup object.
+ */
+static VALUE finish(VALUE self)
+{
+  sqlite3BackupRubyPtr ctx;
+
+  Data_Get_Struct(self, sqlite3BackupRuby, ctx);
+  REQUIRE_OPEN_BACKUP(ctx);
+  (void)sqlite3_backup_finish(ctx->p);
+  ctx->p = NULL;
+  return Qnil;
+}
+
+/* call-seq: SQLite3::Backup#remaining
+ *
+ * Returns the number of pages still to be backed up.
+ *
+ * Note that the value is only updated after step() is called,
+ * so before calling step() returned value is invalid.
+ */
+static VALUE remaining(VALUE self)
+{
+  sqlite3BackupRubyPtr ctx;
+
+  Data_Get_Struct(self, sqlite3BackupRuby, ctx);
+  REQUIRE_OPEN_BACKUP(ctx);
+  return INT2NUM(sqlite3_backup_remaining(ctx->p));
+}
+
+/* call-seq: SQLite3::Backup#pagecount
+ *
+ * Returns the total number of pages in the source database file.
+ *
+ * Note that the value is only updated after step() is called,
+ * so before calling step() returned value is invalid.
+ */
+static VALUE pagecount(VALUE self)
+{
+  sqlite3BackupRubyPtr ctx;
+
+  Data_Get_Struct(self, sqlite3BackupRuby, ctx);
+  REQUIRE_OPEN_BACKUP(ctx);
+  return INT2NUM(sqlite3_backup_pagecount(ctx->p));
+}
+
+void init_sqlite3_backup()
+{
+#if 0
+  VALUE mSqlite3 = rb_define_module("SQLite3");
+#endif
+  cSqlite3Backup = rb_define_class_under(mSqlite3, "Backup", rb_cObject);
+
+  rb_define_alloc_func(cSqlite3Backup, allocate);
+  rb_define_method(cSqlite3Backup, "initialize", initialize, 4);
+  rb_define_method(cSqlite3Backup, "step", step, 1);
+  rb_define_method(cSqlite3Backup, "finish", finish, 0);
+  rb_define_method(cSqlite3Backup, "remaining", remaining, 0);
+  rb_define_method(cSqlite3Backup, "pagecount", pagecount, 0);
+}

data/ext/sqlite3/backup.h

@@ -0,0 +1,15 @@
+#ifndef SQLITE3_BACKUP_RUBY
+#define SQLITE3_BACKUP_RUBY
+
+#include <sqlite3_ruby.h>
+
+struct _sqlite3BackupRuby {
+  sqlite3_backup *p;
+};
+
+typedef struct _sqlite3BackupRuby sqlite3BackupRuby;
+typedef sqlite3BackupRuby * sqlite3BackupRubyPtr;
+
+void init_sqlite3_backup();
+
+#endif

data/ext/sqlite3/database.c

@@ -11,14 +11,8 @@ static void deallocate(void * ctx)
 {
   sqlite3RubyPtr c = (sqlite3RubyPtr)ctx;
   sqlite3 * db     = c->db;
-  sqlite3_stmt * stmt;
 
-  if(db) {
-    while((stmt = sqlite3_next_stmt(db, NULL)) != NULL) {
-      sqlite3_finalize(stmt);
-    }
-    sqlite3_close(db);
-  }
+  if(db) sqlite3_close(db);
   xfree(c);
 }
 
@@ -50,6 +44,7 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
   VALUE file;
   VALUE opts;
   VALUE zvfs;
+  int mode = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
   int status;
 
   Data_Get_Struct(self, sqlite3Ruby, ctx);
@@ -73,10 +68,13 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
       }
 #endif
 
+      if (Qtrue == rb_hash_aref(opts, ID2SYM(rb_intern("readonly")))) {
+        mode = SQLITE_OPEN_READONLY;
+      }
       status = sqlite3_open_v2(
           StringValuePtr(file),
           &ctx->db,
-          SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE,
+          mode,
           NIL_P(zvfs) ? NULL : StringValuePtr(zvfs)
       );
     }
@@ -92,8 +90,10 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
   rb_iv_set(self, "@encoding", Qnil);
   rb_iv_set(self, "@busy_handler", Qnil);
   rb_iv_set(self, "@collations", rb_hash_new());
+  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));
+  rb_iv_set(self, "@readonly", mode == SQLITE_OPEN_READONLY ? Qtrue : Qfalse);
 
   if(rb_block_given_p()) {
     rb_yield(self);
@@ -358,6 +358,8 @@ static VALUE define_function(VALUE self, VALUE name)
 
   CHECK(ctx->db, status);
 
+  rb_hash_aset(rb_iv_get(self, "@functions"), name, block);
+
   return self;
 }
 

data/ext/sqlite3/extconf.rb

@@ -6,13 +6,10 @@ require 'mkmf'
 
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
-sqlite = dir_config('sqlite3', ['/usr/local', '/opt/local', '/usr'])
+sqlite = dir_config('sqlite3', ['/usr/local', '/opt/local', '/sw/local', '/usr'])
 
 if RUBY_PLATFORM =~ /mswin/
   $CFLAGS << ' -W3'
-else
-  $CFLAGS << ' -O3 -Wall -Wcast-qual -Wwrite-strings -Wconversion' <<
-             ' -Wmissing-noreturn -Winline'
 end
 
 def asplode missing
@@ -20,8 +17,11 @@ def asplode missing
     abort "#{missing} is missing. Install SQLite3 from " +
           "http://www.sqlite.org/ first."
   else
-    abort "#{missing} is missing. Try 'port install sqlite3 +universal' " +
-          "or 'yum install sqlite3-devel'"
+    abort <<-error
+#{missing} is missing. Try 'port install sqlite3 +universal'
+or 'yum install sqlite3-devel' and check your shared library search path (the
+location where your sqlite3 shared library is located).
+    error
   end
 end
 

data/ext/sqlite3/sqlite3.c

@@ -28,6 +28,9 @@ void Init_sqlite3_native()
 
   init_sqlite3_database();
   init_sqlite3_statement();
+  init_sqlite3_backup();
 
   rb_define_singleton_method(mSqlite3, "libversion", libversion, 0);
+  rb_define_const(mSqlite3, "SQLITE_VERSION", rb_str_new2(SQLITE_VERSION));
+  rb_define_const(mSqlite3, "SQLITE_VERSION_NUMBER", INT2FIX(SQLITE_VERSION_NUMBER));
 }

data/ext/sqlite3/sqlite3_ruby.h

@@ -39,5 +39,6 @@ extern VALUE cSqlite3Blob;
 #include <database.h>
 #include <statement.h>
 #include <exception.h>
+#include <backup.h>
 
 #endif

data/lib/sqlite3/database.rb

@@ -54,9 +54,15 @@ module SQLite3
     # as hashes or not. By default, rows are returned as arrays.
     attr_accessor :results_as_hash
 
-    # A boolean indicating whether or not type translation is enabled for this
-    # database.
-    attr_accessor :type_translation
+    def type_translation= value # :nodoc:
+      warn(<<-eowarn) if $VERBOSE
+#{caller[0]} is calling SQLite3::Database#type_translation=
+SQLite3::Database#type_translation= is deprecated and will be removed
+in version 2.0.0.
+      eowarn
+      @type_translation = value
+    end
+    attr_reader :type_translation # :nodoc:
 
     # Return the type translator employed by this database instance. Each
     # database instance has its own type translator; this allows for different
@@ -121,22 +127,19 @@ module SQLite3
         warn(<<-eowarn) if $VERBOSE
 #{caller[0]} is calling SQLite3::Database#execute with nil or multiple bind params
 without using an array.  Please switch to passing bind parameters as an array.
+Support for bind parameters as *args will be removed in 2.0.0.
         eowarn
       end
 
       prepare( sql ) do |stmt|
         stmt.bind_params(bind_vars)
-        if type_translation
-          stmt = ResultSet.new(self, stmt).to_a
-        end
+        columns = stmt.columns
+        stmt    = ResultSet.new(self, stmt).to_a if type_translation
 
         if block_given?
           stmt.each do |row|
             if @results_as_hash
-              h = Hash[*stmt.columns.zip(row).flatten]
-              row.each_with_index { |r, i| h[i] = r }
-
-              yield h
+              yield type_translation ? row : ordered_map_for(columns, row)
             else
               yield row
             end
@@ -144,8 +147,7 @@ without using an array.  Please switch to passing bind parameters as an array.
         else
           if @results_as_hash
             stmt.map { |row|
-              h = Hash[*stmt.columns.zip(row).flatten]
-              row.each_with_index { |r, i| h[i] = r }
+              h = type_translation ? row : ordered_map_for(columns, row)
 
               # FIXME UGH TERRIBLE HACK!
               h['unique'] = h['unique'].to_s if hack
@@ -197,7 +199,7 @@ without using an array.  Please switch to passing bind parameters as an array.
         warn(<<-eowarn) if $VERBOSE
 #{caller[0]} is calling SQLite3::Database#execute_batch with bind parameters
 that are not a list of a hash.  Please switch to passing bind parameters as an
-array or hash.
+array or hash. Support for this behavior will be removed in version 2.0.0.
         eowarn
       end
 
@@ -212,6 +214,7 @@ array or hash.
         warn(<<-eowarn) if $VERBOSE
 #{caller[0]} is calling SQLite3::Database#execute_batch with nil or multiple bind params
 without using an array.  Please switch to passing bind parameters as an array.
+Support for this behavior will be removed in version 2.0.0.
         eowarn
       end
 
@@ -239,7 +242,7 @@ without using an array.  Please switch to passing bind parameters as an array.
     #
     # You must be sure to call +close+ on the ResultSet instance that is
     # returned, or you could have problems with locks on the table. If called
-    # with a block, +close+ will be invoked implicitly when the block 
+    # with a block, +close+ will be invoked implicitly when the block
     # terminates.
     def query( sql, bind_vars = [], *args )
 
@@ -253,6 +256,7 @@ without using an array.  Please switch to passing bind parameters as an array.
         warn(<<-eowarn) if $VERBOSE
 #{caller[0]} is calling SQLite3::Database#query with nil or multiple bind params
 without using an array.  Please switch to passing bind parameters as an array.
+Support for this will be removed in version 2.0.0.
         eowarn
       end
 
@@ -273,8 +277,7 @@ without using an array.  Please switch to passing bind parameters as an array.
     #
     # See also #get_first_value.
     def get_first_row( sql, *bind_vars )
-      execute( sql, *bind_vars ) { |row| return row }
-      nil
+      execute( sql, *bind_vars ).first
     end
 
     # A convenience method for obtaining the first value of the first row of a
@@ -298,7 +301,7 @@ without using an array.  Please switch to passing bind parameters as an array.
     # arguments it needs (up to its arity).
     #
     # The block does not return a value directly. Instead, it will invoke
-    # the FunctionProxy#set_result method on the +func+ parameter and
+    # the FunctionProxy#result= method on the +func+ parameter and
     # indicate the return value that way.
     #
     # Example:
@@ -337,7 +340,7 @@ without using an array.  Please switch to passing bind parameters as an array.
     #
     # The +finalize+ parameter must be a +proc+ object that accepts only a
     # single parameter, the FunctionProxy instance representing the current
-    # function invocation. It should invoke FunctionProxy#set_result to
+    # function invocation. It should invoke FunctionProxy#result= to
     # store the result of the function.
     #
     # Example:
@@ -349,7 +352,7 @@ without using an array.  Please switch to passing bind parameters as an array.
     #     end
     #
     #     finalize do |func|
-    #       func.set_result( func[ :total ] || 0 )
+    #       func.result = func[ :total ] || 0
     #     end
     #   end
     #
@@ -435,7 +438,7 @@ without using an array.  Please switch to passing bind parameters as an array.
     #     end
     #
     #     def finalize( ctx )
-    #       ctx.set_result( @total )
+    #       ctx.result = @total
     #     end
     #   end
     #
@@ -521,6 +524,12 @@ without using an array.  Please switch to passing bind parameters as an array.
       @transaction_active
     end
 
+    # Returns +true+ if the database has been open in readonly mode
+    # A helper to check before performing any operation
+    def readonly?
+      @readonly
+    end
+
     # A helper class for dealing with custom functions (see #create_function,
     # #create_aggregate, and #create_aggregate_handler). It encapsulates the
     # opaque function object that represents the current invocation. It also
@@ -566,5 +575,13 @@ without using an array.  Please switch to passing bind parameters as an array.
         @context[ key ] = value
       end
     end
+
+    private
+
+    def ordered_map_for columns, row
+      h = Hash[*columns.zip(row).flatten]
+      row.each_with_index { |r, i| h[i] = r }
+      h
+    end
   end
 end

data/lib/sqlite3/pragmas.rb

@@ -225,7 +225,7 @@ module SQLite3
 
       result = [] unless block_given?
       stmt.each do |row|
-        new_row = Hash[*columns.zip(row).flatten]
+        new_row = Hash[columns.zip(row)]
 
         # FIXME: This should be removed but is required for older versions
         # of rails

data/lib/sqlite3/translator.rb

@@ -35,6 +35,10 @@ module SQLite3
     #
     # The block should return the translated value.
     def add_translator( type, &block ) # :yields: type, value
+      warn(<<-eowarn) if $VERBOSE
+#{caller[0]} is calling `add_translator`.
+Built in translators are deprecated and will be removed in version 2.0.0
+      eowarn
       @translators[ type_name( type ) ] = block
     end
 

data/lib/sqlite3/version.rb

@@ -1,6 +1,8 @@
 module SQLite3
 
-  module Version
+  VERSION = '1.3.2'
+
+  module VersionProxy
 
     MAJOR = 1
     MINOR = 3
@@ -10,7 +12,14 @@ module SQLite3
     STRING = [ MAJOR, MINOR, TINY, BUILD ].compact.join( "." )
     #:beta-tag:
 
-    VERSION = '1.3.1'
+    VERSION = ::SQLite3::VERSION
   end
 
+  def self.const_missing(name)
+    return super unless name == :Version
+    warn(<<-eowarn) if $VERBOSE
+#{caller[0]}: SQLite::Version will be removed in sqlite3-ruby version 2.0.0
+    eowarn
+    VersionProxy
+  end
 end

data/tasks/gem.rake

@@ -17,7 +17,7 @@ HOE = Hoe.spec 'sqlite3-ruby' do
   self.history_file  = 'CHANGELOG.rdoc'
   self.extra_rdoc_files  = FileList['*.rdoc', 'ext/**/*.c']
 
-  spec_extras[:required_ruby_version]     = Gem::Requirement.new('>= 1.8.6')
+  spec_extras[:required_ruby_version]     = Gem::Requirement.new('>= 1.8.7')
   spec_extras[:required_rubygems_version] = '>= 1.3.5'
   spec_extras[:extensions]                = ["ext/sqlite3/extconf.rb"]
 

data/tasks/native.rake

@@ -4,7 +4,7 @@ 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.6.23.1'
+BINARY_VERSION = '3.7.3'
 URL_VERSION = BINARY_VERSION.gsub('.', '_')
 
 # build sqlite3_native C extension

data/test/test_backup.rb

@@ -0,0 +1,33 @@
+require File.expand_path('helper', File.dirname(__FILE__))
+
+module SQLite3
+  class TestBackup < Test::Unit::TestCase
+    def setup
+      @sdb = SQLite3::Database.new(':memory:')
+      @ddb = SQLite3::Database.new(':memory:')
+      @sdb.execute('CREATE TABLE foo (idx, val);');
+      @data = ('A'..'Z').map{|x|x * 40}
+      @data.each_with_index do |v, i|
+        @sdb.execute('INSERT INTO foo (idx, val) VALUES (?, ?);', [i, v])
+      end
+    end
+
+    def test_backup_step
+      b = SQLite3::Backup.new(@ddb, 'main', @sdb, 'main')
+      while b.step(1) == SQLite3::Constants::ErrorCode::OK
+        assert_not_equal(0, b.remaining)
+      end
+      assert_equal(0, b.remaining)
+      b.finish
+      assert_equal(@data.length, @ddb.execute('SELECT * FROM foo;').length)
+    end
+
+    def test_backup_all
+      b = SQLite3::Backup.new(@ddb, 'main', @sdb, 'main')
+      assert_equal(SQLite3::Constants::ErrorCode::DONE, b.step(-1))
+      assert_equal(0, b.remaining)
+      b.finish
+      assert_equal(@data.length, @ddb.execute('SELECT * FROM foo;').length)
+    end
+  end
+end

data/test/test_database.rb

@@ -7,6 +7,23 @@ module SQLite3
       @db = SQLite3::Database.new(':memory:')
     end
 
+    def test_get_first_row
+      assert_equal [1], @db.get_first_row('SELECT 1')
+    end
+
+    def test_get_first_row_with_type_translation_and_hash_results
+      @db.results_as_hash = true
+      assert_equal({0=>1, "1"=>1}, @db.get_first_row('SELECT 1'))
+    end
+
+    def test_execute_with_type_translation_and_hash
+      @db.results_as_hash = true
+      rows = []
+      @db.execute('SELECT 1') { |row| rows << row }
+
+      assert_equal({0=>1, "1"=>1}, rows.first)
+    end
+
     def test_encoding
       assert @db.encoding, 'database has encoding'
     end

data/test/test_database_readonly.rb

@@ -0,0 +1,29 @@
+require 'helper'
+
+module SQLite3
+  class TestDatabaseReadonly < Test::Unit::TestCase
+    def setup
+      File.unlink 'test-readonly.db' if File.exists?('test-readonly.db')
+      @db = SQLite3::Database.new('test-readonly.db')
+      @db.execute("CREATE TABLE foos (id integer)")
+      @db.close
+    end
+
+    def teardown
+      @db.close unless @db.closed?
+      File.unlink 'test-readonly.db'
+    end
+
+    def test_open_readonly_database
+      @db = SQLite3::Database.new('test-readonly.db', :readonly => true)
+      assert @db.readonly?
+    end
+
+    def test_insert_readonly_database
+      @db = SQLite3::Database.new('test-readonly.db', :readonly => true)
+      assert_raise(SQLite3::ReadOnlyException) do
+        @db.execute("INSERT INTO foos (id) VALUES (12)")
+      end
+    end
+  end
+end

data/test/test_integration.rb

@@ -16,7 +16,6 @@ class TC_Database_Integration < Test::Unit::TestCase
   end
 
   def test_table_info_with_type_translation_active
-    @db.type_translation = true
     assert_nothing_raised { @db.table_info("foo") }
   end
 

data/test/test_integration_resultset.rb

@@ -59,58 +59,31 @@ class TC_ResultSet < Test::Unit::TestCase
   end
 
   def test_next_type_translation
-    @db.type_translation = true
     @result.reset( 1 )
     assert_equal [ 1, "foo" ], @result.next
   end
 
   def test_next_type_translation_with_untyped_column
-    @db.type_translation = true
     @db.query( "select count(*) from foo" ) do |result|
       assert_equal [3], result.next
     end
   end
 
-  def test_type_translation_execute
-    @db.type_translation = true
-    @db.execute "create table bar ( a integer, b america )"
-    @db.execute "insert into bar (a, b) values (NULL, '1974-07-25 14:39:00')"
-
-    @db.translator.add_translator('america') do |type, thing|
-      'america'
-    end
-
-    assert_equal [[nil, 'america']], @db.execute("select * from bar")
-  end
-
   def test_type_translation_with_null_column
-    @db.type_translation = true
+    time = '1974-07-25 14:39:00'
+
     @db.execute "create table bar ( a integer, b time, c string )"
-    @db.execute "insert into bar (a, b, c) values (NULL, '1974-07-25 14:39:00', 'hello')"
+    @db.execute "insert into bar (a, b, c) values (NULL, '#{time}', 'hello')"
     @db.execute "insert into bar (a, b, c) values (1, NULL, 'hello')"
-    @db.execute "insert into bar (a, b, c) values (2, '1974-07-25 14:39:00', NULL)"
+    @db.execute "insert into bar (a, b, c) values (2, '#{time}', NULL)"
     @db.query( "select * from bar" ) do |result|
-      assert_equal [nil, Time.local(1974, 7, 25, 14, 39, 0), 'hello'], result.next
+      assert_equal [nil, time, 'hello'], result.next
       assert_equal [1, nil, 'hello'], result.next
-      assert_equal [2, Time.local(1974, 7, 25, 14, 39, 0), nil], result.next
-    end
-  end
-
-  def test_date_and_time_translation
-    @db.type_translation = true
-    @db.execute "create table bar ( a date, b datetime, c time, d timestamp )"
-    @db.execute "insert into bar (a, b, c, d) values ('1999-01-08', '1997-12-17 07:37:16', '07:37:16', '2004-10-19 10:23:54')"
-    @db.query( "select * from bar" ) do |result|
-      result = result.next
-      assert result[0].is_a?(Date)
-      assert result[1].is_a?(DateTime)
-      assert result[2].is_a?(Time)
-      assert result[3].is_a?(Time)
+      assert_equal [2, time, nil], result.next
     end
   end
 
   def test_real_translation
-    @db.type_translation = true
     @db.execute('create table foo_real(a real)')
     @db.execute('insert into foo_real values (42)' )
     @db.query('select a, sum(a), typeof(a), typeof(sum(a)) from foo_real') do |result|

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sqlite3-ruby
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: x86-mingw32
 authors: 
 - Jamis Buck
@@ -16,16 +17,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-10 00:00:00 -03:00
+date: 2010-10-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 0
@@ -37,9 +40,11 @@ dependencies:
   name: rake-compiler
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 7
@@ -51,14 +56,16 @@ dependencies:
   name: hoe
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 6
-        - 0
-        version: 2.6.0
+        - 2
+        version: 2.6.2
   type: :development
   version_requirements: *id003
 description: |-
@@ -78,12 +85,13 @@ extensions: []
 extra_rdoc_files: 
 - Manifest.txt
 - API_CHANGES.rdoc
-- README.rdoc
 - CHANGELOG.rdoc
+- README.rdoc
+- ext/sqlite3/backup.c
 - ext/sqlite3/database.c
-- ext/sqlite3/statement.c
-- ext/sqlite3/sqlite3.c
 - ext/sqlite3/exception.c
+- ext/sqlite3/sqlite3.c
+- ext/sqlite3/statement.c
 files: 
 - API_CHANGES.rdoc
 - CHANGELOG.rdoc
@@ -92,6 +100,8 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
+- ext/sqlite3/backup.c
+- ext/sqlite3/backup.h
 - ext/sqlite3/database.c
 - ext/sqlite3/database.h
 - ext/sqlite3/exception.c
@@ -119,8 +129,10 @@ files:
 - tasks/native.rake
 - tasks/vendor_sqlite3.rake
 - test/helper.rb
+- test/test_backup.rb
 - test/test_collation.rb
 - test/test_database.rb
+- test/test_database_readonly.rb
 - test/test_deprecated.rb
 - test/test_encoding.rb
 - test/test_integration.rb
@@ -142,13 +154,13 @@ post_install_message: |+
   =============================================================================
   
     You've installed the binary version of sqlite3-ruby.
-    It was built using SQLite3 version 3.6.23.1.
+    It was built using SQLite3 version 3.7.3.
     It's recommended to use the exact same version to avoid potential issues.
   
     At the time of building this gem, the necessary DLL files where available
     in the following download:
   
-    http://www.sqlite.org/sqlitedll-3_6_23_1.zip
+    http://www.sqlite.org/sqlitedll-3_7_3.zip
   
     You can put the sqlite3.dll available in this package in your Ruby bin
     directory, for example C:\Ruby\bin
@@ -161,18 +173,22 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
-      - 6
-      version: 1.8.6
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 17
       segments: 
       - 1
       - 3
@@ -181,20 +197,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sqlite3-ruby
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 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_sqlite3.rb
-- test/test_integration_open_close.rb
-- test/test_database.rb
-- test/test_integration.rb
+- test/test_backup.rb
 - test/test_collation.rb
-- test/test_statement.rb
-- test/test_integration_pending.rb
+- test/test_database.rb
+- test/test_database_readonly.rb
 - test/test_deprecated.rb
-- test/test_statement_execute.rb
-- test/test_integration_statement.rb
 - test/test_encoding.rb
+- test/test_integration.rb
+- test/test_integration_open_close.rb
+- test/test_integration_pending.rb
 - test/test_integration_resultset.rb
+- test/test_integration_statement.rb
+- test/test_sqlite3.rb
+- test/test_statement.rb
+- test/test_statement_execute.rb