activerecord-analyze 0.9.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09f3c691a676a55f45059cbfd0e12161e42f7ab87acdc834c1f496a2ceae1c1f'
-  data.tar.gz: c83a3d1bb42bdbbb82ca80f00acc55d420de1c7589660f8fd72f103f19aca0c4
+  metadata.gz: 8871bdc597d0ba5c601a8b93b17aa037430297554ba074fa7ed448f7fce3f9d3
+  data.tar.gz: 846ed95e10f289793e75c17bbae7ee0cd274a93c5af263777da59d66c1006acd
 SHA512:
-  metadata.gz: 96e5ba8e107b9d005f59e6ffe3ff0925b872c753b51ef9deee505919d415e3165a67d5bfe1cffa6f29dbd34eb6726e65f93f14d52389bcdd736edc636c25d0e5
-  data.tar.gz: 957325a0f295e28c76689b504a92a4d0aa636965f6a71326004c3662256aef769ca24bf75bd81a823d2fd3281b9f49d805e0a63dedda3bc5c392f7790cfd0cde
+  metadata.gz: 5699bbab0ed4d533d1c62ce5e02d1e54f5868db437cffee62a1be5fb5a34ad7c91fbb758d26ee6f227cb222e67e391564afbd53eb1a6cf1b197d1dfd3cf18b80
+  data.tar.gz: b4d2a4ab6b79780d3f55584353381904a8a86c7cfe0f311646326b33f229c01097e250fd02f6569e69ecc8fe6ba89767aa39eac7f44b38f869e5a2e99479f3e0

data/.circleci/config.yml

@@ -16,7 +16,7 @@ jobs:
       - run: gem update --system
       - run: gem install bundler
       - run: bundle install --path vendor/bundle
-      - run: sudo apt-get update
+      - run: sudo apt-get update --allow-releaseinfo-change
       - run: sudo apt install postgresql-client-11
       - run: dockerize -wait tcp://localhost:5432 -timeout 1m
       - run:

data/README.md

