pghero 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fe5afd370afcf20d24e1b4e7176931f32671a1cf36866c38c5b88796fab342a
-  data.tar.gz: 20fb8e6756163e7125e5373f8397cfec8c501c5914e610fa23a2ae77c78a6778
+  metadata.gz: cde64b8247e49038ddc1eb136a9900386b128f8e2145e60eb201bec3be586470
+  data.tar.gz: e09c2d6705c5d5edb4054c8a5df8b41847c66e9dfc5ba04d7705c1f9cbb4eb56
 SHA512:
-  metadata.gz: cd9d194ae73f51a58880badd3e3b615c19bfc3390001ccd04d3d69878d0374e124c49acf8281714099ea60258ffdda6142d7ac993134b705216d408e274655b6
-  data.tar.gz: 418f6a52003f27819d23e15e7f8d20e70119d6ca7f40fdff751dcea2cddf810c104599a483bd84c42eb493e12dcf0aa04a0073b5001b750626b605a8d163c6c0
+  metadata.gz: 8a56fb48768e6dfbe10c1056dc71f32e339fa63dba628fcb76fec5cc1c2ca3867be45e6468b06f9fc8ae79da3fab09f8de8c1ad08d4f550c3de5db96e16cd67f
+  data.tar.gz: b5dc376105034625527ff19fa07c21bbf0ffe2281577f3fec3ebd39742c2560b8ea5de33e5e5abe9af078a131efe06e855c18cea733583b3314a0de9422e041b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.7.3 (2020-11-23)
+
+- Improved index suggestions when hash, GiST, GIN, or BRIN index present
+
 ## 2.7.2 (2020-09-10)
 
 - Fixed error with historical query stats

data/README.md

