sqlite3 1.5.3-x64-mingw32 → 1.6.0.rc1-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5117b8ef75a8ac0e6c8f6db204f774e51819799fe2e994ad247b6e79895765e3
-  data.tar.gz: 4efcae516097b8167f51b22d9b7e4cc7f281e355b15820feab02ce63157b231f
+  metadata.gz: 8a6c0095ce6d573f7d9841fa533bc52df562448c1d08b01773f3e12c19146e34
+  data.tar.gz: b33a5039e1b3d8d59e13df5ce514c0269f3c5c3549fa328ea5c8c3deb0e8590a
 SHA512:
-  metadata.gz: 440a84d4559fbbf13030b2cb6b58f092099f72abb83bd01351f3e80d7010b188ec734e18246d3fdb2232339facc4377ccf06ff4f97776a5baedd942e1c932858
-  data.tar.gz: 2db93ad9f630b2eb96899a0155927bdef47a80d350d7ea2a27218226c999ce57d7fb501960a5cbe4bfd7f01733b23166c52ba14e203b66d21f46129b761a6eff
+  metadata.gz: 7e297fdb706417145d5615e589832f77f1824bb757ae8945ddfbdf4c98005a6b75e126b6b894a3859d04aae2315ae233b2a8ee0295b421942acd528698208309
+  data.tar.gz: 7ef3fecaea6fda7064d3e83dd4d9a3ec9ce690e18689137d480db0aaf89ffb0547e8c0d022bbc856c2256451f9ed44b3ca697efb6e469f48856e4c0ed35f61ca

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # sqlite3-ruby Changelog
 
