pgslice 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 325b5cd0c6ec6dfa7a98db88a06bb47ed4f8ee327c6c21dddfd897ec13f54533
-  data.tar.gz: aabbfee0e2bced3b7e93f4d9f0db218db060779a3b75b14ac7056867901bae26
+  metadata.gz: b8084c5bbabb6b85b6e90f03d1895d95c4fa9130dcf68fbb0c0929b43132bf25
+  data.tar.gz: 6313d7ff50a64695fac17e31be5e3939f7982db3d0662629ba0841f4c5a71518
 SHA512:
-  metadata.gz: ba7310102950041d8247779282b6b252d40d7c824bd03b07d08ed7e400534cbf44eb31161595004ff782ccdaa9eacd0d6698797068ea06109ef974eebab8439b
-  data.tar.gz: 50faa245fb1ac68b6b685af8529277f23a46146477fd37e9ec52a6984222daa3392ca49e9d5276f03177f755ccec5c94989d4f6f25e182f3013ed9b24a8a7250
+  metadata.gz: 82751357b5799a2ee7f3e36cff221a9d0a8a41c08bfc3cae1309e50a1af9d6fbd5392ee9ecd657051f03fc59440276d6d481266cf560da034a3012d2a79dee62
+  data.tar.gz: '06320641649d6a8caa68c2fdba355f0bc76755b13f37ae0e1afba53115f0a0e7df1c073e718308e591a7c91938283505730eaf638fb4959bacfdbbb8851bf956'

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.7.1 (2025-07-27)
+
+- Fixed `analyze` analyzing partitions twice with declarative partitioning
+- Removed unnecessary query for `unprep` with declarative partitioning
+
 ## 0.7.0 (2025-05-26)
 
 - Dropped support for Ruby < 3

data/README.md

@@ -14,7 +14,9 @@ pgslice is a command line tool. To install, run:
 gem install pgslice
 ```
 
-This will give you the `pgslice` command. You can also install it with [Homebrew](#homebrew) or [Docker](#docker). If installation fails, you may need to install [dependencies](#dependencies).
+This will give you the `pgslice` command. If installation fails, you may need to install [dependencies](#dependencies).
+
+You can also install it with [Homebrew](#homebrew) or [Docker](#docker).
 
 ## Steps
 
@@ -299,12 +301,14 @@ You can also use pgslice to reduce the size of a table without partitioning by c
 ```sh
 pgslice prep <table> --no-partition
 pgslice fill <table> --where "id > 1000" # use any conditions
+pgslice analyze <table>
 pgslice swap <table>
+pgslice fill <table> --where "id > 1000" --swapped
 ```
 
 ## Triggers
 
-Triggers aren’t copied from the original table. You can set up triggers on the intermediate table if needed. Note that Postgres doesn’t support `BEFORE / FOR EACH ROW` triggers on partitioned tables.
+Triggers aren’t copied from the original table. You can set up triggers on the intermediate table if needed.
 
 ## Data Protection
 
@@ -317,7 +321,7 @@ Always make sure your [connection is secure](https://ankane.org/postgres-sslmode
 With Homebrew, you can use:
 
 ```sh
-brew install ankane/brew/pgslice
+brew install pgslice
 ```
 
 ### Docker

data/lib/pgslice/cli/add_partitions.rb

@@ -63,14 +63,14 @@ module PgSlice
         added_partitions << partition
 
         if declarative
-          queries << <<-SQL
-CREATE TABLE #{quote_table(partition)} PARTITION OF #{quote_table(table)} FOR VALUES FROM (#{sql_date(day, cast, false)}) TO (#{sql_date(advance_date(day, period, 1), cast, false)})#{tablespace_str};
+          queries << <<~SQL
+            CREATE TABLE #{quote_table(partition)} PARTITION OF #{quote_table(table)} FOR VALUES FROM (#{sql_date(day, cast, false)}) TO (#{sql_date(advance_date(day, period, 1), cast, false)})#{tablespace_str};
           SQL
         else
-          queries << <<-SQL
-CREATE TABLE #{quote_table(partition)}
-    (CHECK (#{quote_ident(field)} >= #{sql_date(day, cast)} AND #{quote_ident(field)} < #{sql_date(advance_date(day, period, 1), cast)}))
-    INHERITS (#{quote_table(table)})#{tablespace_str};
+          queries << <<~SQL
+            CREATE TABLE #{quote_table(partition)}
+                (CHECK (#{quote_ident(field)} >= #{sql_date(day, cast)} AND #{quote_ident(field)} < #{sql_date(advance_date(day, period, 1), cast)}))
+                INHERITS (#{quote_table(table)})#{tablespace_str};
           SQL
         end
 
@@ -115,17 +115,17 @@ CREATE TABLE #{quote_table(partition)}
         trigger_defs = current_defs + future_defs + past_defs.reverse
 
         if trigger_defs.any?
-          queries << <<-SQL
-CREATE OR REPLACE FUNCTION #{quote_ident(trigger_name)}()
-    RETURNS trigger AS $$
-    BEGIN
-        IF #{trigger_defs.join("\n        ELSIF ")}
-        ELSE
-            RAISE EXCEPTION 'Date out of range. Ensure partitions are created.';
-        END IF;
-        RETURN NULL;
-    END;
-    $$ LANGUAGE plpgsql;
+          queries << <<~SQL
+            CREATE OR REPLACE FUNCTION #{quote_ident(trigger_name)}()
+                RETURNS trigger AS $$
+                BEGIN
+                    IF #{trigger_defs.join("\n        ELSIF ")}
+                    ELSE
+                        RAISE EXCEPTION 'Date out of range. Ensure partitions are created.';
+                    END IF;
+                    RETURN NULL;
+                END;
+                $$ LANGUAGE plpgsql;
           SQL
         end
       end

data/lib/pgslice/cli/analyze.rb

@@ -5,8 +5,10 @@ module PgSlice
     def analyze(table)
       table = create_table(table)
       parent_table = options[:swapped] ? table : table.intermediate_table
+      assert_table(parent_table)
 
-      analyze_list = parent_table.partitions + [parent_table]
+      _, _, _, _, declarative, _ = parent_table.fetch_settings(table.trigger_name)
+      analyze_list = declarative ? [parent_table] : (parent_table.partitions + [parent_table])
       run_queries_without_transaction(analyze_list.map { |t| "ANALYZE VERBOSE #{quote_table(t)};" })
     end
   end

data/lib/pgslice/cli/fill.rb

@@ -82,11 +82,11 @@ module PgSlice
           where << " AND #{options[:where]}"
         end
 
-        query = <<-SQL
-/* #{i} of #{batch_count} */
-INSERT INTO #{quote_table(dest_table)} (#{fields})
-    SELECT #{fields} FROM #{quote_table(source_table)}
-    WHERE #{where}
+        query = <<~SQL
+          /* #{i} of #{batch_count} */
+          INSERT INTO #{quote_table(dest_table)} (#{fields})
+              SELECT #{fields} FROM #{quote_table(source_table)}
+              WHERE #{where}
         SQL
 
         run_query(query)

data/lib/pgslice/cli/prep.rb

@@ -33,15 +33,12 @@ module PgSlice
       declarative = version > 1
 
       if declarative && options[:partition]
-        including = ["DEFAULTS", "CONSTRAINTS", "STORAGE", "COMMENTS", "STATISTICS"]
-        if server_version_num >= 120000
-          including << "GENERATED"
-        end
+        including = ["DEFAULTS", "CONSTRAINTS", "STORAGE", "COMMENTS", "STATISTICS", "GENERATED"]
         if server_version_num >= 140000
           including << "COMPRESSION"
         end
-        queries << <<-SQL
-CREATE TABLE #{quote_table(intermediate_table)} (LIKE #{quote_table(table)} #{including.map { |v| "INCLUDING #{v}" }.join(" ")}) PARTITION BY RANGE (#{quote_ident(column)});
+        queries << <<~SQL
+          CREATE TABLE #{quote_table(intermediate_table)} (LIKE #{quote_table(table)} #{including.map { |v| "INCLUDING #{v}" }.join(" ")}) PARTITION BY RANGE (#{quote_ident(column)});
         SQL
 
         if version == 3
@@ -57,12 +54,12 @@ CREATE TABLE #{quote_table(intermediate_table)} (LIKE #{quote_table(table)} #{in
 
         # add comment
         cast = table.column_cast(column)
-        queries << <<-SQL
-COMMENT ON TABLE #{quote_table(intermediate_table)} IS 'column:#{column},period:#{period},cast:#{cast},version:#{version}';
+        queries << <<~SQL
+          COMMENT ON TABLE #{quote_table(intermediate_table)} IS 'column:#{column},period:#{period},cast:#{cast},version:#{version}';
         SQL
       else
-        queries << <<-SQL
-CREATE TABLE #{quote_table(intermediate_table)} (LIKE #{quote_table(table)} INCLUDING ALL);
+        queries << <<~SQL
+          CREATE TABLE #{quote_table(intermediate_table)} (LIKE #{quote_table(table)} INCLUDING ALL);
         SQL
 
         table.foreign_keys.each do |fk_def|
@@ -71,24 +68,24 @@ CREATE TABLE #{quote_table(intermediate_table)} (LIKE #{quote_table(table)} INCL
       end
 
       if options[:partition] && !declarative
-        queries << <<-SQL
-CREATE FUNCTION #{quote_ident(trigger_name)}()
-    RETURNS trigger AS $$
-    BEGIN
-        RAISE EXCEPTION 'Create partitions first.';
-    END;
-    $$ LANGUAGE plpgsql;
+        queries << <<~SQL
+          CREATE FUNCTION #{quote_ident(trigger_name)}()
+              RETURNS trigger AS $$
+              BEGIN
+                  RAISE EXCEPTION 'Create partitions first.';
+              END;
+              $$ LANGUAGE plpgsql;
         SQL
 
-        queries << <<-SQL
-CREATE TRIGGER #{quote_ident(trigger_name)}
-    BEFORE INSERT ON #{quote_table(intermediate_table)}
-    FOR EACH ROW EXECUTE PROCEDURE #{quote_ident(trigger_name)}();
+        queries << <<~SQL
+          CREATE TRIGGER #{quote_ident(trigger_name)}
+              BEFORE INSERT ON #{quote_table(intermediate_table)}
+              FOR EACH ROW EXECUTE PROCEDURE #{quote_ident(trigger_name)}();
         SQL
 
         cast = table.column_cast(column)
-        queries << <<-SQL
-COMMENT ON TRIGGER #{quote_ident(trigger_name)} ON #{quote_table(intermediate_table)} IS 'column:#{column},period:#{period},cast:#{cast}';
+        queries << <<~SQL
+          COMMENT ON TRIGGER #{quote_ident(trigger_name)} ON #{quote_table(intermediate_table)} IS 'column:#{column},period:#{period},cast:#{cast}';
         SQL
       end
 

data/lib/pgslice/cli/unprep.rb

@@ -9,9 +9,14 @@ module PgSlice
       assert_table(intermediate_table)
 
       queries = [
-        "DROP TABLE #{quote_table(intermediate_table)} CASCADE;",
-        "DROP FUNCTION IF EXISTS #{quote_ident(trigger_name)}();"
+        "DROP TABLE #{quote_table(intermediate_table)} CASCADE;"
       ]
+
+      _, _, _, _, declarative, _ = intermediate_table.fetch_settings(table.trigger_name)
+      unless declarative
+        queries << "DROP FUNCTION IF EXISTS #{quote_ident(trigger_name)}();"
+      end
+
       run_queries(queries)
     end
   end

data/lib/pgslice/cli.rb

@@ -1,8 +1,10 @@
 module PgSlice
   class CLI < Thor
     class << self
-      attr_accessor :instance
+      attr_accessor :instance, :exit_on_failure
+      alias_method :exit_on_failure?, :exit_on_failure
     end
+    self.exit_on_failure = true
 
     include Helpers
 
@@ -13,10 +15,6 @@ module PgSlice
 
     map %w[--version -v] => :version
 
-    def self.exit_on_failure?
-      ENV["PGSLICE_ENV"] != "test"
-    end
-
     def initialize(*args)
       PgSlice::CLI.instance = self
       $stdout.sync = true

data/lib/pgslice/table.rb

@@ -12,16 +12,24 @@ module PgSlice
     end
 
     def exists?
-      execute("SELECT COUNT(*) FROM pg_catalog.pg_tables WHERE schemaname = $1 AND tablename = $2", [schema, name]).first["count"].to_i > 0
+      query = <<~SQL
+        SELECT COUNT(*) FROM pg_catalog.pg_tables
+        WHERE schemaname = $1 AND tablename = $2
+      SQL
+      execute(query, [schema, name]).first["count"].to_i > 0
     end
 
     def columns
-      execute("SELECT column_name FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2 AND is_generated = 'NEVER'", [schema, name]).map { |r| r["column_name"] }
+      query = <<~SQL
+        SELECT column_name FROM information_schema.columns
+        WHERE table_schema = $1 AND table_name = $2 AND is_generated = 'NEVER'
+      SQL
+      execute(query, [schema, name]).map { |r| r["column_name"] }
     end
 
     # http://www.dbforums.com/showthread.php?1667561-How-to-list-sequences-and-the-columns-by-SQL
     def sequences
-      query = <<-SQL
+      query = <<~SQL
         SELECT
           a.attname AS related_column,
           n.nspname AS sequence_schema,
@@ -41,13 +49,17 @@ module PgSlice
     end
 
     def foreign_keys
-      execute("SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conrelid = #{regclass} AND contype ='f'").map { |r| r["pg_get_constraintdef"] }
+      query = <<~SQL
+        SELECT pg_get_constraintdef(oid) FROM pg_constraint
+        WHERE conrelid = $1::regclass AND contype ='f'
+      SQL
+      execute(query, [quote_table]).map { |r| r["pg_get_constraintdef"] }
     end
 
     # https://stackoverflow.com/a/20537829
     # TODO can simplify with array_position in Postgres 9.5+
     def primary_key
-      query = <<-SQL
+      query = <<~SQL
         SELECT
           pg_attribute.attname,
           format_type(pg_attribute.atttypid, pg_attribute.atttypmod),
@@ -69,7 +81,11 @@ module PgSlice
     end
 
     def index_defs
-      execute("SELECT pg_get_indexdef(indexrelid) FROM pg_index WHERE indrelid = #{regclass} AND indisprimary = 'f'").map { |r| r["pg_get_indexdef"] }
+      query = <<~SQL
+        SELECT pg_get_indexdef(indexrelid) FROM pg_index
+        WHERE indrelid = $1::regclass AND indisprimary = 'f'
+      SQL
+      execute(query, [quote_table]).map { |r| r["pg_get_indexdef"] }
     end
 
     def quote_table
@@ -89,17 +105,25 @@ module PgSlice
     end
 
     def column_cast(column)
-      data_type = execute("SELECT data_type FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2 AND column_name = $3", [schema, name, column])[0]["data_type"]
+      query = <<~SQL
+        SELECT data_type FROM information_schema.columns
+        WHERE table_schema = $1 AND table_name = $2 AND column_name = $3
+      SQL
+      data_type = execute(query, [schema, name, column])[0]["data_type"]
       data_type == "timestamp with time zone" ? "timestamptz" : "date"
     end
 
     def max_id(primary_key, below: nil, where: nil)
       query = "SELECT MAX(#{quote_ident(primary_key)}) FROM #{quote_table}"
       conditions = []
-      conditions << "#{quote_ident(primary_key)} <= #{below}" if below
+      params = []
+      if below
+        conditions << "#{quote_ident(primary_key)} <= $1"
+        params << below
+      end
       conditions << where if where
       query << " WHERE #{conditions.join(" AND ")}" if conditions.any?
-      execute(query)[0]["max"].to_i
+      execute(query, params)[0]["max"].to_i
     end
 
     def min_id(primary_key, column, cast, starting_time, where)
@@ -113,15 +137,15 @@ module PgSlice
 
     # ensure this returns partitions in the correct order
     def partitions
-      query = <<-SQL
+      query = <<~SQL
         SELECT
-          nmsp_child.nspname  AS schema,
-          child.relname       AS name
+          nmsp_child.nspname AS schema,
+          child.relname AS name
         FROM pg_inherits
-          JOIN pg_class parent            ON pg_inherits.inhparent = parent.oid
-          JOIN pg_class child             ON pg_inherits.inhrelid   = child.oid
-          JOIN pg_namespace nmsp_parent   ON nmsp_parent.oid  = parent.relnamespace
-          JOIN pg_namespace nmsp_child    ON nmsp_child.oid   = child.relnamespace
+          JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
+          JOIN pg_class child ON pg_inherits.inhrelid = child.oid
+          JOIN pg_namespace nmsp_parent ON nmsp_parent.oid = parent.relnamespace
+          JOIN pg_namespace nmsp_child ON nmsp_child.oid = child.relnamespace
         WHERE
           nmsp_parent.nspname = $1 AND
           parent.relname = $2
@@ -131,11 +155,15 @@ module PgSlice
     end
 
     def fetch_comment
-      execute("SELECT obj_description(#{regclass}) AS comment")[0]
+      execute("SELECT obj_description($1::regclass) AS comment", [quote_table])[0]
     end
 
     def fetch_trigger(trigger_name)
-      execute("SELECT obj_description(oid, 'pg_trigger') AS comment FROM pg_trigger WHERE tgname = $1 AND tgrelid = #{regclass}", [trigger_name])[0]
+      query = <<~SQL
+        SELECT obj_description(oid, 'pg_trigger') AS comment FROM pg_trigger
+        WHERE tgname = $1 AND tgrelid = $2::regclass
+      SQL
+      execute(query, [trigger_name, quote_table])[0]
     end
 
     # legacy
@@ -186,10 +214,6 @@ module PgSlice
       PG::Connection.quote_ident(value)
     end
 
-    def regclass
-      "#{escape_literal(quote_table)}::regclass"
-    end
-
     def sql_date(time, cast, add_cast = true)
       if cast == "timestamptz"
         fmt = "%Y-%m-%d %H:%M:%S UTC"

data/lib/pgslice/version.rb

@@ -1,3 +1,3 @@
 module PgSlice
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgslice
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Andrew Kane
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Postgres partitioning as easy as pie
 test_files: []