extralite-bundle 2.8.2 → 2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5308b46b6b15860563f1ae4064e0be95da162885743940a8aa8e9f24e7abfb6f
-  data.tar.gz: a4a672e3a45b1cb47f819ebdb288d04bcf5a78af630da28108a67adc1b9994be
+  metadata.gz: 1542a432d7813d5bcdc27667661e0a1d2c1f0f85716c9c3b7ceebb6b6452baa6
+  data.tar.gz: 5ae2a6c6ed93943f964aaf472da3d14ae09c12ab42da94e1d3a635ae699d1f61
 SHA512:
-  metadata.gz: 625acad5183577de37248ccfdffc5184d25aee62235b0862378e8199c2738f68fa2bd37187f0eb5a03d45c0d0a3a8dfb33569bf0141915d745bf185c47b58d67
-  data.tar.gz: 25655a268ff6bd068c782488ea66e90d19f78483206a5ac0560c9eb157d13e09459e11522eaae3c8281090797538f8bace09f05e99a2e0f871bd6238e6b750b0
+  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/.github/workflows/test.yml

@@ -11,9 +11,8 @@ jobs:
     strategy:
       fail-fast: false
       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']
+        os: [ubuntu-latest, macos-latest]
+        ruby: ['3.2', '3.3', '3.4', 'head']
 
     name: ${{matrix.os}}, ${{matrix.ruby}}
 
@@ -25,7 +24,8 @@ jobs:
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{matrix.ruby}}
-        bundler-cache: true # 'bundle install' and cache
+        bundler-cache: true
+        apt-get: libsqlite3-dev
     - name: Compile C-extension
       run: bundle exec rake compile
     - name: Run tests

data/CHANGELOG.md

@@ -1,6 +1,21 @@
+## 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.
+
+## 2.9 2025-01-18
+
+- Update dependencies, test matrix.
+- Update bundled SQLite to version 3.48.0.
+- Optimize getting column names when returning rows as hashes.
+
 ## 2.8.2 2024-06-02
 
