active_record-comments 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb953c9e84e5eda78d22750cd3326237b8c8636d389c3fdc0752a6855d79b172
-  data.tar.gz: 2f5b1b24920f261f3be90ff1ad60af32dcd76cab2337ccd1b603dccab7e50f65
+  metadata.gz: 1ebb348d2ac167aa5d2caf6bed63f158dd18a7f3d15dee7938575a6b927ea688
+  data.tar.gz: 9d4620a2343c79d922f398092dce0d07a925232734245e37f3333b9a86d972b3
 SHA512:
-  metadata.gz: ff820e23eb5785b63d3dc1b144d6c185b6237953b9fabca1b037d3deabda95352b966f144259cfb0850e1cec3f6c22e0ad7bc57e7e32436197e6aca452cb522e
-  data.tar.gz: 13fd57e87378f9e1a61650e075fcbdb979cf5dd554ccccd7b54e74321bddf29783d36cf9db6ba3b5976be80f05d63c6f3743ce40de15dd64f6fc695f3de79942
+  metadata.gz: d1836b9c02f042585d08876707e2802874e36e771b4e62f141b50ed17c179c5a0cd1a67a8c6dde90a67a2ff556c1c8a70b4aa82c1b432f29ab7184935493095a
+  data.tar.gz: '08af0f49517f7b771d56fd0604074a217220bcbcc360ef06ba46e2c9a10686c0ee2f99d1bc0dfdbda76bd2a34ce29ebf9ab9223a2f9cef557c0ef77b823df2f2'

data/lib/active_record/comments/execute_with_comments.rb

@@ -4,22 +4,8 @@ module ActiveRecord
       class << self
         def included(base)
           base.class_eval do
-            # ActiveRecord 8.2
-            if defined?(ActiveRecord::ConnectionAdapters::QueryIntent)
-              alias_method :raw_execute_without_comment, :raw_execute
-              def raw_execute(intent)
-                compile_arel_in_intent(intent)
-
-                if (sql = intent.processed_sql)
-                  intent.processed_sql = ActiveRecord::Comments.with_comment_sql(sql)
-                elsif (sql = intent.raw_sql)
-                  intent.raw_sql = ActiveRecord::Comments.with_comment_sql(sql)
-                end
-
-                raw_execute_without_comment(intent)
-              end
             # ActiveRecord 7.1
-            elsif base.method_defined?(:internal_exec_query)
+            if base.method_defined?(:internal_exec_query)
               alias_method :internal_exec_query_without_comment, :internal_exec_query
               def internal_exec_query(query, *args, **kwargs, &block)
                 query = ActiveRecord::Comments.with_comment_sql(query)
@@ -71,5 +57,12 @@ module ActiveRecord
         end
       end
     end
+
+    module ExecuteIntentWithComments
+      def execute!
+        @processed_sql = ::ActiveRecord::Comments.with_comment_sql(processed_sql)
+        super
+      end
+    end
   end
 end

data/lib/active_record/comments/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Comments
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/lib/active_record/comments.rb

@@ -39,4 +39,10 @@ module ActiveRecord
   end
 end
 
-ActiveRecord::Comments::ExecuteWithComments.install!
+if defined?(ActiveRecord::ConnectionAdapters::QueryIntent)
+  # Rails 8.2
+  ActiveRecord::ConnectionAdapters::QueryIntent.prepend(::ActiveRecord::Comments::ExecuteIntentWithComments)
+else
+  # Rails 8.1 and older
+  ActiveRecord::Comments::ExecuteWithComments.install!
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-comments
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-17 00:00:00.000000000 Z
+date: 2025-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord