pg_party 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5996516e7f3b76373b6fc4f9a29c9e31f48d9edb086b7e0f217031f0ed3707ea
-  data.tar.gz: d4e5d12b2bdb80ab928153efe9ec49e11b7e6e413f0a0edbeddfe2f24a7d4276
+  metadata.gz: 2de3fe17d288034fdb27f8bef0d5c01bad51f568dae6bf92d3e4d547da88b0ac
+  data.tar.gz: b67b26808b013d71a393d3cdc1bd90d5b28c3e318661df1c56ebf8098407579b
 SHA512:
-  metadata.gz: fac73650e2065c300fabb4ad826e59b8877310033490778b81835d28f297135796befec74a3ca5f6f6d5b3204f65a0f6686d58875df53e1332d96b6ef09edbac
-  data.tar.gz: 0fec1b06196dc2fecd95464694ae1d9742fb72687ac676b5a6def977b1a965a2f137b70edb85310f273237d8a7f6370aaa6a193d5c926487e30710d53de720f0
+  metadata.gz: d00eca782f9b7205a8c9bc3fd90a59c69a9e5ecefc828288c9d07ec61c94460e4344da121394aa6bb7b24d7a37a73e137b990ee504d7b78de28d7f29ac901f74
+  data.tar.gz: bc753cae774726c2edb8adad720c59b92214ecb75e1a955df8882f4a733d409c8170202dc65904547a71d8b6ecba65eed237c1d56b4c76f36d33c0ce739eff7b

data/README.md

@@ -59,7 +59,7 @@ These values can be accessed and set via `PgParty.config` and `PgParty.configure
   - Length of time (in seconds) that cache entries are considered valid
   - Default: `-1` (never expire cache entries)
 - `schema_exclude_partitions`
-  - Whether to exclude child partitions in `rake db:structure:dump` (supported in ActiveRecord 5.2+)
+  - Whether to exclude child partitions in `rake db:structure:dump`
   - Default: `true`
 
 Note that caching is done in-memory for each process of an application. Attaching / detaching partitions _will_ clear the cache, but only for the process that initiated the request. For multi-process web servers, it is recommended to use a TTL or disable caching entirely.

data/lib/pg_party.rb

@@ -40,10 +40,11 @@ ActiveSupport.on_load(:active_record) do
     PgParty::Hacks::SchemaCache
   )
 
-  require "pg_party/hacks/database_tasks"
+  require "active_record/tasks/postgresql_database_tasks"
+  require "pg_party/hacks/postgresql_database_tasks"
 
-  ActiveRecord::Tasks::DatabaseTasks.extend(
-    PgParty::Hacks::DatabaseTasks
+  ActiveRecord::Tasks::PostgreSQLDatabaseTasks.prepend(
+    PgParty::Hacks::PostgreSQLDatabaseTasks
   )
 
   begin

data/lib/pg_party/hacks/postgresql_database_tasks.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module PgParty
+  module Hacks
+    module PostgreSQLDatabaseTasks
+      def run_cmd(cmd, args, action)
+        if action != "dumping" || !PgParty.config.schema_exclude_partitions
+          return super
+        end
+
+        partitions = begin
+          ActiveRecord::Base.connection.select_values(
+            "SELECT DISTINCT inhrelid::regclass::text FROM pg_inherits"
+          )
+        rescue
+          []
+        end
+
+        excluded_tables = partitions.flat_map { |table| ["-T", "*.#{table}"] }
+
+        super(cmd, args + excluded_tables, action)
+      end
+    end
+  end
+end

data/lib/pg_party/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_party
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ryan Krage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-27 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -220,7 +220,7 @@ files:
 - lib/pg_party/adapter_decorator.rb
 - lib/pg_party/cache.rb
 - lib/pg_party/config.rb
-- lib/pg_party/hacks/database_tasks.rb
+- lib/pg_party/hacks/postgresql_database_tasks.rb
 - lib/pg_party/hacks/schema_cache.rb
 - lib/pg_party/model/list_methods.rb
 - lib/pg_party/model/methods.rb

data/lib/pg_party/hacks/database_tasks.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module PgParty
-  module Hacks
-    module DatabaseTasks
-      def structure_dump(*)
-        old_ignore_list = ActiveRecord::SchemaDumper.ignore_tables
-
-        if PgParty.config.schema_exclude_partitions
-          new_ignore_list = partitions.map { |table| "*.#{table}" }
-        else
-          new_ignore_list = []
-        end
-
-        ActiveRecord::SchemaDumper.ignore_tables = old_ignore_list + new_ignore_list
-
-        super
-      ensure
-        ActiveRecord::SchemaDumper.ignore_tables = old_ignore_list
-      end
-
-      def partitions
-        ActiveRecord::Base.connection.select_values(
-          "SELECT DISTINCT inhrelid::regclass::text FROM pg_inherits"
-        )
-      rescue
-        []
-      end
-    end
-  end
-end