pg_saurus 4.0.2 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20e72495c2fa2ffdc422bfeefac5c196c888685cf98ed513dc94da2608476572
-  data.tar.gz: '0366790a931f6ebb4283f80d1112588de221d3844968eaedeeb059c4443124ec'
+  metadata.gz: d0658a18dcaee8fd3acbe9334daf053e0a22568157b53d1b182add67970dd799
+  data.tar.gz: 87468b4dca614127ebdea002e67d92e610c3d0057ede82dc4d6a18dd90d60c18
 SHA512:
-  metadata.gz: 149f1cd2738b90d36cc52900af989fed800064b28242e0de3aadb50eff7c3316c240d2696f01de3c6b14d395e2202a68427bb8ff6ab76b673f29f15c8f1cd78a
-  data.tar.gz: 489cda1e93255d713f7fa6c479b738c436ec74fb7591358d7a02c6e3acd0693adcf0e6d63630000299a46ae375f65fd48c2e841cff757eed29cc74e03a664202
+  metadata.gz: f9305018ca8cf965346683abcf7296a3459f2d81d9887829c75f3eb26aa3a0f5341af4c58b0c0459e9fb679481bf3c778f94ba981c8676d0c52dfe36d84f1802
+  data.tar.gz: 41a869cf2aa17cde12b29f684ec39c9d89862c11c9dd1f909d39cbaa3ae29163f634d1ec5070d27c60bb7cc4281ba0e1b30da8bffb81b09538a847260d2463a2

data/lib/core_ext/active_record/connection_adapters/postgresql/schema_statements.rb

@@ -29,7 +29,7 @@ module ActiveRecord
               WHERE schemaname = ANY (ARRAY['public'])
           SQL
         end
-        
+
         # Returns an array of indexes for the given table.
         #
         # == Patch 1:
@@ -173,6 +173,7 @@ module ActiveRecord
           statements << index_options        if index_options.present?
 
           sql = statements.join(' ')
+
           execute(sql)
         end
 
@@ -250,7 +251,7 @@ module ActiveRecord
               column_name, operator_name = split_column_name(name)
 
               result_name = if column_name =~ FUNCTIONAL_INDEX_REGEXP
-                              _name = "#{$1}(#{$2}#{quote_column_name($3)})"
+                              _name = column_name.gsub(/\b#{$3}\b/, quote_column_name($3))
                               _name += " #{operator_name}"
                               _name
                             else

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/connection_adapters/postgresql_adapter/trigger_methods.rb

@@ -95,7 +95,7 @@ module PgSaurus::ConnectionAdapters::PostgreSQLAdapter::TriggerMethods
 
   # Parse the condition from the trigger definition.
   def parse_condition(trigger_definition)
-    trigger_definition[/WHEN[\s](.*?)[\s]EXECUTE[\s]PROCEDURE/m, 1]
+    trigger_definition[/WHEN[\s](.*?)[\s]EXECUTE[\s](FUNCTION|PROCEDURE)/m, 1]
   end
   private :parse_condition
 
@@ -107,7 +107,7 @@ module PgSaurus::ConnectionAdapters::PostgreSQLAdapter::TriggerMethods
 
   # Parse the procedure name from the trigger definition.
   def parse_proc_name(trigger_definition)
-    trigger_definition[/EXECUTE[\s]PROCEDURE[\s](.*?)$/m,1]
+    trigger_definition[/EXECUTE[\s](FUNCTION|PROCEDURE)[\s](.*?)$/m, 2]
   end
   private :parse_proc_name
 

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/schema_dumper/extension_methods.rb

@@ -15,8 +15,8 @@ module PgSaurus::SchemaDumper::ExtensionMethods
     extensions = @connection.pg_extensions
     commands   = extensions.map do |extension_name, options|
       result = [%Q|create_extension "#{extension_name}"|]
-      result << %Q|:schema_name => "#{options[:schema_name]}"| unless options[:schema_name] == 'public'
-      result << %Q|:version => "#{options[:version]}"|
+      result << %Q|schema_name: "#{options[:schema_name]}"| unless options[:schema_name] == 'public'
+      result << %Q|version: "#{options[:version]}"|
       result.join(', ')
     end
 

data/lib/pg_saurus/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_saurus
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.3.0
 platform: ruby
 authors:
 - Potapov Sergey
@@ -10,10 +10,10 @@ authors:
 - Matt Dressel
 - Bruce Burdick
 - HornsAndHooves
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-16 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -29,6 +29,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -205,14 +219,12 @@ email:
 - cryo28@gmail.com
 - matt.dressel@gmail.com
 - rubygems.org@bruceburdick.com
-executables:
-- rails
+executables: []
 extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
 - README.markdown
-- bin/rails
 - lib/colorized_text.rb
 - lib/core_ext/active_record/connection_adapters/postgresql/column.rb
 - lib/core_ext/active_record/connection_adapters/postgresql/schema_statements.rb
@@ -272,7 +284,7 @@ homepage: https://github.com/HornsAndHooves/pg_saurus
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -287,9 +299,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: []

data/bin/rails

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails gems
-# installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('..', __dir__)
-ENGINE_PATH = File.expand_path('../lib/pg_saurus/engine', __dir__)
-APP_PATH = File.expand_path('../test/dummy/config/application', __dir__)
-
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-
-require 'rails/all'
-require 'rails/engine/commands'