Merge branch 'main' into dependabot/bundler/bundler-ef8ef157fc

.github/workflows/ci.yml

@@ -37,10 +37,10 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - run: |
-          mysql -e "CREATE USER 'replica'@'%' IDENTIFIED WITH mysql_native_password BY 'replica_password';" -u root -p${{ env.MYSQL_PASSWORD || 'password' }} -h 127.0.0.1
+          mysql -e "CREATE USER 'replica'@'%' IDENTIFIED BY 'replica_password';" -u root -p${{ env.MYSQL_PASSWORD || 'password' }} -h 127.0.0.1
           mysql -e "GRANT SELECT ON test.* TO 'replica'@'%'" -u root -p${{ env.MYSQL_PASSWORD || 'password' }} -h 127.0.0.1
 
-          mysql -e "CREATE USER 'primary'@'%' IDENTIFIED WITH mysql_native_password BY 'primary_password';" -u root -p${{ env.MYSQL_PASSWORD || 'password' }} -h 127.0.0.1
+          mysql -e "CREATE USER 'primary'@'%' IDENTIFIED BY 'primary_password';" -u root -p${{ env.MYSQL_PASSWORD || 'password' }} -h 127.0.0.1
           mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'primary'@'%';" -u root -p${{ env.MYSQL_PASSWORD || 'password' }} -h 127.0.0.1
           mysql -e "FLUSH PRIVILEGES;" -u root -p${{ env.MYSQL_PASSWORD || 'password' }} -h 127.0.0.1
       - run: |

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    janus-ar (0.15.1)
+    janus-ar (0.15.2)
 
 GEM
   remote: http://rubygems.org/

Rakefile

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'

spec/lib/active_record/connection_adapters/janus_mysql_adapter_spec.rb

@@ -11,6 +11,9 @@
       'username' => 'primary',
       'password' => 'primary_password',
       'host' => '127.0.0.1',
+      'ssl' => true,
+      'ssl_mode' => 'REQUIRED',
+      'tls_min_version' => 3,
     }
   end
   let(:replica_config) do
@@ -19,6 +22,9 @@
       'password' => 'replica_password',
       'host' => '127.0.0.1',
       'pool' => 500,
+      'ssl' => true,
+      'ssl_mode' => 'REQUIRED',
+      'tls_min_version' => 3,
     }
   end
   let(:config) do