pg_ha_migrations 1.3.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 642f8332dd491d8b489d7044c8989bcfc8a7e34c63ad380c42ed3e78f45c5c8f
-  data.tar.gz: 0bec0715601bce8ddd77d83c03c399b2dff21039301a72b67899d5041012c231
+  metadata.gz: 6962b68069791fd1de1da3dd1f8a3bb34438faf217023fdcc05d792eb345a666
+  data.tar.gz: 450e7710be2bac4d25e77dabfb7eff9048f9321ebcf90a428a6125edab848f69
 SHA512:
-  metadata.gz: b40ccad5d82c2f2167515eca20da2152482c7e9cd11b84dbf721b0840c7c40462a8818d4bb8dbea840196171185dd3ddc1fb28e205f96a7845cc9c3df69d1a67
-  data.tar.gz: 2a07b86116d69ee0a51ec8b9d7fb4bcc6ba876e363df79902e7bed3f7ab123bd9f4c4c21b15ba538c0d8850b6f82c353f0c02fa7ad2ac11f8f84ee1f29787bd6
+  metadata.gz: 7467eee266a3c9f49faa84cc771ae35d601b25cc38cfe097b5d696e01dfd317ed1a6b5e67e8a053f80cc262bedf2f3b204dbb4b98732d09688485371613025f1
+  data.tar.gz: 63d05306b246ff151d0849967bd71a5457f94d1ac968cc155fcd58e5b359c868a4888167e43fd5775e7bec3bfc8dab9eb71341b80971b4ffd03ed0a189f8ff83

data/.github/workflows/ci.yml

@@ -9,12 +9,64 @@ jobs:
           - 10
           - 11
           - 12
+        ruby:
+          - 2.7
         gemfile:
           - rails_5.0
           - rails_5.1
           - rails_5.2
           - rails_6.0
           - rails_6.1
+          - rails_7.0
+        include:
+          - gemfile: rails_6.1
+            ruby: 3.0
+            pg: 9.6
+          - gemfile: rails_6.1
+            ruby: 3.0
+            pg: 10
+          - gemfile: rails_6.1
+            ruby: 3.0
+            pg: 11
+          - gemfile: rails_6.1
+            ruby: 3.0
+            pg: 12
+          - gemfile: rails_6.1
+            ruby: 3.1
+            pg: 9.6
+          - gemfile: rails_6.1
+            ruby: 3.1
+            pg: 10
+          - gemfile: rails_6.1
+            ruby: 3.1
+            pg: 11
+          - gemfile: rails_6.1
+            ruby: 3.1
+            pg: 12
+          - gemfile: rails_7.0
+            ruby: 3.0
+            pg: 9.6
+          - gemfile: rails_7.0
+            ruby: 3.0
+            pg: 10
+          - gemfile: rails_7.0
+            ruby: 3.0
+            pg: 11
+          - gemfile: rails_7.0
+            ruby: 3.0
+            pg: 12
+          - gemfile: rails_7.0
+            ruby: 3.1
+            pg: 9.6
+          - gemfile: rails_7.0
+            ruby: 3.1
+            pg: 10
+          - gemfile: rails_7.0
+            ruby: 3.1
+            pg: 11
+          - gemfile: rails_7.0
+            ruby: 3.1
+            pg: 12
     name: PostgreSQL ${{ matrix.pg }}
     runs-on: ubuntu-latest
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
@@ -38,5 +90,6 @@ jobs:
       - name: Setup Ruby using .ruby-version file
         uses: ruby/setup-ruby@v1
         with:
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - run: bundle exec rake spec

data/Appraisals

@@ -18,3 +18,6 @@ appraise "rails-6.1" do
   gem "rails", "6.1.0"
 end
 
+appraise "rails-7.0" do
+  gem "rails", "7.0.0"
+end

data/README.md

@@ -148,6 +148,8 @@ safe_change_column_default :table, :column, -> { "NOW()" }
 safe_change_column_default :table, :column, -> { "'NOW()'" }
 ```
 
+Note: On Postgres 11+ adding a column with a constant default value does not rewrite or scan the table (under a lock or otherwise). In that case a migration adding a column with a default should do so in a single operation rather than the two-step `safe_add_column` followed by `safe_change_column_default`. We enforce this best practice with the error `PgHaMigrations::BestPracticeError`, but if your prefer otherwise (or are running in a mixed Postgres version environment), you may opt out by setting `config.prefer_single_step_column_addition_with_default = true` [in your configuration initializer](#configuration).
+
 #### safe\_make\_column\_nullable
 
 Safely make the column nullable.
@@ -272,6 +274,8 @@ end
 
 - `disable_default_migration_methods`: If true, the default implementations of DDL changes in `ActiveRecord::Migration` and the PostgreSQL adapter will be overridden by implementations that raise a `PgHaMigrations::UnsafeMigrationError`. Default: `true`
 - `check_for_dependent_objects`: If true, some `unsafe_*` migration methods will raise a `PgHaMigrations::UnsafeMigrationError` if any dependent objects exist. Default: `false`
+- `prefer_single_step_column_addition_with_default`: If `true`, raise an error when adding a column and separately setting a constant default value for that column in the same migration. Default: `false`
+- 'allow_force_create_table`: If false, the `force: true` option to ActiveRecord's `create_table` method is disallowed. Default: `true`
 
 ### Rake Tasks
 
