extralite 2.8 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4412f69118d15351524bd0065bc9c4624db0461bdc16b883ff4508e803b74ad4
-  data.tar.gz: de354d27438bf9e93118fbe551c05c0bb11dd6713d70e58714209fa8f64b36d8
+  metadata.gz: b6b62d9130383d4b9c0f8d8efe4ef79b65ad848bd0c47bff3c24f42840f6312f
+  data.tar.gz: 40cad92b674fc3543786d66369a9fca9a0780888207fc067d2840f15017b4d9b
 SHA512:
-  metadata.gz: 2bf2897e5545c4f701cc2efa49c00c68ee976c44d955261014f31a5c949408298a3848b5ba6b9ca35aaea144183f8746d7cee032ef259a0cf1bf2b75ca32fbd4
-  data.tar.gz: de802356ba9f65089e1f9ff89b0af5d4032a8c5687ed33290b1ca0e4ff0bd8dbe8c674fe85a02eb1e94c2c5070b30db115aaef95d913a8d5bd4c51dbc68d62c6
+  metadata.gz: ff4217cf7915fdc5847fe5d12b6bbec5fe702b846e8fe4c4775aced9e63085ff63651ffcd261e8b69ad6e09ba3312cc62ac36985458afe8d67bb7c9128089f42
+  data.tar.gz: 7ebf114c561a9ee4783129442276ec48d5b43d708cc59c378bb37eb486d25d0999e7ade54c85d90b0e8cce40946f2efbc100c76cd83a395fbc31325d9d8419df

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

