active_record_query_stats 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7616eb499befdd021733555a3d398dac7b92e97d10ff68428e99f8d82f313cee
-  data.tar.gz: 9a2e50b46a3eb1fc891a73ed2389a5a78f6de22fbdaa63a5b3c792a6728e8f91
+  metadata.gz: 755c5bc78883b1118c0e46605155798671d8e0800303e2eb642021c16ce16c6e
+  data.tar.gz: 18de36375198cc350c92a8b04a3fd2ef9cc8d4433e89493c9a039d4c2f382746
 SHA512:
-  metadata.gz: 5757368a32479b2d53f131df441524656142cc4e311b422a32f70c1a703e6983cb3107f76de17b046fc45615834996295b8b93d0424ff96ae4c1a6cc379ff4d8
-  data.tar.gz: e857808cd7cc2d5834a0d96c16033a33e72de951908ab516ef68ace4d3ce18fd6eca6e455f4bfeba7ec0c2ec47c52a59929a836d46e2d6dc899cfc3650b802dc
+  metadata.gz: a9848092049fa3b9fd2d34f6035a63e2cc772ba6ae18828cbc9b19a20b3f47a377ddfeb6a02a5d6caa7abfa87f610a6fc973c01927986077b0f13b043a3a6b91
+  data.tar.gz: b733b023fc6853c2f1d3bff32d25c0cea6c4fc7d25203fed5b15a0ace53e09b627b54d8ddabf103cd0c5baf792c2430595e72478169391be7c0a32c3bae31745

data/README.md

@@ -2,8 +2,8 @@
 
 [![Gem Version](https://badge.fury.io/rb/active_record_query_stats.svg)](https://badge.fury.io/rb/active_record_query_stats)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![Maintainability](https://api.codeclimate.com/v1/badges/9ba0a610043a2e1a9e74/maintainability)](https://codeclimate.com/github/tian-im/active_record_query_stats/maintainability)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/9ba0a610043a2e1a9e74/test_coverage)](https://codeclimate.com/github/tian-im/active_record_query_stats/test_coverage)
+[![Maintainability](https://api.codeclimate.com/v1/badges/9bcbeb90bc7f141fc211/maintainability)](https://codeclimate.com/github/tian-im/active_record_query_stats/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/9bcbeb90bc7f141fc211/test_coverage)](https://codeclimate.com/github/tian-im/active_record_query_stats/test_coverage)
 
 ActiveRecordQueryStats produces simple ActiveRecord query stats at the end of each request in the following format:
 
@@ -12,7 +12,7 @@ Query Stats
 -----------
 total: 6, real: 5, cached: 1
 select: 4, insert: 0, update: 1, delete: 0
-transaction: 0, savepoint: 0, lock: 0, rollback: 0, other: 0
+transaction: 0, savepoint: 0, rollback: 0, lock: 0, other: 0
 ```
 
 - **total:** total queries occurred during the request.
@@ -58,7 +58,7 @@ en:
       -----------
       total: %{total}, real: %{real}, cached: %{cached}
       select: %{select}, insert: %{insert}, update: %{update}, delete: %{delete}
-      transaction: %{transaction}, savepoint: %{savepoint}, lock: %{lock}, rollback: %{rollback}, other: %{other}
+      transaction: %{transaction}, savepoint: %{savepoint}, rollback: %{rollback}, lock: %{lock}, other: %{other}
 ```
 
 ## Implementation

data/lib/active_record_query_stats/sql_event_analyzer.rb

@@ -24,20 +24,19 @@ module ActiveRecordQueryStats
     delegate(*Summary.instance_methods(false), to: :summary)
 
     def increase_transaction_related
-      case payload[:sql]
-      when /\A\s*rollback/mi then increase_rollback
-      when /select .*for update/mi, /\A\s*lock/mi then increase_lock
-      when /transaction\s*\Z/i then increase_transaction
-      when /\A\s*(release )?savepoint/i then increase_savepoint
+      if rollback_query? then increase_rollback && increase_transaction
+      elsif savepoint_query? then increase_savepoint && increase_transaction
+      elsif transaction_query? then increase_transaction
       end
     end
 
     def increase_statements
       case payload[:sql]
-      when /\A\s*select/i then increase_select
-      when /\A\s*insert/i then increase_insert
-      when /\A\s*update/i then increase_update
-      when /\A\s*delete/i then increase_delete
+      when /\s*SELECT .*FOR UPDATE\b/mi, /\A\s*LOCK\b/mi then increase_lock
+      when /\A\s*SELECT/i then increase_select
+      when /\A\s*INSERT/i then increase_insert
+      when /\A\s*UPDATE/i then increase_update
+      when /\A\s*DELETE/i then increase_delete
       end
     end
 
@@ -64,5 +63,17 @@ module ActiveRecordQueryStats
     def cached_query?
       /CACHE/i =~ payload[:name] || payload[:cached]
     end
+
+    def rollback_query?
+      /\A\s*ROLLBACK/mi =~ payload[:sql]
+    end
+
+    def savepoint_query?
+      /\A\s*(RELEASE )?SAVEPOINT/mi =~ payload[:sql]
+    end
+
+    def transaction_query?
+      /TRANSACTION\s*\Z/i =~ payload[:sql] || /TRANSACTION/i =~ payload[:name]
+    end
   end
 end

data/lib/active_record_query_stats/summary.rb

@@ -12,9 +12,15 @@ module ActiveRecordQueryStats
       RequestStore[:active_record_query_stats] ||= new
     end
 
+    def initialize
+      STATS.each do |field|
+        instance_variable_set :"@#{field}", 0
+      end
+    end
+
     STATS.each do |field|
       define_method field do
-        instance_variable_get(:"@#{field}") || 0
+        instance_variable_get(:"@#{field}")
       end
 
       define_method :"increase_#{field}" do

data/lib/active_record_query_stats/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordQueryStats
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/locales/active_record_query_stats.en.yml

@@ -5,4 +5,4 @@ en:
       -----------
       total: %{total}, real: %{real}, cached: %{cached}
       select: %{select}, insert: %{insert}, update: %{update}, delete: %{delete}
-      transaction: %{transaction}, savepoint: %{savepoint}, lock: %{lock}, rollback: %{rollback}, other: %{other}
+      transaction: %{transaction}, savepoint: %{savepoint}, rollback: %{rollback}, lock: %{lock}, other: %{other}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_query_stats
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tian Chen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-17 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack