sqlite3 1.5.0.rc1-x86_64-linux → 1.5.0.rc2-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f0e49b165760b52bc6455360a3dfa360d58225a9281e5ab79eb02aa71fd1369
-  data.tar.gz: 7a77d00c116678b23322f404efa5feec4c88ae857b5cb11846972205f176b1e5
+  metadata.gz: 99a755fd4792cb1514dca7cda5001ed97e97b92d9950fc8faea2a57e676ec4f7
+  data.tar.gz: 9e5819cf3f66397fe43804d60c64a2cce96e4235364f56cd2e61807aa9994037
 SHA512:
-  metadata.gz: 1e8314776f45e038c8638fd0d10a315b445c79949dd8a7f0b056a0cdfa90457b4bf62411905e703c4a6dd82c56a4b0a161a21b762ff127430b1a74d4542c8fd0
-  data.tar.gz: e8f81bce58d4449622b9c9d634e2fcc53ed6739138b476272685182ec9ffbfe711457b0d1a27318fe2100d6154d5bb805ff9c11fd928c593b64da17ea4064f82
+  metadata.gz: d2ed80737479cd656ae33f8a0722799764750209e8d7ce3e140b78fddd1e2cded24ddd02098487c0c6ad99e702322ce90379ead49e4b065d65f1e952d77da5fc
+  data.tar.gz: c644ee9e6956a0defdebb72639b8bf7fab485826ef6eb8527a3f996e376ec373ceb97104879273a794ded04702315d2edacb46f9dcef055d166fa76245da48b7

data/CHANGELOG.md

@@ -23,7 +23,7 @@ See [the README](https://github.com/sparklemotion/sqlite3-ruby#native-gems-recom
 
 #### More consistent developer experience
 
-Both the native (precompiled) gems and the vanilla "ruby platform" (source) gem include sqlite v3.39.0 by default.
+Both the native (precompiled) gems and the vanilla "ruby platform" (source) gem include sqlite v3.39.2 by default.
 
 Defaulting to a consistent version of sqlite across all systems means that your development environment behaves exactly like your production environment, and you have access to the latest and greatest features of sqlite.
 
@@ -36,6 +36,7 @@ You can opt-out of the packaged version of sqlite (and use your system-installed
 
 * TruffleRuby is supported.
 * Apple Silicon is supported (M1, arm64-darwin).
+* vcpkg system libraries supported. [#332] (Thanks, @MSP-Greg!)
 
 
 ### Added
@@ -43,6 +44,11 @@ You can opt-out of the packaged version of sqlite (and use your system-installed
 * `SQLite3::SQLITE_LOADED_VERSION` contains the version string of the sqlite3 library that is dynamically loaded (compare to `SQLite3::SQLITE_VERSION` which is the version at compile-time).
 
 
+### Fixed
+
+* `SQLite3::Database#load_extensions` now raises a `TypeError` unless a String is passed as the file path. Previously it was possible to pass a non-string and cause a segfault. [#339]
+
+
 ## 1.4.4 / 2022-06-14
 
 ### Fixes

data/ext/sqlite3/database.c

@@ -31,7 +31,7 @@ static char *
 utf16_string_value_ptr(VALUE str)
 {
   StringValue(str);
-  rb_str_buf_cat(str, "\x00", 1L);
+  rb_str_buf_cat(str, "\x00\x00", 2L);
   return RSTRING_PTR(str);
 }
 
@@ -603,7 +603,7 @@ static VALUE load_extension(VALUE self, VALUE file)
   Data_Get_Struct(self, sqlite3Ruby, ctx);
   REQUIRE_OPEN_DB(ctx);
 
-  status = sqlite3_load_extension(ctx->db, RSTRING_PTR(file), 0, &errMsg);
+  status = sqlite3_load_extension(ctx->db, StringValuePtr(file), 0, &errMsg);
   if (status != SQLITE_OK)
   {
     errexp = rb_exc_new2(rb_eRuntimeError, errMsg);

data/ext/sqlite3/extconf.rb

@@ -36,19 +36,26 @@ module Sqlite3
       end
 
       def sqlcipher?
-        with_config("sqlcipher")
+        with_config("sqlcipher") ||
+          with_config("sqlcipher-dir") ||
+          with_config("sqlcipher-include") ||
+          with_config("sqlcipher-lib")
       end
 
       def configure_system_libraries
         pkg_config(libname)
-        append_cflags("-DUSING_SQLCIPHER") if sqlcipher?
+        append_cppflags("-DUSING_SQLCIPHER") if sqlcipher?
       end
 
       def configure_packaged_libraries
         minimal_recipe.tap do |recipe|
           recipe.configure_options += ["--enable-shared=no", "--enable-static=yes"]
           ENV.to_h.tap do |env|
-            env["CFLAGS"] = [env["CFLAGS"], "-fPIC"].join(" ") # needed for linking the static library into a shared library
+            additional_cflags = [
+              "-fPIC", # needed for linking the static library into a shared library
+              "-O2", # see https://github.com/sparklemotion/sqlite3-ruby/issues/335 for some benchmarks
+            ]
+            env["CFLAGS"] = [env["CFLAGS"], additional_cflags].flatten.join(" ")
             recipe.configure_options += env.select { |k,v| ENV_ALLOWLIST.include?(k) }
                                            .map { |key, value| "#{key}=#{value.strip}" }
           end
@@ -72,10 +79,17 @@ module Sqlite3
 
       def configure_extension
         if Gem::Requirement.new("< 2.7").satisfied_by?(Gem::Version.new(RUBY_VERSION))
-          append_cflags("-DTAINTING_SUPPORT")
+          append_cppflags("-DTAINTING_SUPPORT")
+        end
+
+        if find_header("sqlite3.h")
+          # noop
+        elsif sqlcipher? && find_header("sqlcipher/sqlite3.h")
+          append_cppflags("-DUSING_SQLCIPHER_INC_SUBDIR")
+        else
+          abort_could_not_find("sqlite3.h")
         end
 
-        abort_could_not_find("sqlite3.h") unless find_header("sqlite3.h")
         abort_could_not_find(libname) unless find_library(libname, "sqlite3_libversion_number", "sqlite3.h")
 
         # Functions defined in 1.9 but not 1.8
@@ -121,16 +135,16 @@ module Sqlite3
           sqlite3: {
             # checksum verified by first checking the published sha3(256) checksum:
             #
-            #   $ sha3sum -a 256 sqlite-autoconf-3390000.tar.gz
-            #   b8e5b3265992350d40c4ad31efc2e6dec6256813f1d5acc8f0ea805e9f33ca2a  sqlite-autoconf-3390000.tar.gz
+            # $ sha3sum -a 256 ports/archives/sqlite-autoconf-3390200.tar.gz
+            # b195891eb32305481e61c6718b8cc3b090685b613c4824a076c63166a46c5bee  ports/archives/sqlite-autoconf-3390200.tar.gz
             #
-            #   $ sha256sum sqlite-autoconf-3390000.tar.gz
-            #   e90bcaef6dd5813fcdee4e867f6b65f3c9bfd0aec0f1017f9f3bbce1e4ed09e2  sqlite-autoconf-3390000.tar.gz
+            # $ sha256sum ports/archives/sqlite-autoconf-3390200.tar.gz
+            # 852be8a6183a17ba47cee0bbff7400b7aa5affd283bf3beefc34fcd088a239de  ports/archives/sqlite-autoconf-3390200.tar.gz
             #
-            version: "3.39.0",
+            version: "3.39.2",
             files: [{
-                      url: "https://www.sqlite.org/2022/sqlite-autoconf-3390000.tar.gz",
-                      sha256: "e90bcaef6dd5813fcdee4e867f6b65f3c9bfd0aec0f1017f9f3bbce1e4ed09e2",
+                      url: "https://www.sqlite.org/2022/sqlite-autoconf-3390200.tar.gz",
+                      sha256: "852be8a6183a17ba47cee0bbff7400b7aa5affd283bf3beefc34fcd088a239de",
                     }],
           }
         }
@@ -147,10 +161,89 @@ module Sqlite3
       def download
         minimal_recipe.download
       end
+
+      def print_help
+        print(<<~TEXT)
+          USAGE: ruby #{$PROGRAM_NAME} [options]
+
+            Flags that are always valid:
+
+                --disable-system-libraries
+                    Use the packaged libraries, and ignore the system libraries.
+                    (This is the default behavior.)
+
+                --enable-system-libraries
+                    Use system libraries instead of building and using the packaged libraries.
+
+                --with-sqlcipher
+                    Use libsqlcipher instead of libsqlite3.
+                    (Implies `--enable-system-libraries`.)
+
+                --help
+                    Display this message.
+
+
+            Flags only used when using system libraries:
+
+                General (applying to all system libraries):
+
+                    --with-opt-dir=DIRECTORY
+                        Look for headers and libraries in DIRECTORY.
+
+                    --with-opt-lib=DIRECTORY
+                        Look for libraries in DIRECTORY.
+
+                    --with-opt-include=DIRECTORY
+                        Look for headers in DIRECTORY.
+
+                Related to sqlcipher:
+
+                    --with-sqlcipher-dir=DIRECTORY
+                        Look for sqlcipher headers and library in DIRECTORY.
+                        (Implies `--with-sqlcipher` and `--enable-system-libraries`.)
+
+                    --with-sqlcipher-lib=DIRECTORY
+                        Look for sqlcipher library in DIRECTORY.
+                        (Implies `--with-sqlcipher` and `--enable-system-libraries`.)
+
+                    --with-sqlcipher-include=DIRECTORY
+                        Look for sqlcipher headers in DIRECTORY.
+                        (Implies `--with-sqlcipher` and `--enable-system-libraries`.)
+
+
+            Flags only used when building and using the packaged libraries:
+
+                --enable-cross-build
+                    Enable cross-build mode. (You probably do not want to set this manually.)
+
+
+            Environment variables used for compiling the C extension:
+
+                CC
+                    Use this path to invoke the compiler instead of `RbConfig::CONFIG['CC']`
+
+
+            Environment variables passed through to the compilation of packaged libraries:
+
+                CC
+                CPPFLAGS
+                CFLAGS
+                LDFLAGS
+                LIBS
+                LT_SYS_LIBRARY_PATH
+                CPP
+
+        TEXT
+      end
     end
   end
 end
 
+if arg_config("--help")
+  Sqlite3::ExtConf.print_help
+  exit!(0)
+end
+
 if arg_config("--download-dependencies")
   Sqlite3::ExtConf.download
   exit!(0)

data/ext/sqlite3/sqlite3_ruby.h

@@ -21,8 +21,11 @@
 #define SQLITE3_UTF8_STR_NEW2(_obj) \
     (rb_enc_associate_index(rb_str_new2(_obj), rb_utf8_encindex()))
 
-
-#include <sqlite3.h>
+#ifdef USING_SQLCIPHER_INC_SUBDIR
+#  include <sqlcipher/sqlite3.h>
+#else
+#  include <sqlite3.h>
+#endif
 
 #ifndef HAVE_TYPE_SQLITE3_INT64
 typedef sqlite_int64 sqlite3_int64;

data/lib/sqlite3/version.rb

@@ -1,13 +1,13 @@
 module SQLite3
 
-  VERSION = "1.5.0.rc1"
+  VERSION = "1.5.0.rc2"
 
   module VersionProxy
 
     MAJOR = 1
     MINOR = 5
     TINY  = 0
-    BUILD = "rc1"
+    BUILD = "rc2"
 
     STRING = [ MAJOR, MINOR, TINY, BUILD ].compact.join( "." )
     #:beta-tag:

data/test/test_database.rb

@@ -534,5 +534,12 @@ module SQLite3
       end
       assert_includes error.message, "no such column: nope"
     end
+
+    def test_load_extension_with_nonstring_argument
+      db = SQLite3::Database.new(':memory:')
+      skip("extensions are not enabled") unless db.respond_to?(:load_extension)
+      assert_raises(TypeError) { db.load_extension(1) }
+      assert_raises(TypeError) { db.load_extension(Pathname.new("foo.so")) }
+    end
   end
 end

data/test/test_sqlite3.rb

@@ -19,7 +19,12 @@ module SQLite3
     end
 
     def test_version_strings
+      skip if SQLite3::VERSION.include?("test") # see set-version-to-timestamp rake task
       assert_equal(SQLite3::VERSION, SQLite3::VersionProxy::STRING)
     end
+
+    def test_compiled_version_and_loaded_version
+      assert_equal(SQLite3::SQLITE_VERSION, SQLite3::SQLITE_LOADED_VERSION)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlite3
 version: !ruby/object:Gem::Version
-  version: 1.5.0.rc1
+  version: 1.5.0.rc2
 platform: x86_64-linux
 authors:
 - Jamis Buck
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-05 00:00:00.000000000 Z
+date: 2022-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest