sqlite3 1.3.3 → 1.3.4

data/CHANGELOG.rdoc

@@ -1,4 +1,17 @@
-=== 1.3.3 / unreleased
+=== 1.3.4 / 2011-07-25
+
+* Enhancements:
+  * Windows: build against SQLite 3.7.7.1
+  * Windows: build static binaries that do not depend on sqlite3.dll be
+    installed anymore
+
+* Bugfixes
+  * Backup API is conditionaly required so that older libsqlite3 can be used.
+    Thanks Hongli Lai.
+  * Fixed segmentation fault when nil is passed to SQLite3::Statement.new
+  * Fix extconf's hardcoded path that affected installation on certain systems.
+
+=== 1.3.3 / 2010-01-16
 
 * Bugfixes
   * Abort on installation if sqlite3_backup_init is missing. Fixes #19

data/README.rdoc

@@ -1,8 +1,6 @@
 = SQLite3/Ruby Interface
 
 * http://github.com/luislavena/sqlite3-ruby
-* http://rubyforge.org/projects/sqlite-ruby
-* http://sqlite-ruby.rubyforge.org
 * http://groups.google.com/group/sqlite3-ruby
 
 == DESCRIPTION
@@ -56,11 +54,11 @@ Then do the following:
 Alternatively, you can download and install the RubyGem package for
 SQLite3/Ruby (you must have RubyGems and SQLite3 installed, first):
 
-  gem install sqlite3-ruby
+  gem install sqlite3
 
 If you have sqlite3 installed in a non-standard location, you can specify the location of the include and lib files by doing:
 
-  gem install sqlite3-ruby -- --with-sqlite3-include=/opt/local/include \
+  gem install sqlite3 -- --with-sqlite3-include=/opt/local/include \
      --with-sqlite3-lib=/opt/local/lib
 
 = SUPPORT!!!
@@ -85,9 +83,9 @@ which can be found here:
 == Usage
 
 For help figuring out the SQLite3/Ruby interface, check out the
