sqlite3-ffi 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0099c7235d3e7b13c26861041a474d279952101488139c9b11c40053658bb095'
-  data.tar.gz: e809f4772c73162b7417c79ae56674606c689e2a1fddb3181ac637d958066f04
+  metadata.gz: 6a81fec0d3b0e0c8f1ff287c1e14d8bbeef181b2d03d5708a344324d722c8960
+  data.tar.gz: 4340fbba91c04afb1ab0da5528d2f7277f695fe354c06e0ca61b1fd1ab94b863
 SHA512:
-  metadata.gz: 916507cb952494f227d6182cf92d9e910cf3534f01995706efff64523eb86750fe7601238b9e4d6c32813cff3a097a073b541bad0632dc74f87e2b35e589ccca
-  data.tar.gz: 78586b3eb030fdcb58e4afbcace803efcf78c3e02d3939d73524186148f55cc6b7699c5f15b42df774f6007681ac22bbf82a434887874b1092b3a72ec66efadf
+  metadata.gz: 67a1ee9b4b3c84022f681fbc8180c620fd42e27b34078621261c44e229a954b4c9c97907df0a61d50593b8e62238f30c8589aefc4e4a674e8c8c5e2a7b87f197
+  data.tar.gz: 7fa688353cf24e25a164a721b5c2edcf573960fed63bae701aa039d68aebbe9555aaf41e984ce7e9329ce06dabb0a9472c4f39fc42d0914ba407feba23664205

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.8 (2026-08-11)
+
+- Synced with sqlite3-ruby 2.9.6
+
 ## 0.1.7 (2026-06-07)
 
 - Synced with sqlite3-ruby 2.9.5

data/lib/sqlite3/database.rb

@@ -171,8 +171,6 @@ module SQLite3
         end
       end
 
-      @tracefunc = nil
-      @authorizer = nil
       @progress_handler = nil
       @collations = {}
       @functions = []
@@ -458,9 +456,7 @@ module SQLite3
     #
     # See also #create_aggregate_handler for a more object-oriented approach to
     # aggregate functions.
-    def create_aggregate(name, arity, step = nil, finalize = nil,
-      text_rep = Constants::TextRep::ANY, &block)
-
+    def create_aggregate(name, arity, step = nil, finalize = nil, text_rep = Constants::TextRep::ANY, &block)
       proxy = Class.new do
         def self.step(&block)
           define_method(:step_with_ctx, &block)

data/lib/sqlite3/ffi/c_api.rb

@@ -145,7 +145,7 @@ module SQLite3
       attach_function :sqlite3_bind_parameter_count, [:pointer], :int
       attach_function :sqlite3_bind_parameter_index, [:pointer, :string], :int
       attach_function :sqlite3_bind_parameter_name, [:pointer, :int], :string
-      attach_function :sqlite3_bind_text, [:pointer, :int, :string, :int, :pointer], :int
+      attach_function :sqlite3_bind_text, [:pointer, :int, :pointer, :int, :pointer], :int
       attach_function :sqlite3_bind_text16, [:pointer, :int, :pointer, :int, :pointer], :int
       attach_function :sqlite3_busy_handler, [:pointer, :pointer, :pointer], :int
       attach_function :sqlite3_busy_timeout, [:pointer, :int], :int
@@ -182,8 +182,9 @@ module SQLite3
       attach_function :sqlite3_last_insert_rowid, [:pointer], :int64
       attach_function :sqlite3_libversion, [], :string
       attach_function :sqlite3_libversion_number, [], :int
+      attach_function :sqlite3_mprintf, [:string, :varargs], :pointer
       attach_function :sqlite3_open16, [:pointer, :pointer], :int
-      attach_function :sqlite3_open_v2, [:string, :pointer, :int, :pointer], :int
+      attach_function :sqlite3_open_v2, [:string, :pointer, :int, :string], :int
       attach_function :sqlite3_prepare_v2, [:pointer, :string, :int, :pointer, :pointer], :int
       attach_function :sqlite3_progress_handler, [:pointer, :int, :pointer, :pointer], :void
       attach_function :sqlite3_reset, [:pointer], :int

data/lib/sqlite3/ffi/database.rb

@@ -167,6 +167,12 @@ module SQLite3
       end
     end
 
+    def require_closed_db
+      if !@db.nil?
+        raise SQLite3::Exception, "cannot open a database that is already open"
+      end
+    end
+
     def discard_db
       sfile = ::FFI::MemoryPointer.new(:pointer)
 
@@ -209,13 +215,28 @@ module SQLite3
     end
 
     def utf16_string_value_ptr(str)
-      str + "\x00\x00".encode(Encoding::UTF_16LE)
+      str = FFI.string_value(str)
+
+      utf16str = str.dup
+      if utf16str.encoding != Encoding::UTF_16LE && utf16str.encoding != Encoding::UTF_16BE
+        utf16str.force_encoding(Encoding::UTF_16LE)
+      end
+      codepoints = utf16str.codepoints
+      if codepoints.include?(0)
+        raise ArgumentError, "string contains null char"
+      end
+
+      str = str.dup
+      str << 0
+      str << 0
+      str
     end
 
     def open_v2(file, flags, zvfs)
+      require_closed_db
       @owner = Process.pid
       db = ::FFI::MemoryPointer.new(:pointer)
-      status = FFI::CApi.sqlite3_open_v2(FFI.string_value(file), db, flags, zvfs)
+      status = FFI::CApi.sqlite3_open_v2(FFI.string_value_cstr(file), db, flags, zvfs.nil? ? nil : FFI.string_value_cstr(zvfs))
       @db = db.read_pointer
       @db = ::FFI::AutoPointer.new(db.read_pointer, FFI::CApi.method(:sqlite3_close_v2))
       FFI.check(@db, status)
@@ -250,11 +271,20 @@ module SQLite3
     end
 
     def open16(file)
+      require_closed_db
       @owner = Process.pid
       db = ::FFI::MemoryPointer.new(:pointer)
       status = FFI::CApi.sqlite3_open16(utf16_string_value_ptr(file), db)
       @db = ::FFI::AutoPointer.new(db.read_pointer, FFI::CApi.method(:sqlite3_close_v2))
-      FFI.check(@db, status)
+      if status != FFI::CApi::SQLITE_OK
+        # https://github.com/ffi/ffi/issues/1121
+        # msg = FFI::CApi.sqlite3_mprintf("%s", :string, FFI::CApi.sqlite3_errmsg(@db))
+        # msg = ::FFI::MemoryPointer.new(:pointer).write_pointer(msg)
+        msg = FFI::CApi.sqlite3_errmsg(@db)
+        @db.free
+        @db = nil
+        FFI.check_msg(@db, status, msg)
+      end
       status
     end
 

data/lib/sqlite3/ffi/exception.rb

@@ -87,9 +87,9 @@ module SQLite3
       klass = status2klass(status)
       return if klass.nil?
 
-      exception = klass.new(msg.read_pointer.read_string)
+      exception = klass.new(msg.is_a?(String) ? msg : msg.read_pointer.read_string)
       exception.instance_variable_set(:@code, status)
-      CApi.sqlite3_free(msg.read_pointer)
+      CApi.sqlite3_free(msg.read_pointer) unless msg.is_a?(String)
 
       raise exception
     end

data/lib/sqlite3/ffi/statement.rb

@@ -111,7 +111,7 @@ module SQLite3
           if value.encoding != Encoding::UTF_8 && value.encoding != Encoding::US_ASCII
             value = value.encode(Encoding::UTF_8)
           end
-          status = FFI::CApi.sqlite3_bind_text(@stmt, index, value, value.bytesize, FFI::CApi::SQLITE_TRANSIENT)
+          status = FFI::CApi.sqlite3_bind_text(@stmt, index, +value, value.bytesize, FFI::CApi::SQLITE_TRANSIENT)
         end
       when Float
         status = FFI::CApi.sqlite3_bind_double(@stmt, index, value)

data/lib/sqlite3/ffi/utils.rb

@@ -58,6 +58,14 @@ module SQLite3
       obj.to_str
     end
 
+    def self.string_value_cstr(obj)
+      obj = string_value(obj)
+      if obj.include?("\x00")
+        raise ArgumentError, "string contains null byte"
+      end
+      obj
+    end
+
     RB_ERRINFO = :sqlite3_ffi_rb_errinfo
 
     def self.rb_errinfo

data/lib/sqlite3/ffi/version.rb

@@ -1,5 +1,5 @@
 module SQLite3
   module FFI
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

data/lib/sqlite3/version.rb

@@ -1,4 +1,4 @@
 module SQLite3
   # (String) the version of the sqlite3 gem, e.g. "2.1.1"
-  VERSION = "2.9.5"
+  VERSION = "2.9.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlite3-ffi
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Jamis Buck
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.13
+rubygems_version: 4.0.16
 specification_version: 4
 summary: A drop-in replacement for the sqlite3 gem for JRuby
 test_files: []