sqlite3 1.6.6-x86_64-darwin → 1.6.8-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ec716e2d8d140be870b4863e8351b6e72d46021a43465c0fdbf5f968e62c354
-  data.tar.gz: 1250e1ad647eeb21fcb026e3eb325b62d65c2a74b509f19bb54561c51c922752
+  metadata.gz: ef3b5f7bb3448b438a4f86dc19d34d19552688a7daeac4dcf6f3e8a7acebfeb1
+  data.tar.gz: '096b872dabd3a4a90cf487687c4638013b03ba121cf008b29a9b72ce3f748d52'
 SHA512:
-  metadata.gz: 446ab6351fe3caad0fcf92930525663fd510a7301ae7f4b5016045f5d98f11902b700db6a28676c29d781f94b6017bbe1706e478a7c8a941286ad8a734944c86
-  data.tar.gz: 50c315fb35c8fa72bfb50e278ecbfa5f66641e2ab27b4790ba77de2b39dae0aa374f68913a9670b5b90a581cac11dd8df6fa0a6af1a62db03b1b357d986b40e8
+  metadata.gz: 6be900bd86d7e3bc286df8cdb830ad861ec2a2dd15da8ac834d3c5cfabd8fc00b71444363e693721b49213af44135c8388f92ba1c2239e41b803b85f5a68cee4
+  data.tar.gz: 877e053ab124f429e2ff62ca301f02dcb471c6103ae5b11c23211f95b556651475ceddfeb7deb06101dc0973dabf96eb1bc8d0c7c57abe1e46adedc44ebe3025

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # sqlite3-ruby Changelog
 