@@ -8,7 +8,7 @@ A performance dashboard for Postgres
 
 :tangerine: Battle-tested at [Instacart](https://www.instacart.com/opensource)
 
-[![Build Status](https://travis-ci.org/ankane/pghero.svg?branch=master)](https://travis-ci.org/ankane/pghero) [![Docker Pulls](https://img.shields.io/docker/pulls/ankane/pghero)](https://hub.docker.com/repository/docker/ankane/pghero)
+[![Build Status](https://github.com/ankane/pghero/workflows/build/badge.svg?branch=master)](https://github.com/ankane/pghero/actions) [![Docker Pulls](https://img.shields.io/docker/pulls/ankane/pghero)](https://hub.docker.com/repository/docker/ankane/pghero)
 
 ## Installation
 

data/lib/pghero.rb

@@ -113,13 +113,13 @@ module PgHero
 
           if !ENV["PGHERO_DATABASE_URL"] && spec_supported?
             ActiveRecord::Base.configurations.configs_for(env_name: env, include_replicas: true).each do |db|
-              databases[db.spec_name] = {"spec" => db.spec_name}
+              databases[db.send(spec_name_key)] = {"spec" => db.send(spec_name_key)}
             end
           end
 
           if databases.empty?
             databases["primary"] = {
-              "url" => ENV["PGHERO_DATABASE_URL"] || ActiveRecord::Base.connection_config
+              "url" => ENV["PGHERO_DATABASE_URL"] || connection_config(ActiveRecord::Base)
             }
           end
 
@@ -211,6 +211,18 @@ module PgHero
       ActiveRecord::VERSION::MAJOR >= 6
     end
 
+    # private
+    def connection_config(model)
+      ActiveRecord::VERSION::STRING.to_f >= 6.1 ? model.connection_db_config.configuration_hash : model.connection_config
+    end
+
+    # private
+    # Rails 6.1 deprecate `spec_name` and use `name` for configurations
+    # https://github.com/rails/rails/pull/38536
+    def spec_name_key
+      ActiveRecord::VERSION::STRING.to_f >= 6.1 ? :name : :spec_name
+    end
+
     private
 
     def each_database

data/lib/pghero/database.rb

@@ -149,11 +149,14 @@ module PgHero
       # resolve spec
       if !url && config["spec"]
         raise Error, "Spec requires Rails 6+" unless PgHero.spec_supported?
-        resolved = ActiveRecord::Base.configurations.configs_for(env_name: PgHero.env, spec_name: config["spec"], include_replicas: true)
+        config_options = {env_name: PgHero.env, PgHero.spec_name_key => config["spec"], include_replicas: true}
+        resolved = ActiveRecord::Base.configurations.configs_for(**config_options)
         raise Error, "Spec not found: #{config["spec"]}" unless resolved
-        url = resolved.config
+        url = ActiveRecord::VERSION::STRING.to_f >= 6.1 ? resolved.configuration_hash : resolved.config
       end
 
+      url = url.dup
+
       Class.new(PgHero::Connection) do
         def self.name
           "PgHero::Connection::Database#{object_id}"

data/lib/pghero/methods/suggested_indexes.rb

@@ -30,7 +30,23 @@ module PgHero
               if best_index[:found]
                 index = best_index[:index]
                 best_index[:table_indexes] = indexes_by_table[index[:table]].to_a
-                covering_index = existing_columns[index[:using] || "btree"][index[:table]].find { |e| index_covers?(e, index[:columns]) }
+
+                # indexes of same type
+                indexes = existing_columns[index[:using] || "btree"][index[:table]]
+
+                if best_index[:structure][:sort].empty?
+                  # gist indexes without an opclass
+                  # (opclass is part of column name, so columns won't match if opclass present)
+                  indexes += existing_columns["gist"][index[:table]]
+
+                  # hash indexes work for equality
+                  indexes += existing_columns["hash"][index[:table]] if best_index[:structure][:where].all? { |v| v[:op] == "=" }
+
+                  # brin indexes work for all
+                  indexes += existing_columns["brin"][index[:table]]
+                end
+
+                covering_index = indexes.find { |e| index_covers?(e.map { |v| v.sub(/ inet_ops\z/, "") }, index[:columns]) }
                 if covering_index
                   best_index[:covering_index] = covering_index
                   best_index[:explanation] = "Covered by index on (#{covering_index.join(", ")})"
@@ -86,7 +102,7 @@ module PgHero
         # get stats about columns for relevant tables
         tables = parts.values.map { |t| t[:table] }.uniq
         # TODO get schema from query structure, then try search path
-        schema = connection_model.connection_config[:schema] || "public"
+        schema = PgHero.connection_config(connection_model)[:schema] || "public"
         if tables.any?
           row_stats = Hash[table_stats(table: tables, schema: schema).map { |i| [i[:table], i[:estimated_rows]] }]
           col_stats = column_stats(table: tables, schema: schema).group_by { |i| i[:table] }

data/lib/pghero/methods/system.rb

@@ -144,7 +144,7 @@ module PgHero
 
         # validate input since we need to interpolate below
         raise Error, "Invalid metric name" unless metric_name =~ /\A[a-z\/_]+\z/i
-        raise Error, "Invalid database id" unless gcp_database_id =~ /\A[a-z\-:]+\z/i
+        raise Error, "Invalid database id" unless gcp_database_id =~ /\A[a-z0-9\-:]+\z/i
 
         # we handle three situations:
         # 1. google-cloud-monitoring-v3

data/lib/pghero/methods/users.rb

@@ -5,7 +5,7 @@ module PgHero
       # TODO quote in 3.0, but still not officially supported
       def create_user(user, password: nil, schema: "public", database: nil, readonly: false, tables: nil)
         password ||= random_password
-        database ||= connection_model.connection_config[:database]
+        database ||= PgHero.connection_config(connection_model)[:database]
 
         commands =
           [
@@ -44,7 +44,7 @@ module PgHero
       # documented as unsafe to pass user input
       # TODO quote in 3.0, but still not officially supported
       def drop_user(user, schema: "public", database: nil)
-        database ||= connection_model.connection_config[:database]
+        database ||= PgHero.connection_config(connection_model)[:database]
 
         # thanks shiftb
         commands =

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "2.7.2"
+  VERSION = "2.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Andrew Kane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,91 +24,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
-- !ruby/object:Gem::Dependency
-  name: activerecord-import
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  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
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg_query
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: 
+description:
 email: andrew@chartkick.com
 executables: []
 extensions: []
@@ -191,7 +107,7 @@ homepage: https://github.com/ankane/pghero
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -206,8 +122,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A performance dashboard for Postgres
 test_files: []