activerecord-libsql 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7d43524e4ffab6a8d48512dae7494bd422a0484f4d5de4aab9638af9cc05e11
-  data.tar.gz: 19c8598dd1fe21df3a71822adfbc03b0f99b01a50d46ec0544a5c9ed54fafd76
+  metadata.gz: f3e95b3b3a0f542585ae7ede19f84e2facf3e87e4499248b71f3b5cdb80ae3c0
+  data.tar.gz: da7a0f17f5cf1e7f68d7b3fc6b8d8a777a230896893f8bf3c17e915d68ff515e
 SHA512:
-  metadata.gz: ec59f0d00947a93fc541d2fbe27bbef5132208a472199ad1869187e85beb0a936d49258f3330be290ede8c01f15c3c0eae851d8518725ba2abe2d64a1d38e1a0
-  data.tar.gz: 2823e8e01b17e6553a9ae4f676d589f9e11349200bd133a0e7a20bd372480e5d46efa8098afb6b9780146efb1e5d82722dfa120400d8345c0fd5c1cd8a2c6e77
+  metadata.gz: bbe4d99c6b76a98b58991af803f015db99c6aa41d2d997366d113fa9d0159cd1a55206eaab719cb9c2cc16d57f17c8ff7c8422a910b69e6f15efcc8ce656a51f
+  data.tar.gz: 8c8a30e54eea83a936dc2291d8604cbf3d67bd7b9ec8fec508b61d0b39dfaf999fa9ea0cde407dcab9048b5ca501e57d2e5f5afec531e64dcca1b1e561d9f447

data/CHANGELOG.md

