extralite-bundle 2.10 → 2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 331d047adebf78c99a777dc3fb5861cce9c112bf020c1bfe75c8e188611ba0e1
-  data.tar.gz: c5c02f82568127e8edc4e4b5124f84a361cc53e5d8aafe859456f855b7dca4a7
+  metadata.gz: 1542a432d7813d5bcdc27667661e0a1d2c1f0f85716c9c3b7ceebb6b6452baa6
+  data.tar.gz: 5ae2a6c6ed93943f964aaf472da3d14ae09c12ab42da94e1d3a635ae699d1f61
 SHA512:
-  metadata.gz: 0e38f367a6c1baf1d32c52f9ecb540ab292e93989aad9b47cf3b8b3f728190cadde70d90f962a224365b0e689a2677a9e869aafd82852cbf02414b2eb61630df
-  data.tar.gz: ea986d0dbebcc0f668e55b88ce75e2dd2be30d7e93f05c8735b98a77e3fb72bd55041995e3a0a7fd7ee2e67673e980c73c45cb36b21a85db925590cd164e5869
+  metadata.gz: 5a704616c0b2641461a3d565e503694d7ebfe30619afbfafd71bbda481f8f962c87b9fb8f15b0266c6ff49a79f504bbef767937d97bbd15dd96a7fef1215f74c
+  data.tar.gz: 9c3d99dd4a328b00100c1118840022a167f3fc7a863a52fcfa0d07e09c2859043300e66b77edfb9e69a8583e07577daed411c2fd623431d4bd3807a1cdd382da

data/.github/workflows/test-bundle.yml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         # macos-latest uses arm64, macos-13 uses x86
         os: [ubuntu-latest, macos-latest, macos-13]
-        ruby: ['3.0', '3.1', '3.2', '3.3', 'head']
+        ruby: ['3.2', '3.3', '3.4', 'head']
 
     name: ${{matrix.os}}, ${{matrix.ruby}}
 

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.11 2025-03-14
+
+- Remove support for Ruby versions older than 3.2.
+- Expand SQL given to trace proc [#80](https://github.com/digital-fabric/extralite/issues/80)
+
 ## 2.10 2025-02-17
 
 - Update bundled SQLite to version 3.49.0.

data/ext/extralite/common.c

@@ -629,7 +629,7 @@ static inline VALUE batch_run_array(query_ctx *ctx, enum batch_mode batch_mode)
   for (int i = 0; i < count; i++) {
     sqlite3_reset(ctx->stmt);
     sqlite3_clear_bindings(ctx->stmt);
-    Database_issue_query(ctx->db, ctx->sql);
+    Database_issue_query(ctx->db, ctx->stmt);
     bind_all_parameters_from_object(ctx->stmt, RARRAY_AREF(ctx->params, i));
 
     batch_iterate(ctx, batch_mode, &rows);
@@ -666,7 +666,7 @@ static VALUE batch_run_each_iter(RB_BLOCK_CALL_FUNC_ARGLIST(yield_value, vctx))
 
   sqlite3_reset(each_ctx->ctx->stmt);
   sqlite3_clear_bindings(each_ctx->ctx->stmt);
-  Database_issue_query(each_ctx->ctx->db, each_ctx->ctx->sql);
+  Database_issue_query(each_ctx->ctx->db, each_ctx->ctx->stmt);
   bind_all_parameters_from_object(each_ctx->ctx->stmt, yield_value);
 
   batch_iterate(each_ctx->ctx, each_ctx->batch_mode, &rows);
@@ -712,7 +712,7 @@ static inline VALUE batch_run_proc(query_ctx *ctx, enum batch_mode batch_mode) {
 
     sqlite3_reset(ctx->stmt);
     sqlite3_clear_bindings(ctx->stmt);
-    Database_issue_query(ctx->db, ctx->sql);
+    Database_issue_query(ctx->db, ctx->stmt);
     bind_all_parameters_from_object(ctx->stmt, params);
 
     batch_iterate(ctx, batch_mode, &rows);

data/ext/extralite/database.c

@@ -289,14 +289,16 @@ static inline VALUE Database_perform_query(int argc, VALUE *argv, VALUE self, VA
 
   sql = rb_funcall(argv[0], ID_strip, 0);
   if (RSTRING_LEN(sql) == 0) return Qnil;
+  // sql = argv[0];
 
-  Database_issue_query(db, sql);
   prepare_multi_stmt(DB_GVL_MODE(db), db->sqlite3_db, &stmt, sql);
   RB_GC_GUARD(sql);
 
   if (stmt == NULL) return Qnil;
 
   bind_all_parameters(stmt, argc - 1, argv + 1);
+  Database_issue_query(db, stmt);
+
   query_ctx ctx = QUERY_CTX(
     self, sql, db, stmt, Qnil, transform,
     query_mode, ROW_YIELD_OR_MODE(ROW_MULTI), ALL_ROWS
@@ -1102,8 +1104,12 @@ static inline enum progress_handler_mode symbol_to_progress_mode(VALUE mode) {
   rb_raise(eArgumentError, "Invalid progress handler mode");
 }
 
-inline void Database_issue_query(Database_t *db, VALUE sql) {
-  if (db->trace_proc != Qnil) rb_funcall(db->trace_proc, ID_call, 1, sql);
+inline void Database_issue_query(Database_t *db, sqlite3_stmt *stmt) {
+  if (db->trace_proc != Qnil) {
+    VALUE sql = rb_str_new_cstr(sqlite3_expanded_sql(stmt));
+    rb_funcall(db->trace_proc, ID_call, 1, sql);
+    RB_GC_GUARD(sql);
+  }
   switch (db->progress_handler.mode) {
     case PROGRESS_AT_LEAST_ONCE:
     case PROGRESS_ONCE:

data/ext/extralite/extralite.h

@@ -180,7 +180,7 @@ void bind_all_parameters_from_object(sqlite3_stmt *stmt, VALUE obj);
 int stmt_iterate(query_ctx *ctx);
 VALUE cleanup_stmt(query_ctx *ctx);
 
-void Database_issue_query(Database_t *db, VALUE sql);
+void Database_issue_query(Database_t *db, sqlite3_stmt *stmt);
 sqlite3 *Database_sqlite3_db(VALUE self);
 enum gvl_mode Database_prepare_gvl_mode(Database_t *db);
 Database_t *self_to_database(VALUE self);

data/ext/extralite/query.c

@@ -123,7 +123,7 @@ VALUE Query_initialize(VALUE self, VALUE db, VALUE sql, VALUE mode) {
 static inline void query_reset(Query_t *query) {
   if (!query->stmt)
     prepare_single_stmt(DB_GVL_MODE(query), query->sqlite3_db, &query->stmt, query->sql);
-  Database_issue_query(query->db_struct, query->sql);
+  Database_issue_query(query->db_struct, query->stmt);
   sqlite3_reset(query->stmt);
   query->eof = 0;
 }
@@ -131,7 +131,7 @@ static inline void query_reset(Query_t *query) {
 static inline void query_reset_and_bind(Query_t *query, int argc, VALUE * argv) {
   if (!query->stmt)
     prepare_single_stmt(DB_GVL_MODE(query), query->sqlite3_db, &query->stmt, query->sql);
-  Database_issue_query(query->db_struct, query->sql);
+  Database_issue_query(query->db_struct, query->stmt);
   sqlite3_reset(query->stmt);
   query->eof = 0;
   if (argc > 0) {

data/gemspec.rb

@@ -15,7 +15,7 @@ def common_spec(s)
   s.rdoc_options = ['--title', 'Extralite', '--main', 'README.md']
   s.extra_rdoc_files = ['README.md']
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 3.0'
+  s.required_ruby_version = '>= 3.2'
 
   s.add_development_dependency  'rake-compiler',        '1.2.9'
   s.add_development_dependency  'minitest',             '5.25.4'

data/lib/extralite/version.rb

@@ -1,4 +1,4 @@
 module Extralite
   # Extralite version
-  VERSION = '2.10'
+  VERSION = '2.11'
 end

data/test/test_database.rb

@@ -1245,6 +1245,18 @@ class ScenarioTest < Minitest::Test
     @db.query('select 4')
     assert_equal ['select 1', 'select 2', 'select 3'], sqls
   end
+
+  def test_database_trace_expanded_sql
+    sqls = []
+    @db.trace { |sql| sqls << sql }
+
+    @db.query('select ?, ?, ?', 1, '2', 3)
+    assert_equal ["select 1, '2', 3"], sqls
+
+    sqls = []
+    @db.query('select :x, :y, :z', x: 42, y: '43')
+    assert_equal ["select 42, '43', NULL"], sqls
+  end
 end
 
 class BackupTest < Minitest::Test

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: extralite-bundle
 version: !ruby/object:Gem::Version
-  version: '2.10'
+  version: '2.11'
 platform: ruby
 authors:
 - Sharon Rosner
 bindir: bin
 cert_chain: []
-date: 2025-02-17 00:00:00.000000000 Z
+date: 2025-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="