extralite 2.8.1 → 2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49fbb44a887747091953d2ec2239050036dd1c5c37290d9f651521b47a84fdfb
-  data.tar.gz: 5200205e84f47abad1a9e3c936999edd77defa53e187941d81d50a91926cd520
+  metadata.gz: a7adc40dd1b275c571a25ff887b4d7a82e25c0a562b878cfd9f8988828d105ce
+  data.tar.gz: c7dea7923b4c861a8aefe839c2395ec12fc84715514006e7961e96a728921861
 SHA512:
-  metadata.gz: 1fd77a5ebe191923ba6159eb79b6c60ac5c8311280a5a8513262e6ff6accf2020422a9394df25308718971b98ff25ab50409f50bf81c931cb41274f7401334e4
-  data.tar.gz: 0dde4d327858617ae1b3ad88432a705593303a312e93177a91c2fc25029cf505eaf952ce98a2cbbd4cced57d733a5a2c045cbf9d7909899c42972ca2c59e1cbd
+  metadata.gz: e4113425b3651e5875f44085691ce4e7bc7186391bf968d0882de07196908415c73af58add1367bad4a992ed6c3c30c2dd0ae115b56071a7ef20287febe35a6f
+  data.tar.gz: a4ab94ee82dddf6ed6c0edcb0127b7213101a41606a2995343d50fb14998bd5f84f01b9ad5c6c03a45e8b50fa189951d5bdd7097ac3392a389cde9e32ec3fb19

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

@@ -11,11 +11,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
-        ruby: ['3.0', '3.1', '3.2', '3.3']
+        # 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']
 
-    name: >-
-      ${{matrix.os}}, ${{matrix.ruby}}
+    name: ${{matrix.os}}, ${{matrix.ruby}}
+
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
 
     runs-on: ${{matrix.os}}
     steps:

data/.github/workflows/test.yml

@@ -12,10 +12,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby: ['3.0', '3.1', '3.2', '3.3', 'head']
+        ruby: ['3.2', '3.3', '3.4', 'head']
 
-    name: >-
-      ${{matrix.os}}, ${{matrix.ruby}}
+    name: ${{matrix.os}}, ${{matrix.ruby}}
+
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
 
     runs-on: ${{matrix.os}}
     steps:
@@ -23,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,3 +1,17 @@
+## 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. [#74](https://github.com/digital-fabric/extralite/pull/74)
+
 ## 2.8.1 2024-04-15
 
 - Update bundled sqlite to version 3.45.3.

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.45.3](https://sqlite.org/releaselog/3_45_3.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;
@@ -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/gemspec.rb

@@ -17,9 +17,9 @@ def common_spec(s)
   s.require_paths = ['lib']
   s.required_ruby_version = '>= 3.0'
 
-  s.add_development_dependency  'rake-compiler',        '1.2.7'
-  s.add_development_dependency  'minitest',             '5.22.2'
-  s.add_development_dependency  'simplecov',            '0.17.1'
-  s.add_development_dependency  'yard',                 '0.9.34'
-  s.add_development_dependency  'sequel',               '5.77.0'
+  s.add_development_dependency  'rake-compiler',        '1.2.9'
+  s.add_development_dependency  'minitest',             '5.25.4'
+  s.add_development_dependency  'simplecov',            '0.22.0'
+  s.add_development_dependency  'yard',                 '0.9.37'
+  s.add_development_dependency  'sequel',               '5.88.0'
 end

data/lib/extralite/version.rb

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

data/test/test_database.rb

@@ -40,6 +40,19 @@ class DatabaseTest < Minitest::Test
     assert_equal [], r
   end
 
+  def test_query_hash_with_many_columns
+    # this tests correct processing cof column names when column count is more than
+    # MAX_EMBEDDED_COLUMN_NAMES
+    r = @db.query_hash("
+      select 1 as a, 2 as b, 3 as c, 4 as d, 5 as e, 6 as f, 7 as g, 8 as h, 9 as i, 10 as j,
+      11 as k, 12 as l, 13 as m, 14 as n, 15 as o, 16 as p, 17 as q, 18 as r, 19 as s, 20 as t
+    ")
+    assert_equal [{
+      a: 1, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7, h: 8, i: 9, j: 10,
+      k: 11, l: 12, m: 13, n: 14, o: 15, p: 16, q: 17, r: 18, s: 19, t: 20
+    }], r
+  end
+
   def test_query_array
     r = @db.query_array('select * from t')
     assert_equal [[1, 2, 3], [4, 5, 6]], r
@@ -277,10 +290,14 @@ class DatabaseTest < Minitest::Test
 
   def test_extension_loading
     case RUBY_PLATFORM
-    when /linux/
-      @db.load_extension(File.join(__dir__, 'extensions/text.so'))
-    when /darwin/
-      @db.load_extension(File.join(__dir__, 'extensions/text.dylib'))
+    when /aarch64-linux/
+      @db.load_extension(File.join(__dir__, 'extensions/arm64/text.so'))
+    when /x86_64-linux/
+      @db.load_extension(File.join(__dir__, 'extensions/x86/text.so'))
+    when /arm64-darwin/
+      @db.load_extension(File.join(__dir__, 'extensions/arm64/text.dylib'))
+    when /x86_64-darwin/
+      @db.load_extension(File.join(__dir__, 'extensions/x86/text.dylib'))
     end
 
     r = @db.query_single_splat("select reverse('abcd')")
@@ -359,7 +376,6 @@ class DatabaseTest < Minitest::Test
       [1, '2', 3],
       ['4', 5, 6]
     ]
-
     changes = @db.batch_execute('insert into foo values (?, ?, ?)', records)
 
     assert_equal 2, changes
@@ -369,6 +385,23 @@ class DatabaseTest < Minitest::Test
     ], @db.query('select * from foo')
   end
 
