sqlite3 1.6.7-x86_64-darwin → 1.6.9-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b6a36f25d068ffe24cf9e4fe60f5703a191bfd78baeecfcd213fb1bdfe1ad05
-  data.tar.gz: f3ef9b5407baf99a0ac4ca7bef10abdc20e24c17e93c2705d7243d595f008534
+  metadata.gz: 4794a5634e98c4efb03ce30c6fe17719774101d5af78c9ecd2b243f07a249686
+  data.tar.gz: 1dace3b1967fc90422d8bd70411453a12e7c083c7656172fe9dca9abf202ddfb
 SHA512:
-  metadata.gz: 7902bb70f7671c5ec2b3e16111d3529a1aaa6109007144ee2b73d5f9f93f7e0789db0ddc365bbc3621a3244aff8962956ff6c6349b78014a3813f8d3605d8057
-  data.tar.gz: fbe87495bf21b565ddfa48ab72fb65c01d2dc0ec41e81a8a488c30ad763a691e6f28b94652756adc8a383ee7d60fdd68b84594ba773670adacb29df5ceabf33f
+  metadata.gz: b03ab2e200b72666176046690ea58545315d29370b839db2078de4cd643f71bc615a4134d3d59ad07f09a21eac9eb9f2939aaa3f76283db42c80cb401f1eebd0
+  data.tar.gz: b15eee45083d0cd4ae434a51d7d87c3970bfdfd698e74066d0dc1d4c766d3bd597bbb98b5f1e0bdaea6d9686bffe38e8d616c3d5a3afd4025322d647ed792f2f

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # sqlite3-ruby Changelog
 