+## 1.6.0 / unreleased
+
+### Ruby
+
+This release introduces native gem support for Ruby 3.2.
+
+This release ends native gem support for Ruby 2.6, for which [upstream support ended 2022-04-12](https://www.ruby-lang.org/en/downloads/branches/).
+
+
+### Dependencies
+
+* Vendored sqlite3 is updated to [v3.40.1](https://sqlite.org/releaselog/3_40_1.html).
+
+
+### Fixes
+
+* `get_boolean_pragma` now returns the correct value. Previously, it always returned true. [#275] (Thank you, @Edouard-chin!)
+
+
+## 1.5.4 / 2022-11-18
+
+### Dependencies
+
+* Vendored sqlite is updated to [v3.40.0](https://sqlite.org/releaselog/3_40_0.html).
+
+
 ## 1.5.3 / 2022-10-11
 
 ### Fixed

data/README.md

@@ -71,7 +71,7 @@ end
 
 ### Native Gems (recommended)
 
-As of v1.5.0 of this library, native (precompiled) gems are available for Ruby 2.6, 2.7, 3.0, and 3.1 on all these platforms:
+In v1.5.0 and later, native (precompiled) gems are available for recent Ruby versions on these platforms:
 
 - `aarch64-linux`
 - `arm-linux`

data/dependencies.yml

@@ -2,13 +2,14 @@
 :sqlite3:
   # checksum verified by first checking the published sha3(256) checksum against https://sqlite.org/download.html:
   #
-  # $ sha3sum -a 256 ports/archives/sqlite-autoconf-3390400.tar.gz
-  # 431328e30d12c551da9ba7ef2122b269076058512014afa799caaf62ca567090  ports/archives/sqlite-autoconf-3390400.tar.gz
+  # $ sha3sum -a 256 ports/archives/sqlite-autoconf-3400100.tar.gz
+  # 3136db4bcd9e9e1e485c291380a3d86f0f21cae0eff9f714c0ef4821e2e5cdf7  ports/archives/sqlite-autoconf-3400100.tar.gz
   #
-  # $ sha256sum ports/archives/sqlite-autoconf-3390400.tar.gz
-  # f31d445b48e67e284cf206717cc170ab63cbe4fd7f79a82793b772285e78fdbb  ports/archives/sqlite-autoconf-3390400.tar.gz
+  # juno in sqlite3-ruby on  flavorjones-update-sqlite-3.40.1 [$!?] via 💎 v3.1.2
+  # $ sha256sum ports/archives/sqlite-autoconf-3400100.tar.gz
+  # 2c5dea207fa508d765af1ef620b637dcb06572afa6f01f0815bd5bbf864b33d9  ports/archives/sqlite-autoconf-3400100.tar.gz
   #
-  :version: "3.39.4"
+  :version: "3.40.1"
   :files:
-    - :url: "https://sqlite.org/2022/sqlite-autoconf-3390400.tar.gz"
-      :sha256: "f31d445b48e67e284cf206717cc170ab63cbe4fd7f79a82793b772285e78fdbb"
+    - :url: "https://sqlite.org/2022/sqlite-autoconf-3400100.tar.gz"
+      :sha256: "2c5dea207fa508d765af1ef620b637dcb06572afa6f01f0815bd5bbf864b33d9"

data/ext/sqlite3/extconf.rb

@@ -69,21 +69,29 @@ module Sqlite3
           # on macos, pkg-config will not return --cflags without this
           ENV["PKG_CONFIG_ALLOW_SYSTEM_CFLAGS"] = "t"
 
+          # only needed for Ruby 3.1.3, see https://bugs.ruby-lang.org/issues/19233
+          RbConfig::CONFIG["PKG_CONFIG"] = config_string("PKG_CONFIG") || "pkg-config"
+
           lib_path = File.join(recipe.path, "lib")
           pcfile = File.join(lib_path, "pkgconfig", "sqlite3.pc")
           abort_pkg_config("pkg_config") unless pkg_config(pcfile)
 
           # see https://bugs.ruby-lang.org/issues/18490
-          flags = xpopen(["pkg-config", "--libs", "--static", pcfile], err: [:child, :out], &:read)
+          ldflags = xpopen(["pkg-config", "--libs", "--static", pcfile], err: [:child, :out], &:read)
           abort_pkg_config("xpopen") unless $?.success?
-          flags = flags.split
-
-          # see https://github.com/flavorjones/mini_portile/issues/118
-          "-L#{lib_path}".tap do |lib_path_flag|
-            flags.prepend(lib_path_flag) unless flags.include?(lib_path_flag)
+          ldflags = ldflags.split
+
+          if needs_darwin_linker_hack
+            ldflags.delete("-lsqlite3")
+            ldflags.prepend("-Wl,-flat_namespace", "-Wl,-hidden-lsqlite3")
+          else
+            # see https://github.com/flavorjones/mini_portile/issues/118
+            "-L#{lib_path}".tap do |lib_path_flag|
+              ldflags.prepend(lib_path_flag) unless ldflags.include?(lib_path_flag)
+            end
           end
 
-          flags.each { |flag| append_ldflags(flag) }
+          ldflags.each { |ldflag| append_ldflags(ldflag) }
         end
       end
 
@@ -126,9 +134,13 @@ module Sqlite3
 
       def minimal_recipe
         MiniPortile.new(libname, sqlite3_config[:version]).tap do |recipe|
-          recipe.files = sqlite3_config[:files]
-          recipe.target = File.join(package_root_dir, "ports")
-          recipe.patch_files = Dir[File.join(package_root_dir, "patches", "*.patch")].sort
+          if sqlite_source_dir
+            recipe.source_directory = sqlite_source_dir
+          else
+            recipe.files = sqlite3_config[:files]
+            recipe.target = File.join(package_root_dir, "ports")
+            recipe.patch_files = Dir[File.join(package_root_dir, "patches", "*.patch")].sort
+          end
         end
       end
 
@@ -157,10 +169,25 @@ module Sqlite3
         enable_config("cross-build")
       end
 
+      def sqlite_source_dir
+        arg_config("--with-sqlite-source-dir")
+      end
+
       def download
         minimal_recipe.download
       end
 
+      def needs_darwin_linker_hack
+        # See https://github.com/rake-compiler/rake-compiler-dock/issues/87 for more info.
+        cross_build? &&
+          darwin? &&
+          RbConfig::CONFIG["ruby_version"] >= "3.2"
+      end
+
+      def darwin?
+        RbConfig::CONFIG["target_os"].include?("darwin")
+      end
+
       def print_help
         print(<<~TEXT)
           USAGE: ruby #{$PROGRAM_NAME} [options]
@@ -178,6 +205,9 @@ module Sqlite3
                     Use libsqlcipher instead of libsqlite3.
                     (Implies `--enable-system-libraries`.)
 
+                --with-sqlite-source-dir=DIRECTORY
+                    (dev only) Build sqlite from the source code in DIRECTORY
+
                 --help
                     Display this message.
 

data/lib/sqlite3/pragmas.rb

@@ -11,7 +11,7 @@ module SQLite3
 
     # Returns +true+ or +false+ depending on the value of the named pragma.
     def get_boolean_pragma( name )
-      get_first_value( "PRAGMA #{name}" ) != "0"
+      get_first_value( "PRAGMA #{name}" ) != 0
     end
 
     # Sets the given pragma to the given boolean value. The value itself
@@ -260,7 +260,7 @@ module SQLite3
     def full_column_names=( mode )
       set_boolean_pragma "full_column_names", mode
     end
-  
+
     def fullfsync
       get_boolean_pragma "fullfsync"
     end
@@ -356,7 +356,7 @@ module SQLite3
     def parser_trace=( mode )
       set_boolean_pragma "parser_trace", mode
     end
-  
+
     def query_only
       get_boolean_pragma "query_only"
     end

data/lib/sqlite3/version.rb

@@ -1,12 +1,12 @@
 module SQLite3
 
-  VERSION = "1.5.3"
+  VERSION = "1.6.0.rc1"
 
   module VersionProxy
     MAJOR = 1
-    MINOR = 5
-    TINY  = 3
-    BUILD = nil
+    MINOR = 6
+    TINY  = 0
+    BUILD = "rc1"
 
     STRING = [ MAJOR, MINOR, TINY, BUILD ].compact.join( "." )
 

data/test/test_pragmas.rb

@@ -0,0 +1,22 @@
+require 'helper'
+
+module SQLite3
+  class TestPragmas < SQLite3::TestCase
+    def setup
+      super
+      @db = SQLite3::Database.new(":memory:")
+    end
+
+    def test_get_boolean_pragma
+      refute(@db.get_boolean_pragma("read_uncommitted"))
+    end
+
+    def test_set_boolean_pragma
+      @db.set_boolean_pragma("read_uncommitted", 1)
+
+      assert(@db.get_boolean_pragma("read_uncommitted"))
+    ensure
+      @db.set_boolean_pragma("read_uncommitted", 0)
+    end
+  end
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: sqlite3
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.0.rc1
 platform: x64-mingw32
 authors:
 - Jamis Buck
 - Luis Lavena
 - Aaron Patterson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2023-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -74,13 +74,27 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 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 only compatible with SQLite 3.6.16 or newer.
-email:
+email: 
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -121,7 +135,6 @@ files:
 - faq/faq.rb
 - faq/faq.yml
 - lib/sqlite3.rb
-- lib/sqlite3/2.6/sqlite3_native.so
 - lib/sqlite3/2.7/sqlite3_native.so
 - lib/sqlite3/3.0/sqlite3_native.so
 - lib/sqlite3/constants.rb
@@ -148,6 +161,7 @@ files:
 - test/test_integration_pending.rb
 - test/test_integration_resultset.rb
 - test/test_integration_statement.rb
+- test/test_pragmas.rb
 - test/test_result_set.rb
 - test/test_sqlite3.rb
 - test/test_statement.rb
@@ -162,7 +176,7 @@ metadata:
   changelog_uri: https://github.com/sparklemotion/sqlite3-ruby/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/sparklemotion/sqlite3-ruby
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options:
 - "--main"
 - README.md
@@ -172,18 +186,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
   - - "<"
     - !ruby/object:Gem::Version
       version: 3.1.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.4
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: This module allows Ruby programs to interface with the SQLite3 database engine
   (http://www.sqlite.org)