@@ -2,6 +2,39 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.1.8] - 2026-03-30
+
+### Fixed
+
+- **`SQLite3::BusyException: database is locked` when Solid Queue forks multiple workers** (#19)
+  - `LocalConnection` (used when `replica_path:` is configured) opened SQLite with the default
+    DELETE journal mode, which serializes all writes. When Solid Queue forks multiple worker
+    processes that all write to the same `.sqlite3` file concurrently, lock contention caused
+    an immediate `BusyException`.
+  - `LocalConnection#initialize` now sets `PRAGMA journal_mode=WAL` (allows concurrent reads
+    and writes across processes) and `PRAGMA busy_timeout=5000` (waits up to 5 seconds on
+    lock contention instead of failing immediately).
+
+### Added
+
+- **`rake turso:check` task** (#19)
+  - Verifies adapter health for all databases configured in `database.yml`.
+  - Checks: connection (`SELECT 1`), INSERT, SELECT, `datetime` UTC comparison,
+    and transaction (`BEGIN` / `COMMIT` / `ROLLBACK`).
+  - Useful after initial installation or when migrating an existing app to Turso.
+- **Embedded Replica mode tests in `solid_queue_fork_spec.rb`** (#19)
+  - 4 new examples covering `LocalConnection` with Solid Queue fork patterns.
+  - Directly reproduces the `database is locked` scenario (5 concurrent forked workers
+    writing to the same SQLite file).
+  - Verifies WAL mode and `busy_timeout` are set on the internal connection.
+
+### Fixed (infrastructure)
+
+- `activerecord-libsql.gemspec`: added `lib/**/*.rake` to `spec.files` so that
+  `lib/tasks/turso.rake` is included in the published gem.
+- `lib/activerecord/libsql/railtie.rb`: fixed rake file load path
+  (`../../tasks/turso.rake` instead of `../../../tasks/turso.rake`).
+
 ## [0.1.7] - 2026-03-27
 
 ### Fixed

data/activerecord-libsql.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir[
     'lib/**/*.rb',
+    'lib/**/*.rake',
     '*.md',
     '*.gemspec'
   ]

data/lib/activerecord/libsql/railtie.rb

@@ -6,7 +6,7 @@ module ActiveRecord
   module Libsql
     class Railtie < Rails::Railtie
       rake_tasks do
-        load File.expand_path('../../../tasks/turso.rake', __dir__)
+        load File.expand_path('../../tasks/turso.rake', __dir__)
       end
     end
   end

data/lib/activerecord/libsql/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Libsql
-    VERSION = '0.1.7'
+    VERSION = '0.1.8'
   end
 end

data/lib/tasks/turso.rake

@@ -0,0 +1,233 @@
+# frozen_string_literal: true
+
+require 'shellwords'
+require 'tempfile'
+require 'fileutils'
+
+namespace :turso do
+  desc <<~DESC
+    Check Turso connection and adapter health for all configured databases.
+
+    Verifies:
+      1. Connection (SELECT 1)
+      2. Basic write/read (INSERT / SELECT / DELETE)
+      3. datetime UTC normalization (WHERE datetime <= ?)
+      4. Transaction (BEGIN / COMMIT / ROLLBACK)
+
+    Usage:
+      rake turso:check
+  DESC
+  task check: :environment do
+    configs = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env)
+
+    if configs.empty?
+      puts "No databases configured for environment: #{Rails.env}"
+      exit 1
+    end
+
+    all_ok = true
+
+    configs.each do |db_config|
+      name = db_config.name
+      print "  [#{name}] "
+
+      begin
+        pool = ActiveRecord::Base.establish_connection(db_config.configuration_hash)
+        pool.with_connection do |conn|
+          # 1. 接続確認
+          conn.execute('SELECT 1')
+          print '✓ connect '
+
+          # 2. 一時テーブルで write/read を確認
+          table = "_turso_check_#{SecureRandom.hex(4)}"
+          begin
+            conn.create_table(table, force: true) do |t|
+              t.string   :label,      null: false
+              t.datetime :checked_at, null: false
+            end
+
+            # INSERT
+            now = Time.now.utc
+            conn.execute(
+              "INSERT INTO #{table} (label, checked_at) VALUES ('ping', '#{now.strftime('%Y-%m-%d %H:%M:%S')}')"
+            )
+            print '✓ insert '
+
+            # SELECT
+            rows = conn.execute("SELECT label FROM #{table} WHERE label = 'ping'")
+            raise 'SELECT returned no rows' if rows.empty?
+
+            print '✓ select '
+
+            # datetime 比較（UTC 正規化の確認）
+            future = (now + 60).strftime('%Y-%m-%d %H:%M:%S')
+            rows = conn.execute("SELECT label FROM #{table} WHERE checked_at <= '#{future}'")
+            raise 'datetime comparison failed' if rows.empty?
+
+            print '✓ datetime '
+
+            # トランザクション
+            conn.transaction do
+              conn.execute("INSERT INTO #{table} (label, checked_at) VALUES ('txn', '#{now.strftime('%Y-%m-%d %H:%M:%S')}')")
+            end
+            print '✓ transaction '
+          ensure
+            conn.drop_table(table, if_exists: true)
+          end
+        end
+
+        puts '→ OK'
+      rescue StandardError => e
+        puts "→ FAILED: #{e.message}"
+        all_ok = false
+      ensure
+        # primary に戻す
+        primary_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: 'primary')
+        ActiveRecord::Base.establish_connection(primary_config.configuration_hash) if primary_config
+      end
+    end
+
+    exit 1 unless all_ok
+  end
+
+  namespace :schema do
+    desc <<~DESC
+      Apply schema to Turso Cloud using sqldef (sqlite3def).
+
+      Compares the desired schema (schema.sql) against the current remote schema
+      and applies only the diff — idempotent and declarative.
+
+      Usage:
+        rake turso:schema:apply[db/schema.sql]
+
+      Prerequisites:
+        - sqlite3def must be installed (https://github.com/sqldef/sqldef)
+        - database.yml must have replica_path configured
+
+      Flow:
+        1. Pull latest frames from remote into local replica
+        2. Copy replica to a temp file for sqlite3def (avoids libsql metadata conflict)
+        3. Run sqlite3def --dry-run to compute diff SQL
+        4. If no diff, exit normally ("Already up to date")
+        5. Apply diff SQL to Turso Cloud
+        6. Pull again to confirm
+    DESC
+    task :apply, [:schema_file] => :environment do |_t, args|
+      schema_file = args[:schema_file]
+      abort 'Usage: rake turso:schema:apply[path/to/schema.sql]' unless schema_file
+      abort "Schema file not found: #{schema_file}" unless File.exist?(schema_file)
+
+      unless system('which sqlite3def > /dev/null 2>&1')
+        abort 'sqlite3def not found. Install it from https://github.com/sqldef/sqldef'
+      end
+
+      conn = ActiveRecord::Base.connection
+      replica_path = conn.instance_variable_get(:@config)&.dig(:replica_path)
+      abort 'replica_path is not configured in database.yml' unless replica_path
+      abort "Replica file not found: #{replica_path} (run the app first to initialize)" \
+        unless File.exist?(replica_path)
+
+      puts '==> [1/4] Pulling latest schema from remote...'
+      conn.sync
+      puts '    Done.'
+
+      # sqlite3def は SQLite ファイルを直接開くため、libsql の replica と競合しないよう
+      # 一時ファイルにコピーして使う。WAL モードの場合は -wal / -shm も一緒にコピーする。
+      tmp_db = Tempfile.new(['turso_schema_diff', '.db'])
+      tmp_db.close
+      begin
+        FileUtils.cp(replica_path, tmp_db.path)
+        %w[-wal -shm].each do |suffix|
+          src = "#{replica_path}#{suffix}"
+          FileUtils.cp(src, "#{tmp_db.path}#{suffix}") if File.exist?(src)
+        end
+
+        puts '==> [2/4] Computing schema diff...'
+        diff_sql = `sqlite3def --dry-run --file #{Shellwords.escape(schema_file)} #{Shellwords.escape(tmp_db.path)} 2>&1`
+        exit_status = $?.exitstatus
+
+        abort "sqlite3def failed (exit #{exit_status}):\n#{diff_sql}" if exit_status != 0
+      ensure
+        tmp_db.unlink
+        FileUtils.rm_f("#{tmp_db.path}-wal")
+        FileUtils.rm_f("#{tmp_db.path}-shm")
+      end
+
+      # BEGIN / COMMIT / コメント行（--）を除外する
+      statements = diff_sql
+                   .split(';')
+                   .map(&:strip)
+                   .reject(&:empty?)
+                   .reject { |s| s.match?(/\A(BEGIN|COMMIT|ROLLBACK)\z/i) }
+                   .reject { |s| s.match?(/\A--/) }
+
+      if statements.empty?
+        puts '    Already up to date.'
+        next
+      end
+
+      puts "    #{statements.size} statement(s) to apply:"
+      statements.each { |s| puts "      #{s.lines.first&.strip}" }
+
+      puts '==> [3/4] Applying schema to Turso Cloud...'
+      # libsql は DDL トランザクションをサポートしないため、直接実行する
+      statements.each { |sql| conn.execute(sql) }
+      puts '    Done.'
+
+      puts '==> [4/4] Pulling to confirm...'
+      conn.sync
+      puts '    Done.'
+
+      puts '==> Schema applied successfully!'
+    end
+
+    desc 'Show schema diff between schema.sql and Turso Cloud (dry-run, no changes applied)'
+    task :diff, [:schema_file] => :environment do |_t, args|
+      schema_file = args[:schema_file]
+      abort 'Usage: rake turso:schema:diff[path/to/schema.sql]' unless schema_file
+      abort "Schema file not found: #{schema_file}" unless File.exist?(schema_file)
+
+      unless system('which sqlite3def > /dev/null 2>&1')
+        abort 'sqlite3def not found. Install it from https://github.com/sqldef/sqldef'
+      end
+
+      conn = ActiveRecord::Base.connection
+      replica_path = conn.instance_variable_get(:@config)&.dig(:replica_path)
+      abort 'replica_path is not configured in database.yml' unless replica_path
+      abort "Replica file not found: #{replica_path}" unless File.exist?(replica_path)
+
+      puts '==> Pulling latest schema from remote...'
+      conn.sync
+
+      tmp_db = Tempfile.new(['turso_schema_diff', '.db'])
+      tmp_db.close
+      begin
+        FileUtils.cp(replica_path, tmp_db.path)
+        %w[-wal -shm].each do |suffix|
+          src = "#{replica_path}#{suffix}"
+          FileUtils.cp(src, "#{tmp_db.path}#{suffix}") if File.exist?(src)
+        end
+
+        puts '==> Schema diff (sqlite3def dry-run):'
+        diff_sql = `sqlite3def --dry-run --file #{Shellwords.escape(schema_file)} #{Shellwords.escape(tmp_db.path)} 2>&1`
+
+        statements = diff_sql
+                     .split(';')
+                     .map(&:strip)
+                     .reject(&:empty?)
+                     .reject { |s| s.match?(/\A(BEGIN|COMMIT|ROLLBACK)\z/i) }
+                     .reject { |s| s.match?(/\A--/) }
+
+        if statements.empty?
+          puts '    No changes. Already up to date.'
+        else
+          puts diff_sql
+        end
+      ensure
+        tmp_db.unlink
+        FileUtils.rm_f("#{tmp_db.path}-wal")
+        FileUtils.rm_f("#{tmp_db.path}-shm")
+      end
+    end
+  end
+end

data/lib/turso_libsql/database.rb

@@ -110,6 +110,10 @@ module TursoLibsql
   # AR の discard! が @raw_connection を nil にするので、子プロセスでは
   # reconnect が走って新しい接続が確立される。
   class LocalConnection
+    # Solid Queue など複数プロセスが同時に書き込む場合のロック待機時間（ミリ秒）。
+    # デフォルトの 0ms だと即 SQLite3::BusyException になる。
+    BUSY_TIMEOUT_MS = 5000
+
     def initialize(path, remote_url, token, mode)
       require 'sqlite3'
       @path = path
@@ -118,6 +122,12 @@ module TursoLibsql
       @mode = mode
       @db = SQLite3::Database.new(path)
       @db.results_as_hash = true
+      # WAL モード: 読み取りと書き込みを並行できる。
+      # デフォルトの DELETE ジャーナルモードは同時書き込みで database is locked になる。
+      # Solid Queue のように複数 fork が同じファイルに書く場合に必須。
+      @db.execute('PRAGMA journal_mode=WAL')
+      # ロック競合時に即エラーにならず、指定ミリ秒待ってリトライする。
+      @db.execute("PRAGMA busy_timeout=#{BUSY_TIMEOUT_MS}")
       @last_insert_rowid = 0
       @last_affected_rows = 0
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-libsql
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - aileron
@@ -96,6 +96,7 @@ files:
 - lib/activerecord-libsql.rb
 - lib/activerecord/libsql/railtie.rb
 - lib/activerecord/libsql/version.rb
+- lib/tasks/turso.rake
 - lib/turso_libsql.rb
 - lib/turso_libsql/connection.rb
 - lib/turso_libsql/database.rb