+## 1.6.8 / 2023-11-01
+
+### Dependencies
+
+- Vendored sqlite is updated to [v3.44.0](https://sqlite.org/releaselog/3_44_0.html). @flavorjones
+- rake-compiler-dock updated to v1.3.1 for precompiled native gems. @flavorjones
+
+
+### Added
+
+- `SQLite3::Database.open` now returns the block result. Previously this returned the Database object. [#415] @toy
+- Documentation improvement in `lib/sqlite3/database.rb`. [#421] @szTheory
+
+
+## 1.6.7 / 2023-10-10
+
+### Dependencies
+
+Vendored sqlite is updated to [v3.43.2](https://sqlite.org/releaselog/3_43_2.html).
+
+Upstream release notes:
+
+> - Fix a couple of obscure UAF errors and an obscure memory leak.
+> - Omit the use of the sprintf() function from the standard library in the [CLI](https://sqlite.org/cli.html), as this now generates warnings on some platforms.
+> - Avoid conversion of a double into unsigned long long integer, as some platforms do not do such conversions correctly.
+
+
+### Added
+
+* Compile packaged sqlite3 with additional flags to explicitly enable FTS5, and set synchronous mode to normal when in WAL mode. [#408] (@flavorjones)
+
+
 ## 1.6.6 / 2023-09-12
 
 ### Dependencies

data/Gemfile

@@ -4,8 +4,7 @@ gemspec
 
 gem("minitest", "5.20.0")
 gem("rake-compiler", "1.2.5")
-gem("rake-compiler-dock", "1.3.0")
+gem("rake-compiler-dock", "1.3.1")
 gem("rdoc", "6.5.0")
-gem("psych", "5.1.0")
 
-gem("ruby_memcheck", "2.1.2") if Gem::Platform.local.os == "linux"
+gem("ruby_memcheck", "2.2.0") if Gem::Platform.local.os == "linux"

data/dependencies.yml

@@ -1,14 +1,14 @@
 # TODO: stop using symbols here once we no longer support Ruby 2.7 and can rely on symbolize_names
 :sqlite3:
   # checksum verified by first checking the published sha3(256) checksum against https://sqlite.org/download.html:
+  # 6869046465eae886f1a9f2c8debeeba44d34328693aa77a5bd4a3cfed93d6556
   #
-  # $ sha3sum -a 256 ports/archives/sqlite-autoconf-3430100.tar.gz
-  # 8c6242fb2abf6a556e849d259134aca9130520b2218f9a7fb1f50eb0528a385a  ports/archives/sqlite-autoconf-3430100.tar.gz
+  # $ sha3sum -a 256 ports/archives/sqlite-autoconf-3440000.tar.gz
+  # 6869046465eae886f1a9f2c8debeeba44d34328693aa77a5bd4a3cfed93d6556  ports/archives/sqlite-autoconf-3440000.tar.gz
   #
-  # $ sha256sum ports/archives/sqlite-autoconf-3430100.tar.gz
-  # 46db2f10f306e163e4571b8974d44cd37078aae04295bbf08b253655df3265f4  ports/archives/sqlite-autoconf-3430100.tar.gz
-  #
-  :version: "3.43.1"
+  # $ sha256sum ports/archives/sqlite-autoconf-3440000.tar.gz
+  # b9cd386e7cd22af6e0d2a0f06d0404951e1bef109e42ea06cc0450e10cd15550  ports/archives/sqlite-autoconf-3440000.tar.gz
+  :version: "3.44.0"
   :files:
-    - :url: "https://sqlite.org/2023/sqlite-autoconf-3430100.tar.gz"
-      :sha256: "46db2f10f306e163e4571b8974d44cd37078aae04295bbf08b253655df3265f4"
+    - :url: "https://sqlite.org/2023/sqlite-autoconf-3440000.tar.gz"
+      :sha256: "b9cd386e7cd22af6e0d2a0f06d0404951e1bef109e42ea06cc0450e10cd15550"

data/ext/sqlite3/extconf.rb

@@ -49,13 +49,18 @@ module Sqlite3
 
       def configure_packaged_libraries
         minimal_recipe.tap do |recipe|
-          recipe.configure_options += ["--enable-shared=no", "--enable-static=yes"]
+          recipe.configure_options += [
+            "--enable-shared=no",
+            "--enable-static=yes",
+            "--enable-fts5",
+          ]
           ENV.to_h.tap do |env|
             user_cflags = with_config("sqlite-cflags")
             more_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
               "-fvisibility=hidden", # see https://github.com/rake-compiler/rake-compiler-dock/issues/87
+              "-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1",
             ]
             env["CFLAGS"] = [user_cflags, env["CFLAGS"], more_cflags].flatten.join(" ")
             recipe.configure_options += env.select { |k,v| ENV_ALLOWLIST.include?(k) }

data/lib/sqlite3/database.rb

@@ -18,7 +18,7 @@ module SQLite3
   #     end
   #   end
   #
-  # It wraps the lower-level methods provides by the selected driver, and
+  # It wraps the lower-level methods provided by the selected driver, and
   # includes the Pragmas module for access to various pragma convenience
   # methods.
   #
@@ -39,7 +39,22 @@ module SQLite3
 
     class << self
 
-      alias :open :new
+      # Without block works exactly as new.
+      # With block, like new closes the database at the end, but unlike new
+      # returns the result of the block instead of the database instance.
+      def open( *args )
+        database = new(*args)
+
+        if block_given?
+          begin
+            yield database
+          ensure
+            database.close
+          end
+        else
+          database
+        end
+      end
 
       # Quotes the given string, making it safe to use in an SQL statement.
       # It replaces all instances of the single-quote character with two

data/lib/sqlite3/version.rb

@@ -1,11 +1,11 @@
 module SQLite3
 
-  VERSION = "1.6.6"
+  VERSION = "1.6.8"
 
   module VersionProxy
     MAJOR = 1
     MINOR = 6
-    TINY  = 6
+    TINY  = 8
     BUILD = nil
 
     STRING = [ MAJOR, MINOR, TINY, BUILD ].compact.join( "." )

data/test/test_database.rb

@@ -198,11 +198,25 @@ module SQLite3
 
     def test_new
       db = SQLite3::Database.new(':memory:')
-      assert db
+      assert_instance_of(SQLite3::Database, db)
     ensure
       db.close if db
     end
 
+    def test_open
+      db = SQLite3::Database.open(':memory:')
+      assert_instance_of(SQLite3::Database, db)
+    ensure
+      db.close if db
+    end
+
+    def test_open_returns_block_result
+      result = SQLite3::Database.open(':memory:') do |db|
+        :foo
+      end
+      assert_equal :foo, result
+    end
+
     def test_new_yields_self
       thing = nil
       SQLite3::Database.new(':memory:') do |db|
@@ -211,6 +225,14 @@ module SQLite3
       assert_instance_of(SQLite3::Database, thing)
     end
 
+    def test_open_yields_self
+      thing = nil
+      SQLite3::Database.open(':memory:') do |db|
+        thing = db
+      end
+      assert_instance_of(SQLite3::Database, thing)
+    end
+
     def test_new_with_options
       # determine if Ruby is running on Big Endian platform
       utf16 = ([1].pack("I") == [1].pack("N")) ? "UTF-16BE" : "UTF-16LE"
@@ -221,7 +243,7 @@ module SQLite3
         db = SQLite3::Database.new(Iconv.conv(utf16, 'UTF-8', ':memory:'),
                                    :utf16 => true)
       end
-      assert db
+      assert_instance_of(SQLite3::Database, db)
     ensure
       db.close if db
     end
@@ -241,6 +263,15 @@ module SQLite3
       assert thing.closed?
     end
 
+    def test_open_with_block_closes_self
+      thing = nil
+      SQLite3::Database.open(':memory:') do |db|
+        thing = db
+        assert !thing.closed?
+      end
+      assert thing.closed?
+    end
+
     def test_block_closes_self_even_raised
       thing = nil
       begin
@@ -253,6 +284,18 @@ module SQLite3
       assert thing.closed?
     end
 
+    def test_open_with_block_closes_self_even_raised
+      thing = nil
+      begin
+        SQLite3::Database.open(':memory:') do |db|
+          thing = db
+          raise
+        end
+      rescue
+      end
+      assert thing.closed?
+    end
+
     def test_prepare
       db = SQLite3::Database.new(':memory:')
       stmt = db.prepare('select "hello world"')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlite3
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.8
 platform: x86_64-darwin
 authors:
 - Jamis Buck
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2023-11-01 00:00:00.000000000 Z
 dependencies: []
 description: |
   Ruby library to interface with the SQLite3 database engine (http://www.sqlite.org). Precompiled