pg_ha_migrations 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5eb93231a1de0f12819682bfe42606bf0cc49813a50b91670107f01eafe8f18
-  data.tar.gz: adcea5f591af66bb790118c562a0cab80dca009421529437d2586e6c0b957f01
+  metadata.gz: 6962b68069791fd1de1da3dd1f8a3bb34438faf217023fdcc05d792eb345a666
+  data.tar.gz: 450e7710be2bac4d25e77dabfb7eff9048f9321ebcf90a428a6125edab848f69
 SHA512:
-  metadata.gz: c7c827c5385b13a438a4a2cf1eaa1b7535e54e6d3293f67616849647706ca869a1362db4e102e66802f0930d450a09e3943d365a6b9d7481871c286c3fba1a36
-  data.tar.gz: 334f6c562b0b1288690ff6ec1033beb6676446f4c3a5d708d65de93884e85a65a863d985a37bc02a0c30046d34fbd289f9ac5cca50ada30a9e6d4fcdc0d977ac
+  metadata.gz: 7467eee266a3c9f49faa84cc771ae35d601b25cc38cfe097b5d696e01dfd317ed1a6b5e67e8a053f80cc262bedf2f3b204dbb4b98732d09688485371613025f1
+  data.tar.gz: 63d05306b246ff151d0849967bd71a5457f94d1ac968cc155fcd58e5b359c868a4888167e43fd5775e7bec3bfc8dab9eb71341b80971b4ffd03ed0a189f8ff83

data/.github/workflows/ci.yml

@@ -9,6 +9,8 @@ jobs:
           - 10
           - 11
           - 12
+        ruby:
+          - 2.7
         gemfile:
           - rails_5.0
           - rails_5.1
@@ -16,6 +18,55 @@ jobs:
           - 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
@@ -39,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/gemfiles/rails_7.0.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "7.0.0"
+gem "rails", "7.0.1"
 
 gemspec path: "../"

data/lib/pg_ha_migrations/safe_statements.rb

@@ -65,7 +65,7 @@ module PgHaMigrations::SafeStatements
 
   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
 
@@ -145,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={})
@@ -157,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.5.0"
+  VERSION = "1.6.0"
 end

data/lib/pg_ha_migrations.rb

@@ -3,6 +3,7 @@ require "rails"
 require "active_record"
 require "active_record/migration"
 require "relation_to_struct"
+require "ruby2_keywords"
 
 module PgHaMigrations
   Config = Struct.new(

data/pg_ha_migrations.gemspec

@@ -39,4 +39,5 @@ Gem::Specification.new do |spec|
 
   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.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - celeen
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -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: