sqlite3 2.1.0.rc1-x64-mingw-ucrt → 2.1.0.rc3-x64-mingw-ucrt

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ebe4920b3921a9142d26035d5069ef20f962fe62150cf0c4913803c5c0900db
-  data.tar.gz: 3da4ef1093d9404fe6f20b2803c8d53541d321238f094b45bfc5a382590a6f40
+  metadata.gz: 40d4b4fe9c10edea2b6e95ef5e464653a8fe7215c474e8749e58deb2c14ca0b4
+  data.tar.gz: 88d4cb29472b81424a64ea91cf9deefe4e261a3cbb9f351f3ae1cc71edef6ef5
 SHA512:
-  metadata.gz: 3a126458f3d080ee66ab5530427065ef9d73da8a12219ac409dd09ae3795e5415fcb45b714363521be7b9ac0ea958808cb6e3014b2e430f9da7c16d7d20e66a4
-  data.tar.gz: 3d858a513445fab47d658ee3bad81ceb33f7b833ae83ac9df7e61598e334592708e5a198ad3fc8e6bfbd29ea16ab7dc95d90987b407124d38084163e47fc597c
+  metadata.gz: 2a8fd65fa82d8d5ad5c33d043325ccf659b477d95863a4dd8f671f3c1ae34d3e0c9be836ff5cf3da9718004ea0037b3ddb46d79400a39304e92f915e3a1de4ac
+  data.tar.gz: 1f98ffff838d701d529a8ec97032cb1cfc85b1826a5583d13fc97cdb51ad2a603b9422c6f2718b8ef7386ecf2c881ef84f1c80f1e8ea1d8eb447a6c6f29bb0c8

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # sqlite3-ruby Changelog
 
+## prerelease 2.1.0.rc3 / 2024-09-18
+
+### Improved
+
+- Allow suppression of fork safety warnings. [#566] @flavorjones
+
+
+## prerelease 2.1.0.rc2 / 2024-09-18
+
+### Improved
+
+- Address a performance regression in 2.1.0.rc1.
+
+
 ## prerelease 2.1.0.rc1 / 2024-09-18
 
 ### Ruby

data/CONTRIBUTING.md

@@ -16,20 +16,15 @@ please look there for additional information.
 
 All statements keep pointers back to their respective database connections.
 The `@connection` instance variable on the `Statement` handle keeps the database
-connection alive.  Memory allocated for a statement handler will be freed in
-two cases:
+connection alive.
 
-1. `#close` is called on the statement
-2. The `SQLite3::Database` object gets garbage collected
-
-We can't free the memory for the statement in the garbage collection function
-for the statement handler.  The reason is because there exists a race
-condition.  We cannot guarantee the order in which objects will be garbage
-collected.  So, it is possible that a connection and a statement are up for
-garbage collection.  If the database connection were to be free'd before the
-statement, then boom.  Instead we'll be conservative and free unclosed
-statements when the connection is terminated.
+We use `sqlite3_close_v2` in `Database#close` since v2.1.0 which defers _actually_ closing the
+connection and freeing the underlying memory until all open statments are closed; though the
+`Database` object will immediately behave as though it's been fully closed. If a Database is not
+explicitly closed, it will be closed when it is GCed.
 
+`Statement#close` finalizes the underlying statement. If a Statement is not explicitly closed, it
+will be closed/finalized when it is GCed.
 
 
 ## Building gems

data/ext/sqlite3/database.c

@@ -49,15 +49,16 @@ discard_db(sqlite3RubyPtr ctx)
     }
 
     ctx->db = NULL;
