activerecord-enhancedsqlite3-adapter 0.6.0 → 0.7.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/lib/enhanced_sqlite3/adapter.rb +10 -14
- data/lib/enhanced_sqlite3/railtie.rb +1 -1
- data/lib/enhanced_sqlite3/supports_insert_returning.rb +56 -0
- data/lib/enhanced_sqlite3/version.rb +1 -1
- metadata +5 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 97af786ab4b105a44e48a8501611f13b6a090545b1fa5516138aaebd4a2c203f
|
4
|
+
data.tar.gz: 0f8eec83e65a55ee39a043d5a0d23861dbebd8d2fee1ee554ecc9ca6cf836fb9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 04f39dc81145d1f2a2e39cb41c562675f1bdcbf036291f885d5cfe75203c4a1e36b2575c2cf8762a07c184f7d3ada02fec6403eb0284c4ec82c900b80fd362c5
|
7
|
+
data.tar.gz: 5d7a13c12e202fa5bd5e4da274271194cd7fb770510bb235dc85ede7ead91893c3615c4e8b424073c1416931003bba42c06afc93d0ce3e96353bfa6a6bb7bf89
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,9 @@
|
|
1
1
|
## [Unreleased]
|
2
2
|
|
3
|
+
## [0.7.0] - 2024-04-29
|
4
|
+
|
5
|
+
- Loosen the `sqlite3` dependency to allow for `>= 1.4.0` (including 2.x) ([@fractaledmind](https://github.com/fractaledmind/activerecord-enhancedsqlite3-adapter/pull/15))
|
6
|
+
|
3
7
|
## [0.6.0] - 2024-04-10
|
4
8
|
|
5
9
|
- Use the same busy_handler function as will be in the sqlite3-ruby gem ([@fractaledmind](https://github.com/fractaledmind/activerecord-enhancedsqlite3-adapter/pull/11))
|
@@ -1,12 +1,12 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
# supports concatenation in default functions: https://github.com/rails/rails/pull/49287
|
4
|
-
# supports insert returning values: https://github.com/rails/rails/pull/49290
|
5
4
|
# supports configuring busy_handler: https://github.com/rails/rails/pull/49352
|
6
5
|
|
7
6
|
require "active_record/connection_adapters/sqlite3_adapter"
|
8
7
|
require "enhanced_sqlite3/supports_virtual_columns"
|
9
8
|
require "enhanced_sqlite3/supports_deferrable_constraints"
|
9
|
+
require "enhanced_sqlite3/supports_insert_returning"
|
10
10
|
|
11
11
|
module EnhancedSQLite3
|
12
12
|
module Adapter
|
@@ -48,6 +48,7 @@ module EnhancedSQLite3
|
|
48
48
|
|
49
49
|
EnhancedSQLite3::SupportsVirtualColumns.apply! unless try(:supports_virtual_columns?)
|
50
50
|
EnhancedSQLite3::SupportsDeferrableConstraints.apply! unless try(:supports_deferrable_constraints?)
|
51
|
+
EnhancedSQLite3::SupportsInsertReturning.apply! unless try(:supports_insert_returning?)
|
51
52
|
end
|
52
53
|
|
53
54
|
# Patch the #transaction method to ensure that all transactions are sent to the writing role database connection pool.
|
@@ -72,22 +73,17 @@ module EnhancedSQLite3
|
|
72
73
|
def configure_busy_handler_timeout
|
73
74
|
return unless @config.key?(:timeout)
|
74
75
|
|
75
|
-
|
76
|
-
timeout_seconds =
|
77
|
-
retry_interval = 6e-5 # 60 microseconds
|
76
|
+
timeout_milliseconds = self.class.type_cast_config_to_integer(@config[:timeout])
|
77
|
+
timeout_seconds = timeout_milliseconds.fdiv(1000)
|
78
78
|
|
79
79
|
@raw_connection.busy_handler do |count|
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
end
|
86
|
-
if timed_out
|
87
|
-
false # this will cause the BusyException to be raised
|
80
|
+
now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
|
81
|
+
if count.zero?
|
82
|
+
@timeout_deadline = now + timeout_seconds
|
83
|
+
elsif now > @timeout_deadline
|
84
|
+
next false
|
88
85
|
else
|
89
|
-
sleep(
|
90
|
-
true
|
86
|
+
sleep(0.001)
|
91
87
|
end
|
92
88
|
end
|
93
89
|
end
|
@@ -40,7 +40,7 @@ module EnhancedSQLite3
|
|
40
40
|
)
|
41
41
|
|
42
42
|
# Replace the single production configuration with two separate reader and writer configurations
|
43
|
-
self.configurations = remaining_configs + [
|
43
|
+
self.configurations = remaining_configs + [writer, reader]
|
44
44
|
else
|
45
45
|
reader = env_configs.find { |config| config.name == "reader" }
|
46
46
|
writer = env_configs.find { |config| config.name == "writer" }
|
@@ -0,0 +1,56 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# see: https://github.com/rails/rails/pull/49290
|
4
|
+
module EnhancedSQLite3
|
5
|
+
module SupportsInsertReturning
|
6
|
+
def self.apply!
|
7
|
+
EnhancedSQLite3::Adapter.include(Adapter)
|
8
|
+
ActiveRecord::ConnectionAdapters::SQLite3::DatabaseStatements.include(DatabaseStatements)
|
9
|
+
end
|
10
|
+
|
11
|
+
module Adapter
|
12
|
+
def supports_insert_returning?
|
13
|
+
database_version >= "3.35.0"
|
14
|
+
end
|
15
|
+
|
16
|
+
def return_value_after_insert?(column) # :nodoc:
|
17
|
+
column.auto_populated?
|
18
|
+
end
|
19
|
+
|
20
|
+
def use_insert_returning?
|
21
|
+
@use_insert_returning ||= @config.key?(:insert_returning) ? self.class.type_cast_config_to_boolean(@config[:insert_returning]) : true
|
22
|
+
end
|
23
|
+
|
24
|
+
def build_insert_sql(insert) # :nodoc:
|
25
|
+
sql = super(insert)
|
26
|
+
sql << " RETURNING #{insert.returning}" if insert.returning
|
27
|
+
sql
|
28
|
+
end
|
29
|
+
end
|
30
|
+
|
31
|
+
module DatabaseStatements
|
32
|
+
def sql_for_insert(sql, pk, binds, returning) # :nodoc:
|
33
|
+
if supports_insert_returning?
|
34
|
+
if pk.nil?
|
35
|
+
# Extract the table from the insert sql. Yuck.
|
36
|
+
table_ref = extract_table_ref_from_insert_sql(sql)
|
37
|
+
pk = primary_key(table_ref) if table_ref
|
38
|
+
end
|
39
|
+
|
40
|
+
returning_columns = returning || Array(pk)
|
41
|
+
|
42
|
+
returning_columns_statement = returning_columns.map { |c| quote_column_name(c) }.join(", ")
|
43
|
+
sql = "#{sql} RETURNING #{returning_columns_statement}" if returning_columns.any?
|
44
|
+
end
|
45
|
+
|
46
|
+
[sql, binds]
|
47
|
+
end
|
48
|
+
|
49
|
+
def extract_table_ref_from_insert_sql(sql)
|
50
|
+
if sql =~ /into\s("[A-Za-z0-9_."\[\]\s]+"|[A-Za-z0-9_."\[\]]+)\s*/im
|
51
|
+
$1.strip
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
56
|
+
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: activerecord-enhancedsqlite3-adapter
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.7.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Stephen Margheim
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2024-04-
|
11
|
+
date: 2024-04-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activerecord
|
@@ -28,14 +28,14 @@ dependencies:
|
|
28
28
|
name: sqlite3
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- - "
|
31
|
+
- - ">="
|
32
32
|
- !ruby/object:Gem::Version
|
33
33
|
version: '1.6'
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
|
-
- - "
|
38
|
+
- - ">="
|
39
39
|
- !ruby/object:Gem::Version
|
40
40
|
version: '1.6'
|
41
41
|
- !ruby/object:Gem::Dependency
|
@@ -113,6 +113,7 @@ files:
|
|
113
113
|
- lib/enhanced_sqlite3/railtie.rb
|
114
114
|
- lib/enhanced_sqlite3/resolver.rb
|
115
115
|
- lib/enhanced_sqlite3/supports_deferrable_constraints.rb
|
116
|
+
- lib/enhanced_sqlite3/supports_insert_returning.rb
|
116
117
|
- lib/enhanced_sqlite3/supports_virtual_columns.rb
|
117
118
|
- lib/enhanced_sqlite3/version.rb
|
118
119
|
homepage: https://github.com/fractaledmind/activerecord-enhancedsqlite3-adapter
|