Skip to content

Commit 8aa8832

Browse files
committed
Fix activerecord integration with latest versions.
1 parent 6047e66 commit 8aa8832

File tree

10 files changed

+17
-13
lines changed

10 files changed

+17
-13
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
ruby: ["3.0", "3.1", "3.2"]
22+
ruby: ["3.2", "3.3"]
2323
gemfile:
2424
- Gemfile
2525

.rubocop.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ inherit_gem:
44

55
AllCops:
66
NewCops: enable
7-
TargetRubyVersion: 3.0
7+
TargetRubyVersion: 3.2
88

99
Metrics/MethodLength:
1010
Enabled: false
@@ -15,3 +15,6 @@ Metrics/AbcSize:
1515
Style/OpenStructUse:
1616
Exclude:
1717
- test/**/*.rb
18+
19+
Minitest/UnspecifiedException:
20+
Enabled: false

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# SQLRunner
22

3+
[![ruby-tests](https://github.com/fnando/sql_runner/actions/workflows/test.yml/badge.svg)](https://github.com/fnando/sql_runner/actions/workflows/test.yml)
34
[![Gem](https://img.shields.io/gem/v/sql_runner.svg)](https://rubygems.org/gems/sql_runner)
45
[![Gem](https://img.shields.io/gem/dt/sql_runner.svg)](https://rubygems.org/gems/sql_runner)
56

lib/sql_runner/adapters/active_record.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def disconnect(*)
4242
class ConnectionPool
4343
def with
4444
::ActiveRecord::Base.connection_pool.with_connection do |connection|
45-
connection = connection.instance_variable_get(:@connection)
45+
connection = connection.raw_connection
4646

4747
adapter = case connection.class.name
4848
when "PG::Connection"

lib/sql_runner/adapters/mysql.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def self.load
1212
end
1313

1414
def self.create_connection_pool(timeout:, size:, connection_string:)
15-
ConnectionPool.new(timeout: timeout, size: size) do
15+
ConnectionPool.new(timeout:, size:) do
1616
new(connection_string)
1717
end
1818
end

lib/sql_runner/adapters/postgresql.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def self.load
1212
end
1313

1414
def self.create_connection_pool(timeout:, size:, connection_string:)
15-
ConnectionPool.new(timeout: timeout, size: size) do
15+
ConnectionPool.new(timeout:, size:) do
1616
new(connection_string)
1717
end
1818
end

lib/sql_runner/adapters/sqlite.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def self.load
1212
end
1313

1414
def self.create_connection_pool(timeout:, size:, connection_string:)
15-
ConnectionPool.new(timeout: timeout, size: size) do
15+
ConnectionPool.new(timeout:, size:) do
1616
new(connection_string)
1717
end
1818
end

lib/sql_runner/connection.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ def self.call(connection_string)
99
adapter.create_connection_pool(
1010
timeout: SQLRunner.timeout,
1111
size: SQLRunner.pool,
12-
connection_string: connection_string
12+
connection_string:
1313
)
1414
end
1515

16-
def with_connection(&block)
17-
connection_pool.with(&block)
16+
def with_connection(&)
17+
connection_pool.with(&)
1818
end
1919

2020
def connect(connection_string)

sql_runner.gemspec

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
77
spec.version = SQLRunner::VERSION
88
spec.authors = ["Nando Vieira"]
99
spec.email = ["me@fnando.com"]
10-
spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
10+
spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
1111
spec.metadata = {"rubygems_mfa_required" => "true"}
1212

1313
spec.summary = <<~TEXT.tr("\n", " ")
@@ -34,10 +34,9 @@ Gem::Specification.new do |spec|
3434
spec.add_development_dependency "mocha"
3535
spec.add_development_dependency "mysql2"
3636
spec.add_development_dependency "pg"
37-
spec.add_development_dependency "pry-meta"
3837
spec.add_development_dependency "rake"
3938
spec.add_development_dependency "rubocop"
4039
spec.add_development_dependency "rubocop-fnando"
4140
spec.add_development_dependency "simplecov"
42-
spec.add_development_dependency "sqlite3"
41+
spec.add_development_dependency "sqlite3", "~> 1.7"
4342
end

test/support/assert_adapter_test.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def assert_adapter(options)
2222

2323
tests = options[:tests] || DEFAULT_TESTS
2424
tests.each do |test|
25-
send("#{test}_tests", options)
25+
send(:"#{test}_tests", options)
2626
end
2727
end
2828

@@ -218,6 +218,7 @@ def connection_tests(options)
218218

219219
test "returns database connection" do
220220
options[:setup].call(options)
221+
221222
SQLRunner.with_connection do |conn|
222223
assert conn.active?
223224
end

0 commit comments

Comments
 (0)