lograge-sql-one-line 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcef8cb19ef6af4af568af145c89ab86b3a2e694
-  data.tar.gz: 5fd1128300c3227545ed1a5bc8d89d5bd6818795
+  metadata.gz: ee098cd725561bbc5ab9fc259979d34c2d3bbcee
+  data.tar.gz: d4518423e8ea0fc3d12a7b866ebd948c52e39a49
 SHA512:
-  metadata.gz: 653b65841d67361aa15b1e886373c461a91eae2c88fe6468d6e789e9aafef5d1046f9f2d8ef96177ed4925411de1c33a605045d57ab0728548a49489e5dada61
-  data.tar.gz: 9335b9a193d52b0751f51d108a1d911fcc94c46e1f12d73c09370a082c1e36febf829c6a89f75d61bd0fa44342b842bef6e97363f380df1992826a7b1ff17515
+  metadata.gz: 268b02326ebe8922fa01d268a0c881db841b9931c124b0bb7dde99e37e8b8a7706281d26bc648dc0f90317c60b9f9be8380ad9f53730a460567a420bacdb7a20
+  data.tar.gz: 60e7a136c28d4123d21563b6fff4c4e39ba2ef13ccdce6650c563499d074aa05decb631dc556080eb9515aa13b2aa72027e43a5a361ab91d04b6b158f21f4bb2

data/lib/lograge/sql/extension.rb

@@ -2,18 +2,20 @@ module Lograge
   module Sql
     module Extension
       def extract_request(event, payload)
-        super.merge!(extract_sql_queries)
+        super.merge!(extract_sql_queries(payload[:uuid]))
       end
 
-      def extract_sql_queries
+      def extract_sql_queries(uuid)
         sql_queries = Thread.current[:lograge_sql_queries]
-        transaction_id = Thread.current[:transaction_id]
-
         return {} unless sql_queries
 
-        Thread.current[:transaction_id]      = nil
         Thread.current[:lograge_sql_queries] = nil
-        { transaction_id: transaction_id, sql_queries: sql_queries.join }
+
+        sql_queries_with_uuid = sql_queries.map do |query|
+          "\n[#{uuid}] #{query}"
+        end
+
+        { sql_queries: sql_queries_with_uuid.join }
       end
     end
   end
@@ -25,9 +27,7 @@ module Lograge
       ActiveRecord::LogSubscriber.runtime += event.duration
       return if event.payload[:name] == 'SCHEMA'
       Thread.current[:lograge_sql_queries] ||= []
-      Thread.current[:lograge_sql_queries] << ("\n[#{event.transaction_id}] #{event.payload[:name]} (#{event.duration.to_f.round(2)}) #{event.payload[:sql]}")
-
-      Thread.current[:transaction_id] ||= event.transaction_id
+      Thread.current[:lograge_sql_queries] << ("#{event.payload[:name]} (#{event.duration.to_f.round(2)}) #{event.payload[:sql]}")
     end
   end
 end

data/lib/lograge/sql/version.rb

@@ -1,5 +1,5 @@
 module Lograge
   module Sql
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lograge-sql-one-line
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Mattia Giuffrida