@@ -109,6 +109,43 @@ User.all.analyze(analyze: false)
 
 ```
 
+### Analyzing raw SQL queries
+
+You can also use a raw SQL query string to generate an EXPLAIN ANALYZE output:
+
+```ruby
+query = "SELECT * FROM users WHERE email = 'email@example.com'"
+
+puts ActiveRecordAnalyze.analyze_sql(query, { format: :json })
+
+# [
+# {
+#    "Plan": {
+#      "Node Type": "Seq Scan",
+#      "Parallel Aware": false,
+#      "Relation Name": "users",
+#      "Alias": "users",
+#      "Startup Cost": 0.00,
+#      "Total Cost": 18.75,
+#      "Plan Rows": 4,
+#      "Plan Width": 88,
+#      "Actual Startup Time": 0.010,
+#      "Actual Total Time": 0.018,
+#      "Actual Rows": 0,
+#      "Actual Loops": 1,
+#      "Filter": "((email)::text = 'email@example.com'::text)",
+#      "Rows Removed by Filter": 0
+#    },
+#    "Planning Time": 0.052,
+#    "Triggers": [
+#    ],
+#    "Execution Time": 0.062
+# }
+# ]
+```
+
+This feature is helpful in analyzing SQL queries extracted from the logs.
+
 ### Disclaimer
 
 It is a bit experimental and can break with new Rails release.

data/activerecord-analyze.gemspec

@@ -15,7 +15,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(spec)/})
   gem.require_paths = ["lib"]
   gem.license       = "MIT"
-  gem.add_dependency "rails", ">= 5.1.0"
+  gem.add_dependency "activerecord"
+  gem.add_dependency "railties"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "pg"
   gem.add_development_dependency "rspec"

data/lib/activerecord-analyze/main.rb

@@ -3,60 +3,7 @@ module ActiveRecord
     module PostgreSQL
       module DatabaseStatements
         def analyze(arel, binds = [], opts = {})
-          format_sql = if fmt = opts[:format].presence
-            case fmt
-            when :json
-              "FORMAT JSON, "
-            when :hash
-              "FORMAT JSON, "
-            when :pretty_json
-              "FORMAT JSON, "
-            when :yaml
-              "FORMAT YAML, "
-            when :text
-              "FORMAT TEXT, "
-            when :xml
-              "FORMAT XML, "
-            else
-              ""
-            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/, " ")
-          .gsub(/\(\s?\)/, "")
+          opts_sql = ActiveRecordAnalyze.build_prefix(opts)
 
           sql = "EXPLAIN #{opts_sql} #{to_sql(arel, binds)}"
           PostgreSQL::ExplainPrettyPrinter.new.pp(exec_query(sql, "EXPLAIN #{opts_sql}".strip, binds))

data/lib/activerecord-analyze/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordAnalyze
-  VERSION = "0.9.1"
+  VERSION = "0.10.2"
 end

data/lib/activerecord-analyze.rb

@@ -1,4 +1,84 @@
+# frozen_string_literal: true
+
 require 'activerecord-analyze/main'
 
 module ActiveRecordAnalyze
+  def self.analyze_sql(raw_sql, opts = {})
+    prefix = "EXPLAIN #{build_prefix(opts)}"
+
+    result = ActiveRecord::Base.connection.execute("#{prefix} #{raw_sql}").to_a
+
+
+    if [:json, :hash, :pretty_json].include?(opts[:format])
+      raw_json = result[0].fetch("QUERY PLAN")
+      if opts[:format] == :json
+        raw_json
+      elsif opts[:format] == :hash
+        JSON.parse(raw_json)
+      elsif opts[:format] == :pretty_json
+        JSON.pretty_generate(JSON.parse(raw_json))
+      end
+    else
+      result.map do |el|
+        el.fetch("QUERY PLAN")
+      end.join("\n")
+    end
+  end
+
+  def self.build_prefix(opts = {})
+    format_sql = if fmt = opts[:format].presence
+      case fmt
+      when :json
+        "FORMAT JSON, "
+      when :hash
+        "FORMAT JSON, "
+      when :pretty_json
+        "FORMAT JSON, "
+      when :yaml
+        "FORMAT YAML, "
+      when :text
+        "FORMAT TEXT, "
+      when :xml
+        "FORMAT XML, "
+      else
+        ""
+      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/, " ")
+      .gsub(/\(\s?\)/, "")
+  end
 end

data/spec/analyze_sql_spec.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe "ActiveRecord analyze" do
+  let(:raw_sql) do
+    "SELECT * FROM users WHERE email = 'email@example.com'"
+  end
+
+  let(:result) do
+    ActiveRecordAnalyze.analyze_sql(raw_sql, opts)
+  end
+
+  describe "default opts" do
+    let(:opts) do
+      {}
+    end
+
+    it "works" do
+      expect do
+        result
+      end.not_to raise_error
+    end
+  end
+
+  describe "format json" do
+    let(:opts) do
+      { format: :json }
+    end
+
+    it "works" do
+      puts result
+      expect(JSON.parse(result)[0].keys.sort).to eq [
+        "Execution Time", "Plan", "Planning Time", "Triggers"
+      ]
+    end
+  end
+
+  describe "format hash" do
+    let(:opts) do
+      { format: :hash }
+    end
+
+    it "works" do
+      expect(result[0].keys.sort).to eq [
+        "Execution Time", "Plan", "Planning Time", "Triggers"
+      ]
+    end
+  end
+
+  describe "format pretty" do
+    let(:opts) do
+      { format: :pretty_json }
+    end
+
+    it "works" do
+      expect(JSON.parse(result)[0].keys.sort).to eq [
+        "Execution Time", "Plan", "Planning Time", "Triggers"
+      ]
+    end
+  end
+
+  describe "supports options" do
+    let(:raw_sql) do
+      "SELECT \"users\".* FROM \"users\" WHERE \"users\".\"email\" IS NOT NULL LIMIT 10"
+    end
+
+    let(:opts) do
+      {
+        format: :hash,
+        costs: true,
+        timing: true,
+        summary: true
+      }
+    end
+
+    it "works" do
+      expect(result[0].keys.sort).to eq [
+        "Execution Time", "Plan", "Planning Time", "Triggers"
+      ]
+    end
+  end
+end

data/spec/main_spec.rb

@@ -15,7 +15,7 @@ describe "ActiveRecord analyze" do
     ActiveRecord::Migrator.new(:up, [CreateUsers.new], @schema_migration).migrate
   end
 
-  describe "no opts" do
+  describe "default opts" do
     it "works" do
       expect do
         User.all.analyze

data/spec/spec_helper.rb

@@ -3,6 +3,18 @@
 require 'rubygems'
 require "active_record/railtie"
 require 'bundler/setup'
+require "migrations/create_users_migration.rb"
 require_relative '../lib/activerecord-analyze'
 
 ENV["DATABASE_URL"] ||= "postgresql://postgres:secret@localhost:5432/activerecord-analyze-test"
+
+RSpec.configure do |config|
+  config.before(:suite) do
+    ActiveRecord::Base.establish_connection(
+      ENV.fetch("DATABASE_URL")
+    )
+
+    @schema_migration = ActiveRecord::Base.connection.schema_migration
+    ActiveRecord::Migrator.new(:up, [CreateUsers.new], @schema_migration).migrate
+  end
+end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-analyze
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.2
 platform: ruby
 authors:
 - pawurb
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-11 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +100,7 @@ files:
 - lib/activerecord-analyze/main.rb
 - lib/activerecord-analyze/version.rb
 - query-plan.png
+- spec/analyze_sql_spec.rb
 - spec/main_spec.rb
 - spec/migrations/create_users_migration.rb
 - spec/spec_helper.rb
@@ -93,7 +108,7 @@ homepage: http://github.com/pawurb/activerecord-analyze
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -108,11 +123,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Add EXPLAIN ANALYZE to Active Record query objects
 test_files:
+- spec/analyze_sql_spec.rb
 - spec/main_spec.rb
 - spec/migrations/create_users_migration.rb
 - spec/spec_helper.rb