lograge-sql 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a1b24c2960cc4eecd3b3ca23807587a396e8b483c76e916b8f2a50b600babe2
-  data.tar.gz: 5e33f26703504065a0838c5bb97f9bb45705a7ffce6317d2d239f46967b9fe79
+  metadata.gz: c5983447366cf1c996e3f4a6571646b4d54298df7e8c54417c02537c23b5132f
+  data.tar.gz: 48b16b073f9681e809eb3d1bcf3bb0f661ca2ae80a2a2958ef1d9ce495a1147e
 SHA512:
-  metadata.gz: ee641c7c4988772cf1db3fb37639072e53c4cbe2a6a0b2823637e54f39a5ecba62ab1a52017f0a9418c61091af7419116ff36273f8363813090a45f65bea3a13
-  data.tar.gz: 176fd786ad019f0cf125bbe9a77acbce82722d43f6df0421eeeb0d9b719116e2d0aa68f8a8589e5ddcbc76d32bba183c7bb6d0342ffda993d4719d8d703af7d5
+  metadata.gz: 1d53aade24130437f98e9bd7d06c448be1364cff17c6dc18c44da939723145a938246c15407fdb8644447d2be31824d34f52cafc0260dc3528b4674cf1a888b9
+  data.tar.gz: 9a8b3bbaa5abd569373b97ffbda2f1c8b2493be8c35695935587ae7726ac7af35adeb99caa01e2a03e753e26777d077c8f561fed1fa7d357568771094dcd4928

data/lib/lograge/active_record_log_subscriber.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Lograge
+  # Log subscriber to replace ActiveRecord's default one
+  class ActiveRecordLogSubscriber < ActiveSupport::LogSubscriber
+    # Every time there's an SQL query, stores it into the Thread.
+    # They'll later be access from the RequestLogSubscriber.
+    def sql(event)
+      ActiveRecord::LogSubscriber.runtime += event.duration
+      return if event.payload[:name] == 'SCHEMA'
+
+      Lograge::Sql.store[:lograge_sql_queries] ||= []
+      Lograge::Sql.store[:lograge_sql_queries] << Lograge::Sql.extract_event.call(event)
+    end
+  end
+end

data/lib/lograge/sql.rb

@@ -17,14 +17,16 @@ module Lograge
         Lograge::Sql.formatter     = config.formatter     || default_formatter
         Lograge::Sql.extract_event = config.extract_event || default_extract_event
 
-        return if config.keep_default_active_record_log
-
         # Disable existing ActiveRecord logging
-        ActiveSupport::LogSubscriber.log_subscribers.each do |subscriber|
-          Lograge.unsubscribe(:active_record, subscriber) if subscriber.is_a?(ActiveRecord::LogSubscriber)
+        unless config.keep_default_active_record_log
+          ActiveSupport::LogSubscriber.log_subscribers.each do |subscriber|
+            Lograge.unsubscribe(:active_record, subscriber) if subscriber.is_a?(ActiveRecord::LogSubscriber)
+          end
         end
 
-        Lograge::ActiveRecordLogSubscriber.attach_to :active_record
+        return unless defined?(Lograge::ActiveRecordLogSubscriber)
+
+        Lograge::ActiveRecordLogSubscriber.attach_to(:active_record)
       end
 
       # Gets the store, preferring RequestStore if the gem is found.

data/lib/lograge/sql/extension.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'lograge/active_record_log_subscriber'
+
 module Lograge
   module Sql
     # Module used to extend Lograge
@@ -24,21 +26,6 @@ module Lograge
   end
 end
 
-module Lograge
-  # Log subscriber to replace ActiveRecord's default one
-  class ActiveRecordLogSubscriber < ActiveSupport::LogSubscriber
-    # Every time there's an SQL query, stores it into the Thread.
-    # They'll later be access from the RequestLogSubscriber.
-    def sql(event)
-      ActiveRecord::LogSubscriber.runtime += event.duration
-      return if event.payload[:name] == 'SCHEMA'
-
-      Lograge::Sql.store[:lograge_sql_queries] ||= []
-      Lograge::Sql.store[:lograge_sql_queries] << Lograge::Sql.extract_event.call(event)
-    end
-  end
-end
-
 if defined?(Lograge::RequestLogSubscriber)
   Lograge::RequestLogSubscriber.prepend Lograge::Sql::Extension
 else

data/lib/lograge/sql/version.rb

@@ -3,6 +3,6 @@
 module Lograge
   module Sql
     # Gem version
-    VERSION = '1.3.0'
+    VERSION = '1.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lograge-sql
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Mattia Giuffrida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -67,6 +67,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- lib/lograge/active_record_log_subscriber.rb
 - lib/lograge/sql.rb
 - lib/lograge/sql/extension.rb
 - lib/lograge/sql/railtie.rb