activerecord-enhancedsqlite3-adapter 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0d679b0ee45b0838fc294f50e43b806301fba662e54f280b3d0e747de3e7670
-  data.tar.gz: 5b345ff772a3cba527a4fe638724bb372f488bc8ec3ceb4d3e8b76ee40b2f434
+  metadata.gz: 822503d22973552ab533017c76ee5e40c8687e2283c2b97f17013967a4d981ee
+  data.tar.gz: 99b0f6b59a9e3b5fb49624a0d9258056d0027c34c7cfe430d58fda8af601fa13
 SHA512:
-  metadata.gz: 47288376cd918173cce7edf28fc2a8cbb8a86c749aa44aaf88e4b2f81fc922b3b5369e579abb8e9bab7585f7c8b2ae732c3f6a8601117e935a61effcf7d86276
-  data.tar.gz: 22ae8604263b8a75379a0f9c132d60cf4616d6695665742b4a6a358f24f0fa4daf1b5b1708ecf5599617293bc4a8fc76db89fbd204deaa70b430233db2f6891a
+  metadata.gz: e7c2b49a47f755752a71b7aa7c0e5dbeadb1fd64473c4bf56ff93f104d2c6a5f86ee1273b7f57fb20fcb3e0fdc380662f97c8f462b9a7096c2a7f57f25826141
+  data.tar.gz: b93e48d2dd251aa60495afac78364c2cbb2552d52fa8ca16bb2868468b4b0c10c1807a4ebd571a458cebb48330e96b471a955859ab5af96a04203a46e4e96718

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.8.0] - 2024-05-05
+
+- Load `sqlpkg` extensions if listed and present ([@fractaledmind](https://github.com/fractaledmind/activerecord-enhancedsqlite3-adapter/pull/17))
+
+## [0.7.0] - 2024-04-29
+
+- Loosen the `sqlite3` dependency to allow for `>= 1.4.0` (including 2.x) ([@fractaledmind](https://github.com/fractaledmind/activerecord-enhancedsqlite3-adapter/pull/15))
+
 ## [0.6.0] - 2024-04-10
 
 - Use the same busy_handler function as will be in the sqlite3-ruby gem ([@fractaledmind](https://github.com/fractaledmind/activerecord-enhancedsqlite3-adapter/pull/11))

data/lib/enhanced_sqlite3/adapter.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 # supports concatenation in default functions: https://github.com/rails/rails/pull/49287
-# supports insert returning values: https://github.com/rails/rails/pull/49290
 # supports configuring busy_handler: https://github.com/rails/rails/pull/49352
 
 require "active_record/connection_adapters/sqlite3_adapter"
 require "enhanced_sqlite3/supports_virtual_columns"
 require "enhanced_sqlite3/supports_deferrable_constraints"
+require "enhanced_sqlite3/supports_insert_returning"
 
 module EnhancedSQLite3
   module Adapter
@@ -48,6 +48,7 @@ module EnhancedSQLite3
 
       EnhancedSQLite3::SupportsVirtualColumns.apply! unless try(:supports_virtual_columns?)
       EnhancedSQLite3::SupportsDeferrableConstraints.apply! unless try(:supports_deferrable_constraints?)
+      EnhancedSQLite3::SupportsInsertReturning.apply! unless try(:supports_insert_returning?)
     end
 
     # Patch the #transaction method to ensure that all transactions are sent to the writing role database connection pool.
@@ -72,22 +73,17 @@ module EnhancedSQLite3
     def configure_busy_handler_timeout
       return unless @config.key?(:timeout)
 
-      timeout = self.class.type_cast_config_to_integer(@config[:timeout])
-      timeout_seconds = timeout.fdiv(1000)
-      retry_interval = 6e-5 # 60 microseconds
+      timeout_milliseconds = self.class.type_cast_config_to_integer(@config[:timeout])
+      timeout_seconds = timeout_milliseconds.fdiv(1000)
 
       @raw_connection.busy_handler do |count|
-        timed_out = false
-        # keep track of elapsed time every 100 iterations (to lower load)
-        if (count % 100).zero?
-          # fail if we exceed the timeout value (captured from the timeout config option, converted to seconds)
-          timed_out = (count * retry_interval) > timeout_seconds
-        end
-        if timed_out
-          false # this will cause the BusyException to be raised
+        now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        if count.zero?
+          @timeout_deadline = now + timeout_seconds
+        elsif now > @timeout_deadline
+          next false
         else
-          sleep(retry_interval)
-          true
+          sleep(0.001)
         end
       end
     end
@@ -130,11 +126,21 @@ module EnhancedSQLite3
     def configure_extensions
       @raw_connection.enable_load_extension(true)
       @config.fetch(:extensions, []).each do |extension_name|
-        require extension_name
-        extension_classname = extension_name.camelize
-        extension_class = extension_classname.constantize
-        extension_class.load(@raw_connection)
+        if extension_name.include?("/")
+          raise LoadError unless Dir.exist?(".sqlpkg/#{extension_name}")
+          Dir.glob(".sqlpkg/#{extension_name}/*.{dll,so,dylib}") do |extension_path|
+            @raw_connection.load_extension(extension_path)
+          end
+        else
+          require extension_name
+          extension_classname = extension_name.camelize
+          extension_class = extension_classname.constantize
+          extension_class.load(@raw_connection)
+        end
       rescue LoadError
+        Dir.glob(".sqlpkg/**/*.{dll,so,dylib}") do |extension_path|
+          @raw_connection.load_extension(extension_path)
+        end
         Rails.logger.error("Failed to find the SQLite extension gem: #{extension_name}. Skipping...")
       rescue NameError
         Rails.logger.error("Failed to find the SQLite extension class: #{extension_classname}. Skipping...")

data/lib/enhanced_sqlite3/railtie.rb

@@ -40,7 +40,7 @@ module EnhancedSQLite3
           )
 
           # Replace the single production configuration with two separate reader and writer configurations
-          self.configurations = remaining_configs + [reader, writer]
+          self.configurations = remaining_configs + [writer, reader]
         else
           reader = env_configs.find { |config| config.name == "reader" }
           writer = env_configs.find { |config| config.name == "writer" }

data/lib/enhanced_sqlite3/supports_insert_returning.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+# see: https://github.com/rails/rails/pull/49290
+module EnhancedSQLite3
+  module SupportsInsertReturning
+    def self.apply!
+      EnhancedSQLite3::Adapter.include(Adapter)
+      ActiveRecord::ConnectionAdapters::SQLite3::DatabaseStatements.include(DatabaseStatements)
+    end
+
+    module Adapter
+      def supports_insert_returning?
+        database_version >= "3.35.0"
+      end
+
+      def return_value_after_insert?(column) # :nodoc:
+        column.auto_populated?
+      end
+
+      def use_insert_returning?
+        @use_insert_returning ||= @config.key?(:insert_returning) ? self.class.type_cast_config_to_boolean(@config[:insert_returning]) : true
+      end
+
+      def build_insert_sql(insert) # :nodoc:
+        sql = super(insert)
+        sql << " RETURNING #{insert.returning}" if insert.returning
+        sql
+      end
+    end
+
+    module DatabaseStatements
+      def sql_for_insert(sql, pk, binds, returning) # :nodoc:
+        if supports_insert_returning?
+          if pk.nil?
+            # Extract the table from the insert sql. Yuck.
+            table_ref = extract_table_ref_from_insert_sql(sql)
+            pk = primary_key(table_ref) if table_ref
+          end
+
+          returning_columns = returning || Array(pk)
+
+          returning_columns_statement = returning_columns.map { |c| quote_column_name(c) }.join(", ")
+          sql = "#{sql} RETURNING #{returning_columns_statement}" if returning_columns.any?
+        end
+
+        [sql, binds]
+      end
+
+      def extract_table_ref_from_insert_sql(sql)
+        if sql =~ /into\s("[A-Za-z0-9_."\[\]\s]+"|[A-Za-z0-9_."\[\]]+)\s*/im
+          $1.strip
+        end
+      end
+    end
+  end
+end

data/lib/enhanced_sqlite3/version.rb

@@ -1,3 +1,3 @@
 module EnhancedSQLite3
-  VERSION = "0.6.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-enhancedsqlite3-adapter
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Stephen Margheim
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-10 00:00:00.000000000 Z
+date: 2024-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -28,14 +28,14 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
@@ -113,6 +113,7 @@ files:
 - lib/enhanced_sqlite3/railtie.rb
 - lib/enhanced_sqlite3/resolver.rb
 - lib/enhanced_sqlite3/supports_deferrable_constraints.rb
+- lib/enhanced_sqlite3/supports_insert_returning.rb
 - lib/enhanced_sqlite3/supports_virtual_columns.rb
 - lib/enhanced_sqlite3/version.rb
 homepage: https://github.com/fractaledmind/activerecord-enhancedsqlite3-adapter