extralite-bundle 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c98b87050195caee2a3ac6bbbefdd3bf77ed3fe29add59cf18d5162299856d93
-  data.tar.gz: b0796d7fba1df64d3095d29ff6d8f00bb6f66320467cf54d0ab6f31a164c7c59
+  metadata.gz: 7fffde36ad772833bc816f85c26c6472d1c9e6c8e4ba91092734efeb24e2541a
+  data.tar.gz: c4200d06ffece67d1241297567b37b3ddb6bc882d72dd6b4ba402a2611f4a1a1
 SHA512:
-  metadata.gz: 34f204b0d4abf91ac7b2f114c2e6838515498a068e750c476c7c473a3823e33f871088974b204aed8e98192c1bcfbdec2f8d5f2df1bff770a523724e662a79b7
-  data.tar.gz: c6b48bf9540dd37a663ab21db610f6aeee0193a3cf539b5cff8ba600475b15cc91c9e8679f7c0a897af0b227b39f597aa8d2da4b378c6a5c2d8aaf64d6a6dc49
+  metadata.gz: 97fa8bbe57df8c8f679703764a7b6a185c235cf53c40738bf46f06bea82385fe1a7deed5d2990cb9837a1e1aaf858a5a4a88e5baccbb6117526dce8c3591fd32
+  data.tar.gz: 07716c4ba47c25b2ee796ce287e7a87e051176cdbd79badb906ea86fe45fd7526b3cd0180f077cfae3ff6311a7e182b351c36d8696c10feb8ac50714f8dd1dd0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 3.1.1 2026-09-26
+
+- Fix clearing of stmt cache after `DB#close` or after GC (#87)
+
 # 3.1.0 2026-09-22
 
 - Update bundled SQLite to 3.53.4

data/README.md

@@ -49,7 +49,7 @@ latest features and enhancements.
   allowing iterating through single records or batches of records.
 - [Prepared queries](#prepared-queries).
 - [Parameter binding](#parameter-binding).
-- [Automatic query caching] for queries with parameters.
+- [Automatic query caching](#automatic-query-caching) for parametric queries.
 - [Batch execution](#batch-execution-of-queries) of queries.
 - [transactions and savepoints](#transactions-and-savepoints).
 - Advanced features: load [SQLite extensions](#loading-extensions), create
@@ -363,6 +363,16 @@ To use the transform, pass it along with the SQL string to `Database#query`:
 db.qurey(transform, sql) #=> [...]
 ```
 
+Structured transforms support the following column types:
+
+- `integer`
+- `float`
+- `text`
+- `bool` - represented as an integer value of 0/1.
+- `json` - represented as a string (text).
+- A custom proc/lambda - e.g. `->(v) { v.split(',') }`.
+- `auto` - uses the native database data type.
+
 Transforms can also be used with [prepared
 queries](#transforms-in-prepared-queries).
 

data/ext/extralite/common.c

@@ -318,6 +318,7 @@ void *exec_multi_stmt_impl(void *ptr) {
         int res = sqlite3_prepare_v2(ctx->db, rest, end-rest, &next_stmt, NULL);
         if (next_stmt) res = SQLITE_MISUSE;
         if (res != SQLITE_OK) {
+          ctx->flags &= ~STMT_CTX_F_USE_CACHE;
           ctx->rc = res;
           goto done;
         }
@@ -367,6 +368,7 @@ int exec_multi_stmt(stmt_ctx *ctx) {
   if (ctx->rc == SQLITE_OK) return ctx->total_changes;
 
   if (*(ctx->stmtptr)) sqlite3_finalize(*(ctx->stmtptr));
+
   return raise_error(ctx);
 }
 
@@ -403,6 +405,7 @@ void prep_single_stmt(stmt_ctx *ctx) {
   if (ctx->rc == SQLITE_OK) return;
 
   if (*(ctx->stmtptr)) sqlite3_finalize(*(ctx->stmtptr));
+
   raise_error(ctx);
 }
 
@@ -453,12 +456,10 @@ inline int stmt_iterate(query_ctx *ctx) {
 VALUE cleanup_stmt(query_ctx *ctx) {
   if (!ctx->stmt) goto done;
 
-  if (ctx->flags & STMT_CTX_F_USE_CACHE) {
-    if (!(ctx->flags & STMT_CTX_F_CACHE_HIT))
-      rb_hash_aset(ctx->db->stmt_cache, ctx->sql, ULONG2NUM((uint64_t)(ctx->stmt)));
-  }
-  else
+  if (!(ctx->flags & STMT_CTX_F_USE_CACHE))
     sqlite3_finalize(ctx->stmt);
+  else if (!(ctx->flags & STMT_CTX_F_CACHE_HIT))
+    rb_hash_aset(ctx->db->stmt_cache, ctx->sql, ULONG2NUM((uint64_t)(ctx->stmt)));
 done:
   return Qnil;
 }
@@ -600,8 +601,6 @@ VALUE run_transform_no_identity(
 static inline VALUE run_transform(
   VALUE identity_storage, struct transform_node *node, sqlite3_stmt *stmt
 ) {
-  // fprintf(stdout, "transform_container: %p flags: %02x identity_idx: %d\n", node, node->flags, node->identity_idx);
-  // if (node->flags & TRANSFORM_F_NAME) INSPECT("  name", node->name);
   if (node->identity_node) {
     return run_transform_with_identity(identity_storage, node, stmt);
   }

data/ext/extralite/database.c

@@ -72,9 +72,27 @@ static void Database_compact(void *ptr) {
   db->progress_handler.proc = rb_gc_location(db->progress_handler.proc);
 }
 
+static int stmt_cache_iter(VALUE key, VALUE value, VALUE _param) {
+  sqlite3_stmt *stmt = (sqlite3_stmt *)NUM2ULONG(value);
+  sqlite3_finalize(stmt);
+  return ST_CONTINUE;
+}
+
+static void stmt_cache_clear(sqlite3 *db, VALUE stmt_cache) {
+  if (stmt_cache == Qnil) return;
+  if (rb_hash_size_num(stmt_cache) == 0) return;
+
+  rb_hash_foreach(stmt_cache, stmt_cache_iter, Qnil);
+  rb_hash_clear(stmt_cache);
+  RB_GC_GUARD(stmt_cache);
+}
+
 static void Database_free(void *ptr) {
   Database_t *db = ptr;
-  if (db->sqlite3_db) sqlite3_close_v2(db->sqlite3_db);
+  if (db->sqlite3_db) {
+    stmt_cache_clear(db->sqlite3_db, db->stmt_cache);
+    sqlite3_close_v2(db->sqlite3_db);
+  }
   free(ptr);
 }
 
@@ -261,6 +279,7 @@ VALUE Database_close(VALUE self) {
   int rc;
   Database_t *db = self_to_database(self);
 
+  stmt_cache_clear(db->sqlite3_db, db->stmt_cache);
   rc = sqlite3_close_v2(db->sqlite3_db);
   if (rc) {
     rb_raise(cError, "%s", sqlite3_errmsg(db->sqlite3_db));
@@ -573,13 +592,14 @@ VALUE Database_batch_execute(VALUE self, VALUE sql, VALUE parameters) {
   if (RSTRING_LEN(sql) == 0) return Qnil;
 
   stmt_ctx stmt_ctx;
-  make_stmt_ctx(&stmt_ctx, db, &stmt, sql, RARRAY_LEN(parameters), NULL);
+  make_stmt_ctx(&stmt_ctx, db, &stmt, sql, 1, NULL);
   prep_single_stmt(&stmt_ctx);
   // prepare_xsingle_stmt(DB_GVL_MODE(db), db->stmt_cache, db->sqlite3_db, &stmt, sql, 0, NULL);
   query_ctx ctx = QUERY_CTX(
     self, sql, db, stmt, parameters,
     Qnil, QUERY_HASH, ROW_MULTI, ALL_ROWS
   );
+  ctx.flags = stmt_ctx.flags;
 
   return rb_ensure(SAFE(safe_batch_execute), (VALUE)&ctx, SAFE(cleanup_stmt), (VALUE)&ctx);
 }

data/lib/extralite/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Extralite
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

data/test/helper.rb

@@ -16,3 +16,13 @@ module Minitest::Assertions
     assert exp_range.include?(act), msg
   end
 end
+
+module TestExtensions
+  def teardown
+    @db = nil
+    GC.start
+    super
+  end
+end
+
+Minitest::Test.prepend(TestExtensions)

data/test/test_database.rb

@@ -2225,4 +2225,39 @@ class StmtCacheText < Minitest::Test
     assert_equal [{ x: 42 }], rows
     assert_equal({}, @db.stmt_cache)
   end
+
+  def test_stmt_cache_close
+    fn = Tempfile.new('extralite_test_stmt_cache_close').path
+
+    db = Extralite::Database.new(fn)
+    db.query('create table t (x)')
+
+    db.execute <<~SQL
+      insert into t values (42)
+    SQL
+    assert File.file?("#{fn}-wal"), "WAL file should exist"
+
+    assert_equal [{x: 42}], db.query('select * from t where x = ?', 42)
+
+    db.close
+    refute File.file?("#{fn}-wal"), "WAL file should not exist after close"
+  end
+
+  def test_stmt_cache_gc
+    fn = Tempfile.new('extralite_test_stmt_cache_close').path
+
+    db = Extralite::Database.new(fn)
+    db.query('create table t (x)')
+
+    db.execute <<~SQL
+      insert into t values (42)
+    SQL
+    assert File.file?("#{fn}-wal"), "WAL file should exist"
+
+    assert_equal [{x: 42}], db.query('select * from t where x = ?', 42)
+
+    db = nil
+    GC.start
+    refute File.file?("#{fn}-wal"), "WAL file should not exist after GC"
+  end
 end

data/test/test_sequel.rb

@@ -20,6 +20,7 @@ class SequelExtraliteTest < Minitest::Test
 
   def teardown
     @db.disconnect
+    super
   end
 
   def test_sequel

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: extralite-bundle
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Sharon Rosner