pg_saurus 4.0.3 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 778a1bfb5f393bfecb57a2fdd90ac89044043622d4ad1a7eaae64c4fded53dd5
-  data.tar.gz: e7d4a61024004a1c2cc93667c0d1aeee63d5c7196723aa0908e23fe90e5a9d40
+  metadata.gz: 7a6d057b35291dc622b20193e085fc52c5807fd8310b1d8925b9c0636d72d95b
+  data.tar.gz: 7f0257ad41a044c887519c844a54334172fa5e829f7c6e06c0aca6280f8f6625
 SHA512:
-  metadata.gz: 047a944035bfead9aa7789d3b70a1712a661a79758eb7fcd700147f33845489175087f602aa8c8b1871dbaaeeb98c0c1476faf96cd585c8dc812035cecf3500d
-  data.tar.gz: c60056f0f70e57a931390138f1a12f61c2177f619b15de78a0057fe09995b403f3076018eade54a27a9e899f218cf48e1a288ff3d07ecad2c0a0d9effef6abc8
+  metadata.gz: ab15973698f38c460f51ee4879913be9c6fc4d9b7c5fde71d4e597cb230b8097b1011330017da05d2b67d8fac6c7e852c21e2d2314602ecf0892a9c3ed7251e7
+  data.tar.gz: 680092950b8eeb8d1716edf301d14a94744ecdb352423b9550b5b84abbd59ffd323dcb226bac13707e1b4edbe4753808ccfe955cbb5f2f0890a168f1f0d3658c

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:
@@ -135,13 +135,9 @@ module ActiveRecord
           # the column is difficult to target for quoting.
           skip_column_quoting = options.delete(:skip_column_quoting) or false
 
-          index_name,
-          index_type,
-          index_columns_and_opclasses,
-          index_options,
-          index_algorithm,
-          index_using,
-          comment = add_index_options(table_name, column_name, options)
+          index, algorithm, if_not_exists = add_index_options(table_name, column_name, **options)
+          algorithm = creation_method || algorithm
+          create_index = CreateIndexDefinition.new(index, algorithm, if_not_exists)
 
           # GOTCHA:
           #   It ensures that there is no existing index only for the case when the index
@@ -156,24 +152,11 @@ module ActiveRecord
           #   -- zekefast 2012-09-25
           if creation_method.present? && index_exists?(table_name, column_name, options)
             raise ::PgSaurus::IndexExistsError,
-                  "Index #{index_name} for `#{table_name}.#{column_name}` " \
+                  "Index #{index.name} for `#{table_name}.#{column_name}` " \
                   "column can not be created concurrently, because such index already exists."
           end
 
-          statements = []
-          statements << "CREATE #{index_type} INDEX"
-          statements << creation_method      if creation_method.present?
-          statements << index_algorithm      if index_algorithm.present?
-          statements << quote_column_name(index_name)
-          statements << "ON"
-          statements << quote_table_name(table_name)
-          statements << index_using          if index_using.present?
-          statements << "(#{index_columns_and_opclasses})" if index_columns_and_opclasses.present? unless skip_column_quoting
-          statements << "(#{column_name})"   if column_name.present? and skip_column_quoting
-          statements << index_options        if index_options.present?
-
-          sql = statements.join(' ')
-          execute(sql)
+          execute schema_creation.accept(create_index)
         end
 
         # Check to see if an index exists on a table for a given index definition.
@@ -250,7 +233,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
@@ -260,9 +243,8 @@ module ActiveRecord
             end
           ]
 
-          add_options_for_index_columns(quoted_columns, options).values
+          add_options_for_index_columns(quoted_columns, **options).values.join(", ")
         end
-        protected :quoted_columns_for_index
 
         # Map an expression to a name appropriate for an index.
         def expression_index_name(name)
@@ -280,6 +262,36 @@ module ActiveRecord
         end
         private :expression_index_name
 
+
+        # == Patch 1:
+        # Remove schema name part from table name when sequence name doesn't include it.
+        def new_column_from_field(table_name, field)
+          column_name, type, default, notnull, oid, fmod, collation, comment = field
+          type_metadata = fetch_type_metadata(column_name, type, oid.to_i, fmod.to_i)
+          default_value = extract_value_from_default(default)
+          default_function = extract_default_function(default_value, default)
+
+          if match = default_function&.match(/\Anextval\('"?(?<sequence_name>.+_(?<suffix>seq\d*))"?'::regclass\)\z/)
+            sequence_name = match[:sequence_name]
+            is_schema_name_included = sequence_name.split(".").size > 1
+            _table_name = is_schema_name_included ? table_name : table_name.split(".").last
+
+            serial = sequence_name_from_parts(_table_name, column_name, match[:suffix]) == sequence_name
+          end
+
+          PostgreSQL::Column.new(
+            column_name,
+            default_value,
+            type_metadata,
+            !notnull,
+            default_function,
+            collation: collation,
+            comment: comment.presence,
+            serial: serial
+          )
+        end
+        private :new_column_from_field
+
         # Split column name to name and operator class if possible.
         def split_column_name(name)
           if name =~ OPERATOR_REGEXP

data/lib/pg_saurus/connection_adapters/abstract_adapter/schema_methods.rb

@@ -4,17 +4,19 @@ module PgSaurus::ConnectionAdapters::AbstractAdapter::SchemaMethods
 
   # Provide :schema option to +create_table+ method.
   def create_table(table_name, options = {}, &block)
-    options     = options.dup
-    schema_name = options.delete(:schema)
-    table_name  = "#{schema_name}.#{table_name}" if schema_name
+    table_name, options = extract_table_options(table_name, options)
     super(table_name, options, &block)
   end
 
   # Provide :schema option to +drop_table+ method.
   def drop_table(table_name, options = {})
+    super(*extract_table_options(table_name, options))
+  end
+
+  def extract_table_options(table_name, options)
     options     = options.dup
     schema_name = options.delete(:schema)
     table_name  = "#{schema_name}.#{table_name}" if schema_name
-    super(table_name, options)
+    [table_name, options]
   end
 end

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

@@ -5,14 +5,15 @@ module PgSaurus::ConnectionAdapters::PostgreSQLAdapter::TranslateException
   INSUFFICIENT_PRIVILEGE = "42501"
 
   # Intercept insufficient privilege PG::Error and raise active_record wrapped database exception
-  def translate_exception(exception, message)
+  def translate_exception(exception, message:, sql:, binds:)
+    return exception unless exception.respond_to?(:result)
     exception_result = exception.result
 
     case exception_result.try(:error_field, PG::Result::PG_DIAG_SQLSTATE)
     when INSUFFICIENT_PRIVILEGE
       exc_message = exception_result.try(:error_field, PG::Result::PG_DIAG_MESSAGE_PRIMARY)
       exc_message ||= message
-      ::ActiveRecord::InsufficientPrivilege.new(exc_message)
+      ::ActiveRecord::InsufficientPrivilege.new(exc_message, sql: sql, binds: binds)
     else
       super
     end

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

@@ -72,7 +72,7 @@ module PgSaurus::CreateIndexConcurrently
     def add_index(table_name, column_name, options = {}, &block)
       table_name = proper_table_name(table_name)
       # GOTCHA:
-      #   checks if index should be created concurretnly then put it into
+      #   checks if index should be created concurrently then put it into
       #   the queue to wait till queue processing will be called (should be
       #   happended after closing transaction).
       #   Otherwise just delegate call to PgSaurus's `add_index`.

data/lib/pg_saurus/engine.rb

@@ -2,13 +2,24 @@ 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
-           connection_adapters/postgresql/column).each do |path|
+        %w[
+          schema_dumper
+          errors
+          connection_adapters/postgresql/schema_statements
+        ].each do |path|
           require ::PgSaurus::Engine.root + "lib/core_ext/active_record/" + path
         end
 

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.3"
+  VERSION = "5.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_saurus
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 5.0.0
 platform: ruby
 authors:
 - Potapov Sergey
@@ -10,10 +10,10 @@ authors:
 - Matt Dressel
 - Bruce Burdick
 - HornsAndHooves
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -29,62 +29,76 @@ 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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +226,6 @@ extra_rdoc_files:
 files:
 - README.markdown
 - 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
@@ -270,7 +283,7 @@ homepage: https://github.com/HornsAndHooves/pg_saurus
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -285,9 +298,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.8
+signing_key:
 specification_version: 4
 summary: ActiveRecord extensions for PostgreSQL.
 test_files: []

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

@@ -1,19 +0,0 @@
-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