pg_saurus 4.0.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4621e5c56482cf923810bd206b2449469102f56a92a55acf002d004c5664675
-  data.tar.gz: 8c5b2e568586c128e7d0a248ef6cdd2b8c1f67e8e02e888fa4f2eee5bcd8adde
+  metadata.gz: cc48a831f1ab97b0f56ef559766c5284a92eed10583bd02d31729d7554225016
+  data.tar.gz: 9798c1dd0e4caf1b8407f5c2041ffd52d727375bdfa4c03996ee542419164972
 SHA512:
-  metadata.gz: f9d730184e0b65c57e7a894abf10d26e2553e5b627d92ed211a9b93a7e3e1e163eb95ef3429ea837509e0d1caa5607efc29655446411b51111f90dddd7d7be59
-  data.tar.gz: 5256f3a310c2a8d5586477ee0a0f45c208a02b60ab0720632f26bcaf9b0fa428b546fa6b9ff825b2b8fc2d1e872e5939eefbda75036d93f3486b4485d3dbcbc7
+  metadata.gz: 0e3bc30b1a68e2cfee33264c903b0d34815eb6c9c26692bd85b8157c01a24f9152f3615af2ea25c4b389b02dc4c9f1553cb9fdd05e34cf221a2efc491c945532
+  data.tar.gz: 26fdd30c2a66cd61f18622febd46ceaa4b8d394afcfe66df6161377bf964f03617e8383f7fbcb03526d4fdd27882045270bc19f0d54362cd3c187bc0564563fb

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/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/tools.rb

@@ -19,8 +19,10 @@ module PgSaurus
     #
     # @return [void]
     def create_schema_if_not_exists(schema_name)
-      sql = %{CREATE SCHEMA IF NOT EXISTS "#{schema_name}"}
-      connection.execute sql
+      unless schemas.include?(schema_name.to_s)
+        sql = %{CREATE SCHEMA "#{schema_name}"}
+        connection.execute sql
+      end
     end
 
     # Ensure schema does not exists.

data/lib/pg_saurus/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_saurus
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Potapov Sergey
@@ -10,10 +10,10 @@ authors:
 - Matt Dressel
 - Bruce Burdick
 - HornsAndHooves
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-26 00:00:00.000000000 Z
+date: 2021-09-02 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,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.9
-signing_key: 
+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'