sqlite3 1.3.6-x86-mswin32-60 → 1.3.7-x86-mswin32-60

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+=== 1.3.7
+
+* Bugfixes
+  * Closing a bad statement twice will not segv.
+
+* Internal
+  * Unset environment variables that could affect cross compilation.
+
 === 1.3.6 / 2012-04-16
 
 * Enhancements

data/ext/sqlite3/extconf.rb

@@ -11,7 +11,7 @@ dir_config("sqlite3")
 
 # prioritize local builds
 if enable_config("local", false)
-  $LDFLAGS = ENV.fetch("LDFLAGS", nil)
+  $LDFLAGS = ENV.fetch("LDFLAGS", "")
 end
 
 if RbConfig::CONFIG["host_os"] =~ /mswin/

data/ext/sqlite3/statement.c

@@ -85,9 +85,7 @@ static VALUE sqlite3_rb_close(VALUE self)
 
   REQUIRE_OPEN_STMT(ctx);
 
-  db = sqlite3_db_handle(ctx->st);
-  CHECK(db, sqlite3_finalize(ctx->st));
-
+  sqlite3_finalize(ctx->st);
   ctx->st = NULL;
 
   return self;

data/lib/sqlite3/version.rb

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

data/tasks/gem.rake

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

data/tasks/vendor_sqlite3.rake

@@ -17,7 +17,7 @@ namespace :ports do
 
     unless File.exist?(checkpoint)
       cflags = "-O2 -DSQLITE_ENABLE_COLUMN_METADATA"
-      cflags << " -fPIC" if recipe.host.include?("x86_64")
+      cflags << " -fPIC" if recipe.host && recipe.host.include?("x86_64")
       recipe.configure_options << "CFLAGS='#{cflags}'"
       recipe.cook
       touch checkpoint
@@ -36,6 +36,9 @@ if ENV["USE_MINI_PORTILE"] == "true"
 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

data/test/test_statement.rb

@@ -7,6 +7,17 @@ module SQLite3
       @stmt = SQLite3::Statement.new(@db, "select 'foo'")
     end
 
+    def test_double_close_does_not_segv
+      @db.execute 'CREATE TABLE "things" ("number" float NOT NULL)'
+
+      stmt = @db.prepare 'INSERT INTO things (number) VALUES (?)'
+      assert_raises(SQLite3::ConstraintException) { stmt.execute(nil) }
+
+      stmt.close
+
+      assert_raises(SQLite3::Exception) { stmt.close }
+    end
+
     def test_raises_type_error
       assert_raises(TypeError) do
         SQLite3::Statement.new( @db, nil )

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sqlite3
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 3
-  - 6
-  version: 1.3.6
+  - 7
+  version: 1.3.7
 platform: x86-mswin32-60
 authors: 
 - Jamis Buck
@@ -17,12 +17,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-16 00:00:00 Z
+date: 2013-01-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :development
+  name: rdoc
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -32,28 +33,28 @@ dependencies:
         - 3
         - 10
         version: "3.10"
-  type: :development
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake-compiler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  name: rake-compiler
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 59
         segments: 
         - 0
-        - 7
-        - 0
-        version: 0.7.0
-  type: :development
-  version_requirements: *id002
+        - 8
+        - 2
+        version: 0.8.2
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: mini_portile
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  name: mini_portile
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,23 +65,22 @@ dependencies:
         - 2
         - 2
         version: 0.2.2
-  type: :development
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  name: hoe
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 15
         segments: 
         - 3
-        - 0
-        version: "3.0"
-  type: :development
-  version_requirements: *id004
+        - 4
+        version: "3.4"
+  requirement: *id004
 description: |-
   This module allows Ruby programs to interface with the SQLite3
   database engine (http://www.sqlite.org).  You must have the
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sqlite3
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: This module allows Ruby programs to interface with the SQLite3 database engine (http://www.sqlite.org)