Merge branch 'main' into handle-missing-semaphore

.github/workflows/analysis.yml

@@ -4,9 +4,9 @@ name: Analysis
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
   schedule:
     - cron: 13 7 * * 6
 
@@ -24,7 +24,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         uses: ruby/setup-ruby@v1
         with:

.github/workflows/dependencies.yml

@@ -19,10 +19,10 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-ruby-3.1-gems-${{ hashFiles('Gemfile.lock') }}

.github/workflows/test.yml

@@ -4,9 +4,9 @@ name: Test
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 concurrency:
   group: ${{ github.ref }}-test
@@ -58,10 +58,10 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-ruby-${{ matrix.ruby }}-gems-${{ hashFiles( format('{0}.lock', env.BUNDLE_GEMFILE) ) }}
@@ -164,10 +164,10 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-ruby-${{ matrix.ruby }}-adapter-${{ matrix.gemfile }}-gems-${{ hashFiles( format('{0}.lock', env.BUNDLE_GEMFILE) ) }}

.rubocop.yml

@@ -12,6 +12,8 @@ inherit_gem:
 AllCops:
   TargetRubyVersion: 2.7
   NewCops: enable
+  Exclude:
+    - test/allow_list_bench.rb
 
 Layout/LineLength:
   Exclude:
@@ -52,3 +54,6 @@ Style/SingleLineMethods:
 
 Style/SpecialGlobalVars:
   Enabled: false
+
+Minitest/AssertInDelta:
+  Enabled: false

CHANGELOG.md

@@ -1,7 +1,31 @@
 # Unreleased
 
+# v0.21.3
+
+* Fix: Trilogy ActiveRecord adapter to be compatible with latest Rails edge.
+
+# v0.21.2
+* Change: Trilogy ActiveRecord adapter will not bypass "SAVEPOINT RELEASE" unless it uses the ActiveRecord default name and only 2 levels of nesting
+* Change: The bypass for COMMIT/ROLLBACK statements assumes current ActiveRecord behaviour, that is no blank spaces or ";" chracter at the end of the statement
+
+# v0.21.1
+
+* Fix valid_raw_connection check
+
+# v0.21.0
+
+* Fixed compatibility with redis-rb 5.0.7+
+
+# v0.20.1
+
+* More efficient activerecord_trilogy_adapter and mysql2_adapter regex. (#508, #510)
+
+# v0.20.0
+
 * Ensure Active Record Trilogy adapter handles AdapterTimeout and ConnectionFailed exceptions. (#497)
 * Allow passing --with-openssl-dir for a custom OpenSSL installation. (#499)
+* Use ActiveRecord::ConnectionNotEstablished as base error for TrilogyAdapter. (#496)
+* Fix Mysql2 connection error regular expressions. (#506)
 
 # v0.19.1
 

Gemfile

@@ -7,6 +7,7 @@ gem "rake-compiler"
 
 group :test do
   gem "benchmark-memory"
+  gem "benchmark-ips"
   gem "memory_profiler"
   gem "minitest"
   gem "mocha"
@@ -15,7 +16,7 @@ group :test do
   gem "webrick"
 
   # The last stable version for MacOS ARM darwin
-  gem "grpc", "1.47.0"
+  gem "grpc", "1.60.0"
   gem "mysql2", "~> 0.5"
   gem "trilogy", "~> 2.4"
   gem "activerecord", github: "rails/rails", branch: "main"

RELEASE.md

@@ -10,15 +10,15 @@ Ensure your local workstation is configured to be able to
 ### Checkout latest code
 
 ```shell
-$ git checkout master
-$ git pull origin master
+$ git checkout main
+$ git pull origin main
 ```
 
 ### Bump version
 
 Update version in [`lib/semian/version.rb`](./lib/semian/version.rb).
 Check if there is required changes in [`README.md`](./README.md).
-Add line after `## [Unreleased]` in [`CHANGELOG.md`][./CHANGELOG.md] with new version.
+Add line after `## [Unreleased]` in [`CHANGELOG.md`](./CHANGELOG.md) with new version.
 
 ### Run Tests
 
@@ -28,7 +28,7 @@ Check [`README.md`](./README.md).
 ### Create Release Commit and Tag
 
 Commit changes and create a tag. Make sure commit and tag are signed.
-Extract related content from [`CHANGELOG.md`][./CHANGELOG.md] for a tag message.
+Extract related content from [`CHANGELOG.md`](./CHANGELOG.md) for a tag message.
 
 ```shell
 $ bundle install
@@ -42,7 +42,7 @@ $ git tag -s "v$RELEASE_VERSION"
 On your local machine again, push your commit and tag
 
 ```shell
-$ git push origin master --follow-tags
+$ git push origin main --follow-tags
 ```
 
 ## Verify rubygems release

Rakefile

@@ -151,15 +151,15 @@ task :flamegraph do
   flamegraph_parse_command = "flamegraph.pl --countname=ms --width=1400"
 
   %x(ruby #{script} | #{flamegraph_parse_command} > without_semian.svg)
-  ["v0.15.0", "v0.16.0", "v0.17.0", "master"].each do |ver|
+  ["v0.15.0", "v0.16.0", "v0.17.0", "main"].each do |ver|
     %x(WITH_CIRCUIT_BREAKER_ENABLED=1 SEMIAN_VERSION=#{ver} ruby #{script} \
         | #{flamegraph_parse_command} > semian_#{ver}_enabled.svg)
   end
 end
 
 desc "Run benchmarks for specific versions"
 task :benchmark do
-  ["v0.15.0", "v0.16.0", "v0.17.0", "master"].each do |ver|
+  ["v0.15.0", "v0.16.0", "v0.17.0", "main"].each do |ver|
     ruby "scripts/benchmarks/net_http_acquire_benchmarker.rb SEMIAN_VERSION=#{ver}"
     ruby "scripts/benchmarks/lru_benchmarker.rb SEMIAN_VERSION=#{ver}"
   end