+    ctx->flags |= SQLITE3_RB_DATABASE_DISCARDED;
 }
 
 static void
 close_or_discard_db(sqlite3RubyPtr ctx)
 {
     if (ctx->db) {
-        int isReadonly = (ctx->flags & SQLITE_OPEN_READONLY);
+        int is_readonly = (ctx->flags & SQLITE3_RB_DATABASE_READONLY);
 
-        if (isReadonly || ctx->owner == getpid()) {
+        if (is_readonly || ctx->owner == getpid()) {
             // Ordinary close.
             sqlite3_close_v2(ctx->db);
             ctx->db = NULL;
@@ -153,7 +154,9 @@ rb_sqlite3_open_v2(VALUE self, VALUE file, VALUE mode, VALUE zvfs)
              );
 
     CHECK(ctx->db, status);
-    ctx->flags = flags;
+    if (flags & SQLITE_OPEN_READONLY) {
+        ctx->flags |= SQLITE3_RB_DATABASE_READONLY;
+    }
 
     return self;
 }
@@ -943,11 +946,10 @@ rb_sqlite3_open16(VALUE self, VALUE file)
 #endif
 #endif
 
-    status = sqlite3_open16(utf16_string_value_ptr(file), &ctx->db);
-
-    // these are the perm flags used implicitly by sqlite3_open16,
+    // sqlite3_open16 implicitly uses flags (SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE)
     // see https://www.sqlite.org/capi3ref.html#sqlite3_open
-    ctx->flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
+    // so we do not ever set SQLITE3_RB_DATABASE_READONLY in ctx->flags
+    status = sqlite3_open16(utf16_string_value_ptr(file), &ctx->db);
 
     CHECK(ctx->db, status)
 

data/ext/sqlite3/database.h

@@ -3,6 +3,10 @@
 
 #include <sqlite3_ruby.h>
 
+/* bits in the `flags` field */
+#define SQLITE3_RB_DATABASE_READONLY  0x01
+#define SQLITE3_RB_DATABASE_DISCARDED 0x02
+
 struct _sqlite3Ruby {
     sqlite3 *db;
     VALUE busy_handler;

data/ext/sqlite3/statement.c

@@ -1,22 +1,12 @@
 #include <sqlite3_ruby.h>
 
 #define REQUIRE_OPEN_STMT(_ctxt) \
-  if(!_ctxt->st) \
+  if (!_ctxt->st) \
     rb_raise(rb_path2class("SQLite3::Exception"), "cannot use a closed statement");
 
-static void
-require_open_db(VALUE stmt_rb)
-{
-    VALUE closed_p = rb_funcall(
-                         rb_iv_get(stmt_rb, "@connection"),
-                         rb_intern("closed?"), 0);
-
-    if (RTEST(closed_p)) {
-        rb_raise(rb_path2class("SQLite3::Exception"),
-                 "cannot use a statement associated with a closed database");
-    }
-}
-
+#define REQUIRE_LIVE_DB(_ctxt) \
+  if (_ctxt->db->flags & SQLITE3_RB_DATABASE_DISCARDED) \
+    rb_raise(rb_path2class("SQLite3::Exception"), "cannot use a statement associated with a discarded database");
 
 VALUE cSqlite3Statement;
 
@@ -71,6 +61,11 @@ prepare(VALUE self, VALUE db, VALUE sql)
 
     TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
+    /* Dereferencing a pointer to the database struct will be faster than accessing it through the
+     * instance variable @connection. The struct pointer is guaranteed to be live because instance
+     * variable will keep it from being GCed. */
+    ctx->db = db_ctx;
+
 #ifdef HAVE_SQLITE3_PREPARE_V2
     status = sqlite3_prepare_v2(
 #else
@@ -135,7 +130,7 @@ step(VALUE self)
 
     TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
-    require_open_db(self);
+    REQUIRE_LIVE_DB(ctx);
     REQUIRE_OPEN_STMT(ctx);
 
     if (ctx->done_p) { return Qnil; }
@@ -232,7 +227,7 @@ bind_param(VALUE self, VALUE key, VALUE value)
 
     TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
-    require_open_db(self);
+    REQUIRE_LIVE_DB(ctx);
     REQUIRE_OPEN_STMT(ctx);
 
     switch (TYPE(key)) {
@@ -326,7 +321,7 @@ reset_bang(VALUE self)
 
     TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
-    require_open_db(self);
+    REQUIRE_LIVE_DB(ctx);
     REQUIRE_OPEN_STMT(ctx);
 
     sqlite3_reset(ctx->st);
@@ -348,7 +343,7 @@ clear_bindings_bang(VALUE self)
 
     TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
-    require_open_db(self);
+    REQUIRE_LIVE_DB(ctx);
     REQUIRE_OPEN_STMT(ctx);
 
     sqlite3_clear_bindings(ctx->st);
@@ -382,7 +377,7 @@ column_count(VALUE self)
     sqlite3StmtRubyPtr ctx;
     TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
-    require_open_db(self);
+    REQUIRE_LIVE_DB(ctx);
     REQUIRE_OPEN_STMT(ctx);
 
     return INT2NUM(sqlite3_column_count(ctx->st));
@@ -415,7 +410,7 @@ column_name(VALUE self, VALUE index)
 
     TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
-    require_open_db(self);
+    REQUIRE_LIVE_DB(ctx);
     REQUIRE_OPEN_STMT(ctx);
 
     name = sqlite3_column_name(ctx->st, (int)NUM2INT(index));
@@ -440,7 +435,7 @@ column_decltype(VALUE self, VALUE index)
 
     TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
-    require_open_db(self);
+    REQUIRE_LIVE_DB(ctx);
     REQUIRE_OPEN_STMT(ctx);
 
     name = sqlite3_column_decltype(ctx->st, (int)NUM2INT(index));
@@ -459,7 +454,7 @@ bind_parameter_count(VALUE self)
     sqlite3StmtRubyPtr ctx;
     TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
-    require_open_db(self);
+    REQUIRE_LIVE_DB(ctx);
     REQUIRE_OPEN_STMT(ctx);
 
     return INT2NUM(sqlite3_bind_parameter_count(ctx->st));
@@ -568,7 +563,7 @@ stats_as_hash(VALUE self)
     sqlite3StmtRubyPtr ctx;
     TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
-    require_open_db(self);
+    REQUIRE_LIVE_DB(ctx);
     REQUIRE_OPEN_STMT(ctx);
 
     VALUE arg = rb_hash_new();
@@ -587,7 +582,7 @@ stat_for(VALUE self, VALUE key)
     sqlite3StmtRubyPtr ctx;
     TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
-    require_open_db(self);
+    REQUIRE_LIVE_DB(ctx);
     REQUIRE_OPEN_STMT(ctx);
 
     if (SYMBOL_P(key)) {
@@ -609,7 +604,7 @@ memused(VALUE self)
     sqlite3StmtRubyPtr ctx;
     TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
-    require_open_db(self);
+    REQUIRE_LIVE_DB(ctx);
     REQUIRE_OPEN_STMT(ctx);
 
     return INT2NUM(sqlite3_stmt_status(ctx->st, SQLITE_STMTSTATUS_MEMUSED, 0));
@@ -628,7 +623,7 @@ database_name(VALUE self, VALUE index)
     sqlite3StmtRubyPtr ctx;
     TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
-    require_open_db(self);
+    REQUIRE_LIVE_DB(ctx);
     REQUIRE_OPEN_STMT(ctx);
 
     return SQLITE3_UTF8_STR_NEW2(
@@ -647,7 +642,7 @@ get_sql(VALUE self)
     sqlite3StmtRubyPtr ctx;
     TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
-    require_open_db(self);
+    REQUIRE_LIVE_DB(ctx);
     REQUIRE_OPEN_STMT(ctx);
 
     return rb_obj_freeze(SQLITE3_UTF8_STR_NEW2(sqlite3_sql(ctx->st)));
@@ -667,7 +662,7 @@ get_expanded_sql(VALUE self)
 
     TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
-    require_open_db(self);
+    REQUIRE_LIVE_DB(ctx);
     REQUIRE_OPEN_STMT(ctx);
 
     expanded_sql = sqlite3_expanded_sql(ctx->st);

data/ext/sqlite3/statement.h

@@ -5,6 +5,7 @@
 
 struct _sqlite3StmtRuby {
     sqlite3_stmt *st;
+    sqlite3Ruby *db;
     int done_p;
 };
 

data/lib/sqlite3/fork_safety.rb

@@ -17,6 +17,7 @@ module SQLite3
 
     @databases = []
     @mutex = Mutex.new
+    @suppress = false
 
     class << self
       def hook!
@@ -30,7 +31,7 @@ module SQLite3
       end
 
       def discard
-        warned = false
+        warned = @suppress
         @databases.each do |db|
           next unless db.weakref_alive?
 
@@ -49,6 +50,11 @@ module SQLite3
         end
         @databases.clear
       end
+
+      # Call to suppress the fork-related warnings.
+      def suppress_warnings!
+        @suppress = true
+      end
     end
   end
 end

data/lib/sqlite3/version.rb

@@ -1,3 +1,3 @@
 module SQLite3
-  VERSION = "2.1.0.rc1"
+  VERSION = "2.1.0.rc3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlite3
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc1
+  version: 2.1.0.rc3
 platform: x64-mingw-ucrt
 authors:
 - Jamis Buck
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-18 00:00:00.000000000 Z
+date: 2024-09-24 00:00:00.000000000 Z
 dependencies: []
 description: |
   Ruby library to interface with the SQLite3 database engine (http://www.sqlite.org). Precompiled