+## 1.6.9 / 2023-11-26
+
+### Dependencies
+
+- Vendored sqlite is update to [v3.44.2](https://sqlite.org/releaselog/3_44_2.html). @flavorjones
+
+### Added
+
+- `Database.new` now accepts a `:default_transaction_mode` option (defaulting to `:deferred`), and `Database#transaction` no longer requires a transaction mode to be specified. This should allow higher-level adapters to more easily choose a transaction mode for a database connection. [#426] @masamitsu-murase
+
+
+## 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

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("rdoc", "6.5.0")
-gem("psych", "5.1.0")
+gem("rake-compiler-dock", "1.3.1")
+gem("rdoc", "6.6.0")
 
-gem("ruby_memcheck", "2.2.0") if Gem::Platform.local.os == "linux"
+gem("ruby_memcheck", "2.2.1") if Gem::Platform.local.os == "linux"

data/dependencies.yml

@@ -1,15 +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:
-  # a7463a45ed58849200858e514b79f7e5f5d69850047897c5b659a78a0bc75cc1
+  # 6c427f0547e2f7babe636b748dd5d5a1f2f31601adadef7e2805e7d1f7171861
   #
-  # $ sha3sum -a 256 ports/archives/sqlite-autoconf-3430200.tar.gz
-  # a7463a45ed58849200858e514b79f7e5f5d69850047897c5b659a78a0bc75cc1  ports/archives/sqlite-autoconf-3430200.tar.gz
+  # $ sha3sum -a 256 ports/archives/sqlite-autoconf-3440200.tar.gz
+  # 6c427f0547e2f7babe636b748dd5d5a1f2f31601adadef7e2805e7d1f7171861  ports/archives/sqlite-autoconf-3440200.tar.gz
   #
-  # $ sha256sum ports/archives/sqlite-autoconf-3430200.tar.gz
-  # 6d422b6f62c4de2ca80d61860e3a3fb693554d2f75bb1aaca743ccc4d6f609f0  ports/archives/sqlite-autoconf-3430200.tar.gz
-  #
-  :version: "3.43.2"
+  # $ sha256sum ports/archives/sqlite-autoconf-3440200.tar.gz
+  # 1c6719a148bc41cf0f2bbbe3926d7ce3f5ca09d878f1246fcc20767b175bb407  ports/archives/sqlite-autoconf-3440200.tar.gz
+  :version: "3.44.2"
   :files:
-    - :url: "https://sqlite.org/2023/sqlite-autoconf-3430200.tar.gz"
-      :sha256: "6d422b6f62c4de2ca80d61860e3a3fb693554d2f75bb1aaca743ccc4d6f609f0"
+    - :url: "https://sqlite.org/2023/sqlite-autoconf-3440200.tar.gz"
+      :sha256: "1c6719a148bc41cf0f2bbbe3926d7ce3f5ca09d878f1246fcc20767b175bb407"

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
@@ -56,12 +71,23 @@ module SQLite3
 
     # call-seq: SQLite3::Database.new(file, options = {})
     #
-    # Create a new Database object that opens the given file. If utf16
-    # is +true+, the filename is interpreted as a UTF-16 encoded string.
+    # Create a new Database object that opens the given file.
+    #
+    # Supported permissions +options+:
+    # - the default mode is <tt>READWRITE | CREATE</tt>
+    # - +:readonly+: boolean (default false), true to set the mode to +READONLY+
+    # - +:readwrite+: boolean (default false), true to set the mode to +READWRITE+
+    # - +:flags+: set the mode to a combination of SQLite3::Constants::Open flags.
+    #
+    # Supported encoding +options+:
+    # - +:utf16+: boolean (default false), is the filename's encoding UTF-16 (only needed if the filename encoding is not UTF_16LE or BE)
+    #
+    # Other supported +options+:
+    # - +:strict+: boolean (default false), disallow the use of double-quoted string literals (see https://www.sqlite.org/quirks.html#double_quoted_string_literals_are_accepted)
+    # - +:results_as_hash+: boolean (default false), return rows as hashes instead of arrays
+    # - +:type_translation+: boolean (default false), enable type translation
+    # - +:default_transaction_mode+: one of +:deferred+ (default), +:immediate+, or +:exclusive+. If a mode is not specified in a call to #transaction, this will be the default transaction mode.
     #
-    # By default, the new database will return result rows as arrays
-    # (#results_as_hash) and has type translation disabled (#type_translation=).
-
     def initialize file, options = {}, zvfs = nil
       mode = Constants::Open::READWRITE | Constants::Open::CREATE
 
@@ -104,6 +130,7 @@ module SQLite3
       @type_translation = options[:type_translation]
       @type_translator  = make_type_translator @type_translation
       @readonly         = mode & Constants::Open::READONLY != 0
+      @default_transaction_mode = options[:default_transaction_mode] || :deferred
 
       if block_given?
         begin
@@ -607,8 +634,10 @@ module SQLite3
     # by SQLite, so attempting to nest a transaction will result in a runtime
     # exception.
     #
-    # The +mode+ parameter may be either <tt>:deferred</tt> (the default),
+    # The +mode+ parameter may be either <tt>:deferred</tt>,
     # <tt>:immediate</tt>, or <tt>:exclusive</tt>.
+    # If `nil` is specified, the default transaction mode, which was
+    # passed to #initialize, is used.
     #
     # If a block is given, the database instance is yielded to it, and the
     # transaction is committed when the block terminates. If the block
@@ -619,7 +648,8 @@ module SQLite3
     # If a block is not given, it is the caller's responsibility to end the
     # transaction explicitly, either by calling #commit, or by calling
     # #rollback.
-    def transaction( mode = :deferred )
+    def transaction( mode = nil )
+      mode = @default_transaction_mode if mode.nil?
       execute "begin #{mode.to_s} transaction"
 
       if block_given?

data/lib/sqlite3/version.rb

@@ -1,11 +1,11 @@
 module SQLite3
 
-  VERSION = "1.6.7"
+  VERSION = "1.6.9"
 
   module VersionProxy
     MAJOR = 1
     MINOR = 6
-    TINY  = 7
+    TINY  = 9
     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"')
@@ -581,5 +624,45 @@ module SQLite3
       db.execute("insert into foo values (?)", Float::INFINITY)
       assert_equal Float::INFINITY, db.execute("select avg(temperature) from foo").first.first
     end
+
+    def test_default_transaction_mode
+      tf = Tempfile.new 'database_default_transaction_mode'
+      SQLite3::Database.new(tf.path) do |db|
+        db.execute("create table foo (score int)")
+        db.execute("insert into foo values (?)", 1)
+      end
+
+      test_cases = [
+        {mode: nil, read: true, write: true},
+        {mode: :deferred, read: true, write: true},
+        {mode: :immediate, read: true, write: false},
+        {mode: :exclusive, read: false, write: false},
+      ]
+
+      test_cases.each do |item|
+        db = SQLite3::Database.new tf.path, default_transaction_mode: item[:mode]
+        db2 = SQLite3::Database.new tf.path
+        db.transaction do
+          sql_for_read_test = "select * from foo"
+          if item[:read]
+            assert_nothing_raised{ db2.execute(sql_for_read_test) }
+          else
+            assert_raises(SQLite3::BusyException){ db2.execute(sql_for_read_test) }
+          end
+
+          sql_for_write_test = "insert into foo values (2)"
+          if item[:write]
+            assert_nothing_raised{ db2.execute(sql_for_write_test) }
+          else
+            assert_raises(SQLite3::BusyException){ db2.execute(sql_for_write_test) }
+          end
+        end
+      ensure
+        db.close if db && !db.closed?
+        db2.close if db2 && !db2.closed?
+      end
+    ensure
+      tf.unlink if tf
+    end
   end
 end

metadata

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