sqlite3 1.3.5 → 1.3.13

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b430789a68a6d6079e0395db6fc53421e4b317ab
+  data.tar.gz: db014f4a1f4e980913a3dcb48d9aab14a5a9eca1
+SHA512:
+  metadata.gz: 7e2764239b107677240476bb608bcb46cc0966c06d06e90881113b91dbdb8342c6c7558760cf0645a56449ac8e267f13a0e25dbef0d3e820a38f5857a96c4e05
+  data.tar.gz: 1e08a478ed043d22bbe95df2151bf009a7f03a1457c37df4199c8601fa1ccb9de27986e64341c4fb9a009e5ab4023638704078222f88441b55ac1ee2773838d8

data/CHANGELOG.rdoc

@@ -1,3 +1,87 @@
+=== 1.3.12
+
+* Bugfixes:
+  * OS X install will default to homebrew if available. Fixes #195
+
+=== 1.3.11 / 2015-10-10
+
+* Enhancements:
+  * Windows: build against SQLite 3.8.11.1
+
+* Internal:
+  * Use rake-compiler-dock to build Windows binaries. Pull #159 [larskanis]
+  * Expand Ruby versions being tested for Travis and AppVeyor
+
+=== 1.3.10 / 2014-10-30
+
+* Enhancements:
+  * Windows: build against SQLite 3.8.7.1. Closes #134, #135 [Hubro]
+
+=== 1.3.9 / 2014-02-25
+
+* Bugfixes:
+  * Reset exception message. Closes #80
+  * Reduce warnings due unused pointers. Closes #89
+  * Add BSD-3 license reference to gemspec. Refs #99 and #106
+
+=== 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.
+  * Aggregate handlers are initialized on each query. Closes #44
+
+* Internal
+  * Unset environment variables that could affect cross compilation.
+
+=== 1.3.6 / 2012-04-16
+
+* Enhancements
+  * Windows: build against SQLite 3.7.11
+  * Added SQLite3::ResultSet#each_hash for fetching each row as a hash.
+  * Added SQLite3::ResultSet#next_hash for fetching one row as a hash.
+
+* Bugfixes
+  * Support both UTF-16LE and UTF-16BE encoding modes on PPC. Closes #63
+  * Protect parameters to custom functions from being garbage collected too
+    soon. Fixes #60. Thanks hirataya!
+  * Fix backwards compatibility with 1.2.5 with bind vars and `query` method.
+    Fixes #35.
+  * Fix double definition error caused by defining sqlite3_int64/uint64.
+  * Fix suspicious version regexp.
+
+* Deprecations
+  * ArrayWithTypesAndFields#types is deprecated and the class will be removed
+    in version 2.0.0.  Please use the `types` method on the ResultSet class
+    that created this object.
+  * ArrayWithTypesAndFields#fields is deprecated and the class will be removed
+    in version 2.0.0.  Please use the `columns` method on the ResultSet class
+    that created this object.
+  * The ArrayWithTypesAndFields class will be removed in 2.0.0
+  * The ArrayWithTypes class will be removed in 2.0.0
+  * HashWithTypesAndFields#types is deprecated and the class will be removed
+    in version 2.0.0.  Please use the `types` method on the ResultSet class
+    that created this object.
+  * HashWithTypesAndFields#fields is deprecated and the class will be removed
+    in version 2.0.0.  Please use the `columns` method on the ResultSet class
+    that created this object.
+
 === 1.3.5 / 2011-12-03 - ZOMG Holidays are here Edition!
 
 * Enhancements

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.9", :group => [:development, :test]
+gem "rake-compiler", "~>0.9.3", :group => [:development, :test]
+gem "rake-compiler-dock", "~>0.5.2", :group => [:development, :test]
+gem "mini_portile", "~>0.6.2", :group => [:development, :test]
+gem "hoe-bundler", "~>1.0", :group => [:development, :test]
+gem "hoe", "~>3.15", :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/README.rdoc

@@ -1,7 +1,11 @@
 = SQLite3/Ruby Interface
 
-* http://github.com/luislavena/sqlite3-ruby
+* https://github.com/sparklemotion/sqlite3-ruby
 * http://groups.google.com/group/sqlite3-ruby
+* http://rubygems.org/gems/sqlite3
+* http://www.rubydoc.info/gems/sqlite3/frames
+
+{<img src="https://travis-ci.org/sparklemotion/sqlite3-ruby.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/sparklemotion/sqlite3-ruby]
 
 == DESCRIPTION
 
@@ -18,7 +22,7 @@ Note that this module is only compatible with SQLite 3.6.16 or newer.
   # Open a database
   db = SQLite3::Database.new "test.db"
   
-  # Create a database
+  # Create a table
   rows = db.execute <<-SQL
     create table numbers (
       name varchar(30),
@@ -33,12 +37,31 @@ Note that this module is only compatible with SQLite 3.6.16 or newer.
   }.each do |pair|
     db.execute "insert into numbers values ( ?, ? )", pair
   end
-  
+
   # Find a few rows
   db.execute( "select * from numbers" ) do |row|
     p row
   end
 
+  # Create another table with multiple columns
+
+  db.execute <<-SQL
+    create table students (
+      name varchar(50),
+      email varchar(50),
+      grade varchar(5),
+      blog varchar(50)
+    );
+  SQL
+
+  # Execute inserts with parameter markers
+  db.execute("INSERT INTO students (name, email, grade, blog) 
+              VALUES (?, ?, ?, ?)", ["Jane", "me@janedoe.com", "A", "http://blog.janedoe.com"])
+  
+  db.execute( "select * from students" ) do |row|
+    p row
+  end
+
 
 == Compilation and Installation
 
@@ -75,10 +98,10 @@ can be found here:
 
 Uh oh.  After contacting the mailing list, you've found that you've actually
 discovered a bug.  You can file the bug at the
-{github issues page}[http://github.com/luislavena/sqlite3-ruby/issues]
+{github issues page}[https://github.com/sparklemotion/sqlite3-ruby/issues]
 which can be found here:
 
-  * http://github.com/luislavena/sqlite3-ruby/issues
+  * https://github.com/sparklemotion/sqlite3-ruby/issues
 
 == Usage
 
@@ -91,5 +114,5 @@ FAQ, please send them to {the mailing list}[http://groups.google.com/group/sqlit
 
 The source repository is accessible via git:
 
-  git clone git://github.com/luislavena/sqlite3-ruby.git
+  git clone git://github.com/sparklemotion/sqlite3-ruby.git
 

data/ext/sqlite3/database.c

@@ -30,6 +30,8 @@ utf16_string_value_ptr(VALUE str)
   return RSTRING_PTR(str);
 }
 
+static VALUE sqlite3_rb_close(VALUE self);
+
 /* call-seq: SQLite3::Database.new(file, options = {})
  *
  * Create a new Database object that opens the given file. If utf16
@@ -44,7 +46,10 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
   VALUE file;
   VALUE opts;
   VALUE zvfs;
+  VALUE flags;
+#ifdef HAVE_SQLITE3_OPEN_V2
   int mode = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
+#endif
   int status;
 
   Data_Get_Struct(self, sqlite3Ruby, ctx);
@@ -60,7 +65,7 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
   else Check_Type(opts, T_HASH);
 
 #ifdef HAVE_RUBY_ENCODING_H
-  if(UTF16_LE_P(file)) {
+  if(UTF16_LE_P(file) || UTF16_BE_P(file)) {
     status = sqlite3_open16(utf16_string_value_ptr(file), &ctx->db);
   } else {
 #endif
@@ -75,15 +80,52 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
       }
 #endif
 
+      /* The three primary flag values for sqlite3_open_v2 are:
+       * SQLITE_OPEN_READONLY
+       * SQLITE_OPEN_READWRITE
+       * SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE -- always used for sqlite3_open and sqlite3_open16
+       */
       if (Qtrue == rb_hash_aref(opts, ID2SYM(rb_intern("readonly")))) {
+#ifdef HAVE_SQLITE3_OPEN_V2
         mode = SQLITE_OPEN_READONLY;
+#else
+        rb_raise(rb_eNotImpError, "sqlite3-ruby was compiled against a version of sqlite that does not support readonly databases");
+#endif
+      }
+      if (Qtrue == rb_hash_aref(opts, ID2SYM(rb_intern("readwrite")))) {
+#ifdef HAVE_SQLITE3_OPEN_V2
+        if (mode == SQLITE_OPEN_READONLY) {
+            rb_raise(rb_eRuntimeError, "conflicting options: readonly and readwrite");
+        }
+        mode = SQLITE_OPEN_READWRITE;
+#else
+        rb_raise(rb_eNotImpError, "sqlite3-ruby was compiled against a version of sqlite that does not support readwrite without create");
+#endif
+      }
+      flags = rb_hash_aref(opts, ID2SYM(rb_intern("flags")));
+      if (flags != Qnil) {
+#ifdef HAVE_SQLITE3_OPEN_V2
+        if ((mode & SQLITE_OPEN_CREATE) == 0) {
+            rb_raise(rb_eRuntimeError, "conflicting options: flags with readonly and/or readwrite");
+        }
+        mode = (int)NUM2INT(flags);
+#else
+        rb_raise(rb_eNotImpError, "sqlite3-ruby was compiled against a version of sqlite that does not support flags on open");
+#endif
       }
+#ifdef HAVE_SQLITE3_OPEN_V2
       status = sqlite3_open_v2(
           StringValuePtr(file),
           &ctx->db,
           mode,
           NIL_P(zvfs) ? NULL : StringValuePtr(zvfs)
       );
+#else
+      status = sqlite3_open(
+          StringValuePtr(file),
+          &ctx->db
+      );
+#endif
     }
 
 #ifdef HAVE_RUBY_ENCODING_H
@@ -100,11 +142,14 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
   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);
+#ifdef HAVE_SQLITE3_OPEN_V2
+  rb_iv_set(self, "@readonly", (mode & SQLITE_OPEN_READONLY) ? Qtrue : Qfalse);
+#else
+  rb_iv_set(self, "@readonly", Qfalse);
+#endif
 
   if(rb_block_given_p()) {
-    rb_yield(self);
-    rb_funcall(self, rb_intern("close"), 0);
+    rb_ensure(rb_yield, self, sqlite3_rb_close, self);
   }
 
   return self;
@@ -264,9 +309,23 @@ 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);
+#ifdef HAVE_RUBY_ENCODING_H
+      return rb_tainted_str_new((const char *)sqlite3_value_blob(val), len);
+#else
+      /* When encoding is not available, make it class SQLite3::Blob. */
+      VALUE strargv[1];
+      strargv[0] = rb_tainted_str_new((const char *)sqlite3_value_blob(val), len);
+      return rb_class_new_instance(1, strargv, cSqlite3Blob);
+#endif
       break;
+    }
     case SQLITE_NULL:
       return Qnil;
       break;
