pghero 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f6dedb66d19e25c60630b97b92a84647ade3d2d
-  data.tar.gz: 0e5ca53ffe1bee7cb6a8be895cc974aacd58a1fa
+  metadata.gz: 7180e123821d568de00ca057b46d552b04424cba
+  data.tar.gz: bcad3bb920aeeedf4958aaaa5a941d3e3af5724d
 SHA512:
-  metadata.gz: 6f971500f351580cdb9dfbdaaa9f4c5d9227c5a52672599b7553e20f2fdf5b14d3d8beb8d02a30e5a03aaaf8e105331bd559aef9100e0a34bd2e1292d1172a95
-  data.tar.gz: c464429ebfb5d25deee181b93586e7fe316351325253cc5c254fab6b76009df0f86916db4d3db615550a4c77a15902cfb789c36cca137237edca78a821d53496
+  metadata.gz: 1e4eb14518cac12bced82d9ed97bd057be822f1d1f0f8d3ccd011f36f4b5658f749fd689de57ae4bec93433818b5fc9c9d917235b032ed26a7b5e6356557ea09
+  data.tar.gz: fad8fdc055de2709db694cfdc46be8f52ffe51565945a5e895e56ba9877450f31799af7199338001d61ac806fcaf34b0c7b0ec54a6974496f0db8f52e8353871

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.5.1
+
+- Better tune page for PostgreSQL 9.5
+
 ## 1.5.0
 
 - Added user to query stats (opt-in)

data/app/views/pg_hero/home/tune.html.erb

@@ -18,5 +18,5 @@
     </tbody>
   </table>
 
-  <p>Check out <%= link_to "PgTune", "http://pgtune.leopard.in.ua", target: "_blank" %> for recommendations.</p>
+  <p>Check out <%= link_to "PgTune", "http://pgtune.leopard.in.ua", target: "_blank" %> for recommendations. DB version is <%= @database.server_version.split(".").first(2).join(".") %>.</p>
 </div>

data/lib/pghero/methods/basic.rb

@@ -2,13 +2,21 @@ module PgHero
   module Methods
     module Basic
       def settings
-        names = %w(
-          max_connections shared_buffers effective_cache_size work_mem
-          maintenance_work_mem checkpoint_segments checkpoint_completion_target
-          wal_buffers default_statistics_target
-        )
-        values = Hash[select_all(connection_model.send(:sanitize_sql_array, ["SELECT name, setting, unit FROM pg_settings WHERE name IN (?)", names])).sort_by { |row| names.index(row["name"]) }.map { |row| [row["name"], friendly_value(row["setting"], row["unit"])] }]
-        Hash[names.map { |name| [name, values[name]] }]
+        names =
+          if server_version_num >= 90500
+            %w(
+              max_connections shared_buffers effective_cache_size work_mem
+              maintenance_work_mem min_wal_size max_wal_size checkpoint_completion_target
+              wal_buffers default_statistics_target
+            )
+          else
+            %w(
+              max_connections shared_buffers effective_cache_size work_mem
+              maintenance_work_mem checkpoint_segments checkpoint_completion_target
+              wal_buffers default_statistics_target
+            )
+          end
+        Hash[names.map { |name| [name, select_all("SHOW #{name}").first[name]] }]
       end
 
       def ssl_used?
@@ -25,25 +33,12 @@ module PgHero
         select_all("SELECT current_database()").first["current_database"]
       end
 
-      private
-
-      def friendly_value(setting, unit)
-        if %w(kB 8kB).include?(unit)
-          value = setting.to_i
-          value *= 8 if unit == "8kB"
-
-          if value % (1024 * 1024) == 0
-            "#{value / (1024 * 1024)}GB"
-          elsif value % 1024 == 0
-            "#{value / 1024}MB"
-          else
-            "#{value}kB"
-          end
-        else
-          "#{setting}#{unit}".strip
-        end
+      def server_version
+        select_all("SHOW server_version").first["server_version"]
       end
 
+      private
+
       def select_all(sql)
         # squish for logs
         connection.select_all(squish(sql)).to_a

data/lib/pghero/methods/query_stats.rb

@@ -84,7 +84,7 @@ module PgHero
       end
 
       def supports_query_hash?
-        @supports_query_hash ||= server_version >= 90400 && historical_query_stats_enabled? && PgHero::QueryStats.column_names.include?("query_hash")
+        @supports_query_hash ||= server_version_num >= 90400 && historical_query_stats_enabled? && PgHero::QueryStats.column_names.include?("query_hash")
       end
 
       def supports_query_stats_user?
@@ -240,7 +240,7 @@ module PgHero
         end
       end
 
-      def server_version
+      def server_version_num
         @server_version ||= select_all("SHOW server_version_num").first["server_version_num"].to_i
       end
 

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord