pg_saurus 6.0.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a8ddb3d62425c2f23a5fdf1b329d7a84be0129ab1be67bb87ca0a5150994720
-  data.tar.gz: 13cf5197c303baa0c95bf53d44d582e0c783ade8694329be03de7397cd53e46f
+  metadata.gz: 9875c3cdffb8f2d496539d99a81de258a72c820fc21c4e2941f288c2063d3470
+  data.tar.gz: acb8edcb2354ce71888d9367edfd981fd4d19ecb3fd347286c69fab82cf3dc1d
 SHA512:
-  metadata.gz: fb9565fa59ab7b6cbd3087e0d1a63b57f14832a2987e17ab010db47ff8ee46fa6b272d3e8b001c62b3ad699327b1a4151a1d5d64cc7552486129cb8e4cef2aca
-  data.tar.gz: 51ad1458b2cfebec850f8ef9144a4613a11598824b29e77a53dd06cacddd0c1e0bb3cb1dba7fcdbeb66c7ecbccbb6c16ca220bf8712aa8ba1944edfda9b50c0e
+  metadata.gz: 915b2e091c2b4e696ccb3c1128b792729bc79090af93f2d053eb3aa96d04320774b24a18c6adc12e50fcd9a81295cc9f9bd95177317714acd27ea0a1e59ef8ed
+  data.tar.gz: 988ee22b6138d8b6151f2c5e1f078d88f20718ead4ab410ad1edba7a795988bf1afc24321e387abcc90c3a150147be40059984ac9af8562d8f21514140c24b8a

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

@@ -264,9 +264,6 @@ module ActiveRecord
 
 
         # Overrides https://github.com/rails/rails/blob/v7.2.2.2/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L923
-        #
-        # == 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, identity, attgenerated = field
           type_metadata = fetch_type_metadata(column_name, type, oid.to_i, fmod.to_i)
@@ -279,19 +276,35 @@ module ActiveRecord
           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,

data/lib/pg_saurus/schema_dumper/schema_methods.rb

@@ -5,7 +5,13 @@ module PgSaurus::SchemaDumper::SchemaMethods
   # Overrides https://github.com/rails/rails/blob/v7.2.2.2/activerecord/lib/active_record/schema_dumper.rb#L95
   def header(stream)
     super
-    dump_schemas(stream)
+    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
@@ -15,19 +21,12 @@ module PgSaurus::SchemaDumper::SchemaMethods
   end
 
   # Generates code to create schemas.
-  def dump_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|
-      dump_schema(schema_name, stream)
+      stream.puts %(  create_schema_if_not_exists "#{schema_name}")
     end
     stream.puts
   end
-  private :dump_schemas
-
-  # Generates code to create schema.
-  def dump_schema(schema_name, stream)
-    stream.puts %(  create_schema_if_not_exists "#{schema_name}")
-  end
-  private :dump_schema
 end

data/lib/pg_saurus/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_saurus
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.1
 platform: ruby
 authors:
 - Potapov Sergey
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-29 00:00:00.000000000 Z
+date: 2026-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -47,56 +47,56 @@ dependencies:
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '8'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '8'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '8'
 - !ruby/object:Gem::Dependency