-FAQ[http://sqlite-ruby.rubyforge.org/sqlite3/faq.html]. It includes examples of
+SYNOPSIS as well as the RDoc. It includes examples of
 usage. If you have any questions that you feel should be address in the
-FAQ, please send them to jamis@37signals.com
+FAQ, please send them to {the mailing list}[http://groups.google.com/group/sqlite3-ruby]
 
 == Source Code
 
@@ -95,9 +93,3 @@ The source repository is accessible via git:
 
   git clone git://github.com/luislavena/sqlite3-ruby.git
 
-== Contact Information
-
-The project page is http://rubyforge.org/projects/sqlite-ruby. There, you can
-find links to mailing lists and forums that you can use to discuss this
-library. Additionally, there are trackers for submitting bugs and feature
-requests. Feel free to use them!

data/ext/sqlite3/backup.c

@@ -1,3 +1,5 @@
+#ifdef HAVE_SQLITE3_BACKUP_INIT
+
 #include <sqlite3_ruby.h>
 
 #define REQUIRE_OPEN_BACKUP(_ctxt) \
@@ -162,3 +164,5 @@ void init_sqlite3_backup()
   rb_define_method(cSqlite3Backup, "remaining", remaining, 0);
   rb_define_method(cSqlite3Backup, "pagecount", pagecount, 0);
 }
+
+#endif

data/ext/sqlite3/backup.h

@@ -1,4 +1,4 @@
-#ifndef SQLITE3_BACKUP_RUBY
+#if !defined(SQLITE3_BACKUP_RUBY) && defined(HAVE_SQLITE3_BACKUP_INIT)
 #define SQLITE3_BACKUP_RUBY
 
 #include <sqlite3_ruby.h>

data/ext/sqlite3/extconf.rb

@@ -6,14 +6,20 @@ require 'mkmf'
 
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
-sqlite = dir_config('sqlite3', ['/usr/local', '/opt/local', '/sw/local', '/usr'])
+# --with-sqlite3-{dir,include,lib}
+dir_config("sqlite3")
 
-if RUBY_PLATFORM =~ /mswin/
+# prioritize local builds
+if enable_config("local", false)
+  $LDFLAGS = ENV.fetch("LDFLAGS", nil)
+end
+
+if RbConfig::CONFIG["host_os"] =~ /mswin/
   $CFLAGS << ' -W3'
 end
 
 def asplode missing
-  if RUBY_PLATFORM =~ /mswin/
+  if RUBY_PLATFORM =~ /mingw|mswin/
     abort "#{missing} is missing. Install SQLite3 from " +
           "http://www.sqlite.org/ first."
   else
@@ -31,15 +37,9 @@ asplode('sqlite3') unless find_library 'sqlite3', 'sqlite3_libversion_number'
 # Functions defined in 1.9 but not 1.8
 have_func('rb_proc_arity')
 
-unless %w{
-  sqlite3_initialize
-  sqlite3_next_stmt
-  sqlite3_backup_init
-}.all? { |func| have_func func }
-  abort "sqlite3-ruby only supports sqlite3 versions 3.6.16+, please upgrade!"
-end
-
 # These functions may not be defined
+have_func('sqlite3_initialize')
+have_func('sqlite3_backup_init')
 have_func('sqlite3_column_database_name')
 have_func('sqlite3_enable_load_extension')
 have_func('sqlite3_load_extension')

data/ext/sqlite3/sqlite3.c

@@ -24,11 +24,15 @@ void Init_sqlite3_native()
   cSqlite3Blob = rb_define_class_under(mSqlite3, "Blob", rb_cString);
 
   /* Initialize the sqlite3 library */
+#ifdef HAVE_SQLITE3_INITIALIZE
   sqlite3_initialize();
+#endif
 
   init_sqlite3_database();
   init_sqlite3_statement();
+#ifdef HAVE_SQLITE3_BACKUP_INIT
   init_sqlite3_backup();
+#endif
 
   rb_define_singleton_method(mSqlite3, "libversion", libversion, 0);
   rb_define_const(mSqlite3, "SQLITE_VERSION", rb_str_new2(SQLITE_VERSION));

data/ext/sqlite3/statement.c

@@ -35,6 +35,8 @@ static VALUE initialize(VALUE self, VALUE db, VALUE sql)
   const char *tail = NULL;
   int status;
 
+  StringValue(sql);
+
   Data_Get_Struct(db, sqlite3Ruby, db_ctx);
   Data_Get_Struct(self, sqlite3StmtRuby, ctx);
 
@@ -43,10 +45,7 @@ static VALUE initialize(VALUE self, VALUE db, VALUE sql)
 
 #ifdef HAVE_RUBY_ENCODING_H
   if(!UTF8_P(sql)) {
-    VALUE encoding    = rb_funcall(db, rb_intern("encoding"), 0);
-    rb_encoding * enc = NIL_P(encoding) ? rb_utf8_encoding() :
-                                          rb_to_encoding(encoding);
-    sql               = rb_str_export_to_enc(sql, enc);
+    sql               = rb_str_export_to_enc(sql, rb_utf8_encoding());
   }
 #endif
 

data/lib/sqlite3/version.rb

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

data/tasks/gem.rake

@@ -22,6 +22,7 @@ HOE = Hoe.spec 'sqlite3' do
   spec_extras[:extensions]                = ["ext/sqlite3/extconf.rb"]
 
   extra_dev_deps << ['rake-compiler', "~> 0.7.0"]
+  extra_dev_deps << ["mini_portile", "~> 0.2.2"]
 
   clean_globs.push('**/test.db')
 end

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.3'
-URL_VERSION = BINARY_VERSION.gsub('.', '_')
+BINARY_VERSION = '3.7.7.1'
+URL_VERSION = BINARY_VERSION.tr(".", "0")
 
 # build sqlite3_native C extension
 Rake::ExtensionTask.new('sqlite3_native', HOE.spec) do |ext|
@@ -15,9 +15,6 @@ Rake::ExtensionTask.new('sqlite3_native', HOE.spec) do |ext|
   # where native extension will be copied (matches makefile)
   ext.lib_dir = "lib/sqlite3"
 
-  # reference to the sqlite3 library
-  sqlite3_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'sqlite3'))
-
   # clean binary folders always
   CLEAN.include("#{ext.lib_dir}/?.?")
 
@@ -26,32 +23,11 @@ Rake::ExtensionTask.new('sqlite3_native', HOE.spec) do |ext|
     # define target for extension (supporting fat binaries)
     RUBY_VERSION =~ /(\d+\.\d+)/
     ext.lib_dir = "lib/sqlite3/#{$1}"
-    ext.config_options << "--with-sqlite3-dir=#{sqlite3_lib}"
+    ext.config_options << "--enable-local"
   else
     ext.cross_compile = true
     ext.cross_platform = ['i386-mswin32-60', 'i386-mingw32']
-    ext.cross_config_options << "--with-sqlite3-dir=#{sqlite3_lib}"
-    ext.cross_compiling do |gemspec|
-      gemspec.post_install_message = <<-POST_INSTALL_MESSAGE
-
-=============================================================================
-
-  You've installed the binary version of #{gemspec.name}.
-  It was built using SQLite3 version #{BINARY_VERSION}.
-  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-#{URL_VERSION}.zip
-
-  You can put the sqlite3.dll available in this package in your Ruby bin
-  directory, for example C:\\Ruby\\bin
-
-=============================================================================
-
-      POST_INSTALL_MESSAGE
-    end
+    ext.cross_config_options << "--enable-local"
   end
 end
 

data/tasks/vendor_sqlite3.rake

@@ -1,104 +1,41 @@
-require 'rake/clean'
-require 'rake/extensioncompiler'
+require "rake/clean"
+require "rake/extensioncompiler"
+require "mini_portile"
 
-# download sqlite3 library and headers
+$recipes = {}
 
-# only on Windows or cross platform compilation
-def dlltool(dllname, deffile, libfile)
-  # define if we are using GCC or not
-  if Rake::ExtensionCompiler.mingw_gcc_executable then
-    dir = File.dirname(Rake::ExtensionCompiler.mingw_gcc_executable)
-    tool = case RUBY_PLATFORM
-      when /mingw/
-        File.join(dir, 'dlltool.exe')
-      when /linux|darwin/
-        File.join(dir, "#{Rake::ExtensionCompiler.mingw_host}-dlltool")
-    end
-    return "#{tool} --dllname #{dllname} --def #{deffile} --output-lib #{libfile}"
-  else
-    if RUBY_PLATFORM =~ /mswin/ then
-      tool = 'lib.exe'
-    else
-      fail "Unsupported platform for cross-compilation (please, contribute some patches)."
-    end
-    return "#{tool} /DEF:#{deffile} /OUT:#{libfile}"
-  end
-end
+$recipes[:sqlite3] = MiniPortile.new "sqlite3", BINARY_VERSION
+$recipes[:sqlite3].files << "http://sqlite.org/sqlite-autoconf-#{URL_VERSION}.tar.gz"
 
-# required folder structure for --with-sqlite3-dir (include + lib)
-directory "vendor/sqlite3/lib"
-directory "vendor/sqlite3/include"
+namespace :ports do
+  directory "ports"
 
-# download amalgamation version (for include files)
-file "vendor/sqlite-amalgamation-#{URL_VERSION}.zip" => ['vendor'] do |t|
-  url = "http://www.sqlite.org/#{File.basename(t.name)}"
-  when_writing "downloading #{t.name}" do
-    cd File.dirname(t.name) do
-      system "wget -c #{url} || curl -C - -O #{url}"
-    end
-  end
-end
+  desc "Install port sqlite3 #{$recipes[:sqlite3].version}"
+  task :sqlite3 => ["ports"] do |t|
+    recipe = $recipes[:sqlite3]
+    checkpoint = "ports/.#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
 
-# download dll binaries
-file "vendor/sqlitedll-#{URL_VERSION}.zip" => ['vendor'] do |t|
-  url = "http://www.sqlite.org/#{File.basename(t.name)}"
-  when_writing "downloading #{t.name}" do
-    cd File.dirname(t.name) do
-      system "wget -c #{url} || curl -C - -O #{url}"
+    unless File.exist?(checkpoint)
+      recipe.cook
+      touch checkpoint
     end
-  end
-end
 
-# extract header files into include folder
-file "vendor/sqlite3/include/sqlite3.h" => ['vendor/sqlite3/include', "vendor/sqlite-amalgamation-#{URL_VERSION}.zip"] do |t|
-  full_file = File.expand_path(t.prerequisites.last)
-  when_writing "creating #{t.name}" do
-    cd File.dirname(t.name) do
-      sh "unzip #{full_file}"
-      # update file timestamp to avoid Rake perform this extraction again.
-      touch File.basename(t.name)
-    end
+    recipe.activate
   end
 end
 
-# extract dll files into lib folder
-file "vendor/sqlite3/lib/sqlite3.dll" => ['vendor/sqlite3/lib', "vendor/sqlitedll-#{URL_VERSION}.zip"] do |t|
-  full_file = File.expand_path(t.prerequisites.last)
-  when_writing "creating #{t.name}" do
-    cd File.dirname(t.name) do
-      sh "unzip #{full_file}"
-      # update file timestamp to avoid Rake perform this extraction again.
-      touch File.basename(t.name)
-    end
-  end
+if RUBY_PLATFORM =~ /mingw/
+  Rake::Task['compile'].prerequisites.unshift "ports:sqlite3"
 end
 
-# generate import library from definition and dll file
-file "vendor/sqlite3/lib/sqlite3.lib" => ["vendor/sqlite3/lib/sqlite3.dll"] do |t|
-  libfile = t.name
-  dllname = libfile.ext('dll')
-  deffile = libfile.ext('def')
-
-  when_writing "creating #{t.name}" do
-    sh dlltool(dllname, deffile, libfile)
+task :cross do
+  host = ENV.fetch("HOST", Rake::ExtensionCompiler.mingw_host)
+  $recipes.each do |_, recipe|
+    recipe.host = host
   end
-end
-
-# clean and clobber actions
-# All the uncompressed files must be removed at clean
-CLEAN.include('vendor/sqlite3')
 
-# clobber vendored packages
-CLOBBER.include('vendor')
-
-# vendor:sqlite3
-task 'vendor:sqlite3' => ["vendor/sqlite3/lib/sqlite3.lib", "vendor/sqlite3/include/sqlite3.h"]
-
-# hook into cross compilation vendored sqlite3 dependency
-if RUBY_PLATFORM =~ /mingw|mswin/ then
-  Rake::Task['compile'].prerequisites.unshift 'vendor:sqlite3'
-else
-  if Rake::Task.task_defined?(:cross)
-    Rake::Task['cross'].prerequisites.unshift 'vendor:sqlite3'
-  end
+  # hook compile task with dependencies
+  Rake::Task["compile"].prerequisites.unshift "ports:sqlite3"
 end
+
+CLOBBER.include("ports")

data/test/test_backup.rb

@@ -29,5 +29,5 @@ module SQLite3
       b.finish
       assert_equal(@data.length, @ddb.execute('SELECT * FROM foo;').length)
     end
-  end
+  end if defined?(SQLite3::Backup)
 end

data/test/test_database.rb

@@ -1,5 +1,4 @@
 require 'helper'
-require 'iconv'
 
 module SQLite3
   class TestDatabase < Test::Unit::TestCase
@@ -7,6 +6,13 @@ module SQLite3
       @db = SQLite3::Database.new(':memory:')
     end
 
+    def test_blob
+      @db.execute("CREATE TABLE blobs ( id INTEGER, hash BLOB(10) )")
+      str = "\0foo"
+      @db.execute("INSERT INTO blobs VALUES (0, ?)", [str])
+      assert_equal [[0, str]], @db.execute("SELECT * FROM blobs")
+    end
+
     def test_get_first_row
       assert_equal [1], @db.get_first_row('SELECT 1')
     end
@@ -291,7 +297,7 @@ module SQLite3
     end
 
     def test_close_with_open_statements
-      stmt = @db.prepare("select 'foo'")
+      @db.prepare("select 'foo'")
       assert_raises(SQLite3::BusyException) do
         @db.close
       end

data/test/test_statement.rb

@@ -7,6 +7,12 @@ module SQLite3
       @stmt = SQLite3::Statement.new(@db, "select 'foo'")
     end
 
+    def test_raises_type_error
+      assert_raises(TypeError) do
+        SQLite3::Statement.new( @db, nil )
+      end
+    end
+
     ###
     # This method may not exist depending on how sqlite3 was compiled
     def test_database_name

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sqlite3
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
   - 3
-  - 3
-  version: 1.3.3
+  - 4
+  version: 1.3.4
 platform: ruby
 authors: 
 - Jamis Buck
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-16 00:00:00 -08:00
+date: 2011-07-25 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,21 +37,36 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: mini_portile
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 19
         segments: 
-        - 2
-        - 8
         - 0
-        version: 2.8.0
+        - 2
+        - 2
+        version: 0.2.2
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 10
+        version: "2.10"
+  type: :development
+  version_requirements: *id003
 description: |-
   This module allows Ruby programs to interface with the SQLite3
   database engine (http://www.sqlite.org).  You must have the
@@ -68,14 +83,14 @@ extensions:
 - ext/sqlite3/extconf.rb
 extra_rdoc_files: 
 - Manifest.txt
-- API_CHANGES.rdoc
-- CHANGELOG.rdoc
 - 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
@@ -127,6 +142,7 @@ files:
 - test/test_sqlite3.rb
 - test/test_statement.rb
 - test/test_statement_execute.rb
+- .gemtest
 has_rdoc: true
 homepage: http://github.com/luislavena/sqlite3-ruby
 licenses: []
@@ -162,22 +178,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sqlite3
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 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_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_collation.rb
+- test/test_integration.rb
 - test/test_statement_execute.rb
+- test/test_integration_statement.rb
+- test/test_integration_pending.rb