pgslice 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30d1c5d3ed842d1250761b64f3da34a6e25e0ea17d7689d1eca9f1f0d4db1b8f
-  data.tar.gz: 82cbeccebcbdc6edeff9808d9013635d880aa8af20cb462722bdfe0fca5732a1
+  metadata.gz: 73d406b68757fa95efcc58a98249f9a8394cab3408a9ae14ef642983720f44b3
+  data.tar.gz: 7952c9aaa1734c76260b76a59822a4065e6184ac01bf3b1916bd217f7b368403
 SHA512:
-  metadata.gz: 1db66bb9409d26d39952230c127d5edc900cf6070915d8a58ef4bec94a460d2db4588991fc2ed46e3c9205e904c424c6a379711c0ffc985e1723623f2eed3835
-  data.tar.gz: 60612ea69df38bcc43f27e492f93ca96f17dc9528236f3e107ea1e7990b5df372dd7d799ea1bdebd6ae3064903a63e9d086668208ba6d3e5958b6247d237df43
+  metadata.gz: 057aeaddcf952f2bb99f657f290e03f2ec3bac2deffce0d7701a7549418d7d8211b2454cbc71039226b369fc5b355d7ad426df0c4ce032d660e8ce09ebe15eab
+  data.tar.gz: a36f9db976f72cc656e289ff5af6ebb89657eb739fb6ca1bc4ccba652fdfa8b93894bc2e3fde5a9fdcd63d53a24574347a280af60157d124445a565810b9839c

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.7 (2020-08-14)
+
+- Added `--tablespace` option to `add_partitions`
+- Fixed sequence query if sequence in different schema than table
+
 ## 0.4.6 (2020-05-29)
 
 - Ensure correct order with multi-column primary keys

data/README.md

@@ -171,7 +171,7 @@ ALTER TABLE "public"."visits" RENAME TO "visits_retired";
 
 ALTER TABLE "public"."visits_intermediate" RENAME TO "visits";
 
-ALTER SEQUENCE "visits_id_seq" OWNED BY "public"."visits"."id";
+ALTER SEQUENCE "public"."visits_id_seq" OWNED BY "public"."visits"."id";
 
 COMMIT;
 ```
@@ -383,14 +383,14 @@ Everyone is encouraged to help improve this project. Here are a few ways you can
 - Write, clarify, or fix documentation
 - Suggest or add new features
 
-To get started with development and testing:
+To get started with development:
 
 ```sh
 git clone https://github.com/ankane/pgslice.git
 cd pgslice
 bundle install
 createdb pgslice_test
-bundle exec rake
+bundle exec rake test
 ```
 
 To test against different versions of Postgres with Docker, use:

data/lib/pgslice/cli/add_partitions.rb

@@ -4,6 +4,7 @@ module PgSlice
     option :intermediate, type: :boolean, default: false, desc: "Add to intermediate table"
     option :past, type: :numeric, default: 0, desc: "Number of past partitions to add"
     option :future, type: :numeric, default: 0, desc: "Number of future partitions to add"
+    option :tablespace, type: :string, default: "", desc: "Tablespace to use"
     def add_partitions(table)
       original_table = create_table(table)
       table = options[:intermediate] ? original_table.intermediate_table : original_table
@@ -13,6 +14,7 @@ module PgSlice
 
       future = options[:future]
       past = options[:past]
+      tablespace = options[:tablespace]
       range = (-1 * past)..future
 
       period, field, cast, needs_comment, declarative, version = table.fetch_settings(original_table.trigger_name)
@@ -50,6 +52,7 @@ module PgSlice
       end
 
       primary_key = schema_table.primary_key
+      tablespace_str = tablespace.empty? ? "" : " TABLESPACE #{quote_ident(tablespace)}"
 
       added_partitions = []
       range.each do |n|
@@ -61,13 +64,13 @@ module PgSlice
 
         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)});
+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)});
+    INHERITS (#{quote_table(table)})#{tablespace_str};
           SQL
         end
 

data/lib/pgslice/cli/swap.rb

@@ -17,7 +17,7 @@ module PgSlice
       ]
 
       table.sequences.each do |sequence|
-        queries << "ALTER SEQUENCE #{quote_ident(sequence["sequence_name"])} OWNED BY #{quote_table(table)}.#{quote_ident(sequence["related_column"])};"
+        queries << "ALTER SEQUENCE #{quote_ident(sequence["sequence_schema"])}.#{quote_ident(sequence["sequence_name"])} OWNED BY #{quote_table(table)}.#{quote_ident(sequence["related_column"])};"
       end
 
       queries.unshift("SET LOCAL lock_timeout = '#{options[:lock_timeout]}';") if server_version_num >= 90300

data/lib/pgslice/cli/unswap.rb

@@ -16,7 +16,7 @@ module PgSlice
       ]
 
       table.sequences.each do |sequence|
-        queries << "ALTER SEQUENCE #{quote_ident(sequence["sequence_name"])} OWNED BY #{quote_table(table)}.#{quote_ident(sequence["related_column"])};"
+        queries << "ALTER SEQUENCE #{quote_ident(sequence["sequence_schema"])}.#{quote_ident(sequence["sequence_name"])} OWNED BY #{quote_table(table)}.#{quote_ident(sequence["related_column"])};"
       end
 
       run_queries(queries)

data/lib/pgslice/helpers.rb

@@ -36,7 +36,11 @@ module PgSlice
         uri.query = URI.encode_www_form(params)
 
         ENV["PGCONNECT_TIMEOUT"] ||= "1"
-        PG::Connection.new(uri.to_s)
+        conn = PG::Connection.new(uri.to_s)
+        conn.set_notice_processor do |message|
+          say message
+        end
+        conn
       end
     rescue PG::ConnectionBad => e
       abort e.message

data/lib/pgslice/table.rb

@@ -23,15 +23,17 @@ module PgSlice
     def sequences
       query = <<-SQL
         SELECT
-          a.attname as related_column,
-          s.relname as sequence_name
+          a.attname AS related_column,
+          n.nspname AS sequence_schema,
+          s.relname AS sequence_name
         FROM pg_class s
-          JOIN pg_depend d ON d.objid = s.oid
-          JOIN pg_class t ON d.objid = s.oid AND d.refobjid = t.oid
-          JOIN pg_attribute a ON (d.refobjid, d.refobjsubid) = (a.attrelid, a.attnum)
-          JOIN pg_namespace n ON n.oid = s.relnamespace
+          INNER JOIN pg_depend d ON d.objid = s.oid
+          INNER JOIN pg_class t ON d.objid = s.oid AND d.refobjid = t.oid
+          INNER JOIN pg_attribute a ON (d.refobjid, d.refobjsubid) = (a.attrelid, a.attnum)
+          INNER JOIN pg_namespace n ON n.oid = s.relnamespace
+          INNER JOIN pg_namespace nt ON nt.oid = t.relnamespace
         WHERE s.relkind = 'S'
-          AND n.nspname = $1
+          AND nt.nspname = $1
           AND t.relname = $2
         ORDER BY s.relname ASC
       SQL
@@ -109,6 +111,7 @@ module PgSlice
       (execute(query)[0]["min"] || 1).to_i
     end
 
+    # ensure this returns partitions in the correct order
     def partitions
       query = <<-SQL
         SELECT

data/lib/pgslice/version.rb

@@ -1,3 +1,3 @@
 module PgSlice
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgslice
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor