pgslice 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43cc2dd89adcb7a9ab6967e5d87b28d24e7e8c26
-  data.tar.gz: f9661b8e3cdf0239c0ba2174bc0c5694f95d834a
+  metadata.gz: 07d87eec1238827086898708a5b4e026746a0c11
+  data.tar.gz: 76024edd24065ec3e24b74d72563583e01cecc6e
 SHA512:
-  metadata.gz: 41176b19e45fd47d89d50f45b4a4cf9ab5802ed63b68100852e776dc0c821745a85cb80b2f942e5a445fa5752b696c0dce5a6fe6528477f26ec3673d41cbe94f
-  data.tar.gz: 04d50a9863351b4b97928e8dfb5f8a018c5723e5daa473a4430c5ed41ff9db355ebb4d1f749a48ebc5eb3ebc7e88e84a8ab795edd394fbd351219a09d30071b8
+  metadata.gz: 9c6042dc4fe0d093c3b38c05d91b445ad1882241f5c3b814f4fe7124ae3609b591ead4d70de39ebf496164e72221ffb409703173689a0daa6f37f884e73dce45
+  data.tar.gz: b79e389ab3529ad08eadb2e18b6c374d40436007e4fe788e2898888e5caf5592b3839326fee9c4d8d658bbfd284c0c953683171d8789de826b86fa79b7d3354c

data/CHANGELOG.md

@@ -1,6 +1,11 @@
+## 0.3.6
+
+- Fixed drop trigger on `unprep` for non-lowercase tables
+- Fixed index creation for non-lowercase tables
+
 ## 0.3.5
 
-- Quote identifiers
+- Added support for non-lowercase tables and columns
 
 ## 0.3.4
 

data/lib/pgslice.rb

@@ -112,7 +112,7 @@ SQL
 
       queries = [
         "DROP TABLE #{quote_ident(intermediate_table)} CASCADE;",
-        "DROP FUNCTION IF EXISTS #{trigger_name}();"
+        "DROP FUNCTION IF EXISTS #{quote_ident(trigger_name)}();"
       ]
       run_queries(queries)
     end
@@ -132,7 +132,7 @@ SQL
       # ensure table has trigger
       abort "No trigger on table: #{table}\nDid you mean to use --intermediate?" unless has_trigger?(trigger_name, table)
 
-      index_defs = execute("SELECT pg_get_indexdef(indexrelid) FROM pg_index INNER JOIN pg_stat_user_indexes USING (indexrelid) WHERE relname = $1 AND schemaname = $2 AND indisprimary = 'f'", [original_table, schema]).map { |r| r["pg_get_indexdef"] }
+      index_defs = execute("SELECT pg_get_indexdef(indexrelid) FROM pg_index WHERE indrelid = #{regclass(schema, original_table)} AND indisprimary = 'f'").map { |r| r["pg_get_indexdef"] }
       primary_key = self.primary_key(table)
 
       queries = []
@@ -163,7 +163,7 @@ CREATE TABLE #{quote_ident(partition_name)}
         queries << "ALTER TABLE #{quote_ident(partition_name)} ADD PRIMARY KEY (#{quote_ident(primary_key)});" if primary_key
 
         index_defs.each do |index_def|
-          queries << index_def.sub(" ON #{original_table} USING ", " ON #{partition_name} USING ").sub(/ INDEX .+ ON /, " INDEX ON ") + ";"
+          queries << index_def.sub(/ ON \S+ USING /, " ON #{quote_ident(partition_name)} USING ").sub(/ INDEX .+ ON /, " INDEX ON ") + ";"
         end
       end
 
@@ -172,7 +172,7 @@ CREATE TABLE #{quote_ident(partition_name)}
       future_defs = []
       past_defs = []
       name_format = self.name_format(period)
-      existing_tables = self.existing_tables(like: "#{original_table}_%").select { |t| /\A#{Regexp.escape("#{original_table}_")}\d{6,8}\z/.match(t) }
+      existing_tables = existing_partitions(original_table)
       existing_tables = (existing_tables + added_partitions).uniq.sort
 
       existing_tables.each do |table|
@@ -236,7 +236,7 @@ CREATE OR REPLACE FUNCTION #{quote_ident(trigger_name)}()
       if period
         name_format = self.name_format(period)
 
-        existing_tables = self.existing_tables(like: "#{table}_%").select { |t| /\A#{Regexp.escape("#{table}_")}\d{6,8}\z/.match(t) }.sort
+        existing_tables = existing_partitions(table)
         if existing_tables.any?
           starting_time = DateTime.strptime(existing_tables.first.split("_").last, name_format)
           ending_time = advance_date(DateTime.strptime(existing_tables.last.split("_").last, name_format), period, 1)
@@ -315,7 +315,7 @@ INSERT INTO #{quote_ident(dest_table)} (#{fields})
       ]
 
       self.sequences(table).each do |sequence|
-        queries << "ALTER SEQUENCE #{quote_ident(sequence["sequence_name"])} OWNED BY #{table}.#{sequence["related_column"]};"
+        queries << "ALTER SEQUENCE #{quote_ident(sequence["sequence_name"])} OWNED BY #{quote_ident(table)}.#{quote_ident(sequence["related_column"])};"
       end
 
       queries.unshift("SET LOCAL lock_timeout = '#{options[:lock_timeout]}';") if server_version_num >= 90300
@@ -339,7 +339,7 @@ INSERT INTO #{quote_ident(dest_table)} (#{fields})
       ]
 
       self.sequences(table).each do |sequence|
-        queries << "ALTER SEQUENCE #{quote_ident(sequence["sequence_name"])} OWNED BY #{table}.#{sequence["related_column"]};"
+        queries << "ALTER SEQUENCE #{quote_ident(sequence["sequence_name"])} OWNED BY #{quote_ident(table)}.#{quote_ident(sequence["related_column"])};"
       end
 
       run_queries(queries)
@@ -351,7 +351,7 @@ INSERT INTO #{quote_ident(dest_table)} (#{fields})
 
       abort "Usage: pgslice analyze <table>" if arguments.length != 1
 
-      existing_tables = self.existing_tables(like: "#{table}_%").select { |t| /\A#{Regexp.escape("#{table}_")}\d{6,8}\z/.match(t) }
+      existing_tables = existing_partitions(table)
       analyze_list = existing_tables + [parent_table]
       run_queries_without_transaction analyze_list.map { |t| "ANALYZE VERBOSE #{quote_ident(t)};" }
     end
@@ -464,6 +464,10 @@ INSERT INTO #{quote_ident(dest_table)} (#{fields})
       execute("SHOW server_version_num")[0]["server_version_num"].to_i
     end
 
+    def existing_partitions(table)
+      existing_tables(like: "#{table}_%").select { |t| /\A#{Regexp.escape("#{table}_")}\d{6,8}\z/.match(t) }
+    end
+
     def existing_tables(like:)
       query = "SELECT tablename FROM pg_catalog.pg_tables WHERE schemaname = $1 AND tablename LIKE $2"
       execute(query, [schema, like]).map { |r| r["tablename"] }.sort
@@ -599,8 +603,12 @@ INSERT INTO #{quote_ident(dest_table)} (#{fields})
       PG::Connection.quote_ident(value)
     end
 
+    def regclass(schema, table)
+      "'#{quote_ident(schema)}.#{quote_ident(table)}'::regclass"
+    end
+
     def fetch_trigger(trigger_name, table)
-      execute("SELECT obj_description(oid, 'pg_trigger') AS comment FROM pg_trigger WHERE tgname = $1 AND EXISTS (SELECT 1 FROM pg_stat_user_tables WHERE relid = tgrelid AND relname = $2 AND schemaname = $3)", [trigger_name, table, schema])[0]
+      execute("SELECT obj_description(oid, 'pg_trigger') AS comment FROM pg_trigger WHERE tgname = $1 AND tgrelid = #{regclass(schema, table)}", [trigger_name])[0]
     end
 
     def settings_from_trigger(original_table, table)

data/lib/pgslice/version.rb

@@ -1,3 +1,3 @@
 module PgSlice
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgslice
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop