sqlite3 1.3.7-x86-mingw32 → 1.3.8-x86-mingw32

data/CHANGELOG.rdoc

@@ -1,4 +1,21 @@
-=== 1.3.7
+=== 1.3.8 / 2013-08-17
+
+* Enhancements:
+  * Windows: build against SQLite 3.7.17
+
+* Bugfixes:
+  * Reset exception message. Closes #80
+  * Correctly convert BLOB values to Ruby. Closes #65
+  * Add MIT license reference to gemspec. Closes #99
+  * Remove unused pointer. Closes #89
+
+* Internal:
+  * Backport improvements in cross compilation for Windows
+  * Use of Minitest for internal tests
+  * Use Gemfile (generated by Hoe) to deal with dependencies
+  * Cleanup Travis CI
+
+=== 1.3.7 / 2013-01-11
 
 * Bugfixes
   * Closing a bad statement twice will not segv.

data/Gemfile

@@ -0,0 +1,15 @@
+# -*- ruby -*-
+
+# DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake bundler:gemfile`.
+
+source "https://rubygems.org/"
+
+
+gem "minitest", "~>5.0", :group => [:development, :test]
+gem "rdoc", "~>4.0", :group => [:development, :test]
+gem "rake-compiler", "~>0.9.1", :group => [:development, :test]
+gem "mini_portile", "~>0.5.1", :group => [:development, :test]
+gem "hoe-bundler", "~>1.0", :group => [:development, :test]
+gem "hoe", "~>3.7", :group => [:development, :test]
+
+# vim: syntax=ruby

data/Manifest.txt

@@ -1,6 +1,7 @@
 API_CHANGES.rdoc
 CHANGELOG.rdoc
 ChangeLog.cvs
+Gemfile
 LICENSE
 Manifest.txt
 README.rdoc
@@ -45,6 +46,7 @@ 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

data/ext/sqlite3/database.c

@@ -281,9 +281,16 @@ static VALUE sqlite3val2rb(sqlite3_value * val)
     case SQLITE_TEXT:
       return rb_tainted_str_new2((const char *)sqlite3_value_text(val));
       break;
-    case SQLITE_BLOB:
-      return rb_tainted_str_new2((const char *)sqlite3_value_blob(val));
+    case SQLITE_BLOB: {
+      /* Sqlite warns calling sqlite3_value_bytes may invalidate pointer from sqlite3_value_blob,
+         so we explicitly get the length before getting blob pointer.
+         Note that rb_str_new and rb_tainted_str_new apparently create string with ASCII-8BIT (BINARY) encoding,
+         which is what we want, as blobs are binary
+       */
+      int len = sqlite3_value_bytes(val);
+      return rb_tainted_str_new((const char *)sqlite3_value_blob(val), len);
       break;
+    }
     case SQLITE_NULL:
       return Qnil;
       break;

data/ext/sqlite3/statement.c

@@ -79,7 +79,6 @@ static VALUE initialize(VALUE self, VALUE db, VALUE sql)
 static VALUE sqlite3_rb_close(VALUE self)
 {
   sqlite3StmtRubyPtr ctx;
-  sqlite3 * db;
 
   Data_Get_Struct(self, sqlite3StmtRuby, ctx);
 
@@ -186,6 +185,8 @@ static VALUE step(VALUE self)
       return Qnil;
       break;
     default:
+      sqlite3_reset(stmt);
+      ctx->done_p = 0;
       CHECK(sqlite3_db_handle(ctx->st), value);
   }
 

data/lib/sqlite3/version.rb

@@ -1,12 +1,12 @@
 module SQLite3
 
-  VERSION = '1.3.7'
+  VERSION = '1.3.8'
 
   module VersionProxy
 
     MAJOR = 1
     MINOR = 3
-    TINY  = 7
+    TINY  = 8
     BUILD = nil
 
     STRING = [ MAJOR, MINOR, TINY, BUILD ].compact.join( "." )

data/tasks/gem.rake

@@ -6,23 +6,28 @@ rescue LoadError
   require 'hoe'
 end
 
-Hoe.plugin :debugging, :doofus, :git
+Hoe.plugin :debugging, :doofus, :git, :minitest, :bundler
 
 HOE = Hoe.spec 'sqlite3' do
   developer           'Jamis Buck', 'jamis@37signals.com'
   developer           'Luis Lavena', 'luislavena@gmail.com'
   developer           'Aaron Patterson', 'aaron@tenderlovemaking.com'
 
+  license             "MIT"
+
   self.readme_file   = 'README.rdoc'
   self.history_file  = 'CHANGELOG.rdoc'
   self.extra_rdoc_files  = FileList['*.rdoc', 'ext/**/*.c']
 
-  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"]
+  require_ruby_version ">= 1.8.7"
+  require_rubygems_version ">= 1.3.5"
+
+  spec_extras[:extensions] = ["ext/sqlite3/extconf.rb"]
 
-  extra_dev_deps << ['rake-compiler', "~> 0.8.2"]
-  extra_dev_deps << ["mini_portile", "~> 0.2.2"]
+  extra_dev_deps << ['rake-compiler', "~> 0.9.1"]
+  extra_dev_deps << ["mini_portile", "~> 0.5.1"]
+  extra_dev_deps << ["minitest", "~> 5.0"]
+  extra_dev_deps << ["hoe-bundler", "~> 1.0"]
 
   clean_globs.push('**/test.db')
 end

data/tasks/native.rake

@@ -1,14 +1,16 @@
 # use rake-compiler for building the extension
 require 'rake/extensiontask'
+require 'rake/extensioncompiler'
 
 # 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.11"
-URL_VERSION    = "3071100"
+BINARY_VERSION = "3.7.17"
+URL_VERSION    = "3071700"
+URL_PATH       = "/2013"
 
 # build sqlite3_native C extension
-Rake::ExtensionTask.new('sqlite3_native', HOE.spec) do |ext|
+RUBY_EXTENSION = Rake::ExtensionTask.new('sqlite3_native', HOE.spec) do |ext|
   # where to locate the extension
   ext.ext_dir = 'ext/sqlite3'
 
@@ -25,9 +27,15 @@ Rake::ExtensionTask.new('sqlite3_native', HOE.spec) do |ext|
     ext.lib_dir = "lib/sqlite3/#{$1}"
     ext.config_options << "--enable-local"
   else
-    ext.cross_compile = true
-    ext.cross_platform = ['i386-mswin32-60', 'i386-mingw32']
-    ext.cross_config_options << "--enable-local"
+
+    # detect cross-compiler available
+    begin
+      Rake::ExtensionCompiler.mingw_host
+      ext.cross_compile = true
+      ext.cross_platform = ['i386-mswin32-60', 'i386-mingw32', 'x64-mingw32']
+    rescue RuntimeError
+      # noop
+    end
   end
 end
 

data/tasks/vendor_sqlite3.rake

@@ -2,50 +2,86 @@ require "rake/clean"
 require "rake/extensioncompiler"
 require "mini_portile"
 
-$recipes = {}
+CLOBBER.include("ports")
 
-$recipes[:sqlite3] = MiniPortile.new "sqlite3", BINARY_VERSION
-$recipes[:sqlite3].files << "http://sqlite.org/sqlite-autoconf-#{URL_VERSION}.tar.gz"
+directory "ports"
 
-namespace :ports do
-  directory "ports"
+def define_sqlite_task(platform, host)
+  recipe = MiniPortile.new "sqlite3", BINARY_VERSION
+  recipe.files << "http://sqlite.org#{URL_PATH}/sqlite-autoconf-#{URL_VERSION}.tar.gz"
+  recipe.host = host
 
-  desc "Install port sqlite3 #{$recipes[:sqlite3].version}"
-  task :sqlite3 => ["ports"] do |t|
-    recipe = $recipes[:sqlite3]
+  desc "Compile sqlite3 for #{platform} (#{host})"
+  task "ports:sqlite3:#{platform}" => ["ports"] do |t|
     checkpoint = "ports/.#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
 
     unless File.exist?(checkpoint)
       cflags = "-O2 -DSQLITE_ENABLE_COLUMN_METADATA"
-      cflags << " -fPIC" if recipe.host && recipe.host.include?("x86_64")
+      cflags << " -fPIC" if recipe.host.include?("x86_64")
       recipe.configure_options << "CFLAGS='#{cflags}'"
       recipe.cook
       touch checkpoint
     end
-
-    recipe.activate
   end
+
+  recipe
 end
 
+# native sqlite3 compilation
+define_sqlite_task RUBY_PLATFORM, RbConfig::CONFIG["host"]
+
+# trick to test local compilation of sqlite3
+if ENV["USE_MINI_PORTILE"] == "true"
+  # fake recipe so we can build a directory to it
+  recipe = MiniPortile.new "sqlite3", BINARY_VERSION
+  recipe.host = RbConfig::CONFIG["host"]
+
+  RUBY_EXTENSION.config_options << "--with-opt-dir=#{recipe.path}"
+
+  # compile sqlite3 first
+  Rake::Task["compile"].prerequisites.unshift "ports:sqlite3:#{RUBY_PLATFORM}"
+end
+
+# force compilation of sqlite3 when working natively under MinGW
 if RUBY_PLATFORM =~ /mingw/
-  Rake::Task['compile'].prerequisites.unshift "ports:sqlite3"
+  Rake::Task['compile'].prerequisites.unshift "ports:sqlite3:#{RUBY_PLATFORM}"
 end
 
-if ENV["USE_MINI_PORTILE"] == "true"
-  Rake::Task["compile"].prerequisites.unshift "ports:sqlite3"
+# iterate over all cross-compilation platforms and define the proper
+# sqlite3 recipe for it.
+if RUBY_EXTENSION.cross_compile
+  config_path = File.expand_path("~/.rake-compiler/config.yml")
+  if File.exist?(config_path)
+    # obtains platforms from rake-compiler's config.yml
+    config_file = YAML.load_file(config_path)
+
+    Array(RUBY_EXTENSION.cross_platform).each do |platform|
+      # obtain platform from rbconfig file
+      config_key = config_file.keys.sort.find { |key|
+        key.start_with?("rbconfig-#{platform}-")
+      }
+      rbfile = config_file[config_key]
+
+      # skip if rbconfig cannot be read
+      next unless File.exist?(rbfile)
+
+      host = IO.read(rbfile).match(/CONFIG\["CC"\] = "(.*)"/)[1].sub(/\-gcc/, '')
+      recipe = define_sqlite_task(platform, host)
+
+      RUBY_EXTENSION.cross_config_options << {
+        platform => "--with-opt-dir=#{recipe.path}"
+      }
+
+      # pre-compile sqlite3 port when cross-compiling
+      task :cross => "ports:sqlite3:#{platform}"
+    end
+  else
+    warn "rake-compiler configuration doesn't exist, but is required for ports"
+  end
 end
 
 task :cross do
   ["CC", "CXX", "LDFLAGS", "CPPFLAGS", "RUBYOPT"].each do |var|
     ENV.delete(var)
   end
-  host = ENV.fetch("HOST", Rake::ExtensionCompiler.mingw_host)
-  $recipes.each do |_, recipe|
-    recipe.host = host
-  end
-
-  # hook compile task with dependencies
-  Rake::Task["compile"].prerequisites.unshift "ports:sqlite3"
 end
-
-CLOBBER.include("ports")

data/test/helper.rb

@@ -1,14 +1,18 @@
 require 'sqlite3'
-require 'test/unit'
+require 'minitest/autorun'
 
 unless RUBY_VERSION >= "1.9"
   require 'iconv'
 end
 
 module SQLite3
-  class TestCase < Test::Unit::TestCase
-    unless RUBY_VERSION >= '1.9'
-      undef :default_test
+  class TestCase < Minitest::Test
+    alias :assert_not_equal :refute_equal
+    alias :assert_not_nil   :refute_nil
+    alias :assert_raise     :assert_raises
+
+    def assert_nothing_raised
+      yield
     end
   end
 end

data/test/test_database.rb

@@ -22,9 +22,9 @@ module SQLite3
 
     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")
+      blob = Blob.new("foo\0bar")
+      @db.execute("INSERT INTO blobs VALUES (0, ?)", [blob])
+      assert_equal [[0, blob, blob.length, blob.length*2]], @db.execute("SELECT id, hash, length(hash), length(hex(hash)) FROM blobs")
     end
 
     def test_get_first_row
@@ -227,6 +227,17 @@ module SQLite3
       assert_equal [2.2, 'foo', nil], called_with
     end
 
+    def test_call_func_blob
+      called_with = nil
+      @db.define_function("hello") do |a, b|
+        called_with = [a, b, a.length]
+        nil
+      end
+      blob = Blob.new("a\0fine\0kettle\0of\0fish")
+      @db.execute("select hello(?, length(?))", [blob, blob])
+      assert_equal [blob, blob.length, 21], called_with
+    end
+
     def test_function_return
       @db.define_function("hello") { |a| 10 }
       assert_equal [10], @db.execute("select hello('world')").first

data/test/test_statement.rb

@@ -24,6 +24,15 @@ module SQLite3
       end
     end
 
+    def test_insert_duplicate_records
+      @db.execute 'CREATE TABLE "things" ("name" varchar(20) CONSTRAINT "index_things_on_name" UNIQUE)'
+      stmt = @db.prepare("INSERT INTO things(name) VALUES(?)")
+      stmt.execute('ruby')
+
+      exception = assert_raises(SQLite3::ConstraintException) { stmt.execute('ruby') }
+      assert_match /column(s)? .* (is|are) not unique/, exception.message
+    end
+
     ###
     # This method may not exist depending on how sqlite3 was compiled
     def test_database_name
@@ -227,9 +236,7 @@ module SQLite3
       stmt.execute('employee-1')
       stmt.execute('employee-1') rescue SQLite3::ConstraintException
       stmt.reset!
-      assert_nothing_raised(SQLite3::ConstraintException) {
-        stmt.execute('employee-2')
-      }
+      assert stmt.execute('employee-2')
     end
 
     def test_clear_bindings

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sqlite3
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 3
-  - 7
-  version: 1.3.7
+  - 8
+  version: 1.3.8
 platform: x86-mingw32
 authors: 
 - Jamis Buck
@@ -17,70 +17,100 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-12 00:00:00 Z
+date: 2013-08-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  name: rdoc
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 31
         segments: 
-        - 3
-        - 10
-        version: "3.10"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+        - 5
+        - 0
+        version: "5.0"
+  name: minitest
   prerelease: false
   type: :development
-  name: rake-compiler
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 27
         segments: 
+        - 4
         - 0
-        - 8
-        - 2
-        version: 0.8.2
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+        version: "4.0"
+  name: rdoc
   prerelease: false
   type: :development
-  name: mini_portile
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 57
         segments: 
         - 0
-        - 2
-        - 2
-        version: 0.2.2
+        - 9
+        - 1
+        version: 0.9.1
+  name: rake-compiler
+  prerelease: false
+  type: :development
   requirement: *id003
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 5
+        - 1
+        version: 0.5.1
+  name: mini_portile
   prerelease: false
   type: :development
-  name: hoe
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         hash: 15
         segments: 
+        - 1
+        - 0
+        version: "1.0"
+  name: hoe-bundler
+  prerelease: false
+  type: :development
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
         - 3
-        - 4
-        version: "3.4"
-  requirement: *id004
+        - 7
+        version: "3.7"
+  name: hoe
+  prerelease: false
+  type: :development
+  requirement: *id006
 description: |-
   This module allows Ruby programs to interface with the SQLite3
   database engine (http://www.sqlite.org).  You must have the
@@ -109,6 +139,7 @@ files:
 - API_CHANGES.rdoc
 - CHANGELOG.rdoc
 - ChangeLog.cvs
+- Gemfile
 - LICENSE
 - Manifest.txt
 - README.rdoc
@@ -153,16 +184,17 @@ files:
 - 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
-- test/test_result_set.rb
 - .gemtest
 - lib/sqlite3/1.8/sqlite3_native.so
 - lib/sqlite3/1.9/sqlite3_native.so
+- lib/sqlite3/2.0/sqlite3_native.so
 homepage: http://github.com/luislavena/sqlite3-ruby
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: 
 - --main
@@ -194,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sqlite3
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: This module allows Ruby programs to interface with the SQLite3 database engine (http://www.sqlite.org)