@@ -284,23 +343,39 @@ static void set_sqlite3_func_result(sqlite3_context * ctx, VALUE result)
     case T_FIXNUM:
       sqlite3_result_int64(ctx, (sqlite3_int64)FIX2LONG(result));
       break;
-    case T_BIGNUM:
+    case T_BIGNUM: {
 #if SIZEOF_LONG < 8
-      if (RBIGNUM_LEN(result) * SIZEOF_BDIGITS <= 8) {
-          sqlite3_result_int64(ctx, NUM2LL(result));
-          break;
+      sqlite3_int64 num64;
+
+      if (bignum_to_int64(result, &num64)) {
+	  sqlite3_result_int64(ctx, num64);
+	  break;
       }
 #endif
+    }
     case T_FLOAT:
       sqlite3_result_double(ctx, NUM2DBL(result));
       break;
     case T_STRING:
-      sqlite3_result_text(
-          ctx,
-          (const char *)StringValuePtr(result),
-          (int)RSTRING_LEN(result),
-          SQLITE_TRANSIENT
-      );
+      if(CLASS_OF(result) == cSqlite3Blob
+#ifdef HAVE_RUBY_ENCODING_H
+              || rb_enc_get_index(result) == rb_ascii8bit_encindex()
+#endif
+        ) {
+        sqlite3_result_blob(
+            ctx,
+            (const void *)StringValuePtr(result),
+            (int)RSTRING_LEN(result),
+            SQLITE_TRANSIENT
+        );
+      } else {
+        sqlite3_result_text(
+            ctx,
+            (const char *)StringValuePtr(result),
+            (int)RSTRING_LEN(result),
+            SQLITE_TRANSIENT
+        );
+      }
       break;
     default:
       rb_raise(rb_eRuntimeError, "can't return %s",
@@ -311,20 +386,18 @@ static void set_sqlite3_func_result(sqlite3_context * ctx, VALUE result)
 static void rb_sqlite3_func(sqlite3_context * ctx, int argc, sqlite3_value **argv)
 {
   VALUE callable = (VALUE)sqlite3_user_data(ctx);
-  VALUE * params = NULL;
+  VALUE params = rb_ary_new2(argc);
   VALUE result;
   int i;
 
   if (argc > 0) {
-    params = xcalloc((size_t)argc, sizeof(VALUE *));
-
     for(i = 0; i < argc; i++) {
-      params[i] = sqlite3val2rb(argv[i]);
+      VALUE param = sqlite3val2rb(argv[i]);
+      rb_ary_push(params, param);
     }
   }
 
-  result = rb_funcall2(callable, rb_intern("call"), argc, params);
-  xfree(params);
+  result = rb_apply(callable, rb_intern("call"), params);
 
   set_sqlite3_func_result(ctx, result);
 }
@@ -625,13 +698,12 @@ static VALUE collation(VALUE self, VALUE name, VALUE comparator)
   Data_Get_Struct(self, sqlite3Ruby, ctx);
   REQUIRE_OPEN_DB(ctx);
 
-  CHECK(ctx->db, sqlite3_create_collation_v2(
+  CHECK(ctx->db, sqlite3_create_collation(
         ctx->db,
         StringValuePtr(name),
         SQLITE_UTF8,
         (void *)comparator,
-        NIL_P(comparator) ? NULL : rb_comparator_func,
-        NULL));
+        NIL_P(comparator) ? NULL : rb_comparator_func));
 
   /* Make sure our comparator doesn't get garbage collected. */
   rb_hash_aset(rb_iv_get(self, "@collations"), name, comparator);
@@ -639,10 +711,11 @@ static VALUE collation(VALUE self, VALUE name, VALUE comparator)
   return self;
 }
 
+#ifdef HAVE_SQLITE3_LOAD_EXTENSION
 /* call-seq: db.load_extension(file)
  *
  * Loads an SQLite extension library from the named file. Extension
- * loading must be enabled using db.enable_load_extension(1) prior
+ * loading must be enabled using db.enable_load_extension(true) prior
  * to calling this API.
  */
 static VALUE load_extension(VALUE self, VALUE file)
@@ -664,7 +737,9 @@ static VALUE load_extension(VALUE self, VALUE file)
 
   return self;
 }
