pg_saurus 4.2.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc48a831f1ab97b0f56ef559766c5284a92eed10583bd02d31729d7554225016
-  data.tar.gz: 9798c1dd0e4caf1b8407f5c2041ffd52d727375bdfa4c03996ee542419164972
+  metadata.gz: 4a5ce70db53d9b1636c43b1e2156bc88eeabebf62fbeb39e9ea6141bec719eb3
+  data.tar.gz: '058c5db2a699fba1f9bec20a0136e4fef2721f03a30b8fc74d1a83197dc20f21'
 SHA512:
-  metadata.gz: 0e3bc30b1a68e2cfee33264c903b0d34815eb6c9c26692bd85b8157c01a24f9152f3615af2ea25c4b389b02dc4c9f1553cb9fdd05e34cf221a2efc491c945532
-  data.tar.gz: 26fdd30c2a66cd61f18622febd46ceaa4b8d394afcfe66df6161377bf964f03617e8383f7fbcb03526d4fdd27882045270bc19f0d54362cd3c187bc0564563fb
+  metadata.gz: 4909fe1c8a4694daf48598534b9d4e0dac565224be24c055187e1fe1a125e542f48fbbd4af646b81d4cf7c2a729b56712f6687abfc5106386e302abdfbf105ed
+  data.tar.gz: a647b93cd3c8ac24b62c9accf944fa1874d7a902a0129eea64e2f3bf20361f855eff2ed5ee0bb18e66055bf8210a8e8aff1d6da38d663eb4679616a5c436f138

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

@@ -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,25 +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.
@@ -261,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)
@@ -281,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/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

@@ -15,10 +15,11 @@ module PgSaurus
     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/errors.rb

@@ -7,4 +7,10 @@ module PgSaurus
 
   # Raised if config.ensure_role_set = true, but migration have no role set.
   class RoleNotSetError < Error; end
+
+  # Raised if set_role used for data change migration.
+  class UseKeepDefaultRoleError < Error; end
+
+  # Raised if keep_default_role used for structure change migration.
+  class UseSetRoleError < Error; end
 end

data/lib/pg_saurus/migration/set_role_method.rb

@@ -13,11 +13,57 @@ module PgSaurus
         #
         # @param role [String]
         def set_role(role)
+          if const_defined?("SeedMigrator") && self.ancestors.include?(SeedMigrator)
+            msg = <<~MSG
+              Use keep_default_role instead of set_role for data change migration #{self}
+
+              Example:
+
+                class PopulateExample < ActiveRecord::Migration
+                  include #{self.ancestors[1]}
+
+                  keep_default_role
+
+                  def up
+                    apply_update "populate_example_data_update"
+                  end
+
+                  def down
+                    revert_update "populate_example_data_update"
+                  end
+                end
+            MSG
+
+            raise PgSaurus::UseKeepDefaultRoleError, msg
+          end
+
           @role = role
         end
 
         # Prevents raising exception when ensure_role_set=true and no role is set.
         def keep_default_role
+          if const_defined?("SeedMigrator") && !self.ancestors.include?(SeedMigrator)
+            msg = <<~MSG
+              Use set_role instead of keep_default_role for structure migration #{self}
+
+              Example:
+
+                class CreateExamples < ActiveRecord::Migration
+                  set_role "superhero"
+
+                  def up
+                    ...
+                  end
+
+                  def down
+                    ...
+                  end
+                end
+            MSG
+
+            raise PgSaurus::UseSetRoleError, msg
+          end
+
           @keep_default_role = true
         end
 

data/lib/pg_saurus/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_saurus
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Potapov Sergey
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -49,56 +49,56 @@ dependencies:
     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
@@ -226,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
@@ -299,8 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.9
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: ActiveRecord extensions for PostgreSQL.

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