extralite-bundle 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eac653308555c057d121db6b0e17905fff645a62d926bdd3ac07323f40f8f9e
-  data.tar.gz: 2bcfeb952ce57afa647b969016891edae0fd615fc78f97a0a6b0336cc35791d6
+  metadata.gz: 476ad3a137ab5292ac1e7a5b6053db39b8136141154e42c06502e0d723875680
+  data.tar.gz: d33bae3131575f702577d7e1960a54f64d4d2ac6d3903eb41b3f8fb9f896288f
 SHA512:
-  metadata.gz: aa4d929c51e1f2c05fc0e67aa37447281c50d697b9dff242ca6f96e3723027e03b3db5b4c437399f28045a12d251dfff3e0f3a47709302b132347cca9c7fa514
-  data.tar.gz: 9809ca98906d5b853e646814057b976a55171249ae85b0502eea8ab39032d725889d736d3e9eff71ee46c9ca31d64e81f42102936753e69a2714188abec3bca5
+  metadata.gz: cbeb90a19c16e0355825de837ef6488614c1576df06ab2ba4dba1e6868568b839ee124d1713f4884156aa58ae3d7c8314e5675d90022fe3a08c6a54ec3448498
+  data.tar.gz: 885f3d695eec965ef271c3500eb07a56f9f06890b514f52d27d8f3a6e25c71c43b8034d730048b1a7f9db7e8f25ddebb5f69f1ddd2a9f53fe8adb926d323ad4a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 3.1.3 2026-10-03
+
+- Fix database finalization of stmts (on free/close)
+- Use stmt_cache for storing Query stmts
+
 # 3.1.2 2026-10-03
 
 - Fix handling of failed BEGIN in #transaction (#89)

data/ext/extralite/database.c

@@ -72,24 +72,19 @@ 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_finalize(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_GC_GUARD(stmt_cache);
+static inline void finalize_all_stmts(sqlite3 *db) {
+  sqlite3_stmt *stmt = sqlite3_next_stmt(db, NULL);
+  while (stmt) {
+    sqlite3_stmt *next = sqlite3_next_stmt(db, stmt);
+    sqlite3_finalize(stmt);
+    stmt = next;
+  }
 }
 
 static void Database_free(void *ptr) {
   Database_t *db = ptr;
   if (db->sqlite3_db) {
-    stmt_cache_finalize(db->sqlite3_db, db->stmt_cache);
+    finalize_all_stmts(db->sqlite3_db);
     sqlite3_close_v2(db->sqlite3_db);
   }
   free(ptr);
@@ -278,7 +273,7 @@ VALUE Database_close(VALUE self) {
   int rc;
   Database_t *db = self_to_database(self);
 
-  stmt_cache_finalize(db->sqlite3_db, db->stmt_cache);
+  finalize_all_stmts(db->sqlite3_db);
   rb_hash_clear(db->stmt_cache);
   rc = sqlite3_close_v2(db->sqlite3_db);
   if (rc) {

data/ext/extralite/query.c

@@ -40,8 +40,7 @@ static void Query_compact(void *ptr) {
 }
 
 static void Query_free(void *ptr) {
-  Query_t *query = ptr;
-  if (query->stmt) sqlite3_finalize(query->stmt);
+  // Query_t *query = ptr;
   free(ptr);
 }
 
@@ -70,7 +69,7 @@ static inline Query_t *self_to_query(VALUE obj) {
 // verifies that the query is not closed
 static inline Query_t *self_to_query_verify(VALUE obj) {
   Query_t *query = self_to_query(obj);
-  if (query->closed) rb_raise(cError, "Query is closed");
+  if (query->closed || !(query->db_struct->sqlite3_db)) rb_raise(cError, "Query is closed");
   return query;
 }
 
@@ -133,8 +132,10 @@ VALUE Query_initialize(VALUE self, VALUE db, VALUE sql, VALUE mode) {
 
 static inline void prep_query(Query_t *query) {
   stmt_ctx stmt_ctx;
-  make_stmt_ctx(&stmt_ctx, query->db_struct, &(query->stmt), query->sql, 0, NULL);
+  make_stmt_ctx(&stmt_ctx, query->db_struct, &(query->stmt), query->sql, 1, NULL);
   prep_single_stmt(&stmt_ctx);
+  if (!(stmt_ctx.flags & STMT_CTX_F_CACHE_HIT))
+    rb_hash_aset(query->db_struct->stmt_cache, query->sql, ULONG2NUM((uint64_t)(query->stmt)));
 }
 
 static inline void query_reset(Query_t *query) {
@@ -531,7 +532,6 @@ VALUE Query_clone(VALUE self) {
 VALUE Query_close(VALUE self) {
   Query_t *query = self_to_query(self);
   if (query->stmt) {
-    sqlite3_finalize(query->stmt);
     query->stmt = NULL;
   }
   query->closed = 1;

data/lib/extralite/version.rb

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

data/test/test_query.rb

@@ -933,7 +933,7 @@ class QueryTest < Minitest::Test
   def test_query_after_db_close
     assert_equal [{ x: 4, y: 5, z: 6}], @query.bind(4).to_a
     @db.close
-    assert_equal [{ x: 4, y: 5, z: 6}], @query.bind(4).to_a
+    assert_raises(Extralite::Error) { @query.bind(4).to_a }
   end
 
   def test_query_eof

metadata

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