active_record-comments 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3479f24b30ad73efbf9937f33c94c3f722e8dac7
-  data.tar.gz: 4f399eabfb49d657ffb82dcd702eb66ee20a54bb
+  metadata.gz: a9cad33bbee4634a2c13b3d6c108da34ac7c50e2
+  data.tar.gz: ec4874db0062e24adccd9865022120a17f9f9c52
 SHA512:
-  metadata.gz: 19a92d96e8c9faebeb5b9a0d34287e9abd150f3fd98f9296fd01e286178f8c4f95687cca52db24976a33b8dde38dd291c10c980f8fae7b71d7eec46c574a492e
-  data.tar.gz: bd39c3c075ec5a66b1a2db8566abd48675fd3a64af43c6bd12d1e1b62a088c70f04da3f64fdac96f5104b40c83f951cab192f1e14c25bd7cf4e599027bc0f96b
+  metadata.gz: e68299120b751403d0dd037db7871ff60db3a523693bb248313a91f44255aeb438b651fb290b7113f5127597e9b4737215990c6c84f9dd0cb6b9a661db2ea84c
+  data.tar.gz: ab64379e0934eee080442aec23049c8af2b9f30c33f9ed3f50da02888ce3f00978b584f6c007b96316b158671d7b50fdcbcb631d700a69a9cd5013b0d99c1842

data/lib/active_record/comments.rb

@@ -2,6 +2,56 @@ require "active_record"
 
 module ActiveRecord
   module Comments
+    module ExecuteWithComments
+      class << self
+        def included(base)
+          base.class_eval do
+            # 99% case
+            if 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
+
+            # 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
+            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
+
     class << self
       def comment(comment)
         @comment ||= []
@@ -25,11 +75,4 @@ module ActiveRecord
   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!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-comments
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord