activerecord-turso 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04f8ecc726fa450fadcf8b819a04663b3035bed1c1b5f592d362ec07664d2f14
-  data.tar.gz: 4ce85117e6f562ead6d2defeaaa5c70fccc2c62492d9916c798e56bcf32acfca
+  metadata.gz: b8e00bcf26be0b39f02a05bd0f4850db41d277f7d72bdb15013c218f032d93eb
+  data.tar.gz: 9e9ccad1e346648fef21eb2d0a3aceafa7afada0bc67348a0ed912b723e6cca5
 SHA512:
-  metadata.gz: 6d18e249a927642d705959341439129523cb3f2763ab699a8c2dfbc1f38d8f52b3b831a96f140a95518f3e932a9da348184af605525d354a54893419f332c0aa
-  data.tar.gz: 8b1cec4617634414e11928453aeed21e2c382fe4a36357ca435b601f337f8b9ca3fb732f035db02ebd8a0fe8f7dfc35db961c384faffd2cf8937ea612ec6363e
+  metadata.gz: c16dce07f7dbcf2bd60d07e58b10d6960c7d4a2945f88deda0082c532b0e1e42cc58213582acd2548c0c19d72a13ef30e5688503ba8ab9a00b7fa99f882048e8
+  data.tar.gz: 22f295b0eda449f11b5f31c63b16718e5f609452904b0c9c5b534117fe4145324460d3ed56f7ac7365f38345ac165eb8969a3e01bb5c21d59c2e9f3bef2f4f4d

data/README.md

@@ -4,12 +4,12 @@ ActiveRecord adapter for [Turso](https://turso.tech) (SQLite compatible db).
 
 ## Status
 
-This adapter is under **active** development. It can run basic ActiveRecord operations against Turso today, but several production features are still being hardened. See [Limitations and Risks](#limitations-and-risks) before using it in production.
+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.
 
 ## Requirements
 
 - Ruby >= 3.2
-- ActiveRecord >= 8.0, < 8.2
+- ActiveRecord ~> 8.1.0
 - The `turso` Ruby gem
 
 ## Runtime dependencies
@@ -51,7 +51,9 @@ end
 Post.create!(title: "Hello", body: "World", published: true)
 ```
 
-## Recommended production configuration
+## Configuration
+
+### Recommended production configuration
 
 ```yaml
 production:
@@ -65,6 +67,23 @@ production:
   experimental_features: "index_method"
 ```
 
+### Connection options
+
+| Option | Description | Default |
+|---|---|---|
+| `database` | Path to the SQLite database file | Required |
+| `journal_mode` | Journal mode (`wal`, `mvcc`, `delete`, etc.) | WAL |
+| `pool` | Connection pool size | 5 |
+| `timeout` | Busy timeout in milliseconds | 5000 |
+| `busy_timeout` | Busy timeout in milliseconds (overrides `timeout`) | 5000 |
+| `query_timeout` | Query timeout in milliseconds | 30000 |
+| `experimental_features` | Comma-separated experimental features (`index_method`, `generated_columns`) | None |
+| `statement_limit` | Maximum number of cached prepared statements | 1000 |
+
+### `query_timeout` and `interrupt`
+
+The adapter exposes `query_timeout=` to set a maximum execution time for queries. When a query exceeds this timeout, the Turso engine interrupts the operation and raises `ActiveRecord::QueryCanceled`. Use `interrupt` to cancel a running query from another thread.
+
 ### MVCC / BEGIN CONCURRENT (experimental)
 
 ⚠️ **Experimental.** Do not use in production unless you understand the caveats below. Normal ActiveRecord model persistence (`create!`, `save!`, `update!`, `touch`) is **not supported** inside `transaction(concurrent: true)`.
@@ -168,9 +187,9 @@ The following limitations apply to the current implementation. Read this section
 
 The adapter builds column type maps from `column_decltype` metadata. This works for most column definitions but may not capture type information for computed expressions or subquery columns.
 
-### 2. Batch SQL execution uses a simple string splitter
+### 2. Batch SQL execution uses the Turso native batch API
 
-The adapter's batch execution path splits multi-statement SQL on semicolons. This means SQL containing semicolons inside string literals, triggers, or stored expressions may be split incorrectly. Avoid relying on multi-statement strings other than simple schema dumps.
+The adapter's batch execution path uses the Turso native batch API (`execute_batch`), which correctly handles semicolons inside string literals, triggers, and stored expressions.
 
 ### 3. MVCC requires opt-in and has ActiveRecord compatibility caveats
 
@@ -187,9 +206,9 @@ Only use `transaction(concurrent: true)` after testing it under your app's concu
 
 The adapter uses a bounded statement pool with a default limit inherited from Rails (typically `1000`). Statements are evicted with an LRU policy and finalized against the underlying Turso connection. Set `statement_limit` in `database.yml` to tune the pool size.
 
-### 5. ActiveRecord 8.0 support is CI-tested, not locally tested
+### 5. Only ActiveRecord 8.1 is supported
 
-Only ActiveRecord 8.1 is installed in the primary development environment. ActiveRecord 8.0 compatibility is validated through CI. If you run into 8.0-specific issues, please report them.
+The adapter is pinned to ActiveRecord `~> 8.1.0`.
 
 ### 6. INSERT RETURNING is disabled (not supported by Turso)
 
@@ -200,9 +219,9 @@ The underlying Turso SQLite build does not support `INSERT ... RETURNING` syntax
 - Transaction isolation levels other than the default are reported as unsupported (`supports_transaction_isolation?` returns `false`) because Turso remote connections do not provide shared-cache read-uncommitted semantics.
 - `insert_on_conflict` is enabled only when the reported SQLite version is `>= 3.24.0`.
 
-### 8. `execute_batch` in the underlying bindings is a Ruby-side fallback
+### 8. `execute_batch` uses the Turso native batch API
 
-The `turso` gem provides `DB#execute_batch` as a convenience that splits and executes statements one by one. It does not use a native batch API, so it carries the same semicolon-splitting risk as item 2 above.
+The `turso` gem's `execute_batch` uses the Turso native batch API (`prepare_first`/`execute` loop), correctly handling edge cases like semicolons in string literals and triggers.
 
 ## Development
 

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

@@ -14,7 +14,7 @@ module ActiveRecord
           when ::Turso::BusySnapshotException
             ActiveRecord::SerializationFailure.new(message, sql: sql, binds: binds)
           when ::Turso::BusyException
-            ActiveRecord::Deadlocked.new(message, sql: sql, binds: binds)
+            ActiveRecordTurso::BusyError.new(message, sql: sql, binds: binds)
           when ::Turso::ReadonlyException
             ActiveRecord::ReadOnlyRecord.new(message, sql: sql, binds: binds)
           when ::Turso::IoException, ::Turso::CorruptException
@@ -38,6 +38,8 @@ module ActiveRecord
             ActiveRecord::InvalidForeignKey.new(message, sql: sql, binds: binds)
           when /unique constraint|primary key/i
             ActiveRecord::RecordNotUnique.new(message, sql: sql, binds: binds)
+          when /NOT NULL|cannot be NULL/i
+            ActiveRecord::NotNullViolation.new(message, sql: sql, binds: binds)
           else
             ActiveRecord::StatementInvalid.new(message, sql: sql, binds: binds)
           end

data/lib/activerecord-turso/error.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module ActiveRecordTurso
+  class Error < ActiveRecord::StatementInvalid; end
+  class BusyError < Error; end
+end

data/lib/activerecord-turso/version.rb

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

data/lib/activerecord-turso.rb

@@ -3,6 +3,7 @@
 require "active_record"
 require "turso"
 
+require_relative "activerecord-turso/error"
 require_relative "turso/ar/connection"
 require_relative "active_record/connection_adapters/turso_adapter"
 

data/lib/turso/ar/connection.rb

@@ -7,7 +7,8 @@ module Turso
     class Connection
       extend Forwardable
 
-      def_delegators :@db, :close, :closed?, :changes, :total_changes
+      def_delegators :@db, :close, :closed?, :changes, :total_changes,
+                     :last_insert_rowid, :prepare, :interrupt, :busy_timeout=
 
       DEFAULT_BUSY_TIMEOUT_MS = 5000
       DEFAULT_QUERY_TIMEOUT_MS = 30_000
@@ -19,11 +20,10 @@ module Turso
           query_timeout: config[:query_timeout] || DEFAULT_QUERY_TIMEOUT_MS
         }
         db_opts[:experimental_features] = config[:experimental_features] if config[:experimental_features]
-        @db = ::Turso::Database.new(config[:database].to_s, **db_opts)
-      end
-
-      def last_insert_rowid
-        query("SELECT last_insert_rowid()").first&.to_a&.first.to_i
+        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
 
       def raw_connection
@@ -48,107 +48,11 @@ module Turso
       end
 
       def execute_batch(sql)
-        split_batch(sql).each do |stmt|
-          @db.execute(stmt)
-        end
-      end
-
-      def prepare(sql)
-        @db.prepare(sql)
-      end
-
-      def busy_timeout=(ms)
-        @db.busy_timeout = ms.to_i
-      end
-
-      def interrupt
-        @db.interrupt
+        @db.execute_batch(sql)
       end
 
       private
 
-      def split_batch(sql)
-        statements = []
-        current = +""
-        in_string = false
-        in_line_comment = false
-        in_block_comment = false
-        i = 0
-        while i < sql.length
-          char = sql[i]
-          next_char = sql[i + 1]
-
-          if in_line_comment
-            if char == "\n"
-              in_line_comment = false
-            end
-            i += 1
-            next
-          end
-
-          if in_block_comment
-            if char == "*" && next_char == "/"
-              in_block_comment = false
-              i += 2
-            else
-              i += 1
-            end
-            next
-          end
-
-          if in_string
-            if char == "'" && next_char == "'"
-              current << char << next_char
-              i += 2
-              next
-            elsif char == "'"
-              in_string = false
-              current << char
-              i += 1
-              next
-            end
-            current << char
-            i += 1
-            next
-          end
-
-          case char
-          when "'"
-            in_string = true
-            current << char
-          when "-"
-            if next_char == "-"
-              in_line_comment = true
-              i += 2
-              next
-            end
-            current << char
-          when "#"
-            in_line_comment = true
-            i += 1
-            next
-          when "/"
-            if next_char == "*"
-              in_block_comment = true
-              i += 2
-              next
-            end
-            current << char
-          when ";"
-            stmt = current.strip
-            statements << stmt unless stmt.empty?
-            current = +""
-          else
-            current << char
-          end
-          i += 1
-        end
-
-        stmt = current.strip
-        statements << stmt unless stmt.empty?
-        statements
-      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.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ben D'Angelo
@@ -13,22 +13,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '8.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: 8.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '8.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: 8.1.0
 - !ruby/object:Gem::Dependency
   name: turso
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +64,7 @@ files:
 - lib/active_record/connection_adapters/turso_adapter/statement_pool.rb
 - lib/active_record/connection_adapters/turso_adapter/transaction_management.rb
 - lib/activerecord-turso.rb
+- lib/activerecord-turso/error.rb
 - lib/activerecord-turso/version.rb
 - lib/turso/ar/connection.rb
 licenses: