activerecord-turso 0.2.2 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8e00bcf26be0b39f02a05bd0f4850db41d277f7d72bdb15013c218f032d93eb
-  data.tar.gz: 9e9ccad1e346648fef21eb2d0a3aceafa7afada0bc67348a0ed912b723e6cca5
+  metadata.gz: 8dc77c288fa28d1c9872459245f9afe593a510dac77d5e0630bdb58d7bab4b90
+  data.tar.gz: 192ddeb9179b451e2844ce533f1bbaf7a96bae2c493a1b0a322398401dae838a
 SHA512:
-  metadata.gz: c16dce07f7dbcf2bd60d07e58b10d6960c7d4a2945f88deda0082c532b0e1e42cc58213582acd2548c0c19d72a13ef30e5688503ba8ab9a00b7fa99f882048e8
-  data.tar.gz: 22f295b0eda449f11b5f31c63b16718e5f609452904b0c9c5b534117fe4145324460d3ed56f7ac7365f38345ac165eb8969a3e01bb5c21d59c2e9f3bef2f4f4d
+  metadata.gz: 502dce7acddd392a64255e2e59d3fa7290196218968456dc4a4032bdfe83fde510f31625ae260bb9f4d979fc5af1626ac3dfc4484608b32dd223cb37d75d9dfc
+  data.tar.gz: 6f8570e0a2e17733238babaaf41a17dba6d5cf2e8ca1b983d883dd4a3b0a0fc7373975c9fb21d4bac0e273de3feaa1377f263e68f5123e703761c73067b840ce

data/README.md

@@ -4,7 +4,7 @@ ActiveRecord adapter for [Turso](https://turso.tech) (SQLite compatible db).
 
 ## Status
 
-Production ready for ActiveRecord 8.1 applications. The underlying `turso` gem releases the GVL during blocking operations, supports fiber-aware connection ownership, and uses native batch execution.
+Production ready for **embedded/local** ActiveRecord 8.1 applications using the Turso SQLite-compatible database engine. This adapter does **not** support remote `libsql://` URLs or Turso cloud authentication. The underlying `turso` gem releases the GVL during blocking operations, supports fiber-aware connection ownership, and uses native batch execution.
 
 ## Requirements
 
@@ -14,7 +14,7 @@ Production ready for ActiveRecord 8.1 applications. The underlying `turso` gem r
 
 ## Runtime dependencies
 
-This adapter uses the `turso` gem and does **not** require the `sqlite3` Ruby gem at runtime.
+This adapter uses the `turso` gem and does **not** require the `sqlite3` Ruby gem at runtime. The `sqlite3` gem is used only in the Rails conformance test harness.
 
 ## Installation
 
@@ -114,6 +114,7 @@ development:
 - `transaction(concurrent: true)` requires the same database connection to be held for the entire retry loop. Rails' connection pool may reap the connection between retries, which can silently break MVCC semantics. Use this only when you understand the pooling behavior of your app.
 - `lock!`, `with_lock`, and `lock_version` are not meaningful under MVCC. Do not use them inside concurrent transactions.
 - If the retry limit is exhausted, the conflict is raised as `ActiveRecord::StatementInvalid`. You must handle it in application code.
+- Normal ActiveRecord model persistence (`create!`, `save!`, `update!`, `touch`) is **not supported** inside a concurrent transaction because ActiveRecord opens its own internal transaction for each model change. Use raw SQL (`execute`, `exec_query`) or bulk operations (`insert_all`, `update_all`, `update_columns`) instead.
 
 ### Full-text search (Tantivy)
 
@@ -246,6 +247,12 @@ TURSO_TEST_EXPERIMENTAL_FEATURES=generated_columns bundle exec rake test
 
 The CI workflow in `.github/workflows/ci.yml` runs all three configurations automatically.
 
+Run the Rails sqlite3 adapter conformance suite:
+
+```bash
+bundle exec rake test:conformance
+```
+
 ## License
 
 MIT

data/lib/active_record/connection_adapters/turso_adapter/connection_management.rb

@@ -6,6 +6,7 @@ module ActiveRecord
       module ConnectionManagement
         def self.included(base)
           base.extend(ClassMethods)
+          base.set_callback :checkout, :before, :reconnect_for_execution_context
         end
 
         module ClassMethods
@@ -17,12 +18,28 @@ module ActiveRecord
         end
 
         def active?
-          return false unless @raw_connection
-          !@raw_connection.closed?
+          connected?
+        end
+
+        def connected?
+          !(@raw_connection.nil? || @raw_connection.closed?)
         rescue ::Turso::Error
           false
         end
 
+        def disconnect!
+          super
+
+          if @raw_connection && !@raw_connection.closed?
+            begin
+              @raw_connection.execute("PRAGMA wal_checkpoint(TRUNCATE)")
+            rescue ::Turso::Error
+            end
+            @raw_connection.close
+          end
+          @raw_connection = nil
+        end
+
         def reconnect!(**)
           @lock.synchronize do
             disconnect!
@@ -31,13 +48,6 @@ module ActiveRecord
           end
         end
 
-        def disconnect!
-          @lock.synchronize do
-            @raw_connection&.close
-            @raw_connection = nil
-          end
-        end
-
         def raw_connection
           @lock.synchronize { @raw_connection }
         end
@@ -62,10 +72,23 @@ module ActiveRecord
 
           execute("PRAGMA foreign_keys = ON")
 
+          autocheckpoint = @config.fetch(:wal_autocheckpoint, 1000)
+          execute("PRAGMA wal_autocheckpoint = #{autocheckpoint.to_i}")
+
           timeout = @config[:busy_timeout] || @config[:timeout] || 5000
           @raw_connection.busy_timeout = timeout
 
+          query_timeout = @config[:query_timeout] || 30_000
+          @raw_connection.query_timeout = query_timeout
+        end
+
+        private
+
+        def reconnect_for_execution_context
+          return unless @raw_connection
+          return if @raw_connection.owned_by_current_execution_context?
 
+          reconnect!
         end
       end
     end

data/lib/active_record/connection_adapters/turso_adapter/database_statements.rb

@@ -69,6 +69,10 @@ module ActiveRecord
               type_map = build_type_map(stmt)
               ActiveRecord::Result.new(columns, rows, type_map, affected_rows: affected_rows)
             end
+          rescue
+            @statements.delete(sql) if prepare
+            stmt.close
+            raise
           ensure
             stmt.close unless prepare
           end

data/lib/active_record/connection_adapters/turso_adapter/error_translation.rb

@@ -5,8 +5,7 @@ module ActiveRecord
     class TursoAdapter < SQLite3Adapter
       module ErrorTranslation
         def translate_exception(exception, message:, sql:, binds:)
-          cause = exception.cause
-          case cause
+          case exception
           when ::Turso::ConstraintException
             translate_constraint_error(message, sql, binds)
           when ::Turso::NotADatabaseException
@@ -25,11 +24,21 @@ module ActiveRecord
             ActiveRecord::QueryCanceled.new(message, sql: sql, binds: binds)
           when ::Turso::MisuseException
             ActiveRecord::StatementInvalid.new(message, sql: sql, binds: binds)
+          when ::Turso::Exception
+            ActiveRecord::ConnectionFailed.new(message, connection_pool: pool)
           else
             super
           end
         end
 
+        def retryable_connection_error?(exception)
+          super || exception.is_a?(::Turso::Exception)
+        end
+
+        def retryable_query_error?(exception)
+          super || exception.is_a?(::Turso::Exception)
+        end
+
         private
 
         def translate_constraint_error(message, sql, binds)

data/lib/active_record/connection_adapters/turso_adapter/transaction_management.rb

@@ -97,7 +97,9 @@ module ActiveRecord
 
         def rollback_if_active
           return unless @raw_connection && !@raw_connection.closed?
-          @raw_connection.execute("ROLLBACK") rescue nil
+          @raw_connection.execute("ROLLBACK")
+        rescue ::Turso::Error
+          disconnect! rescue nil
         end
 
         def backoff(base_delay_ms, retries)

data/lib/active_record/tasks/turso_database_tasks.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require "active_record/tasks/database_tasks"
+
+module ActiveRecord
+  module Tasks
+    class TursoDatabaseTasks < SQLiteDatabaseTasks
+      def initialize(db_config, root = nil)
+        @configuration = db_config
+      end
+
+      def create
+        path = configuration.database
+        return if path == ":memory:"
+
+        FileUtils.mkdir_p(File.dirname(path))
+        establish_connection(configuration)
+        connection.execute("SELECT 1")
+      end
+
+      def drop
+        path = configuration.database
+        return if path == ":memory:"
+
+        disconnect!
+        FileUtils.rm_f(path)
+        FileUtils.rm_f("#{path}-wal")
+        FileUtils.rm_f("#{path}-shm")
+      end
+
+      def purge
+        drop
+        create
+      end
+
+      def charset
+        "UTF-8"
+      end
+
+      def charset_collation
+        nil
+      end
+
+      def structure_dump(filename, extra_flags)
+        establish_connection(configuration)
+        io = File.open(filename, "w")
+        io.puts("PRAGMA foreign_keys = OFF;")
+
+        tables = connection.query_values(<<~SQL, "SCHEMA")
+          SELECT name FROM sqlite_master
+          WHERE type = 'table'
+            AND name NOT LIKE 'sqlite_%'
+            AND name NOT LIKE '__turso_internal_%'
+          ORDER BY name
+        SQL
+
+        tables.each do |table|
+          sql = connection.query_value(<<~SQL, "SCHEMA")
+            SELECT sql FROM sqlite_master WHERE name = #{connection.quote(table)}
+          SQL
+          io.puts("#{sql};") if sql
+        end
+
+        indexes = connection.query_values(<<~SQL, "SCHEMA")
+          SELECT name FROM sqlite_master
+          WHERE type = 'index'
+            AND name NOT LIKE 'sqlite_%'
+            AND name NOT LIKE '__turso_internal_%'
+            AND sql IS NOT NULL
+          ORDER BY name
+        SQL
+
+        indexes.each do |index|
+          sql = connection.query_value(<<~SQL, "SCHEMA")
+            SELECT sql FROM sqlite_master WHERE name = #{connection.quote(index)}
+          SQL
+          io.puts("#{sql};") if sql
+        end
+
+        views = connection.query_values(<<~SQL, "SCHEMA")
+          SELECT name FROM sqlite_master
+          WHERE type = 'view'
+            AND name NOT LIKE 'sqlite_%'
+          ORDER BY name
+        SQL
+
+        views.each do |view|
+          sql = connection.query_value(<<~SQL, "SCHEMA")
+            SELECT sql FROM sqlite_master WHERE name = #{connection.quote(view)}
+          SQL
+          io.puts("#{sql};") if sql
+        end
+
+        io.puts("PRAGMA foreign_keys = ON;")
+        io.close
+      end
+
+      def structure_load(filename, extra_flags)
+        establish_connection(configuration)
+        sql = File.read(filename)
+        ActiveRecord::Base.connection.raw_connection.execute_batch(sql)
+      end
+
+      private
+
+      def configuration
+        @configuration
+      end
+
+      def connection
+        ActiveRecord::Base.connection
+      end
+
+      def establish_connection(config)
+        @configuration = config
+        ActiveRecord::Base.establish_connection(config)
+        ActiveRecord::Base.connection.connect!
+      end
+
+      def disconnect!
+        ActiveRecord::Base.connection_pool.disconnect!
+      end
+    end
+  end
+end

data/lib/activerecord-turso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordTurso
-  VERSION = "0.2.2"
+  VERSION = "0.3.2"
 end

data/lib/activerecord-turso.rb

@@ -12,3 +12,12 @@ ActiveRecord::ConnectionAdapters.register(
   "ActiveRecord::ConnectionAdapters::TursoAdapter",
   "active_record/connection_adapters/turso_adapter"
 )
+
+require "active_record/tasks/database_tasks"
+require_relative "active_record/tasks/turso_database_tasks"
+
+ActiveRecord::Tasks::DatabaseTasks.register_task(/turso/, "ActiveRecord::Tasks::TursoDatabaseTasks")
+
+at_exit do
+  ActiveRecord::Base.connection_pool&.disconnect! rescue nil
+end

data/lib/turso/ar/connection.rb

@@ -8,20 +8,25 @@ module Turso
       extend Forwardable
 
       def_delegators :@db, :close, :closed?, :changes, :total_changes,
-                     :last_insert_rowid, :prepare, :interrupt, :busy_timeout=
+                     :last_insert_rowid, :prepare, :interrupt, :busy_timeout=,
+                     :query_timeout, :query_timeout=
 
       DEFAULT_BUSY_TIMEOUT_MS = 5000
       DEFAULT_QUERY_TIMEOUT_MS = 30_000
 
       def initialize(config)
         @config = config
+        @owner = owner_token
         db_opts = {
           busy_timeout: config[:busy_timeout] || config[:timeout] || DEFAULT_BUSY_TIMEOUT_MS,
           query_timeout: config[:query_timeout] || DEFAULT_QUERY_TIMEOUT_MS
         }
-        db_opts[:experimental_features] = config[:experimental_features] if config[:experimental_features]
-        database = ::Turso::Database.new(config[:database].to_s, **db_opts)
-        @db = database.connection
+        if config[:experimental_features]
+          features = Array(config[:experimental_features]).map(&:to_s).reject(&:empty?)
+          db_opts[:experimental_features] = features.join(",") unless features.empty?
+        end
+        @database = ::Turso::Database.new(config[:database].to_s, **db_opts)
+        @db = @database.connection
         @db.busy_timeout = db_opts[:busy_timeout]
         @db.query_timeout = db_opts[:query_timeout]
       end
@@ -34,6 +39,10 @@ module Turso
         !@db.closed?
       end
 
+      def owned_by_current_execution_context?
+        @owner == owner_token
+      end
+
       def disconnect!
         @db.close unless @db.closed?
       end
@@ -53,6 +62,10 @@ module Turso
 
       private
 
+      def owner_token
+        [Thread.current.object_id, Fiber.current.object_id]
+      end
+
       def normalize_binds(binds)
         binds.map do |value|
           case value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turso
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.2
 platform: ruby
 authors:
 - Ben D'Angelo
@@ -63,6 +63,7 @@ files:
 - lib/active_record/connection_adapters/turso_adapter/schema_statements.rb
 - lib/active_record/connection_adapters/turso_adapter/statement_pool.rb
 - lib/active_record/connection_adapters/turso_adapter/transaction_management.rb
+- lib/active_record/tasks/turso_database_tasks.rb
 - lib/activerecord-turso.rb
 - lib/activerecord-turso/error.rb
 - lib/activerecord-turso/version.rb
@@ -84,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.15
+rubygems_version: 4.0.18
 specification_version: 4
-summary: ActiveRecord adapter for Turso
+summary: Embedded ActiveRecord adapter for Turso (SQLite-compatible)
 test_files: []