extralite-bundle 2.11 → 2.13

data/lib/extralite/version.rb

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

data/test/perf_array.rb

@@ -4,7 +4,7 @@ require 'bundler/inline'
 
 gemfile do
   source 'https://rubygems.org'
-  gem 'sqlite3'
+  gem 'sqlite3', '2.6.0'
   gem 'extralite', path: '..'
   gem 'benchmark-ips'
 end

data/test/perf_hash.rb

@@ -7,7 +7,7 @@ require 'bundler/inline'
 gemfile do
   source 'https://rubygems.org'
   gem 'extralite', path: '..'
-  gem 'sqlite3'
+  gem 'sqlite3', '2.6.0'
   gem 'benchmark-ips'
 end
 

data/test/perf_hash_prepared.rb

@@ -5,7 +5,7 @@ require 'bundler/inline'
 gemfile do
   source 'https://rubygems.org'
   gem 'extralite', path: '..'
-  gem 'sqlite3'
+  gem 'sqlite3', '2.6.0'
   gem 'benchmark-ips'
 end
 

data/test/perf_polyphony.rb

@@ -20,7 +20,7 @@ $db2 = Extralite::Database.new(DB_PATH, gvl_release_threshold: 0)
 $db3 = Extralite::Database.new(DB_PATH)
 
 $snooze_count = 0
-$db3.on_progress(25) { $snooze_count += 1; snooze }
+$db3.on_progress(tick: 50, period: 100, mode: :at_least_once) { $snooze_count += 1; snooze }
 
 def prepare_database(count)
   $db1.execute('create table if not exists foo ( a integer primary key, b text )')

data/test/perf_splat.rb

@@ -4,7 +4,7 @@ require 'bundler/inline'
 
 gemfile do
   source 'https://rubygems.org'
-  gem 'sqlite3'
+  gem 'sqlite3', '2.6.0'
   gem 'extralite', path: '..'
   gem 'benchmark-ips'
 end

data/test/test_database.rb

@@ -1221,6 +1221,8 @@ class ScenarioTest < Minitest::Test
     t2&.kill
   end
 
+  # Note: more comprehensive testing of the trace functionality is done in
+  # test_trace.rb
   def test_database_trace
     sqls = []
     @db.trace { |sql| sqls << sql }
@@ -1245,18 +1247,6 @@ 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
@@ -1337,7 +1327,7 @@ class ConcurrencyTest < Minitest::Test
     t2.join
     t1.join
 
-    assert delays.size > 4
+    assert_in_range 4.., delays.size
     assert_equal 0, delays.select { |d| d > 0.15 }.size
   ensure
     t1&.kill

data/test/test_trace.rb

@@ -0,0 +1,189 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+require 'date'
+require 'json'
+
+class DatabaseTraceTest < Minitest::Test
+  def setup
+    @db = Extralite::Database.new(':memory:')
+
+    @trace_buf = []
+    @db.trace { |sql, *args| @trace_buf << { sql: sql, args: args } }
+  end
+
+  def test_trace_database_query
+    @db.query('select 1')
+    @db.query('select ?', 2)
+    @db.query('select ?, ?, ?', 3, 4, 5)
+    @db.query('select :x, :y, :z', x: 6, y: 7)
+
+    assert_equal [
+      { sql: 'select 1', args: [] },
+      { sql: 'select ?', args: [2] },
+      { sql: 'select ?, ?, ?', args: [3, 4, 5] },
+      { sql: 'select :x, :y, :z', args: [{ x: 6, y: 7 }] }
+    ], @trace_buf
+  end
+
+  def test_trace_database_execute
+    @db.execute('select 1')
+    @db.execute('select ?', 2)
+    @db.execute('select ?, ?, ?', 3, 4, 5)
+    @db.execute('select :x, :y, :z', x: 6, y: 7)
+
+    assert_equal [
+      { sql: 'select 1', args: [] },
+      { sql: 'select ?', args: [2] },
+      { sql: 'select ?, ?, ?', args: [3, 4, 5] },
+      { sql: 'select :x, :y, :z', args: [{ x: 6, y: 7 }] }
+    ], @trace_buf
+  end
+
+  def test_trace_database_query_xxx
+    @db.query_single('select 1')
+    @db.query_array('select ?', 2)
+    @db.query_splat('select ?, ?, ?', 3, 4, 5)
+    @db.query_single_array('select :x, :y, :z', x: 6, y: 7)
+
+    assert_equal [
+      { sql: 'select 1', args: [] },
+      { sql: 'select ?', args: [2] },
+      { sql: 'select ?, ?, ?', args: [3, 4, 5] },
+      { sql: 'select :x, :y, :z', args: [{ x: 6, y: 7 }] }
+    ], @trace_buf
+  end
+
+  def test_trace_database_batch_execute
+    @db.batch_execute('select ?', [1, 2, 3])
+    @db.batch_execute('select ?, ?', [[44, 55], [66, 77]])
+    @db.batch_execute('select :x, :y', [{ x: 5, y: 6 }, { x: 7, y: 8 }])
+
+    assert_equal [
+      { sql: 'select ?', args: [1] },
+      { sql: 'select ?', args: [2] },
+      { sql: 'select ?', args: [3] },
+      { sql: 'select ?, ?', args: [44, 55] },
+      { sql: 'select ?, ?', args: [66, 77] },
+      { sql: 'select :x, :y', args: [{ x: 5, y: 6 }] },
+      { sql: 'select :x, :y', args: [{ x: 7, y: 8 }] }
+    ], @trace_buf
+  end
+
+  def test_trace_database_batch_query
+    @db.batch_query('select ?', [1, 2, 3])
+    @db.batch_query('select ?, ?', [[44, 55], [66, 77]])
+    @db.batch_query('select :x, :y', [{ x: 5, y: 6 }, { x: 7, y: 8 }])
+
+    assert_equal [
+      { sql: 'select ?', args: [1] },
+      { sql: 'select ?', args: [2] },
+      { sql: 'select ?', args: [3] },
+      { sql: 'select ?, ?', args: [44, 55] },
+      { sql: 'select ?, ?', args: [66, 77] },
+      { sql: 'select :x, :y', args: [{ x: 5, y: 6 }] },
+      { sql: 'select :x, :y', args: [{ x: 7, y: 8 }] }
+    ], @trace_buf
+  end
+
+  def test_trace_database_batch_query_with_enumerable
+    @db.batch_query('select ?', 1..3)
+    
+    assert_equal [
+      { sql: 'select ?', args: [1] },
+      { sql: 'select ?', args: [2] },
+      { sql: 'select ?', args: [3] }
+    ], @trace_buf
+  end
+
+  def test_trace_database_batch_query_with_proc
+    values = [4, 5, 6]
+
+    @db.batch_query('select ?', -> { values.shift })
+    
+    assert_equal [
+      { sql: 'select ?', args: [4] },
+      { sql: 'select ?', args: [5] },
+      { sql: 'select ?', args: [6] }
+    ], @trace_buf
+  end
+end
+
+class QueryTraceTest < Minitest::Test
+  def setup
+    @db = Extralite::Database.new(':memory:')
+
+    @query = @db.prepare('select ?')
+
+    @trace_buf = []
+    @db.trace { |sql, *args| @trace_buf << { sql: sql, args: args } }
+  end
+
+  def test_trace_query_iteration
+    assert_equal [], @trace_buf
+
+    @query.bind(42)
+    assert_equal [], @trace_buf
+
+    @query.to_a
+    assert_equal [
+      { sql: 'select ?', args: [42] },
+    ], @trace_buf
+
+    @query.to_a
+    assert_equal [
+      { sql: 'select ?', args: [42] },
+      { sql: 'select ?', args: [42] }
+    ], @trace_buf
+
+    @query.bind(44)
+    assert_equal [
+      { sql: 'select ?', args: [42] },
+      { sql: 'select ?', args: [42] }
+    ], @trace_buf
+
+    @query.reset
+    assert_equal [
+      { sql: 'select ?', args: [42] },
+      { sql: 'select ?', args: [42] },
+      { sql: 'select ?', args: [44] }
+    ], @trace_buf
+
+    @trace_buf = []
+    @query.bind(46)
+    assert_equal [], @trace_buf
+
+    @query.each { }
+    assert_equal [
+      { sql: 'select ?', args: [46] }
+    ], @trace_buf
+
+    @trace_buf = []
+    @query.bind(48)
+    assert_equal [], @trace_buf
+
+    e = @query.each
+    e.to_a
+    assert_equal [
+      { sql: 'select ?', args: [48] }
+    ], @trace_buf
+
+    e.map {}
+    assert_equal [
+      { sql: 'select ?', args: [48] },
+      { sql: 'select ?', args: [48] }
+    ], @trace_buf
+  end
+
+  def test_trace_query_batch_execute
+    assert_equal [], @trace_buf
+
+    @query.batch_execute([42, 43, 44])
+    assert_equal [
+      { sql: 'select ?', args: [42] },
+      { sql: 'select ?', args: [43] },
+      { sql: 'select ?', args: [44] },
+    ], @trace_buf
+    
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: extralite-bundle
 version: !ruby/object:Gem::Version
-  version: '2.11'
+  version: '2.13'
 platform: ruby
 authors:
 - Sharon Rosner
 bindir: bin
 cert_chain: []
-date: 2025-03-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -146,6 +146,7 @@ files:
 - test/test_iterator.rb
 - test/test_query.rb
 - test/test_sequel.rb
+- test/test_trace.rb
 homepage: https://github.com/digital-fabric/extralite
 licenses:
 - MIT
@@ -171,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.8
 specification_version: 4
 summary: Extra-lightweight SQLite3 wrapper for Ruby with bundled SQLite3
 test_files: []