active_record-comments 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3479f24b30ad73efbf9937f33c94c3f722e8dac7
-  data.tar.gz: 4f399eabfb49d657ffb82dcd702eb66ee20a54bb
+SHA256:
+  metadata.gz: 8059c748ce80a85b6afe8229401296ec82288357acd47119b289d3b5a31d50f9
+  data.tar.gz: 742ab1f77aa2ff09e4bdb96994549db0690781c070ae1b202a2478331614e5e9
 SHA512:
-  metadata.gz: 19a92d96e8c9faebeb5b9a0d34287e9abd150f3fd98f9296fd01e286178f8c4f95687cca52db24976a33b8dde38dd291c10c980f8fae7b71d7eec46c574a492e
-  data.tar.gz: bd39c3c075ec5a66b1a2db8566abd48675fd3a64af43c6bd12d1e1b62a088c70f04da3f64fdac96f5104b40c83f951cab192f1e14c25bd7cf4e599027bc0f96b
+  metadata.gz: c0012f4cb152f560e43135435ae1c7be7c2d4b05d6540780fd983aa8fa236518ecbe6d0b81c90157977c1decda1ce17da0e49c1abaae8c3aa2241d08e8037206
+  data.tar.gz: 6ca97bd722121bf43fea68b98b58d215ed3af35d2c75ce8dc03a427d3158c3d3a9049b5746e391cdd463e8eed66dd507a4d6d74a2382c31ee4e4c8dc4c49d03f

data/lib/active_record/comments.rb

@@ -1,14 +1,15 @@
+require "active_record/comments/execute_with_comments"
+require "active_record/comments/version"
 require "active_record"
 
 module ActiveRecord
   module Comments
     class << self
       def comment(comment)
-        @comment ||= []
-        @comment << comment
+        current_comments << comment
         yield
       ensure
-        @comment.pop
+        current_comments.pop
       end
 
       def with_comment_sql(sql)
@@ -17,19 +18,15 @@ module ActiveRecord
       end
 
       private
+      def current_comments
+        Thread.current[:ar_comments] ||= []
+      end
 
       def current_comment
-        @comment.join(" ") if @comment.present?
+        current_comments.join(" ") if current_comments.present?
       end
     end
   end
 end
 
-# log is called by execute in all db adapters
-ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
-  def log_with_comment_injection(query, *args, &block)
-    query = ActiveRecord::Comments.with_comment_sql(query)
-    log_without_comment_injection(query, *args, &block)
-  end
-  alias_method_chain :log, :comment_injection
-end
+ActiveRecord::Comments::ExecuteWithComments.install!

data/lib/active_record/comments/execute_with_comments.rb

@@ -0,0 +1,52 @@
+module ActiveRecord
+  module Comments
+    module ExecuteWithComments
+      class << self
+        def included(base)
+          base.class_eval do
+            # ActiveRecord 3.2 vs sqlite, maybe others ...
+            if base.method_defined?(:exec_query)
+              alias_method :exec_query_without_comment, :exec_query
+              def exec_query(query, *args, &block)
+                query = ActiveRecord::Comments.with_comment_sql(query)
+                exec_query_without_comment(query, *args, &block)
+              end
+
+            # 99% case
+            elsif base.method_defined?(:execute)
+              alias_method :execute_without_comment, :execute
+              def execute(query, *args, &block)
+                query = ActiveRecord::Comments.with_comment_sql(query)
+                execute_without_comment(query, *args, &block)
+              end
+            end
+          end
+        end
+
+        def install!
+          if defined? ActiveRecord::ConnectionAdapters::SQLite3Adapter
+            install ActiveRecord::ConnectionAdapters::SQLite3Adapter
+          end
+
+          if defined? ActiveRecord::ConnectionAdapters::MysqlAdapter
+            install ActiveRecord::ConnectionAdapters::MysqlAdapter
+          end
+
+          if defined? ActiveRecord::ConnectionAdapters::Mysql2Adapter
+            install ActiveRecord::ConnectionAdapters::Mysql2Adapter
+          end
+
+          if defined? ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+            install ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+          end
+        end
+
+        private
+
+        def install(adapter)
+          adapter.send(:include, ::ActiveRecord::Comments::ExecuteWithComments)
+        end
+      end
+    end
+  end
+end

data/lib/active_record/comments/version.rb

@@ -0,0 +1,5 @@
+module ActiveRecord
+  module Comments
+    VERSION = "0.2.0"
+  end
+end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: active_record-comments
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2021-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.2'
 description: 
 email: michael@grosser.it
 executables: []
@@ -32,6 +38,8 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - lib/active_record/comments.rb
+- lib/active_record/comments/execute_with_comments.rb
+- lib/active_record/comments/version.rb
 homepage: https://github.com/grosser/active_record-comments
 licenses:
 - MIT
@@ -42,17 +50,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Comments for activerecord