pg_saurus 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b32de47fc9d97bfc956d5e2e26c9601ed2da3866dea9a51b97722c90d4b1db7
-  data.tar.gz: 497db5f622d6332efa57216e13527b71a2895125856330e320166f342e088637
+  metadata.gz: 6752e3270a15b3c039999db06e47cef3a6cbb7bddc6b9c1a11e3a53b3e032932
+  data.tar.gz: bdcf9f4e1d30a30f84930595dba797e005e6e42e29e74cbd9eb0fad929d4f09b
 SHA512:
-  metadata.gz: 4626a2eeaf870f6a000e048e0d7264aaf8d79486c09eaffd247358f14d83eb2cfe201f758d62b60bfb5a6da4ce5dddbdbc1ce701350920bf88c5f4396a4bb196
-  data.tar.gz: e5c098daabeaa492376e42dfbd1639439d09c9f457323e43f4f00c240d8d4a5c91b0d05ce53d41306fb9b28788bdc53115df8a3698f87e41f9d76e8dd548d804
+  metadata.gz: f26c0a9d9147f8a2af05eefc95f7f65d21ab048cec633b93875a652e8ae77815e248ffe6c09155f3318e8d81cb53ef957cb00a9562e37baeffaee6b6c8bdf542
+  data.tar.gz: 2867b714cf7599e686cce0f01f388f227874f00c641fb8b969fbf1a3316886c21c4a9e665d96fe0dbbd3fb3dc359157ae62ed1ed0e9c6eb7a735695ff14925ec

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

@@ -0,0 +1,19 @@
+module ActiveRecord
+  module ConnectionAdapters
+    # PostgreSQL-specific extensions to column definitions in a table.
+    class PostgreSQLColumn < Column #:nodoc:
+      # == Patch 1:
+      # Remove schema name part from table name when sequence name doesn't include it.
+      def serial?
+        return unless default_function
+
+        if %r{\Anextval\('"?(?<sequence_name>.+_(?<suffix>seq\d*))"?'::regclass\)\z} =~ default_function
+          is_schema_name_included = sequence_name.split(".").size > 1
+          _table_name = is_schema_name_included ? table_name : table_name.split(".").last
+
+          sequence_name_from_parts(_table_name, name, suffix) == sequence_name
+        end
+      end
+    end
+  end
+end

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

@@ -15,6 +15,21 @@ module ActiveRecord
         # Regex to find where clause in index statements
         INDEX_WHERE_EXPRESSION = /WHERE (.+)$/
 
+        # Returns the list of all tables in the schema search path or a specified schema.
+        #
+        # == Patch:
+        # If current user is not `postgres` original method return all tables from all schemas
+        # without schema prefix. This disables such behavior by querying only default schema.
+        # Tables with schemas will be queried later.
+        #
+        def tables(name = nil)
+          query(<<-SQL, 'SCHEMA').map { |row| row[0] }
+              SELECT tablename
+              FROM pg_tables
+              WHERE schemaname = ANY (ARRAY['public'])
+          SQL
+        end
+        
         # Returns an array of indexes for the given table.
         #
         # == Patch 1:

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,10 +2,23 @@ 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
-        %w(schema_dumper errors connection_adapters/postgresql/schema_statements).each do |path|
+        %w(schema_dumper
+           errors
+           connection_adapters/postgresql/schema_statements
+           connection_adapters/postgresql/column).each do |path|
           require ::PgSaurus::Engine.root + "lib/core_ext/active_record/" + path
         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.0"
+  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.0
+  version: 4.1.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-24 00:00:00.000000000 Z
+date: 2020-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -205,15 +205,14 @@ 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
 - lib/core_ext/active_record/errors.rb
 - lib/core_ext/active_record/schema_dumper.rb
@@ -271,7 +270,7 @@ homepage: https://github.com/HornsAndHooves/pg_saurus
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -286,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: []

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'