activerecord-trilogy-adapter 3.1.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdefae6851cc1a947548be1483c2b7caf0cfa4c212e44f6729148e21e5a72179
-  data.tar.gz: 07e1d853816ccf58b1a7cda8c45cdd79e2901b5098b46afa1d9eac7c096ff9f3
+  metadata.gz: 3f5d6b4f69f5c1f439b891dca0922cd393772f6e1776e23ac2d0b547bf17365a
+  data.tar.gz: 337d3a8f1e675d4af5f0b7601a38efa538c07feaa682ee80fce8e2cc7b8ba528
 SHA512:
-  metadata.gz: 776643f73ad3698495123ad6498d59cf02d77d0be66f1353a52e4f08c530946e6013316366fb62279b50a7b027fbce7e044b9bef87165e4acc5d454bb5c73252
-  data.tar.gz: afffb5839b51028ff2b33a34ee147bf5cce501e920273051eaf8054c73e76836b56a426198ef3762ba3749286222e38f27033d93e82f08cf45d5d066e6d36c0c
+  metadata.gz: 4e68d138d1b76e9f97e22883c2652790d39845e1be27878c5ba17eaaf27397505644620febd3694b87a8a4f0ca4b8011ed0d2127eca6cbab859d999ef8bdc414
+  data.tar.gz: a1661d07d31cf117a78abb3d3b53fb2aa9316cc9697c67c4e16cd4785a640b72a58bf01eceec53b2dd74eb26dcf7824fb6d9934407954b07606dfdbf1af9a0e0

data/README.md

@@ -4,7 +4,7 @@ Ruby on Rails Active Record database adapter for [Trilogy](https://github.com/tr
 
 This gem offers Trilogy support for versions of Active Record prior to v7.1. Currently supports:
 
-- ⚠️ Rails v7.1+ includes Trilogy support by default making this gem unnecessary
+- ⚠️ Rails v7.1+ includes Trilogy support by default making this gem unnecessary (and still do add `gem "trilogy"` to your Gemfile)
 - ✅ Rails v7.0.x
 - ✅ Rails v6.1.x
 - ✅ Rails v6.0.x

data/lib/active_record/connection_adapters/trilogy/database_statements.rb

@@ -21,21 +21,6 @@ module ActiveRecord
           ActiveRecord::Result.new(result.fields, result.to_a)
         end
 
-        def write_query?(sql) # :nodoc:
-          !READ_QUERY.match?(sql)
-        rescue ArgumentError # Invalid encoding
-          !READ_QUERY.match?(sql.b)
-        end
-
-        def explain(arel, binds = [])
-          sql     = "EXPLAIN #{to_sql(arel, binds)}"
-          start   = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-          result  = internal_exec_query(sql, "EXPLAIN", binds)
-          elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
-
-          MySQL::ExplainPrettyPrinter.new.pp(result, elapsed)
-        end
-
         def select_all(*, **) # :nodoc:
           result = super
           with_trilogy_connection do |conn|

data/lib/active_record/connection_adapters/trilogy_adapter.rb

@@ -80,7 +80,7 @@ module ActiveRecord
         def new_client(config)
           config[:ssl_mode] = parse_ssl_mode(config[:ssl_mode]) if config[:ssl_mode]
           ::Trilogy.new(config)
-        rescue ::Trilogy::ConnectionError, ::Trilogy::ProtocolError => error
+        rescue ::Trilogy::Error => error
           raise translate_connect_error(config, error)
         end
 
@@ -155,6 +155,12 @@ module ActiveRecord
       end
 
       def initialize(connection, logger, connection_options, config)
+        config = config.dup
+
+        # Trilogy ignores `socket` if `host` is set. We want the opposite to allow
+        # configuring UNIX domain sockets via `DATABASE_URL`.
+        config.delete(:host) if config[:socket]
+
         super
         # Ensure that we're treating prepared_statements in the same way that Rails 7.1 does
         @prepared_statements = self.class.type_cast_config_to_boolean(
@@ -214,6 +220,10 @@ module ActiveRecord
         end
       end
 
+      def connected?
+        !connection.nil?
+      end
+
       def active?
         return false if connection&.closed?
 
@@ -240,6 +250,10 @@ module ActiveRecord
         end
       end
 
+      def error_number(exception)
+        exception.error_code if exception.respond_to?(:error_code)
+      end
+
       def self.find_cmd_and_exec(commands, *args) # :doc:
         commands = Array(commands)
 
@@ -290,10 +304,6 @@ module ActiveRecord
           nil
         end
 
-        def error_number(exception)
-          exception.error_code if exception.respond_to?(:error_code)
-        end
-
         attr_accessor :connection
 
         def connect

data/lib/trilogy_adapter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TrilogyAdapter
-  VERSION = "3.1.2"
+  VERSION = "3.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-trilogy-adapter
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0
 platform: ruby
 authors:
 - GitHub Engineering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2025-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trilogy
@@ -100,7 +100,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.3'
-description:
+description: "This gem is only needed before Rails 7.1, where the trilogy adapter
+  is built in. \nWhen you upgrade to a version after 7.1.a, replace this with `gem
+  \"trilogy\"` to ensure\nthat trilogy itself is available.\n"
 email:
 - opensource+trilogy@github.com
 executables: []