activerecord-turso 0.3.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfdd23462f8313c9a19d64bab33314e3d5a4b7532249695f01811ebcf3fcccbd
-  data.tar.gz: 74e33f479629655b50621e300dc7a1d38b2d94d95edd2da9b57b3d18c5799dbe
+  metadata.gz: a01719b3af125da831484f92746047dcc6b93870d38cc328f47dacd356b9bc53
+  data.tar.gz: 86fad027bd12ace8b43f359c2118c9c04ade3f0b5408d516a1e3ec165963a6e2
 SHA512:
-  metadata.gz: 9dee234b1fa1abd37883de7c10b876cad339858a41643000eee969348ae0ad1da8458a8b546145aa1c7e38648e5e7da3734d35fa484b08c0d87260dc170f3fe5
-  data.tar.gz: 314bda7c65ccc415af50204690e098859517419f8f7ba035852a6230c0654c40f94a82ba3bd22ba54a829920cfb7f9159fbf1acc0de8e04816641669b6789938
+  metadata.gz: 5bb60d2fd6f7068774f587d06614d4023b0a047ac02e97deb98d393c94686174a7c04b9a4122c80e7e1971fce0cf272cf6b6f1dd49d9db1936ed8f36d1dff181
+  data.tar.gz: bf562f2e7c986ed051de4e800800e62e19624d146ee88d76a18db4727bde00540f1825962da035ad8caf7dfeee3c4467f055282f940418e521fbbb77b9efb5c8

data/README.md

@@ -14,7 +14,7 @@ Production ready for **embedded/local** ActiveRecord 8.1 applications using the
 
 ## 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
 
@@ -141,7 +141,7 @@ match = ActiveRecord::Base.connection.fts_match(:posts, [:title, :body], "databa
 Post.where(match)
 
 score = ActiveRecord::Base.connection.fts_score(:posts, [:title, :body], "database")
-Post.select(:id, :title, score.as("rank")).where(match).order("rank ASC")
+Post.select(:id, :title, score.as("rank")).where(match).order("rank DESC")
 ```
 
 Note: `fts5` virtual tables are not supported. Use `USING fts` indexes instead. This requires the `index_method` experimental feature:
@@ -247,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,24 +18,37 @@ 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 reconnect!(**)
-          @lock.synchronize do
-            disconnect!
-            @raw_connection = self.class.new_client(@config)
-            configure_connection
+        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 disconnect!
+        def reconnect!(**)
           @lock.synchronize do
-            @raw_connection&.close
-            @raw_connection = nil
+            disconnect!
+            begin
+              @raw_connection = self.class.new_client(@config)
+              configure_connection
+            rescue => original_exception
+              raise translate_exception_class(original_exception, nil, nil)
+            end
           end
         end
 
@@ -62,12 +76,24 @@ 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
   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,18 +5,17 @@ module ActiveRecord
     class TursoAdapter < SQLite3Adapter
       module ErrorTranslation
         def translate_exception(exception, message:, sql:, binds:)
-          cause = exception.cause || exception
-          case cause
+          case exception
           when ::Turso::ConstraintException
             translate_constraint_error(message, sql, binds)
           when ::Turso::NotADatabaseException
-            ActiveRecord::NoDatabaseError.new(message, sql: sql, binds: binds)
+            ActiveRecord::NoDatabaseError.new(message, connection_pool: pool)
           when ::Turso::BusySnapshotException
             ActiveRecord::SerializationFailure.new(message, sql: sql, binds: binds)
           when ::Turso::BusyException
             ActiveRecordTurso::BusyError.new(message, sql: sql, binds: binds)
           when ::Turso::ReadonlyException
-            ActiveRecord::ReadOnlyRecord.new(message, sql: sql, binds: binds)
+            ActiveRecord::ReadOnlyRecord.new(message)
           when ::Turso::IoException, ::Turso::CorruptException
             ActiveRecord::StatementInvalid.new(message, sql: sql, binds: binds)
           when ::Turso::DatabaseFullException
@@ -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

@@ -26,6 +26,7 @@ module ActiveRecord
         FileUtils.rm_f(path)
         FileUtils.rm_f("#{path}-wal")
         FileUtils.rm_f("#{path}-shm")
+        FileUtils.rm_f(mvcc_log_path(path))
       end
 
       def purge
@@ -65,6 +66,7 @@ module ActiveRecord
           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
@@ -106,6 +108,12 @@ module ActiveRecord
         @configuration
       end
 
+      # Turso stores the MVCC logical log beside the database as
+      # `<database>.db-log` (Rust's `Path::with_extension`).
+      def mvcc_log_path(path)
+        path.sub(/\.[^.\/]+\z/, "") + ".db-log"
+      end
+
       def connection
         ActiveRecord::Base.connection
       end

data/lib/activerecord-turso/version.rb

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

data/lib/activerecord-turso.rb

@@ -17,3 +17,7 @@ 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

@@ -16,6 +16,7 @@ module Turso
 
       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
@@ -24,8 +25,8 @@ module Turso
           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
+        @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
@@ -38,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
@@ -57,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.3.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Ben D'Angelo
@@ -85,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: Embedded ActiveRecord adapter for Turso (SQLite-compatible)
 test_files: []