pgslice 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '00404860fae8f92d17c1be36fb44f6b8fea7413644bf3f184a2431589c750abc'
-  data.tar.gz: db1520df2c4bd9097927cf73900785c42bebeb67f747a12a857c48fdc6ca64a9
+  metadata.gz: '08f3d08e8d7f2f60615587f8c842b8a80e59f10d4f00d299422ca44caef031d7'
+  data.tar.gz: 889bcd29c7b381ffdcdc0a32150a512243950dc106dec9d34d791f50794a3bb1
 SHA512:
-  metadata.gz: accd820d05e151745c26cf7138394ded42f0b50f3272f051b8a154cf6dbc51271a8f810f41602138ed003bfba72a3279129638d7eb312cff4a967d6ef05bfe2e
-  data.tar.gz: 1b52fc649ff7f7a6832ad69236c3de3343b00cf762bfe9d935dc2be96552dfcee69e55d2ece4926e1d3b0d8a9123c970db31f706250c3d19501796c0a9a38874
+  metadata.gz: 91319129faa191528b4808ade4138310969cd95c256b7beaba307947f5b962027cde2965a90122bceb84bcc5c4eafcca65d3aa27638b6cce4383963f5e5c1d10
+  data.tar.gz: 9b270632d217dc19e74d479bf15ef9378aae34b813c56904fa8d7ccd10f8cdfc8d8db1a049826b1bb0a03539929de551510a1520a1df9c6ccb4cfbf6fb71cb56

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.2
+
+- Added support for Postgres 11 index improvements
+- Added support for all connection options
+
 ## 0.4.1
 
 - Better support for schemas

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2017 Andrew Kane
+Copyright (c) 2016-2018 Andrew Kane
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -359,7 +359,7 @@ pgslice swap <table>
 Once a table is partitioned, here’s how to change the schema:
 
 - To add, remove, or modify a column, make the update on the master table only
-- To add or remove an index, make the update on the master table and all partitions
+- To add or remove an index, make the update on the master table and all partitions (for Postgres 11, make the update on the master table only)
 
 ## Declarative Partitioning
 
