pg_saurus 5.3.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4dfa9fa5e2ea0cf5c38fc323434ff9a8e2fd0fc051adf45e378d31d09bfd3bb
-  data.tar.gz: db821a3566aea980399af5d4178771d42b7aac460549905e8f2765690e930562
+  metadata.gz: 9875c3cdffb8f2d496539d99a81de258a72c820fc21c4e2941f288c2063d3470
+  data.tar.gz: acb8edcb2354ce71888d9367edfd981fd4d19ecb3fd347286c69fab82cf3dc1d
 SHA512:
-  metadata.gz: 8b5c252cba03504a37fb499a6c38fb7a97807025ff3aa0e9574a12036fa1583b7d4307d5398a3aaa0dda2979a764a5d7af3c8a96da80e6ae7d399c268b234e75
-  data.tar.gz: c5b8a0629e1a25d53e52f57451e9efa54f8e31a5b8abab97f0b1de624eca446893785a53e2b54d372bb0a0f1e83fd128cd0bb27badc816d5fd093a57e35cc762
+  metadata.gz: 915b2e091c2b4e696ccb3c1128b792729bc79090af93f2d053eb3aa96d04320774b24a18c6adc12e50fcd9a81295cc9f9bd95177317714acd27ea0a1e59ef8ed
+  data.tar.gz: 988ee22b6138d8b6151f2c5e1f078d88f20718ead4ab410ad1edba7a795988bf1afc24321e387abcc90c3a150147be40059984ac9af8562d8f21514140c24b8a

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

@@ -263,31 +263,53 @@ module ActiveRecord
         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
+        # Overrides https://github.com/rails/rails/blob/v7.2.2.2/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L923
+        def new_column_from_field(table_name, field, ...)
+          column_name, type, default, notnull, oid, fmod, collation, comment, identity, attgenerated = 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 attgenerated.present?
+            default_function = default
+          else
+            default_function = extract_default_function(default_value, default)
+          end
 
           if match = default_function&.match(/\Anextval\('"?(?<sequence_name>.+_(?<suffix>seq\d*))"?'::regclass\)\z/)
+            # Begin patch
+            # Remove schema name part from table name when sequence name doesn't include it.
             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 patch
           end
 
-          PostgreSQL::Column.new(
+          column_args = [
             column_name,
             default_value,
             type_metadata,
             !notnull,
             default_function,
+          ]
+
+          if Rails.gem_version >= "8.1"
+            # https://github.com/rails/rails/pull/54333
+            # https://github.com/rails/rails/blob/v8.1.3/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L1020
+            column_args.insert(
+              1,
+              get_oid_type(oid.to_i, fmod.to_i, column_name, type),
+            )
+          end
+
+          PostgreSQL::Column.new(
+            *column_args,
             collation: collation,
             comment: comment.presence,
-            serial: serial
+            serial: serial,
+            identity: identity.presence,
+            generated: attgenerated
           )
         end
         private :new_column_from_field
@@ -342,6 +364,19 @@ module ActiveRecord
           column_with_type.sub(/\((\w+)\)::\w+/, '\1')
         end
         private :remove_type
+
+        # Override to only check table name, not schema and table name.
+        #
+        # https://github.com/rails/rails/blob/v7.2.2.2/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb#L1787
+        def validate_table_length!(table_name)
+          max_table_name_length = 64
+          if table_name.to_s.split(".").last.length > max_table_name_length
+            raise ArgumentError, <<~MSG.squish
+              Table name '#{table_name}' is too long (#{table_name.length} characters); the limit is
+              #{max_table_name_length} characters
+            MSG
+          end
+        end
       end
     end
   end

data/lib/core_ext/active_record/migration/compatibility.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  class Migration
+    module Compatibility
+      # PgSaurus has been properly creating functional index names since Rails 4, so we don't want the old logic
+      class V7_0
+        module TableDefinition
+          # Override https://github.com/rails/rails/blob/v7.2.2.2/activerecord/lib/active_record/migration/compatibility.rb#L80
+          def index(...)
+            super
+          end
+        end
+        # Override https://github.com/rails/rails/blob/v7.2.2.2/activerecord/lib/active_record/migration/compatibility.rb#L102
+        def add_index(...)
+          super
+        end
+      end
+    end
+  end
+end

data/lib/pg_saurus/connection_adapters/postgresql_adapter/foreign_key_methods.rb

@@ -24,7 +24,7 @@ module PgSaurus # :nodoc:
     #
     # Creates index on the FK column by default. Pass in the option exclude_index: true
     # to disable this.
-    def add_foreign_key(from_table, to_table, options = {})
+    def add_foreign_key(from_table, to_table, **options)
       exclude_index = (options.has_key?(:exclude_index) ? options.delete(:exclude_index) : false)
       column        = options[:column] || foreign_key_column_for(to_table)
 
@@ -57,10 +57,14 @@ module PgSaurus # :nodoc:
     # See: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
     #
     # Removes schema name from table name.
-    def foreign_key_column_for(table_name)
+    def foreign_key_column_for(table_name, column_name = "id")
       table = table_name.to_s.split('.').last
 
-      super table
+      if Rails.gem_version >= "7.2"
+        super table, column_name
+      else
+        super table
+      end
     end
 
     # See activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb

data/lib/pg_saurus/engine.rb

@@ -19,11 +19,12 @@ module PgSaurus
           schema_dumper
           errors
           connection_adapters/postgresql/schema_statements
+          migration/compatibility
         ].each do |path|
           require ::PgSaurus::Engine.root + "lib/core_ext/active_record/" + path
         end
 
-        ActiveRecord::SchemaDumper.class_eval do
+        ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.class_eval do
           prepend ::PgSaurus::SchemaDumper::SchemaMethods
           prepend ::PgSaurus::SchemaDumper::ExtensionMethods
           prepend ::PgSaurus::SchemaDumper::ViewMethods

data/lib/pg_saurus/schema_dumper/extension_methods.rb

@@ -1,17 +1,11 @@
 # Extends ActiveRecord::SchemaDumper class to dump comments on tables and columns.
 module PgSaurus::SchemaDumper::ExtensionMethods
-  # Hook ActiveRecord::SchemaDumper#header method to dump extensions in all
-  # schemas except for pg_catalog.
-  def header(stream)
-    super(stream)
-    dump_extensions(stream)
-    stream
-  end
-
-# Dump current database extensions recreation commands to the given stream.
-#
-# @param [#puts] stream Stream to write to
-  def dump_extensions(stream)
+  # Overrides https://github.com/rails/rails/blob/v7.2.2.2/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb#L8
+  #
+  # Dump current database extensions recreation commands to the given stream.
+  #
+  # @param [#puts] stream Stream to write to
+  def extensions(stream)
     extensions = @connection.pg_extensions
     commands   = extensions.map do |extension_name, options|
       result = [%Q|create_extension "#{extension_name}"|]
@@ -25,5 +19,7 @@ module PgSaurus::SchemaDumper::ExtensionMethods
     end
 
     stream.puts
+
+    super
   end
 end

data/lib/pg_saurus/schema_dumper/schema_methods.rb

@@ -1,27 +1,32 @@
 # Extends ActiveRecord::SchemaDumper class to dump schemas other than "public"
 # and tables from those schemas.
 module PgSaurus::SchemaDumper::SchemaMethods
-  # Dump create schema statements
+
+  # Overrides https://github.com/rails/rails/blob/v7.2.2.2/activerecord/lib/active_record/schema_dumper.rb#L95
   def header(stream)
-    super(stream)
-    schemas(stream)
-    stream
+    super
+    dump_all_schemas(stream)
+  end
+
+  # Remove per-schema dumping logic from https://github.com/rails/rails/pull/50020
+  # https://github.com/rails/rails/blob/v8.1.3/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb#L142
+  def within_each_schema
+    yield
+  end
+
+  # Overrides https://github.com/rails/rails/blob/v7.2.2.2/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb#L31
+  #
+  # We are already dumping the schemas through #header
+  def schemas(...)
   end
 
   # Generates code to create schemas.
-  def schemas(stream)
+  private def dump_all_schemas(stream)
     # Don't create "public" schema since it exists by default.
-    schema_names = PgSaurus::Tools.schemas - ["public", "information_schema"]
+    schema_names = PgSaurus::Tools.schemas - %w[public information_schema]
     schema_names.each do |schema_name|
-      schema(schema_name, stream)
+      stream.puts %(  create_schema_if_not_exists "#{schema_name}")
     end
-    stream << "\n"
-  end
-  private :schemas
-
-  # Generates code to create schema.
-  def schema(schema_name, stream)
-    stream << "  create_schema_if_not_exists \"#{schema_name}\"\n"
+    stream.puts
   end
-  private :schema
 end

data/lib/pg_saurus/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_saurus
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 6.1.1
 platform: ruby
 authors:
 - Potapov Sergey
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-09 00:00:00.000000000 Z
+date: 2026-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -33,72 +33,72 @@ dependencies:
   name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -155,20 +155,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -228,6 +214,7 @@ files:
 - lib/colorized_text.rb
 - lib/core_ext/active_record/connection_adapters/postgresql/schema_statements.rb
 - lib/core_ext/active_record/errors.rb
+- lib/core_ext/active_record/migration/compatibility.rb
 - lib/core_ext/active_record/schema_dumper.rb
 - lib/generators/pg_saurus/install/install_generator.rb
 - lib/generators/pg_saurus/install/templates/config/initializers/pg_saurus.rb
@@ -298,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: ActiveRecord extensions for PostgreSQL.