pg_ha_migrations 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5effa97634fe0a432ff8176cfc7638e6435eb8765246a8cbc9c61444488e6c6
-  data.tar.gz: '08965111ea15df0a4b1011c514fbac358265b953239e13253702ca65fb7669bf'
+  metadata.gz: ae8983eec2507ce164936c65c32a7c296d0d3ef338ada2d90d68f37c572d00f7
+  data.tar.gz: 9c07cb77837a23a603e713e94cdae71f26acce82dbc2332d6fd77260c54d7c8c
 SHA512:
-  metadata.gz: 5b4649d6a4473d82441b6ea6f55105b313fac1ad75dc1938fbcc71ec16257a46e89ae9b09f7d95d645e184d093cc5b55ff550df846793842d9670f2491514766
-  data.tar.gz: 61241d289fde274935041a8b1401c5a0a4d49188b5f594949d5cbae7b1e410e3cf56c45e4521c00f4e4b2be644f37a7546c3e24570ccb418c96c0553d3fb6da2
+  metadata.gz: 247dd7ac257a208ef985d86b94710fbf41c0e622d02ce1acecb46d490ab17adb6aa080060d6e48ddf56e8ef4a5289121dcf4edd41e83f3bb7418ce20cfc91d4c
+  data.tar.gz: 0f0fb4ac98e6732d7d020a55e0f2608e256dbf34b4fe669ccfcde7e1878df43b3ccd8e153af61e6681d5eec62b8269ea435303376136207af54341d8bb19da41

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.3
+ruby-2.5.7

data/.travis.yml

@@ -1,16 +1,28 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4
+  - 2.5
+global:
+  env:
+    PGPORT: 5433
+env:
+  - PGVERSION: "9.6"
+  - PGVERSION: "10"
+  - PGVERSION: "11"
+  - PGVERSION: "12"
 services:
   - postgresql
-addons:
-  postgresql: "9.6"
 before_install:
+  - sudo service postgresql stop
+  - sudo apt-get update
+  - sudo apt-get -y install postgresql-$PGVERSION postgresql-client-$PGVERSION postgresql-server-dev-$PGVERSION postgresql-client-common postgresql-common
+  - if [ $PGVERSION != '9.6' ]; then sudo cp /etc/postgresql/{9.6,$PGVERSION}/main/pg_hba.conf; fi
+  - sudo service postgresql restart $PGVERSION
   - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
   - gem install bundler -v 1.15.4
 gemfile:
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.gemfile
 script: "bundle exec rake spec"

data/Appraisals

@@ -10,3 +10,7 @@ appraise "rails-5.2" do
   gem "rails", "5.2.3"
 end
 
+appraise "rails-6.0" do
+  gem "rails", "6.0.0"
+end
+

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "6.0.0"
+
+gemspec path: "../"

data/lib/pg_ha_migrations/allowed_versions.rb

@@ -1,7 +1,7 @@
 require "active_record/migration/compatibility"
 
 module PgHaMigrations::AllowedVersions
-  ALLOWED_VERSIONS = [4.2, 5.0, 5.1, 5.2].map do |v|
+  ALLOWED_VERSIONS = [4.2, 5.0, 5.1, 5.2, 6.0].map do |v|
     begin
       ActiveRecord::Migration[v]
     rescue ArgumentError

data/lib/pg_ha_migrations/blocking_database_transactions.rb

@@ -25,13 +25,19 @@ module PgHaMigrations
     end
 
     def self.find_blocking_transactions(minimum_transaction_age = "0 seconds")
-      pid_column, query_column = if ActiveRecord::Base.connection.select_value("SHOW server_version") =~ /9\.1/
+      postgres_version = ActiveRecord::Base.connection.postgresql_version
+      pid_column, query_column = if postgres_version < 9_02_00
         ["procpid", "current_query"]
       else
         ["pid", "query"]
       end
 
-      raw_query = <<-SQL
+      # In some versions of Postgres, walsenders show up here with a non-null xact_start.
+      # That's been patched, so hard to test, but we should exclude them anyway.
+      # https://www.postgresql.org/message-id/flat/20191209234409.exe7osmyalwkt5j4%40development
+      ignore_sqlsender_sql = "psa.backend_type != 'walsender'"
+
+      raw_query = <<~SQL
         SELECT
           psa.datname as database, -- Will only ever be one database
           psa.#{query_column} as current_query,
@@ -59,6 +65,7 @@ module PgHaMigrations
           )
           AND psa.xact_start < clock_timestamp() - ?::interval
           AND psa.#{query_column} !~ ?
+          #{postgres_version >= 10_00_00 ? "AND #{ignore_sqlsender_sql}" : ""}
         GROUP BY psa.datname, psa.#{query_column}, psa.state, psa.xact_start
       SQL
 

data/lib/pg_ha_migrations/blocking_database_transactions_reporter.rb

@@ -24,7 +24,7 @@ module PgHaMigrations
         end
 
         if blocking_transactions.any?(&:concurrent_index_creation?)
-          report << <<-eos.strip_heredoc.lines.map { |line| "\t#{line}" }.join
+          report << <<~eos.lines.map { |line| "\t#{line}" }.join
             Warning: concurrent indexes are currently being built. If you have any other
                      migrations in this deploy that will attempt to create additional
                      concurrent indexes on the same physical database (even if the table

data/lib/pg_ha_migrations/version.rb

@@ -1,3 +1,3 @@
 module PgHaMigrations
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/pg_ha_migrations.gemspec

@@ -37,6 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "appraisal", "~> 2.2.0"
 
-  spec.add_dependency "rails", ">= 5.0", "< 5.3"
-  spec.add_dependency "relation_to_struct"
+  spec.add_dependency "rails", ">= 5.0", "< 6.1"
+  spec.add_dependency "relation_to_struct", ">= 1.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_ha_migrations
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - celeen
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -123,7 +123,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -133,21 +133,21 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: relation_to_struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
 description: Enforces DDL/migration safety in Ruby on Rails project with an emphasis
   on explicitly choosing trade-offs and avoiding unnecessary magic.
 email:
@@ -173,6 +173,7 @@ files:
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
 - lib/pg_ha_migrations.rb
 - lib/pg_ha_migrations/allowed_versions.rb
 - lib/pg_ha_migrations/blocking_database_transactions.rb