active_record-comments 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 155747a2b7351da88fd82efe5a24efd1e4d0a7982316d9dcd7838cdbc6926560
-  data.tar.gz: f54706401737ea0e6967b61eb889045e9ecb0a8c1ce36a6f9856594b66d84bba
+  metadata.gz: 2f3d063aaa596c171fa3fa92e31be8745f38c880310ca51afc9a32d8db64b7c9
+  data.tar.gz: 9b1c2ae2bb85a846e690ac0f8e08fa032795cc9ccce090b55c94e85158909f95
 SHA512:
-  metadata.gz: 2c8a7cb8875e6aec22a3f5d206c76f756efdf53cd448cff0c10ead98fec4881b8df6a899d1f7908a1c9c955c192142d5c67314db5e6570013abac5f59a42cdc0
-  data.tar.gz: 7b6372e72ec6c2f9d2bdda3a8570db89f683c3cb2e1dee2c8dcb1b2b22f9b66f3355b65dcadf20f81944077270a691050ca6f0d855d87d1c4e0febce109a11a9
+  metadata.gz: b1eafcfa480e6dd6dd4c69cc6cbe81bc11828a27f0c49ec49fe001f8e0b8baf276e26b753385473e7823243a3736a9a212e418158e90411e73baf941edc516f5
+  data.tar.gz: ea2f8d1591d25617513aa1aeb84903ff38e8bd6f85fc07c5eea28e73126deeb3de8ee3973d1a0ef8a3c84b6c0017451c53491d5ebfb1fc92d003528a772e6fac

data/lib/active_record/comments/execute_with_comments.rb

@@ -4,15 +4,20 @@ module ActiveRecord
       class << self
         def included(base)
           base.class_eval do
+            # ActiveRecord 7.1
+            if base.method_defined?(:internal_exec_query)
+              alias_method :exec_query_without_comment, :internal_exec_query
+              def internal_exec_query(query, *args, **kwargs, &block)
+                query = ActiveRecord::Comments.with_comment_sql(query)
+                exec_query_without_comment(query, *args, **kwargs, &block)
+              end
             # ActiveRecord 3.2 vs sqlite, maybe others ...
-            if base.method_defined?(:exec_query)
+            elsif base.method_defined?(:exec_query)
               alias_method :exec_query_without_comment, :exec_query
-              def exec_query(query, *args, prepare: false, &block)
+              def exec_query(query, *args, **kwargs, &block)
                 query = ActiveRecord::Comments.with_comment_sql(query)
-                exec_query_without_comment(query, *args, prepare: prepare, &block)
+                exec_query_without_comment(query, *args, **kwargs, &block)
               end
-
-            # 99% case
             elsif base.method_defined?(:execute)
               alias_method :execute_without_comment, :execute
               def execute(query, *args, &block)

data/lib/active_record/comments/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Comments
-    VERSION = "0.6.0"
+    VERSION = "0.8.0"
   end
 end

data/lib/active_record/comments.rb

@@ -28,7 +28,6 @@ module ActiveRecord
         end
       end
 
-      private
       def current_comments
         Thread.current[:ar_comments] ||= []
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-comments
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-16 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 description: 
 email: michael@grosser.it
 executables: []