turso 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0f137216982382d730f16f60d4d54b154fd86948c1a062d44e287d27c395a79
-  data.tar.gz: da3364aa4a00bb7e18383dc19e3d75d012e5f4c1f6657f65832fff9d1bd4859f
+  metadata.gz: 84d6e0b4a1a771d9076be22e4376a5ee2b411df4c38f4a8e648e36f0ea842a18
+  data.tar.gz: 5d23d15b3f15f21341a84aaa023b273c0241da38e10edf736a675a73a5878328
 SHA512:
-  metadata.gz: 6ad3d918170633203bacb29ca479b53dece61e2ea44832a79a411ef2931f0ad8230495af20a8b9e64f7def2672dcf7360dc92e0dd0a652ff2c627f9c52e55b9a
-  data.tar.gz: 764bf603e8b367abf6598af2b987ccb357414bcef242a899c1226bf9484a044a6cb57f81606910fafac000cd5793dbb26c04b1de4066c19a4405bc3e6bb5280c
+  metadata.gz: 0ee347f73af6248f112c8cafe24bfce4741931a26138bcd17dea95ffc8488c1eb5116fedcf467ecd67e11f39244dafe767e741f231a98fc1fb09ff3516415d21
+  data.tar.gz: fbd0036b2131b80c98352acd288673c617289048c01f0c58f7c67c78638ee72cd00ef17e500b19424fb65256ee874d966d9f1005bdd081801a5e57315ae3e01a

data/lib/turso/connection.rb

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+module Turso
+  class Connection
+    def initialize(native_connection)
+      @native = native_connection
+      @closed = false
+      @owner = owner_token
+    end
+
+    def closed?
+      @closed
+    end
+
+    def close
+      return if closed?
+      @native.close
+      @closed = true
+    end
+
+    def prepare(sql)
+      check_owner!
+      Statement.new(@native.prepare(sql), self)
+    end
+
+    def execute(sql, *bind_args)
+      stmt = prepare(sql)
+      begin
+        stmt.bind(*bind_args) unless bind_args.empty?
+        stmt.run
+      ensure
+        stmt.close
+      end
+    end
+
+    def execute_batch(sql)
+      check_owner!
+      @native.execute_batch(sql)
+    end
+
+    def query(sql, *bind_args)
+      stmt = prepare(sql)
+      stmt.bind(*bind_args) unless bind_args.empty?
+      ResultSet.new(stmt)
+    end
+
+    def get_first_row(sql, *bind_args)
+      stmt = prepare(sql)
+      begin
+        stmt.bind(*bind_args) unless bind_args.empty?
+        stmt.get
+      ensure
+        stmt.close
+      end
+    end
+
+    def get_first_value(sql, *bind_args)
+      row = get_first_row(sql, *bind_args)
+      row&.first
+    end
+
+    def busy_timeout=(ms)
+      check_owner!
+      @native.busy_timeout = ms.to_i
+    end
+
+    def query_timeout=(ms)
+      check_owner!
+      @native.query_timeout = ms.to_i
+    end
+
+    def query_timeout
+      check_owner!
+      @native.query_timeout
+    end
+
+    def interrupt
+      check_owner!
+      @native.interrupt
+    end
+
+    def total_changes
+      check_owner!
+      @native.total_changes
+    end
+
+    def changes
+      check_owner!
+      @native.changes
+    end
+
+    def last_insert_rowid
+      check_owner!
+      @native.last_insert_rowid
+    end
+
+    def savepoint(name)
+      execute("SAVEPOINT #{name}")
+    end
+
+    def release_savepoint(name)
+      execute("RELEASE SAVEPOINT #{name}")
+    end
+
+    def rollback_to_savepoint(name)
+      execute("ROLLBACK TO SAVEPOINT #{name}")
+    end
+
+    private
+
+    def owner_token
+      [Thread.current.object_id, Fiber.current.object_id]
+    end
+
+    def check_owner!
+      unless owner_token == @owner
+        raise Turso::Exception, "connection is already in use by another thread or fiber"
+      end
+    end
+  end
+end

data/lib/turso/database.rb

@@ -1,7 +1,16 @@
 # frozen_string_literal: true
 
+require "forwardable"
+
 module Turso
   class Database
+    extend Forwardable
+
+    def_delegators :connection, :prepare, :execute, :execute_batch, :query,
+                   :get_first_row, :get_first_value, :busy_timeout, :busy_timeout=,
+                   :query_timeout, :query_timeout=, :interrupt, :total_changes,
+                   :changes, :last_insert_rowid
+
     def initialize(path = ":memory:", **options)
       options[:experimental_features] = normalize_experimental_features(options[:experimental_features])
       @native = NativeDatabase.new(path, options)
@@ -28,45 +37,8 @@ module Turso
       @closed = true
     end
 
-    def prepare(sql)
-      raise Turso::Exception, "database is closed" if closed?
-      Statement.new(@native.connection.prepare(sql), @native.connection)
-    end
-
-    def execute(sql, *bind_args)
-      stmt = prepare(sql)
-      begin
-        stmt.bind(*bind_args) unless bind_args.empty?
-        stmt.run
-      ensure
-        stmt.close
-      end
-    end
-
-    def execute_batch(sql)
-      raise Turso::Exception, "database is closed" if closed?
-      @native.connection.execute_batch(sql)
-    end
-
-    def query(sql, *bind_args)
-      stmt = prepare(sql)
-      stmt.bind(*bind_args) unless bind_args.empty?
-      ResultSet.new(stmt)
-    end
-
-    def get_first_row(sql, *bind_args)
-      stmt = prepare(sql)
-      begin
-        stmt.bind(*bind_args) unless bind_args.empty?
-        stmt.get
-      ensure
-        stmt.close
-      end
-    end
-
-    def get_first_value(sql, *bind_args)
-      row = get_first_row(sql, *bind_args)
-      row&.first
+    def connection
+      Connection.new(@native.connection)
     end
 
     def transaction(mode = :deferred)
@@ -81,29 +53,5 @@ module Turso
         raise
       end
     end
-
-    def busy_timeout=(ms)
-      @native.connection.busy_timeout = ms
-    end
-
-    def busy_timeout
-      @native.connection.busy_timeout
-    end
-
-    def total_changes
-      @native.total_changes
-    end
-
-    def changes
-      @native.connection.changes
-    end
-
-    def last_insert_rowid
-      @native.last_insert_rowid
-    end
-
-    def interrupt
-      @native.connection.interrupt
-    end
   end
 end

data/lib/turso/statement.rb

@@ -5,7 +5,7 @@ module Turso
     def initialize(native_statement, native_database)
       @native = native_statement
       @database = native_database
-      @owner = Thread.current
+      @owner = owner_token
     end
 
     def bind(*args)
@@ -79,9 +79,13 @@ module Turso
 
     private
 
+    def owner_token
+      [Thread.current.object_id, Fiber.current.object_id]
+    end
+
     def check_owner!
-      unless Thread.current.equal?(@owner)
-        raise Turso::Exception, "statement is already in use by another thread"
+      unless owner_token == @owner
+        raise Turso::Exception, "statement is already in use by another thread or fiber"
       end
     end
 

data/lib/turso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Turso
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/turso.rb

@@ -5,6 +5,7 @@ require "turso/turso_ruby"
 require_relative "turso/row"
 require_relative "turso/result_set"
 require_relative "turso/statement"
+require_relative "turso/connection"
 require_relative "turso/database"
 require_relative "turso/transaction"
 require_relative "turso/version"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turso
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Turso Team
@@ -47,6 +47,7 @@ files:
 - ext/turso_ruby/Cargo.toml
 - ext/turso_ruby/extconf.rb
 - lib/turso.rb
+- lib/turso/connection.rb
 - lib/turso/database.rb
 - lib/turso/result_set.rb
 - lib/turso/row.rb