sqlite3-ffi 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbbaa5e5e143c05707d0a5862d7a18b795bbd862d0e1a2fd952ac116b1abc614
-  data.tar.gz: 1b0a5244008fb363938d6db3367085b9df6024400f0bf99d94dc70f42be446e1
+  metadata.gz: 4a7ab9e95562191fa0a9dbc1e41206379def028455f2bf5d76332829034bd2ef
+  data.tar.gz: 7866ba35fb73f902f8c1511046ebbbbe684a537358dd0a8513a0ef5facbbcbb6
 SHA512:
-  metadata.gz: 15ea673d89d9087f71dfaca5e17684f8b8298c5d5f24c7ca08d3bfe40bdb345bb13ad3576d35a8f5895b5e0a77ff6ba256f77944db4327fad234100a7ca1965a
-  data.tar.gz: 9473c68f8da638de6c04d93476564583a28e885dafcea23c4349c9eb2170be8b15f335b3729ecb4d2f27887d0e6c4bbe0e147f12f7959a641a518d115634a9c2
+  metadata.gz: 9954f178afb06b6d43dc1e3cda5241d3a4c8d7ad57bf43efede58aba563abcfcbc4a56bdc2941b9ac1c9983bb15274de0bfd16fc35fb1b8b4be118f3e4c090c4
+  data.tar.gz: f7e0486214763d90a26ab03df63be2a45495bb5569b60143b6728da9ce6f81d71a4ac68eb551f2ab32519a29a5c8c0623e227a58ade6b9928db0e7bdf412eaf9

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.1.6 (2026-02-19)
+
+- Fixed memory leaks
+
+## 0.1.5 (2026-01-02)
+
+- Synced with sqlite3-ruby 2.9.0
+
 ## 0.1.4 (2025-06-09)
 
 - Synced with sqlite3-ruby 2.7.0

data/lib/sqlite3/ffi/aggregator.rb

@@ -19,7 +19,7 @@ module SQLite3
       inst_ptr = CApi.sqlite3_aggregate_context(ctx, 8)
 
       if inst_ptr.null?
-        fatal "SQLite is out-of-merory"
+        fatal "SQLite is out-of-memory"
       end
 
       if inst_ptr.read_pointer.null?

data/lib/sqlite3/ffi/c_api.rb

@@ -129,6 +129,9 @@ module SQLite3
       SQLITE_TRACE_ROW     = 0x04
       SQLITE_TRACE_CLOSE   = 0x08
 
+      SQLITE_FCNTL_FILE_POINTER    = 7
+      SQLITE_FCNTL_JOURNAL_POINTER = 28
+
       attach_function :sqlite3_aggregate_context, [:pointer, :int], :pointer
       attach_function :sqlite3_backup_finish, [:pointer], :int
       attach_function :sqlite3_backup_init, [:pointer, :string, :pointer, :string], :pointer
@@ -141,6 +144,7 @@ module SQLite3
       attach_function :sqlite3_bind_null, [:pointer, :int], :int
       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_text16, [:pointer, :int, :pointer, :int, :pointer], :int
       attach_function :sqlite3_busy_handler, [:pointer, :pointer, :pointer], :int
@@ -168,9 +172,9 @@ module SQLite3
       attach_function :sqlite3_errmsg, [:pointer], :string
       attach_function :sqlite3_error_offset, [:pointer], :int
       attach_function :sqlite3_exec, [:pointer, :string, :pointer, :pointer, :pointer], :int
-      attach_function :sqlite3_expanded_sql, [:pointer], :string
+      attach_function :sqlite3_expanded_sql, [:pointer], :pointer
       attach_function :sqlite3_extended_result_codes, [:pointer, :int], :int
-      attach_function :sqlite3_file_control, [:pointer, :string, :int, :pointer], :int
+      attach_function :sqlite3_file_control, [:pointer, :pointer, :int, :pointer], :int
       attach_function :sqlite3_finalize, [:pointer], :int
       attach_function :sqlite3_free, [:pointer], :void
       attach_function :sqlite3_get_autocommit, [:pointer], :int
@@ -204,6 +208,13 @@ module SQLite3
       attach_function :sqlite3_value_text, [:pointer], :pointer
       attach_function :sqlite3_value_type, [:pointer], :int
 
+      HAVE_SQLITE3_DB_NAME = begin
+        attach_function :sqlite3_db_name, [:pointer, :int], :pointer
+        true
+      rescue ::FFI::NotFoundError
+        false
+      end
+
       HAVE_SQLITE3_ENABLE_LOAD_EXTENSION = begin
         attach_function :sqlite3_enable_load_extension, [:pointer, :int], :int
         true

data/lib/sqlite3/ffi/database.rb

@@ -169,8 +169,31 @@ module SQLite3
     end
 
     def discard_db
+      sfile = ::FFI::MemoryPointer.new(:pointer)
+
       FFI::CApi.sqlite3_db_release_memory(@db)
-      # TODO sqlite3_file_control
+
+      if FFI::CApi::HAVE_SQLITE3_DB_NAME
+        j_db = 0
+        while !(db_name = FFI::CApi.sqlite3_db_name(@db, j_db)).null?
+          status = FFI::CApi.sqlite3_file_control(@db, db_name, FFI::CApi::SQLITE_FCNTL_FILE_POINTER, sfile)
+          if status == 0
+            # TODO
+          end
+          j_db += 1
+        end
+      else
+        status = FFI::CApi.sqlite3_file_control(@db, nil, FFI::CApi::SQLITE_FCNTL_FILE_POINTER, sfile)
+        if status == 0
+          # TODO
+        end
+      end
+
+      status = FFI::CApi.sqlite3_file_control(@db, nil, FFI::CApi::SQLITE_FCNTL_JOURNAL_POINTER, sfile)
+      if status == 0
+        # TODO
+      end
+
       @db = nil
       @discarded = true
     end
@@ -178,7 +201,7 @@ module SQLite3
     def close_or_discard_db
       unless @db.nil?
         if @readonly || @owner == Process.pid
-          FFI::CApi.sqlite3_close_v2(@db)
+          @db.free
           @db = nil
         else
           discard_db
@@ -191,14 +214,15 @@ module SQLite3
     end
 
     def open_v2(file, flags, zvfs)
+      @owner = Process.pid
       db = ::FFI::MemoryPointer.new(:pointer)
       status = FFI::CApi.sqlite3_open_v2(FFI.string_value(file), db, flags, zvfs)
       @db = db.read_pointer
+      @db = ::FFI::AutoPointer.new(db.read_pointer, FFI::CApi.method(:sqlite3_close_v2))
       FFI.check(@db, status)
       if (flags & FFI::CApi::SQLITE_OPEN_READONLY) != 0
         @readonly = true
       end
-      @owner = Process.pid
       self
     end
 
@@ -228,9 +252,10 @@ module SQLite3
     end
 
     def open16(file)
+      @owner = Process.pid
       db = ::FFI::MemoryPointer.new(:pointer)
       status = FFI::CApi.sqlite3_open16(utf16_string_value_ptr(file), db)
-      @db = db.read_pointer
+      @db = ::FFI::AutoPointer.new(db.read_pointer, FFI::CApi.method(:sqlite3_close_v2))
       FFI.check(@db, status)
       status
     end

data/lib/sqlite3/ffi/statement.rb

@@ -10,7 +10,7 @@ module SQLite3
       status = FFI::CApi.sqlite3_prepare_v2(db, sql, sql.bytesize, stmt, tail)
       FFI.check_prepare(db, status, sql)
 
-      @stmt = stmt.read_pointer
+      @stmt = ::FFI::AutoPointer.new(stmt.read_pointer, FFI::CApi.method(:sqlite3_finalize))
       @db.instance_variable_set(:@stmt_deadline, nil)
 
       tail.read_pointer.read_string.force_encoding(Encoding::UTF_8)
@@ -19,7 +19,7 @@ module SQLite3
     def close
       require_open_stmt
 
-      FFI::CApi.sqlite3_finalize(@stmt)
+      @stmt.free
       @stmt = nil
     end
 
@@ -178,6 +178,23 @@ module SQLite3
       FFI::CApi.sqlite3_bind_parameter_count(@stmt)
     end
 
+    def named_params
+      require_live_db
+      require_open_stmt
+
+      param_count = FFI::CApi.sqlite3_bind_parameter_count(@stmt)
+      params = []
+
+      1.upto(param_count) do |i|
+        name = FFI::CApi.sqlite3_bind_parameter_name(@stmt, i)
+        if name && name[0] != "?"
+          param = FFI.interned_utf8_cstr(name[1..])
+          params << param
+        end
+      end
+      params.freeze
+    end
+
     STMT_STAT_SYMBOLS = {
       fullscan_steps: FFI::CApi::SQLITE_STMTSTATUS_FULLSCAN_STEP,
       sorts: FFI::CApi::SQLITE_STMTSTATUS_SORT,
@@ -222,7 +239,11 @@ module SQLite3
       require_live_db
       require_open_stmt
 
-      FFI::CApi.sqlite3_expanded_sql(@stmt).force_encoding(Encoding::UTF_8).freeze
+      expanded_sql = FFI::CApi.sqlite3_expanded_sql(@stmt)
+      rb_expanded_sql = expanded_sql.read_string.force_encoding(Encoding::UTF_8).freeze
+      FFI::CApi.sqlite3_free(expanded_sql)
+
+      rb_expanded_sql
     end
 
     private

data/lib/sqlite3/ffi/version.rb

@@ -1,5 +1,5 @@
 module SQLite3
   module FFI
-    VERSION = "0.1.4"
+    VERSION = "0.1.6"
   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.7.0"
+  VERSION = "2.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlite3-ffi
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 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: 3.6.7
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A drop-in replacement for the sqlite3 gem for JRuby
 test_files: []