activerecord-analyze 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d52550c794a58f382c5e5e1d1b78463bc0766969e5e3d7818b494bbf7027924e
-  data.tar.gz: 2a884a86a595021e5afc2c43083bb51287db83a5ac56da1ff4a9fe985c35870b
+  metadata.gz: 5163e6745e43205926a1c88a02c4459bd3d9971dde022f5dd64c3368d2c72c13
+  data.tar.gz: f084b56b9a5b9c5ba1e6ae69e6653c01224287b6e0107ca97666cbd695c04b73
 SHA512:
-  metadata.gz: 7e10b5364ed42150d2c41f49c3378f0f4e44e886e9f6100ccc073500ed5185e2d97c39f74c3922544ad36ec1f52c7d947ec1385e573bcf994e0c96af461913ad
-  data.tar.gz: 7d531a91c688a6c0127cc55b16f253ccbc9ada4a67b382c7dbfa25694b20ce5e0d33e18ed8ba7d81d5745e6a626c8e2b5769f6a4af52231b28187e461cd07bff
+  metadata.gz: 10a11c9983859c51270ae38503e6f751b49f281c85c2f5fd7f28a7709f93d285e6288db8c00741e402f031771b1208c531a142ee28b2bcf5f84d8f14f84c8c18
+  data.tar.gz: 3669dc47d6dc8e4b1b63881d3bf61fa2d6eff4be1264dab55f77a98a6e55d98ebf22cd37e22b731f1d866954c20032f381d3577db168527d7490b88275037f98

data/README.md

@@ -14,4 +14,4 @@ gem 'activerecord-analyze'
 
 ### Disclaimer
 
-It is a bit experimental and can break with new Rails release. As soon as [this pull request](https://github.com/rails/rails/pull/31374/) is merged it will be obsolete.
+It is a bit experimental and can break with new Rails release.

data/lib/activerecord-analyze/main.rb

@@ -2,9 +2,57 @@ module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL
       module DatabaseStatements
-        def analyze(arel, binds = [])
-          sql = "EXPLAIN ANALYZE #{to_sql(arel, binds)}"
-          PostgreSQL::ExplainPrettyPrinter.new.pp(exec_query(sql, "EXPLAIN ANALYZE", binds))
+        def analyze(arel, binds = [], opts = {})
+          format_sql = if fmt = opts[:format].presence
+            case fmt
+            when :json
+              "FORMAT JSON,"
+            when :yaml
+              "FORMAT YAML,"
+            when :text
+              "FORMAT TEXT,"
+            when :xml
+              "FORMAT XML,"
+            end
+          end
+
+          verbose_sql = if opts[:verbose] == true
+            ", VERBOSE"
+          end
+
+          costs_sql = if opts[:costs] == true
+            ", COSTS"
+          end
+
+          settings_sql = if opts[:settings] == true
+            ", SETTINGS"
+          end
+
+          buffers_sql = if opts[:buffers] == true
+            ", BUFFERS"
+          end
+
+          timing_sql = if opts[:timing] == true
+            ", TIMING"
+          end
+
+          summary_sql = if opts[:summary] == true
+            ", SUMMARY"
+          end
+
+          analyze_sql = if opts[:analyze] == false
+            ""
+          else
+            "ANALYZE"
+          end
+
+          opts_sql = "(#{format_sql} #{analyze_sql}#{verbose_sql}#{costs_sql}#{settings_sql}#{buffers_sql}#{timing_sql}#{summary_sql})"
+          .strip.gsub(/\s+/, " ")
+          .gsub(/\(\s?\s?\s?,/, "(")
+          .gsub(/\s,\s/, " ")
+
+          sql = "EXPLAIN #{opts_sql} #{to_sql(arel, binds)}"
+          PostgreSQL::ExplainPrettyPrinter.new.pp(exec_query(sql, "EXPLAIN #{opts_sql}".strip, binds))
         end
       end
     end
@@ -13,15 +61,15 @@ end
 
 module ActiveRecord
   class Relation
-    def analyze
-      exec_analyze(collecting_queries_for_explain { exec_queries })
+    def analyze(opts = {})
+      exec_analyze(collecting_queries_for_explain { exec_queries }, opts)
     end
   end
 end
 
 module ActiveRecord
   module Explain
-    def exec_analyze(queries) # :nodoc:
+    def exec_analyze(queries, opts = {}) # :nodoc:
       str = queries.map do |sql, binds|
         msg = "EXPLAIN ANALYZE for: #{sql}".dup
         unless binds.empty?
@@ -29,7 +77,7 @@ module ActiveRecord
           msg << binds.map { |attr| render_bind(attr) }.inspect
         end
         msg << "\n"
-        msg << connection.analyze(sql, binds)
+        msg << connection.analyze(sql, binds, opts)
       end.join("\n")
 
       # Overriding inspect to be more human readable, especially in the console.

data/lib/activerecord-analyze/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordAnalyze
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-analyze
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - pawurb
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -45,7 +45,7 @@ homepage: http://github.com/pawurb/activerecord-analyze
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -60,8 +60,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Add EXPLAIN ANALYZE to Active Record query objects
 test_files: []