sqlite3 1.3.4-x86-mingw32 → 1.3.5-x86-mingw32

data/CHANGELOG.rdoc

@@ -1,3 +1,21 @@
+=== 1.3.5 / 2011-12-03 - ZOMG Holidays are here Edition!
+
+* Enhancements
+  * Windows: build against SQLite 3.7.9
+  * Static: enable SQLITE_ENABLE_COLUMN_METADATA
+  * Added Statement#clear_bindings! to set bindings back to nil
+
+* Bugfixes
+  * Fixed a segv on Database.new. Fixes #34 (thanks nobu!)
+  * Database error is not reset, so don't check it in Statement#reset!
+  * Remove conditional around Bignum statement bindings.
+    Fixes #52. Fixes #56. Thank you Evgeny Myasishchev.
+
+* Internal
+  * Use proper endianness when testing database connection with UTF-16.
+    Fixes #40. Fixes #51
+  * Use -fPIC for static compilation when host is x86_64.
+
 === 1.3.4 / 2011-07-25
 
 * Enhancements:

data/README.rdoc

@@ -9,7 +9,7 @@ This module allows Ruby programs to interface with the SQLite3
 database engine (http://www.sqlite.org).  You must have the
 SQLite engine installed in order to build this module.
 
-Note that this module is NOT compatible with SQLite 2.x.
+Note that this module is only compatible with SQLite 3.6.16 or newer.
 
 == SYNOPSIS
 
@@ -42,7 +42,7 @@ Note that this module is NOT compatible with SQLite 2.x.
 
 == Compilation and Installation
 
-Install SQLite3, enabling option SQLITE_ENABLE_COLUMN_METADATA (see
+Install SQLite3, enabling the option SQLITE_ENABLE_COLUMN_METADATA (see
 www.sqlite.org/compile.html for details).
 
 Then do the following:

data/ext/sqlite3/database.c

@@ -50,7 +50,14 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
   Data_Get_Struct(self, sqlite3Ruby, ctx);
 
   rb_scan_args(argc, argv, "12", &file, &opts, &zvfs);
+#if defined StringValueCStr
+  StringValuePtr(file);
+  rb_check_safe_obj(file);
+#else
+  Check_SafeStr(file);
+#endif
   if(NIL_P(opts)) opts = rb_hash_new();
+  else Check_Type(opts, T_HASH);
 
 #ifdef HAVE_RUBY_ENCODING_H
   if(UTF16_LE_P(file)) {
@@ -716,6 +723,20 @@ static VALUE db_encoding(VALUE self)
   return rb_iv_get(self, "@encoding");
 }
 
+/* call-seq: db.transaction_active?
+ *
+ * Returns +true+ if there is a transaction active, and +false+ otherwise.
+ *
+ */
+static VALUE transaction_active_p(VALUE self)
+{
+  sqlite3RubyPtr ctx;
+  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  REQUIRE_OPEN_DB(ctx);
+
+  return sqlite3_get_autocommit(ctx->db) ? Qfalse : Qtrue;
+}
+
 void init_sqlite3_database()
 {
   ID id_utf16, id_results_as_hash, id_type_translation;
@@ -742,6 +763,7 @@ void init_sqlite3_database()
   rb_define_method(cSqlite3Database, "authorizer=", set_authorizer, 1);
   rb_define_method(cSqlite3Database, "busy_handler", busy_handler, -1);
   rb_define_method(cSqlite3Database, "busy_timeout=", set_busy_timeout, 1);
+  rb_define_method(cSqlite3Database, "transaction_active?", transaction_active_p, 0);
 
 #ifdef HAVE_SQLITE3_LOAD_EXTENSION
   rb_define_method(cSqlite3Database, "load_extension", load_extension, 1);

data/ext/sqlite3/extconf.rb

@@ -25,7 +25,7 @@ def asplode missing
   else
     abort <<-error
 #{missing} is missing. Try 'port install sqlite3 +universal'
-or 'yum install sqlite3-devel' and check your shared library search path (the
+or 'yum install sqlite-devel' and check your shared library search path (the
 location where your sqlite3 shared library is located).
     error
   end

data/ext/sqlite3/statement.c

@@ -255,12 +255,10 @@ static VALUE bind_param(VALUE self, VALUE key, VALUE value)
       }
       break;
     case T_BIGNUM:
-#if SIZEOF_LONG < 8
       if (RBIGNUM_LEN(value) * SIZEOF_BDIGITS <= 8) {
           status = sqlite3_bind_int64(ctx->st, index, (sqlite3_int64)NUM2LL(value));
           break;
       }
-#endif
     case T_FLOAT:
       status = sqlite3_bind_double(ctx->st, index, NUM2DBL(value));
       break;
@@ -295,7 +293,26 @@ static VALUE reset_bang(VALUE self)
   REQUIRE_OPEN_STMT(ctx);
 
   status = sqlite3_reset(ctx->st);
-  CHECK(sqlite3_db_handle(ctx->st), status);
+
+  ctx->done_p = 0;
+
+  return self;
+}
+
+/* call-seq: stmt.clear_bindings!
+ *
+ * Resets the statement. This is typically done internally, though it might
+ * occassionally be necessary to manually reset the statement.
+ */
+static VALUE clear_bindings(VALUE self)
+{
+  sqlite3StmtRubyPtr ctx;
+  int status;
+
+  Data_Get_Struct(self, sqlite3StmtRuby, ctx);
+  REQUIRE_OPEN_STMT(ctx);
+
+  status = sqlite3_clear_bindings(ctx->st);
 
   ctx->done_p = 0;
 
@@ -405,6 +422,7 @@ void init_sqlite3_statement()
   rb_define_method(cSqlite3Statement, "closed?", closed_p, 0);
   rb_define_method(cSqlite3Statement, "bind_param", bind_param, 2);
   rb_define_method(cSqlite3Statement, "reset!", reset_bang, 0);
+  rb_define_method(cSqlite3Statement, "clear_bindings!", clear_bindings, 0);
   rb_define_method(cSqlite3Statement, "step", step, 0);
   rb_define_method(cSqlite3Statement, "done?", done_p, 0);
   rb_define_method(cSqlite3Statement, "column_count", column_count, 0);

data/lib/sqlite3/database.rb

@@ -482,7 +482,6 @@ Support for this will be removed in version 2.0.0.
     # #rollback.
     def transaction( mode = :deferred )
       execute "begin #{mode.to_s} transaction"
-      @transaction_active = true
 
       if block_given?
         abort = false
@@ -505,7 +504,6 @@ Support for this will be removed in version 2.0.0.
     # <tt>abort? and rollback or commit</tt>.
     def commit
       execute "commit transaction"
-      @transaction_active = false
       true
     end
 
@@ -515,15 +513,9 @@ Support for this will be removed in version 2.0.0.
     # <tt>abort? and rollback or commit</tt>.
     def rollback
       execute "rollback transaction"
-      @transaction_active = false
       true
     end
 
-    # Returns +true+ if there is a transaction active, and +false+ otherwise.
-    def transaction_active?
-      @transaction_active
-    end
-
     # Returns +true+ if the database has been open in readonly mode
     # A helper to check before performing any operation
     def readonly?

data/lib/sqlite3/version.rb

@@ -1,6 +1,6 @@
 module SQLite3
 
-  VERSION = '1.3.4'
+  VERSION = '1.3.5'
 
   module VersionProxy
 

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.7.1'
-URL_VERSION = BINARY_VERSION.tr(".", "0")
+BINARY_VERSION = "3.7.9"
+URL_VERSION    = "3070900"
 
 # build sqlite3_native C extension
 Rake::ExtensionTask.new('sqlite3_native', HOE.spec) do |ext|

data/tasks/vendor_sqlite3.rake

@@ -16,6 +16,9 @@ namespace :ports do
     checkpoint = "ports/.#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
 
     unless File.exist?(checkpoint)
+      cflags = "-O2 -DSQLITE_ENABLE_COLUMN_METADATA"
+      cflags << " -fPIC" if recipe.host.include?("x86_64")
+      recipe.configure_options << "CFLAGS='#{cflags}'"
       recipe.cook
       touch checkpoint
     end
@@ -28,6 +31,10 @@ if RUBY_PLATFORM =~ /mingw/
   Rake::Task['compile'].prerequisites.unshift "ports:sqlite3"
 end
 
+if ENV["USE_MINI_PORTILE"] == "true"
+  Rake::Task["compile"].prerequisites.unshift "ports:sqlite3"
+end
+
 task :cross do
   host = ENV.fetch("HOST", Rake::ExtensionCompiler.mingw_host)
   $recipes.each do |_, recipe|

data/test/test_database.rb

@@ -2,10 +2,24 @@ require 'helper'
 
 module SQLite3
   class TestDatabase < Test::Unit::TestCase
+    attr_reader :db
+
     def setup
       @db = SQLite3::Database.new(':memory:')
     end
 
+    def test_segv
+      assert_raises(TypeError) { SQLite3::Database.new 1 }
+    end
+
+    def test_bignum
+      num = 4907021672125087844
+      db.execute 'CREATE TABLE "employees" ("token" integer(8), "name" varchar(20) NOT NULL)'
+      db.execute "INSERT INTO employees(name, token) VALUES('employee-1', ?)", [num]
+      rows = db.execute 'select token from employees'
+      assert_equal num, rows.first.first
+    end
+
     def test_blob
       @db.execute("CREATE TABLE blobs ( id INTEGER, hash BLOB(10) )")
       str = "\0foo"
@@ -60,7 +74,10 @@ module SQLite3
     end
 
     def test_new_with_options
-      db = SQLite3::Database.new(Iconv.conv('UTF-16LE', 'UTF-8', ':memory:'),
+      # 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)
       assert db
     end

data/test/test_encoding.rb

@@ -75,8 +75,10 @@ module SQLite3
     end
 
     def test_db_with_utf16
-      db = SQLite3::Database.new(':memory:'.encode('UTF-16LE'))
-      assert_equal(Encoding.find('UTF-16LE'), db.encoding)
+      utf16 = ([1].pack("I") == [1].pack("N")) ? "UTF-16BE" : "UTF-16LE"
+
+      db = SQLite3::Database.new(':memory:'.encode(utf16))
+      assert_equal(Encoding.find(utf16), db.encoding)
     end
 
     def test_statement_eucjp

data/test/test_integration.rb

@@ -454,6 +454,17 @@ class TC_Database_Integration < Test::Unit::TestCase
     assert !@db.transaction_active?
   end
 
+  def test_transaction_implicit_rollback
+    assert !@db.transaction_active?
+    @db.transaction 
+    @db.execute('create table bar (x CHECK(1 = 0))')
+    assert @db.transaction_active?
+    assert_raises( SQLite3::ConstraintException ) do
+      @db.execute("insert or rollback into bar (x) VALUES ('x')")
+    end
+    assert !@db.transaction_active?
+  end
+
   def test_interrupt
     @db.create_function( "abort", 1 ) do |func,x|
       @db.interrupt

data/test/test_statement.rb

@@ -209,5 +209,30 @@ module SQLite3
       stmt = @db.prepare('select :n, :h')
       assert_equal [[10, nil]], stmt.execute('n' => 10, 'h' => nil).to_a
     end
+
+    def test_with_error
+      @db.execute('CREATE TABLE "employees" ("name" varchar(20) NOT NULL CONSTRAINT "index_employees_on_name" UNIQUE)')
+      stmt = @db.prepare("INSERT INTO Employees(name) VALUES(?)")
+      stmt.execute('employee-1')
+      stmt.execute('employee-1') rescue SQLite3::ConstraintException
+      stmt.reset!
+      assert_nothing_raised(SQLite3::ConstraintException) {
+        stmt.execute('employee-2')
+      }
+    end
+
+    def test_clear_bindings
+      stmt = @db.prepare('select ?, ?')
+      stmt.bind_param 1, "foo"
+      stmt.bind_param 2, "bar"
+
+      # We can't fetch bound parameters back out of sqlite3, so just call
+      # the clear_bindings! method and assert that nil is returned
+      stmt.clear_bindings!
+
+      while x = stmt.step
+        assert_equal [nil, nil], x
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sqlite3
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 3
-  - 4
-  version: 1.3.4
+  - 5
+  version: 1.3.5
 platform: x86-mingw32
 authors: 
 - Jamis Buck
@@ -17,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-25 00:00:00 -03:00
-default_executable: 
+date: 2011-12-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
@@ -60,19 +59,34 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 27
         segments: 
         - 2
-        - 10
-        version: "2.10"
+        - 12
+        version: "2.12"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
+  type: :development
+  version_requirements: *id004
 description: |-
   This module allows Ruby programs to interface with the SQLite3
   database engine (http://www.sqlite.org).  You must have the
   SQLite engine installed in order to build this module.
   
-  Note that this module is NOT compatible with SQLite 2.x.
+  Note that this module is only compatible with SQLite 3.6.16 or newer.
 email: 
 - jamis@37signals.com
 - luislavena@gmail.com
@@ -145,7 +159,6 @@ files:
 - .gemtest
 - lib/sqlite3/1.8/sqlite3_native.so
 - lib/sqlite3/1.9/sqlite3_native.so
-has_rdoc: true
 homepage: http://github.com/luislavena/sqlite3-ruby
 licenses: []
 
@@ -180,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sqlite3
-rubygems_version: 1.6.2
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: This module allows Ruby programs to interface with the SQLite3 database engine (http://www.sqlite.org)