@@ -394,12 +394,6 @@ This will give you the `pgslice` command.
 - [PostgreSQL Manual](https://www.postgresql.org/docs/current/static/ddl-partitioning.html)
 - [PostgreSQL Wiki](https://wiki.postgresql.org/wiki/Table_partitioning)
 
-## TODO
-
-- Command to sync index changes with partitions
-- Disable indexing for faster `fill`
-- ETA for `fill`
-
 ## Related Projects
 
 Also check out:
@@ -425,3 +419,12 @@ bundle install
 createdb pgslice_test
 bundle exec rake
 ```
+
+To test against different versions of Postgres with Docker, use:
+
+```sh
+docker run -p=8000:5432 postgres:10
+TZ=Etc/UTC PGSLICE_URL=postgres://postgres@localhost:8000/postgres bundle exec rake
+```
+
+On Mac, you must use [Docker for Mac](https://www.docker.com/docker-mac) for the port mapping to localhost to work.

data/lib/pgslice.rb

@@ -82,6 +82,13 @@ module PgSlice
 CREATE TABLE #{quote_table(intermediate_table)} (LIKE #{quote_table(table)} INCLUDING DEFAULTS INCLUDING CONSTRAINTS INCLUDING STORAGE INCLUDING COMMENTS) PARTITION BY RANGE (#{quote_table(column)});
         SQL
 
+        if server_version_num >= 110000
+          index_defs = execute("SELECT pg_get_indexdef(indexrelid) FROM pg_index WHERE indrelid = #{regclass(table)} AND indisprimary = 'f'").map { |r| r["pg_get_indexdef"] }
+          index_defs.each do |index_def|
+            queries << index_def.sub(/ ON \S+ USING /, " ON #{quote_table(intermediate_table)} USING ").sub(/ INDEX .+ ON /, " INDEX ON ") + ";"
+          end
+        end
+
         # add comment
         cast = column_cast(table, column)
         queries << <<-SQL
@@ -175,7 +182,14 @@ COMMENT ON TRIGGER #{quote_ident(trigger_name)} ON #{quote_table(intermediate_ta
           existing_partitions(original_table, period).last
         end
 
-      index_defs = execute("SELECT pg_get_indexdef(indexrelid) FROM pg_index WHERE indrelid = #{regclass(schema_table)} AND indisprimary = 'f'").map { |r| r["pg_get_indexdef"] }
+      # indexes automatically propagate in Postgres 11+
+      index_defs =
+        if !declarative || server_version_num < 110000
+          execute("SELECT pg_get_indexdef(indexrelid) FROM pg_index WHERE indrelid = #{regclass(schema_table)} AND indisprimary = 'f'").map { |r| r["pg_get_indexdef"] }
+        else
+          []
+        end
+
       fk_defs = foreign_keys(schema_table)
       primary_key = self.primary_key(schema_table)
 
@@ -293,7 +307,12 @@ CREATE OR REPLACE FUNCTION #{quote_ident(trigger_name)}()
       primary_key = self.primary_key(schema_table)[0]
       abort "No primary key" unless primary_key
 
-      max_source_id = max_id(source_table, primary_key)
+      max_source_id = nil
+      begin
+        max_source_id = max_id(source_table, primary_key)
+      rescue PG::UndefinedFunction
+        abort "Only numeric primary keys are supported"
+      end
 
       max_dest_id =
         if options[:start]
@@ -454,22 +473,20 @@ INSERT INTO #{quote_table(dest_table)} (#{fields})
       @connection ||= begin
         url = options[:url] || ENV["PGSLICE_URL"]
         abort "Set PGSLICE_URL or use the --url option" unless url
+
         uri = URI.parse(url)
-        uri_parser = URI::Parser.new
-        config = {
-          host: uri.host,
-          port: uri.port,
-          dbname: uri.path.sub(/\A\//, ""),
-          user: uri.user,
-          password: uri.password,
-          connect_timeout: 1
-        }.reject { |_, value| value.to_s.empty? }
-        config.map { |key, value| config[key] = uri_parser.unescape(value) if value.is_a?(String) }
-        @schema = CGI.parse(uri.query.to_s)["schema"][0] || "public"
-        PG::Connection.new(config)
+        params = CGI.parse(uri.query.to_s)
+        # remove schema
+        @schema = Array(params.delete("schema") || "public")[0]
+        uri.query = URI.encode_www_form(params)
+
+        ENV["PGCONNECT_TIMEOUT"] ||= "1"
+        PG::Connection.new(uri.to_s)
       end
     rescue PG::ConnectionBad => e
       abort e.message
+    rescue URI::InvalidURIError
+      abort "Invalid url"
     end
 
     def schema

data/lib/pgslice/version.rb

@@ -1,3 +1,3 @@
 module PgSlice
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgslice
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-01 00:00:00.000000000 Z
+date: 2018-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -81,25 +81,18 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: 
-email:
-- andrew@chartkick.com
+email: andrew@chartkick.com
 executables:
 - pgslice
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
-- Dockerfile
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - exe/pgslice
 - lib/pgslice.rb
 - lib/pgslice/version.rb
-- pgslice.gemspec
 homepage: https://github.com/ankane/pgslice
 licenses:
 - MIT
@@ -112,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -120,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Postgres partitioning as easy as pie

data/.gitignore

@@ -1,9 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-rvm: 2.4.1
-cache: bundler
-sudo: false
-script: bundle exec rake test
-addons:
-  postgresql: "9.4"
-before_script:
-  - psql -c 'create database pgslice_test;' -U postgres
-notifications:
-  email:
-    on_success: never
-    on_failure: change

data/Dockerfile

@@ -1,3 +0,0 @@
-FROM ruby:latest
-RUN gem install pgslice
-ENTRYPOINT ["pgslice"]

data/Gemfile

@@ -1,4 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in pgslice.gemspec
-gemspec

data/Rakefile

@@ -1,11 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
-  t.warning = false
-end
-
-task default: :test

data/pgslice.gemspec

@@ -1,27 +0,0 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "pgslice/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "pgslice"
-  spec.version       = PgSlice::VERSION
-  spec.authors       = ["Andrew Kane"]
-  spec.email         = ["andrew@chartkick.com"]
-
-  spec.summary       = "Postgres partitioning as easy as pie"
-  spec.homepage      = "https://github.com/ankane/pgslice"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "slop", ">= 4.2.0"
-  spec.add_dependency "pg"
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
-end