@@ -11,11 +11,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        # 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/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 2.8.2 2024-06-02
+
+- Update bundled SQLite to version 3.46.0
+
+## 2.8.1 2024-04-15
+
+- Update bundled sqlite to version 3.45.3.
+- Fix `Database#execute` for SQL ending with a comment.
+  [#72](https://github.com/digital-fabric/extralite/pull/72)
+
 # 2.8 2024-03-10
 
 - Improve documentation.

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.0](https://sqlite.org/releaselog/3_45_0.html)), offering access to the
+([3.46.0](https://sqlite.org/releaselog/3_46_0.html)), offering access to the
 latest features and enhancements.
 
 ## Features

data/examples/pubsub_store_polyphony.rb

@@ -103,9 +103,9 @@ db2.pragma(journal_mode: :wal, synchronous: 1)
 db3 = Extralite::Database.new(fn)
 db3.pragma(journal_mode: :wal, synchronous: 1)
 
-db1.on_progress(1000) { |b| b ? sleep(0.0001) : snooze }
-db2.on_progress(1000) { |b| b ? sleep(0.0001) : snooze }
-db3.on_progress(1000) { |b| b ? sleep(0.0001) : snooze }
+db1.on_progress { |b| b ? sleep(0.0001) : snooze }
+db2.on_progress { |b| b ? sleep(0.0001) : snooze }
+db3.on_progress { |b| b ? sleep(0.0001) : snooze }
 
 producer = PubSub.new(db1)
 producer.setup
@@ -163,7 +163,7 @@ end
 
 db4 = Extralite::Database.new(fn)
 db4.pragma(journal_mode: :wal, synchronous: 1)
-db4.on_progress(1000) { |busy| busy ? sleep(0.05) : snooze }
+db4.on_progress { |busy| busy ? sleep(0.05) : snooze }
 
 last_t = Time.now
 last_publish_count = 0
@@ -175,7 +175,7 @@ while true
   d_publish = publish_count - last_publish_count
   d_receive = receive_count - last_receive_count
   pending = db4.query_single_splat('select count(*) from messages')
-  puts "#{Time.now} publish: #{d_publish/elapsed}/s receive: #{d_receive/elapsed}/s pending: #{pending}"
+  puts "#{Time.now} publish: #{(d_publish/elapsed).round}/s receive: #{(d_receive/elapsed).round}/s pending: #{pending} latency: #{pending / (d_receive/elapsed)}"
   last_t = now
   last_publish_count = publish_count
   last_receive_count = receive_count

data/ext/extralite/database.c

@@ -294,6 +294,8 @@ static inline VALUE Database_perform_query(int argc, VALUE *argv, VALUE self, VA
   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);
   query_ctx ctx = QUERY_CTX(
     self, sql, db, stmt, Qnil, transform,
@@ -485,6 +487,10 @@ VALUE Database_query_single_array(int argc, VALUE *argv, VALUE self) {
  * specified using keyword arguments:
  *
  *     db.execute('update foo set x = :bar', bar: 42)
+ *
+ * @param sql [String] query SQL
+ * @param parameters [Array, Hash] parameters to run query with
+ * @return [Integer, nil] Total number of changes effected or `nil` if the query ends with a comment.
  */
 VALUE Database_execute(int argc, VALUE *argv, VALUE self) {
   return Database_perform_query(argc, argv, self, safe_query_changes, QUERY_HASH);

data/lib/extralite/version.rb

@@ -1,4 +1,4 @@
 module Extralite
   # Extralite version
-  VERSION = '2.8'
+  VERSION = '2.8.2'
 end

data/test/test_database.rb

@@ -277,10 +277,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')")
@@ -948,7 +952,7 @@ class DatabaseTest < Minitest::Test
 
       db.execute('insert into foo values (43)')
       assert_equal [42, 43], db.query_splat('select x from foo')
-      
+
       db.savepoint(:b)
 
       db.execute('insert into foo values (44)')
@@ -1046,6 +1050,48 @@ class DatabaseTest < Minitest::Test
     assert File.size(wal_fn) == 0
     assert_equal [0, 0], r
   end
+
+  def test_execute_with_comments
+    result = @db.execute(<<~SQL)
+      -- this is a comment
+    SQL
+    assert_nil result
+
+    result = @db.execute(<<~SQL)
+      DELETE FROM t;
+      INSERT INTO t (x, y, z) VALUES (1, 1, 1);
+      INSERT INTO t (x, y, z) VALUES (2, 2, 2);
+    SQL
+    assert_equal 1, result
+    assert_equal [1, 2], @db.query_splat('SELECT x FROM t ORDER BY x')
+
+    result = @db.execute(<<~SQL)
+      -- this is a comment at the beginning
+      DELETE FROM t;
+      INSERT INTO t (x, y, z) VALUES (3, 3, 3);
+      INSERT INTO t (x, y, z) VALUES (4, 4, 4);
+    SQL
+    assert_equal 1, result
+    assert_equal [3, 4], @db.query_splat('SELECT x FROM t ORDER BY x')
+
+    result = @db.execute(<<~SQL)
+      DELETE FROM t;
+      INSERT INTO t (x, y, z) VALUES (5, 5, 5);
+      -- this is a comment in the middle
+      INSERT INTO t (x, y, z) VALUES (6, 6, 6);
+    SQL
+    assert_equal 1, result
+    assert_equal [5, 6], @db.query_splat('SELECT x FROM t ORDER BY x')
+
+    result = @db.execute(<<~SQL)
+      DELETE FROM t;
+      INSERT INTO t (x, y, z) VALUES (7, 7, 7);
+      INSERT INTO t (x, y, z) VALUES (8, 8, 8);
+      -- this is a comment at the end
+    SQL
+    assert_nil result
+    assert_equal [7, 8], @db.query_splat('SELECT x FROM t ORDER BY x')
+  end
 end
 
 class ScenarioTest < Minitest::Test
@@ -1438,7 +1484,7 @@ class ConcurrencyTest < Minitest::Test
 
   def test_progress_handler_invalid_arg
     db = Extralite::Database.new(':memory:')
-    
+
     assert_raises(TypeError) { db.on_progress(period: :foo) }
     assert_raises(TypeError) { db.on_progress(tick: :foo) }
     assert_raises(ArgumentError) { db.on_progress(mode: :foo) }
@@ -1635,7 +1681,7 @@ end
 class RactorTest < Minitest::Test
   def test_ractor_simple
     skip if SKIP_RACTOR_TESTS
-    
+
     fn = Tempfile.new('extralite_test_database_in_ractor').path
 
     r = Ractor.new do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extralite
 version: !ruby/object:Gem::Version
-  version: '2.8'
+  version: 2.8.2
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-10 00:00:00.000000000 Z
+date: 2024-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -123,8 +123,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