-- Update bundled SQLite to version 3.46.0
+- Update bundled SQLite to version 3.46.0. [#74](https://github.com/digital-fabric/extralite/pull/74)
 
 ## 2.8.1 2024-04-15
 

data/README.md

@@ -32,7 +32,7 @@ databases.
 Extralite comes in two flavors: the `extralite` gem which uses the
 system-installed sqlite3 library, and the `extralite-bundle` gem which bundles
 the latest version of SQLite
-([3.46.0](https://sqlite.org/releaselog/3_46_0.html)), offering access to the
+([3.49.0](https://sqlite.org/releaselog/3_49_0.html)), offering access to the
 latest features and enhancements.
 
 ## Features

data/ext/extralite/common.c

@@ -135,7 +135,44 @@ inline void bind_all_parameters_from_object(sqlite3_stmt *stmt, VALUE obj) {
     bind_parameter_value(stmt, 1, obj);
 }
 
-static inline VALUE get_column_names(sqlite3_stmt *stmt, int column_count) {
+#define MAX_EMBEDDED_COLUMN_NAMES 12
+
+struct column_names {
+  int count;
+  union {
+    VALUE array;
+    VALUE names[MAX_EMBEDDED_COLUMN_NAMES];
+  };
+};
+
+static inline void column_names_setup(struct column_names *names, int count) {
+  names->count = count;
+  names->array = (count > MAX_EMBEDDED_COLUMN_NAMES) ? rb_ary_new2(count) : Qnil;
+}
+
+static inline void column_names_set(struct column_names *names, int idx, VALUE value) {
+  if (names->count <= MAX_EMBEDDED_COLUMN_NAMES) 
+    names->names[idx] = value;
+  else
+    rb_ary_push(names->array, value);
+}
+
+static inline VALUE column_names_get(struct column_names *names, int idx) {
+  return (names->count <= MAX_EMBEDDED_COLUMN_NAMES) ?
+    names->names[idx] : RARRAY_AREF(names->array, idx);
+}
+
+static inline struct column_names get_column_names(sqlite3_stmt *stmt, int column_count) {
+  struct column_names names;
+  column_names_setup(&names, column_count);
+  for (int i = 0; i < column_count; i++) {
+    VALUE name = ID2SYM(rb_intern(sqlite3_column_name(stmt, i)));
+    column_names_set(&names, i, name);
+  }
+  return names;
+}
+
+static inline VALUE get_column_names_array(sqlite3_stmt *stmt, int column_count) {
   VALUE arr = rb_ary_new2(column_count);
   for (int i = 0; i < column_count; i++) {
     VALUE name = ID2SYM(rb_intern(sqlite3_column_name(stmt, i)));
@@ -144,11 +181,19 @@ static inline VALUE get_column_names(sqlite3_stmt *stmt, int column_count) {
   return arr;
 }
 
-static inline VALUE row_to_hash(sqlite3_stmt *stmt, int column_count, VALUE column_names) {
+static inline VALUE row_to_hash(sqlite3_stmt *stmt, int column_count, struct column_names *names) {
   VALUE row = rb_hash_new();
-  for (int i = 0; i < column_count; i++) {
-    VALUE value = get_column_value(stmt, i, sqlite3_column_type(stmt, i));
-    rb_hash_aset(row, RARRAY_AREF(column_names, i), value);
+  if (names->count <= MAX_EMBEDDED_COLUMN_NAMES) {
+    for (int i = 0; i < column_count; i++) {
+      VALUE value = get_column_value(stmt, i, sqlite3_column_type(stmt, i));
+      rb_hash_aset(row, names->names[i], value);
+    }
+  }
+  else {
+    for (int i = 0; i < column_count; i++) {
+      VALUE value = get_column_value(stmt, i, sqlite3_column_type(stmt, i));
+      rb_hash_aset(row, RARRAY_AREF(names->array, i), value);
+    }
   }
   return row;
 }
@@ -327,12 +372,12 @@ VALUE safe_query_hash(query_ctx *ctx) {
   VALUE array = ROW_MULTI_P(ctx->row_mode) ? rb_ary_new() : Qnil;
   VALUE row = Qnil;
   int column_count = sqlite3_column_count(ctx->stmt);
-  VALUE column_names = get_column_names(ctx->stmt, column_count);
+  struct column_names names = get_column_names(ctx->stmt, column_count);
   int row_count = 0;
   int do_transform = !NIL_P(ctx->transform_proc);
 
   while (stmt_iterate(ctx)) {
-    row = row_to_hash(ctx->stmt, column_count, column_names);
+    row = row_to_hash(ctx->stmt, column_count, &names);
     if (do_transform)
       row = rb_funcall(ctx->transform_proc, ID_call, 1, row);
     row_count++;
@@ -350,7 +395,7 @@ VALUE safe_query_hash(query_ctx *ctx) {
       return ROW_MULTI_P(ctx->row_mode) ? array : ctx->self;
   }
 
-  RB_GC_GUARD(column_names);
+  RB_GC_GUARD(names.array);
   RB_GC_GUARD(row);
   RB_GC_GUARD(array);
   return ROW_MULTI_P(ctx->row_mode) ? array : Qnil;
@@ -445,21 +490,18 @@ VALUE safe_query_array(query_ctx *ctx) {
 }
 
 VALUE safe_query_single_row_hash(query_ctx *ctx) {
-  int column_count;
+  int column_count = sqlite3_column_count(ctx->stmt);
   VALUE row = Qnil;
-  VALUE column_names;
-
-  column_count = sqlite3_column_count(ctx->stmt);
-  column_names = get_column_names(ctx->stmt, column_count);
+  struct column_names names = get_column_names(ctx->stmt, column_count);
 
   if (stmt_iterate(ctx)) {
-    row = row_to_hash(ctx->stmt, column_count, column_names);
+    row = row_to_hash(ctx->stmt, column_count, &names);
     if (!NIL_P(ctx->transform_proc))
       row = rb_funcall(ctx->transform_proc, ID_call, 1, row);
   }
 
   RB_GC_GUARD(row);
-  RB_GC_GUARD(column_names);
+  RB_GC_GUARD(names.array);
   return row;
 }
 
@@ -506,17 +548,17 @@ static inline VALUE batch_iterate_hash(query_ctx *ctx) {
   VALUE rows = rb_ary_new();
   VALUE row = Qnil;
   int column_count = sqlite3_column_count(ctx->stmt);
-  VALUE column_names = get_column_names(ctx->stmt, column_count);
+  struct column_names names = get_column_names(ctx->stmt, column_count);
   const int do_transform = !NIL_P(ctx->transform_proc);
 
   while (stmt_iterate(ctx)) {
-    row = row_to_hash(ctx->stmt, column_count, column_names);
+    row = row_to_hash(ctx->stmt, column_count, &names);
     if (do_transform)
       row = rb_funcall(ctx->transform_proc, ID_call, 1, row);
     rb_ary_push(rows, row);
   }
 
-  RB_GC_GUARD(column_names);
+  RB_GC_GUARD(names.array);
   RB_GC_GUARD(row);
   RB_GC_GUARD(rows);
   return rows;
@@ -587,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);
@@ -624,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);
@@ -670,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);
@@ -733,7 +775,7 @@ VALUE safe_batch_query_splat(query_ctx *ctx) {
 }
 
 VALUE safe_query_columns(query_ctx *ctx) {
-  return get_column_names(ctx->stmt, sqlite3_column_count(ctx->stmt));
+  return get_column_names_array(ctx->stmt, sqlite3_column_count(ctx->stmt));
 }
 
 VALUE safe_query_changes(query_ctx *ctx) {

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) {