@@ -299,7 +303,11 @@ After checking out the repo, run `bin/setup` to install dependencies and start a
 
 Running tests will automatically create a test database in the locally running Postgres server. You can find the connection parameters in `spec/spec_helper.rb`, but setting the environment variables `PGHOST`, `PGPORT`, `PGUSER`, and `PGPASSWORD` will override the defaults.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`.
+
+To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+Note: if while releasing the gem you get the error ``Your rubygems.org credentials aren't set. Run `gem push` to set them.`` you can more simply run `gem signin`.
 
 ## Contributing
 

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "7.0.1"
+
+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, 6.0, 6.1].map do |v|
+  ALLOWED_VERSIONS = [4.2, 5.0, 5.1, 5.2, 6.0, 6.1, 7.0].map do |v|
     begin
       ActiveRecord::Migration[v]
     rescue ArgumentError

data/lib/pg_ha_migrations/blocking_database_transactions.rb

@@ -49,10 +49,6 @@ module PgHaMigrations
           LEFT JOIN pg_class c ON ( -- Database wide
             l.locktype = 'relation'
             AND l.relation = c.oid
-            -- Be explicit about this being for a single database -- it's already implicit in
-            -- the relations used, and if we don't restrict this we could get incorrect results
-            -- with oid collisions from pg_namespace and pg_class.
-            AND l.database = (SELECT d.oid FROM pg_database d WHERE d.datname = current_database())
           )
           LEFT JOIN pg_namespace ns ON (c.relnamespace = ns.oid) -- Database wide
         WHERE psa.#{pid_column} != pg_backend_pid()
@@ -65,6 +61,10 @@ module PgHaMigrations
           )
           AND psa.xact_start < clock_timestamp() - ?::interval
           AND psa.#{query_column} !~ ?
+          -- Be explicit about this being for a single database -- it's already implicit in
+          -- the relations used, and if we don't restrict this we could get incorrect results
+          -- with oid collisions from pg_namespace and pg_class.
+          AND psa.datname = current_database()
           #{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/safe_statements.rb

@@ -1,4 +1,8 @@
 module PgHaMigrations::SafeStatements
+  def safe_added_columns_without_default_value
+    @safe_added_columns_without_default_value ||= []
+  end
+
   def safe_create_table(table, options={}, &block)
     if options[:force]
       raise PgHaMigrations::UnsafeMigrationError.new(":force is NOT SAFE! Explicitly call unsafe_drop_table first if you want to recreate an existing table")
@@ -52,16 +56,26 @@ module PgHaMigrations::SafeStatements
       raise PgHaMigrations::UnsafeMigrationError.new(":null => false is NOT SAFE if the table has data! If you _really_ want to do this, use unsafe_make_column_not_nullable")
     end
 
+    unless options.has_key?(:default)
+      self.safe_added_columns_without_default_value << [table.to_s, column.to_s]
+    end
+
     unsafe_add_column(table, column, type, options)
   end
 
   def unsafe_add_column(table, column, type, options = {})
     safely_acquire_lock_for_table(table) do
-      super(table, column, type, options)
+      super(table, column, type, **options)
     end
   end
 
   def safe_change_column_default(table_name, column_name, default_value)
+    if PgHaMigrations.config.prefer_single_step_column_addition_with_default &&
+        ActiveRecord::Base.connection.postgresql_version >= 11_00_00 &&
+        self.safe_added_columns_without_default_value.include?([table_name.to_s, column_name.to_s])
+      raise PgHaMigrations::BestPracticeError, "On Postgres 11+ it's safe to set a constant default value when adding a new column; please set the default value as part of the column addition"
+    end
+
     column = connection.send(:column_for, table_name, column_name)
 
     # In 5.2 we have an edge whereby passing in a string literal with an expression
@@ -131,7 +145,7 @@ module PgHaMigrations::SafeStatements
   end
 
   def safe_add_concurrent_index(table, columns, options={})
-    unsafe_add_index(table, columns, options.merge(:algorithm => :concurrently))
+    unsafe_add_index(table, columns, **options.merge(:algorithm => :concurrently))
   end
 
   def safe_remove_concurrent_index(table, options={})
@@ -143,7 +157,7 @@ module PgHaMigrations::SafeStatements
     end
     index_size = select_value("SELECT pg_size_pretty(pg_relation_size('#{options[:name]}'))")
     say "Preparing to drop index #{options[:name]} which is #{index_size} on disk..."
-    unsafe_remove_index(table, options.merge(:algorithm => :concurrently))
+    unsafe_remove_index(table, **options.merge(:algorithm => :concurrently))
   end
 
   def safe_set_maintenance_work_mem_gb(gigabytes)

data/lib/pg_ha_migrations/unsafe_statements.rb

@@ -19,6 +19,7 @@ module PgHaMigrations::UnsafeStatements
 
       execute_ancestor_statement(method_name, *args, &block)
     end
+    ruby2_keywords method_name
   end
 
   def self.delegate_unsafe_method_to_migration_base_class(method_name)
@@ -29,6 +30,7 @@ module PgHaMigrations::UnsafeStatements
 
       execute_ancestor_statement(method_name, *args, &block)
     end
+    ruby2_keywords "unsafe_#{method_name}"
   end
 
   delegate_unsafe_method_to_migration_base_class :add_column
@@ -65,7 +67,7 @@ module PgHaMigrations::UnsafeStatements
       raise PgHaMigrations::UnsafeMigrationError.new(":force is NOT SAFE! Explicitly call unsafe_drop_table first if you want to recreate an existing table")
     end
 
-    execute_ancestor_statement(:create_table, table, options, &block)
+    execute_ancestor_statement(:create_table, table, **options, &block)
   end
 
   def unsafe_add_index(table, column_names, options = {})
@@ -74,11 +76,10 @@ module PgHaMigrations::UnsafeStatements
       raise PgHaMigrations::InvalidMigrationError, "ActiveRecord drops the :opclass option when supplying a string containing an expression or list of columns; instead either supply an array of columns or include the opclass in the string for each column"
     end
 
-    execute_ancestor_statement(:add_index, table, column_names, options)
+    execute_ancestor_statement(:add_index, table, column_names, **options)
   end
 
-
-  def execute_ancestor_statement(method_name, *args, &block)
+  ruby2_keywords def execute_ancestor_statement(method_name, *args, &block)
     # Dispatching here is a bit complicated: we need to execute the method
     # belonging to the first member of the inheritance chain (besides
     # UnsafeStatements). If don't find the method in the inheritance chain,

data/lib/pg_ha_migrations/version.rb

@@ -1,3 +1,3 @@
 module PgHaMigrations
-  VERSION = "1.3.0"
+  VERSION = "1.6.0"
 end

data/lib/pg_ha_migrations.rb

@@ -3,19 +3,22 @@ require "rails"
 require "active_record"
 require "active_record/migration"
 require "relation_to_struct"
+require "ruby2_keywords"
 
 module PgHaMigrations
   Config = Struct.new(
     :disable_default_migration_methods,
     :check_for_dependent_objects,
-    :allow_force_create_table
+    :allow_force_create_table,
+    :prefer_single_step_column_addition_with_default
   )
 
   def self.config
     @config ||= Config.new(
       true,
       false,
-      true
+      true,
+      false
     )
   end
 
@@ -29,18 +32,24 @@ module PgHaMigrations
   # Safe versus unsafe in this context specifically means the following:
   # - Safe operations will not block for long periods of time.
   # - Unsafe operations _may_ block for long periods of time.
-  UnsafeMigrationError = Class.new(Exception)
+  UnsafeMigrationError = Class.new(StandardError)
 
   # Invalid migrations are operations which we expect to not function
   # as expected or get the schema into an inconsistent state
-  InvalidMigrationError = Class.new(Exception)
+  InvalidMigrationError = Class.new(StandardError)
+
+  # Operations violating a best practice, but not actually unsafe will
+  # raise this error. For example, adding a column without a default and
+  # then setting its default in a second action in a single migration
+  # isn't our documented best practice and will raise this error.
+  BestPracticeError = Class.new(Exception)
 
   # Unsupported migrations use ActiveRecord::Migration features that
   # we don't support, and therefore will likely have unexpected behavior.
-  UnsupportedMigrationError = Class.new(Exception)
+  UnsupportedMigrationError = Class.new(StandardError)
 
   # This gem only supports the PostgreSQL adapter at this time.
-  UnsupportedAdapter = Class.new(Exception)
+  UnsupportedAdapter = Class.new(StandardError)
 end
 
 require "pg_ha_migrations/blocking_database_transactions"

data/pg_ha_migrations.gemspec

@@ -29,14 +29,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pg"
-  spec.add_development_dependency "db-query-matchers", "~> 0.10.0"
+  spec.add_development_dependency "db-query-matchers", "~> 0.11.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "appraisal", "~> 2.2.0"
 
-  spec.add_dependency "rails", ">= 5.0", "< 6.2"
+  spec.add_dependency "rails", ">= 5.0", "< 7.1"
   spec.add_dependency "relation_to_struct", ">= 1.5.1"
+  spec.add_dependency "ruby2_keywords"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_ha_migrations
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.6.0
 platform: ruby
 authors:
 - celeen
@@ -14,22 +14,22 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: relation_to_struct
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +148,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Enforces DDL/migration safety in Ruby on Rails project with an emphasis
   on explicitly choosing trade-offs and avoiding unnecessary magic.
 email:
@@ -161,7 +175,6 @@ files:
 - ".pryrc"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -176,6 +189,7 @@ files:
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
 - lib/pg_ha_migrations.rb
 - lib/pg_ha_migrations/allowed_versions.rb
 - lib/pg_ha_migrations/blocking_database_transactions.rb

data/.travis.yml

@@ -1,27 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5
-env:
-  jobs:
-    - PGVERSION: "9.6"
-    - PGVERSION: "10"
-    - PGVERSION: "11"
-    - PGVERSION: "12"
-services:
-  - postgresql
-before_install:
-  - "for CLUSTER_VERSION in $(pg_lsclusters -h | cut -d' ' -f1); do sudo pg_dropcluster $CLUSTER_VERSION main --stop || true; done"
-  - sudo apt-get update
-  - sudo apt-get -y install postgresql-$PGVERSION postgresql-client-$PGVERSION postgresql-server-dev-$PGVERSION postgresql-client-common postgresql-common
-  - sudo pg_dropcluster $PGVERSION main --stop || true
-  - sudo pg_createcluster $PGVERSION main -D /var/ramfs/postgresql/11/main -- --auth=trust
-  - sudo pg_ctlcluster start $PGVERSION main
-  - 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"