pg_party 1.5.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b833474e06e9a20278f5ad629e4c26f290baeeac56a0aa9c4ec6dc1104023393
-  data.tar.gz: 881f312c5714dc37760ef49537a5a200b46e72bace05a944890fe78dcc110f71
+  metadata.gz: 47b9e6d4d46ab349625ffcb49760675371e99412bdeac53993a7965dd08224cf
+  data.tar.gz: '08005f8354b7619a3e7745a67c157b2265851f0b7bc25568bfbd84d56e29a2b4'
 SHA512:
-  metadata.gz: 6b9a253b6fe399aa6908bc4d7a4e8625622fadf4877af642d22c52f1e52c211a89b23e4cf3d4bec94b461fc9daf4db5de23384091255a33d055872cd337f97ef
-  data.tar.gz: 8425ced0e015ceada85d6fedf1b553358a774ff39b85a0d4700c058a8747a24049e4f6d52a7d138722cb7cca3e04f75d883eed51f10df8f8ddbe88de629ead6a
+  metadata.gz: b6f5d302c2d4bdccc61ed263db7d04723551ab83bffdb1c89e229d8a602733329aa7568ff66ddcac7d4ffcf4a8c44ebd47536e3a50aa5f48a5876504224b8258
+  data.tar.gz: 0b5d15d2f46417a2a1eb54d56be0ba2b0a7c4a665c2c1b6ae38600891cb91260bb667f5d88cdd28b97d1b50370b4ce098ca895de3d8cdb2f58970aab474d76fc

data/README.md

@@ -21,9 +21,20 @@
 
 - Partition tables are not represented correctly in `db/schema.rb` — please use the `:sql` schema format
 
+## Compatibility
+
+This gem is tested against:
+
+- Rails: 6.1, 7.0, 7.1
+- Ruby: 3.0, latest (currently 3.2 at the time of this commit)
+- PostgreSQL: 11, 12, 13, 14, 15, 16
+
 ## Future Work
 
-- Automatic partition creation (via cron or some other means)
+I plan to separate out the model functionality into a new gem and port the migration functionality into [pg\_ha\_migrations](https://github.com/braintree/pg_ha_migrations) (some of which has already been done).
+I will continue to maintain this gem (bugfixes / support for new versions of Rails) until that work is complete.
+
+I originally planned to add a feature for automatic partition creation, but I think that functionality would be better served by [pg\_partman](https://github.com/pgpartman/pg_partman).
 
 ## Installation
 

data/lib/pg_party/adapter_decorator.rb

@@ -117,7 +117,7 @@ module PgParty
             ON pg_tables.tablename::regclass = pg_inherits.inhparent::regclass
           WHERE pg_tables.schemaname = current_schema() AND
           pg_tables.tablename = #{quote(table_name)}
-                    ]).each_with_object(_accumulator) do |partition, acc|
+                    ], "SCHEMA").each_with_object(_accumulator) do |partition, acc|
         acc << partition
         next unless include_subpartitions
 
@@ -133,7 +133,7 @@ module PgParty
             ON pg_tables.tablename::regclass = pg_inherits.inhrelid::regclass
           WHERE pg_tables.schemaname = current_schema() AND
           pg_tables.tablename = #{quote(table_name)}
-      ]).first
+      ], "SCHEMA").first
       return parent if parent.nil? || !traverse
 
       while (parents_parent = parent_for_table_name(parent)) do
@@ -174,12 +174,12 @@ module PgParty
         SELECT relkind FROM pg_catalog.pg_class AS c
         JOIN pg_catalog.pg_namespace AS ns ON c.relnamespace = ns.oid
         WHERE relname = #{quote(table_name)} AND nspname = current_schema()
-      ]).first == 'p'
+      ], "SCHEMA").first == 'p'
     end
 
     private
 
-    def create_partition(table_name, type, partition_key, **options)
+    def create_partition(table_name, type, partition_key, **options, &blk)
       modified_options      = options.except(:id, :primary_key, :template, :create_with_primary_key)
       template              = options.fetch(:template, PgParty.config.create_template_tables)
       id                    = options.fetch(:id, :bigserial)
@@ -200,18 +200,18 @@ module PgParty
       end
       modified_options[:options] = partition_by_clause(type, partition_key)
 
-      create_table(table_name, **modified_options) do |td|
+      migration_or_adapter(blk).create_table(table_name, **modified_options) do |td|
         if !modified_options[:id] && id == :uuid
-          td.column(primary_key, id, null: false, default: uuid_function)
+          td.column(primary_key, id, null: false, default: "gen_random_uuid()")
         elsif !modified_options[:id] && id
           td.column(primary_key, id, null: false)
         end
 
-        yield(td) if block_given?
+        blk&.call(td)
       end
 
       # Rails 4 has a bug where uuid columns are always nullable
-      change_column_null(table_name, primary_key, false) if !modified_options[:id] && id == :uuid
+      migration_or_adapter(blk).change_column_null(table_name, primary_key, false) if !modified_options[:id] && id == :uuid
 
       return unless template
 
@@ -410,10 +410,6 @@ module PgParty
       "PARTITION BY #{type.to_s.upcase} (#{quote_partition_key(partition_key)})"
     end
 
-    def uuid_function
-      try(:supports_pgcrypto_uuid?) ? "gen_random_uuid()" : "uuid_generate_v4()"
-    end
-
     def hashed_table_name(table_name, key)
       return "#{table_name}_#{Digest::MD5.hexdigest(key)[0..6]}" if key
 
@@ -424,7 +420,8 @@ module PgParty
     def index_valid?(index_name)
       select_values(
         "SELECT relname FROM pg_class, pg_index WHERE pg_index.indisvalid = false AND "\
-          "pg_index.indexrelid = pg_class.oid AND relname = #{quote(index_name)}"
+          "pg_index.indexrelid = pg_class.oid AND relname = #{quote(index_name)}",
+        "SCHEMA"
       ).empty?
     end
 
@@ -455,5 +452,10 @@ module PgParty
     def postgres_major_version
       __getobj__.send(:postgresql_version)/10000
     end
+
+    def migration_or_adapter(blk)
+      blk_receiver = blk&.binding&.receiver
+      blk_receiver.is_a?(ActiveRecord::Migration) ? blk_receiver : self
+    end
   end
 end

data/lib/pg_party/hacks/postgresql_database_tasks.rb

@@ -8,13 +8,14 @@ module PgParty
           return super
         end
 
-        partitions = begin
-          ActiveRecord::Base.connection.select_values(
-            "SELECT DISTINCT inhrelid::regclass::text FROM pg_inherits"
-          )
-        rescue
-          []
-        end
+        partitions = ActiveRecord::Base.connection.select_values(<<-SQL, "SCHEMA")
+          SELECT
+            inhrelid::regclass::text
+          FROM
+            pg_inherits
+          JOIN pg_class AS p ON inhparent = p.oid
+          WHERE p.relkind = 'p'
+        SQL
 
         excluded_tables = partitions.flat_map { |table| ["-T", "*.#{table}"] }
 

data/lib/pg_party/model_decorator.rb

@@ -36,7 +36,7 @@ module PgParty
       if complex_partition_key
         complex_partition_key_query("(#{partition_key}) = (?)", value)
       else
-        where_partition_key(:eq, value)
+        where(partition_key_arel(:eq, value))
       end
     end
 
@@ -48,9 +48,7 @@ module PgParty
           end_range
         )
       else
-        where_partition_key(:gteq, start_range).merge(
-          where_partition_key(:lt, end_range)
-        )
+        where(partition_key_arel(:gteq, start_range).and(partition_key_arel(:lt, end_range)))
       end
     end
 
@@ -146,7 +144,7 @@ module PgParty
       from(subquery, current_alias)
     end
 
-    def where_partition_key(meth, values)
+    def partition_key_arel(meth, values)
       partition_key_array = Array.wrap(partition_key)
       values = Array.wrap(values)
 
@@ -154,7 +152,7 @@ module PgParty
         raise "number of provided values does not match the number of partition key columns"
       end
 
-      arel_query = partition_key_array.zip(values).inject(nil) do |obj, (column, value)|
+      partition_key_array.zip(values).inject(nil) do |obj, (column, value)|
         node = current_arel_table[column].send(meth, value)
 
         if obj.nil?
@@ -163,8 +161,6 @@ module PgParty
           obj.and(node)
         end
       end
-
-      where(arel_query)
     end
   end
 end

data/lib/pg_party/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgParty
-  VERSION = "1.5.0"
+  VERSION = "1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_party
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Ryan Krage
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: ruby2_keywords
   requirement: !ruby/object:Gem::Requirement
@@ -100,20 +100,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -182,14 +168,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -210,14 +196,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -232,6 +218,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 description: Migrations and model helpers for creating and managing PostgreSQL 10
   partitions
 email:
@@ -261,7 +261,7 @@ homepage: https://github.com/rkrage/pg_party
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -269,15 +269,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: ActiveRecord PostgreSQL Partitioning
 test_files: []