+  def test_batch_execute_with_array_of_hashes
+    @db.query('create table foo (a, b, c)')
+    assert_equal [], @db.query('select * from foo')
+
+    records = [
+      { a: 1, b: '2', c: 3 },
+      { a: '4', b: 5, c: 6 }
+    ]
+    changes = @db.batch_execute('insert into foo values (:a, :b, :c)', records)
+
+    # assert_equal 2, changes
+    assert_equal [
+      { a: 1, b: '2', c: 3 },
+      { a: '4', b: 5, c: 6 }
+    ], @db.query('select * from foo')
+  end
+
   def test_batch_execute_single_values
     @db.query('create table foo (bar)')
     assert_equal [], @db.query('select * from foo')
@@ -1355,6 +1388,12 @@ class ConcurrencyTest < Minitest::Test
   def test_progress_handler_simple
     db = Extralite::Database.new(':memory:')
 
+    # SQLite's behaviour post 3.46.0 has changed, such that the first time the
+    # query is ran, the progress handler is called more times than in later
+    # invocations, so here we run it once before measuring, in order to have
+    # reliable figures.
+    result = db.query_single('select 1 as a, 2 as b, 3 as c')
+
     buf = []
     db.on_progress(period: 1) { buf << :progress }
 
@@ -1373,6 +1412,12 @@ class ConcurrencyTest < Minitest::Test
   def test_progress_handler_normal_mode
     db = Extralite::Database.new(':memory:')
 
+    # SQLite's behaviour post 3.46.0 has changed, such that the first time the
+    # query is ran, the progress handler is called more times than in later
+    # invocations, so here we run it once before measuring, in order to have
+    # reliable figures.
+    db.query('select 1 as a')
+
     count = 0
     db.on_progress(period: 1) { count += 1 }
     db.query('select 1 as a')
@@ -1393,6 +1438,12 @@ class ConcurrencyTest < Minitest::Test
   def test_progress_handler_at_least_once_mode
     db = Extralite::Database.new(':memory:')
 
+    # SQLite's behaviour post 3.46.0 has changed, such that the first time the
+    # query is ran, the progress handler is called more times than in later
+    # invocations, so here we run it once before measuring, in order to have
+    # reliable figures.
+    db.query('select 1 as a')
+
     count = 0
     db.on_progress(period: 1) { count += 1 }
     db.query('select 1 as a')

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: extralite
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: '2.10'
 platform: ruby
 authors:
 - Sharon Rosner
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-16 00:00:00.000000000 Z
+date: 2025-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -16,71 +15,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: 1.2.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: 1.2.9
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.22.2
+        version: 5.25.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.22.2
+        version: 5.25.4
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.34
+        version: 0.9.37
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.34
+        version: 0.9.37
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.77.0
+        version: 5.88.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.77.0
-description:
+        version: 5.88.0
 email: sharon@noteflakes.com
 executables: []
 extensions:
@@ -123,8 +121,10 @@ files:
 - lib/extralite.rb
 - lib/extralite/version.rb
 - lib/sequel/adapters/extralite.rb
-- test/extensions/text.dylib
-- test/extensions/text.so
+- test/extensions/arm64/text.dylib
+- test/extensions/arm64/text.so
+- test/extensions/x86/text.dylib
+- test/extensions/x86/text.so
 - test/fixtures/image.png
 - test/helper.rb
 - test/issue-38.rb
@@ -151,7 +151,6 @@ metadata:
   homepage_uri: https://github.com/digital-fabric/extralite
   documentation_uri: https://www.rubydoc.info/gems/extralite
   changelog_uri: https://github.com/digital-fabric/extralite/blob/master/CHANGELOG.md
-post_install_message:
 rdoc_options:
 - "--title"
 - Extralite
@@ -170,8 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Extra-lightweight SQLite3 wrapper for Ruby
 test_files: []