+#endif
 
+#ifdef HAVE_SQLITE3_ENABLE_LOAD_EXTENSION
 /* call-seq: db.enable_load_extension(onoff)
  *
  * Enable or disable extension loading.
@@ -672,13 +747,23 @@ static VALUE load_extension(VALUE self, VALUE file)
 static VALUE enable_load_extension(VALUE self, VALUE onoff)
 {
   sqlite3RubyPtr ctx;
+  int onoffparam;
   Data_Get_Struct(self, sqlite3Ruby, ctx);
   REQUIRE_OPEN_DB(ctx);
 
-  CHECK(ctx->db, sqlite3_enable_load_extension(ctx->db, (int)NUM2INT(onoff)));
+  if (Qtrue == onoff) {
+    onoffparam = 1;
+  } else if (Qfalse == onoff) {
+    onoffparam = 0;
+  } else {
+    onoffparam = (int)NUM2INT(onoff);
+  }
+
+  CHECK(ctx->db, sqlite3_enable_load_extension(ctx->db, onoffparam));
 
   return self;
 }
+#endif
 
 #ifdef HAVE_RUBY_ENCODING_H
 static int enc_cb(void * _self, int UNUSED(columns), char **data, char **UNUSED(names))
@@ -737,6 +822,24 @@ static VALUE transaction_active_p(VALUE self)
   return sqlite3_get_autocommit(ctx->db) ? Qfalse : Qtrue;
 }
 
+/* call-seq: db.db_filename(database_name)
+ *
+ * Returns the file associated with +database_name+.  Can return nil or an
+ * empty string if the database is temporary, or in-memory.
+ */
+static VALUE db_filename(VALUE self, VALUE db_name)
+{
+  sqlite3RubyPtr ctx;
+  const char * fname;
+  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  REQUIRE_OPEN_DB(ctx);
+
+  fname = sqlite3_db_filename(ctx->db, StringValueCStr(db_name));
+
+  if(fname) return SQLITE3_UTF8_STR_NEW2(fname);
+  return Qnil;
+}
+
 void init_sqlite3_database()
 {
   ID id_utf16, id_results_as_hash, id_type_translation;
@@ -764,6 +867,7 @@ void init_sqlite3_database()
   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);
+  rb_define_private_method(cSqlite3Database, "db_filename", db_filename, 1);
 
 #ifdef HAVE_SQLITE3_LOAD_EXTENSION
   rb_define_method(cSqlite3Database, "load_extension", load_extension, 1);