pg_saurus 4.0.3 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 778a1bfb5f393bfecb57a2fdd90ac89044043622d4ad1a7eaae64c4fded53dd5
-  data.tar.gz: e7d4a61024004a1c2cc93667c0d1aeee63d5c7196723aa0908e23fe90e5a9d40
+  metadata.gz: 6752e3270a15b3c039999db06e47cef3a6cbb7bddc6b9c1a11e3a53b3e032932
+  data.tar.gz: bdcf9f4e1d30a30f84930595dba797e005e6e42e29e74cbd9eb0fad929d4f09b
 SHA512:
-  metadata.gz: 047a944035bfead9aa7789d3b70a1712a661a79758eb7fcd700147f33845489175087f602aa8c8b1871dbaaeeb98c0c1476faf96cd585c8dc812035cecf3500d
-  data.tar.gz: c60056f0f70e57a931390138f1a12f61c2177f619b15de78a0057fe09995b403f3076018eade54a27a9e899f218cf48e1a288ff3d07ecad2c0a0d9effef6abc8
+  metadata.gz: f26c0a9d9147f8a2af05eefc95f7f65d21ab048cec633b93875a652e8ae77815e248ffe6c09155f3318e8d81cb53ef957cb00a9562e37baeffaee6b6c8bdf542
+  data.tar.gz: 2867b714cf7599e686cce0f01f388f227874f00c641fb8b969fbf1a3316886c21c4a9e665d96fe0dbbd3fb3dc359157ae62ed1ed0e9c6eb7a735695ff14925ec

data/lib/pg_saurus/connection_adapters/postgresql_adapter/extension_methods.rb

@@ -112,8 +112,7 @@ module PgSaurus::ConnectionAdapters::PostgreSQLAdapter::ExtensionMethods
   # @return [Hash{String => Hash{Symbol => String}}] A list of loaded extensions with their options
   def pg_extensions
     # Check postgresql version to not break on Postgresql < 9.1 during schema dump
-    pg_version_str = select_value('SELECT version()')
-    return {} unless pg_version_str =~ /^PostgreSQL (\d+\.\d+.\d+)/ && ($1 >= '9.1')
+    return {} if (::PgSaurus::Engine.pg_server_version <=> [9, 1]) < 0
 
     sql = <<-SQL
       SELECT pge.extname AS ext_name, pgn.nspname AS schema_name, pge.extversion AS ext_version

data/lib/pg_saurus/connection_adapters/postgresql_adapter/function_methods.rb

@@ -11,12 +11,13 @@ module PgSaurus::ConnectionAdapters::PostgreSQLAdapter::FunctionMethods
 
   # Return a list of defined DB functions. Ignore function definitions that can't be parsed.
   def functions
+    pg_major = ::PgSaurus::Engine.pg_server_version[0]
     res = select_all <<-SQL
       SELECT n.nspname AS "Schema",
         p.proname AS "Name",
         pg_catalog.pg_get_function_result(p.oid) AS "Returning",
        CASE
-        WHEN p.proiswindow                                           THEN 'window'
+        WHEN #{pg_major >= 11 ? "p.prokind = 'w'" : "p.proiswindow"} THEN 'window'
         WHEN p.prorettype = 'pg_catalog.trigger'::pg_catalog.regtype THEN 'trigger'
         ELSE 'normal'
        END   AS "Type",
@@ -26,7 +27,7 @@ module PgSaurus::ConnectionAdapters::PostgreSQLAdapter::FunctionMethods
       WHERE pg_catalog.pg_function_is_visible(p.oid)
             AND n.nspname <> 'pg_catalog'
             AND n.nspname <> 'information_schema'
-            AND p.proisagg <> TRUE
+            AND #{pg_major >= 11 ? "p.prokind <> 'a'" : "p.proisagg <> TRUE"}
       ORDER BY 1, 2, 3, 4;
     SQL
     res.inject([]) do |buffer, row|

data/lib/pg_saurus/engine.rb

@@ -2,6 +2,16 @@ module PgSaurus
   # :nodoc:
   class Engine < Rails::Engine
 
+    # Postgres server version.
+    #
+    # @return [Array<Integer>]
+    def self.pg_server_version
+      @pg_server_version ||=
+        ::ActiveRecord::Base.connection.
+          select_value('SHOW SERVER_VERSION').
+          split('.')[0..1].map(&:to_i)
+    end
+
     initializer "pg_saurus" do
       ActiveSupport.on_load(:active_record) do
         # load monkey patches

data/lib/pg_saurus/version.rb

@@ -1,4 +1,4 @@
 module PgSaurus
   # Version of pg_saurus gem.
-  VERSION = "4.0.3"
+  VERSION = "4.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_saurus
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.1.0
 platform: ruby
 authors:
 - Potapov Sergey
@@ -10,7 +10,7 @@ authors:
 - Matt Dressel
 - Bruce Burdick
 - HornsAndHooves
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2020-01-31 00:00:00.000000000 Z
@@ -270,7 +270,7 @@ homepage: https://github.com/HornsAndHooves/pg_saurus
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -285,9 +285,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: ActiveRecord extensions for PostgreSQL.
 test_files: []