activerecord-pg_enum 1.0.3 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 552cd4fa6b85fd2002965150aca5e1f92f9752bfce9ab6628241dce0ef40406f
-  data.tar.gz: b7915cd86940a3f2c5b2e9053712369f639073e22123b7a3a173f5403539aca1
+  metadata.gz: b134179642533a863076d742b3650d8206950d606059ac10be38d38bdee70789
+  data.tar.gz: d10ed445144b43dd6e0f9fd06997b198fd80b49411917a26014bc65539b60426
 SHA512:
-  metadata.gz: 5b48750e4060fb131d1099ddf2198362e750901873e590ca488cb376e99ef30ab09c11857d9aa91ae9e0caea2903367a97bb34073f31f1ee1a9c4377cf9a27a5
-  data.tar.gz: 66fc8ee9467a8dc96445e5e5f8fdab62b77ad4740086b17fa1d3a673415c657f3fdccf5cc09898f8153534951ccfa88b644359b7ebb2ccb81fd187e5465b4655
+  metadata.gz: 37b15da659116a26e3e94097a5ccf698dc1cfcdc59fe2aa8ab20f8a2402bf8534a4bbc373cbaadbd18b585da420e1f14ea7f944f3400e759f7a9d4a80230cfae
+  data.tar.gz: 379a854b1d0a307ebfcb6a02f4cf4eb75135c941d6beda0e5ba53eb067a14398379e9102af6d76b2ac7116f896b5ba61a61fab0948a953ba1200d7436eb57eb1

data/.travis.yml

@@ -15,6 +15,8 @@ matrix:
     gemfile: gemfiles/5.2.gemfile
   - rvm: 2.6.0
     gemfile: gemfiles/6.0.gemfile
+  - rvm: 2.7.0
+    gemfile: gemfiles/6.1.gemfile
   - rvm: ruby-head
     gemfile: gemfiles/edge.gemfile
   allow_failures:
@@ -22,7 +24,7 @@ matrix:
 services:
 - postgresql
 addons:
-  postgresql: "9.6"
+  postgresql: "10"
 before_install: gem install bundler -v 1.17.3
 script: "bundle exec rake spec"
 env:

data/Appraisals

@@ -1,5 +1,9 @@
+appraise "6.1" do
+  gem "activerecord", "~> 6.1"
+end
+
 appraise "6.0" do
-  gem "activerecord", "6.0.0"
+  gem "activerecord", "~> 6.0"
 end
 
 appraise "5.2" do

data/CHANGELOG.md

@@ -6,6 +6,31 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.2.1] - 2021-01-05
+### Fixed
+- Argument bug that surfaced in Ruby 3.0
+
+## [1.2.0] - 2020-12-09
+### Added
+- Support for 6.1
+
+## [1.1.0] - 2020-01-18
+### Added
+- `rename_enum` command for changing the type name
+- `rename_enum_value` command for changing an enum label (PostgreSQL 10+ only)
+
+### Changed
+- Refactored some code to eliminate deprecation warnings in 2.7 related to kwargs
+
+## [1.0.5] - 2019-11-22
+### Fixed
+- Don't include schema name in dumped enum types to be consistent with the way tables are dumped (@TylerRick)
+
+## [1.0.4] - 2019-11-16
+### Fixed
+- Dump enums declared in non-public schemas
+- Fix missing `enum` method with using `change_table`
+
 ## [1.0.3] - 2019-10-13
 ### Fixed
 - Allow enum labels to contain spaces (@AndrewSpeed)

data/README.md

@@ -117,6 +117,36 @@ class AddStatusToOrder < ActiveRecord::Migration[5.2]
 end
 ```
 
+Renaming an enum type
+
+```ruby
+class RenameStatusType < ActiveRecord::Migration[6.0]
+  def change
+    rename_enum "status_type", to: "order_status_type"
+  end
+end
+```
+
+```SQL
+ALTER TYPE status_type RENAME TO order_status_type;
+```
+
+**PostgreSQL 10+ required**:
+
+Changing an enum label
+
+```ruby
+class ChangeStatusHoldLabel < ActiveRecord::Migration[6.0]
+  def change
+    rename_enum_value "status_type", from: "on hold", to: "OnHold"
+  end
+end
+```
+
+```SQL
+ALTER TYPE status_type RENAME VALUE 'on hold' TO 'OnHold';
+```
+
 ### Module Builder
 
 ```ruby
@@ -133,6 +163,20 @@ class ContactInfo < ActiveRecord::Base
 end
 ```
 
+Additionally, `enum` options are fully supported, for example
+```ruby
+class User < ActiveRecord::Base
+  include PGEnum(status: %w[active inactive deleted], _prefix: 'user', _suffix: true)
+end
+```
+
+is equivalent to
+```ruby
+class User < ActiveRecord::Base
+  enum status: { active: 'active', inactive: 'inactive', deleted: 'deleted' }, _prefix: 'user', _suffix: true
+end
+```
+
 There's no technical reason why you couldn't detect enum columns at startup time and automatically do this wireup, but I feel that the benefit of self-documenting outweighs the convenience.
 
 ## Development

data/Rakefile

@@ -1,6 +1,7 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "appraisal"
+require "pry"
 
 if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
   task :default => :appraisal
@@ -10,13 +11,15 @@ end
 
 task :connection do
   require "active_record"
+  require_relative "spec/support/connection_config"
 
-  ActiveRecord::Base.establish_connection(
-    adapter:  "postgresql",
-    port:     ENV.fetch("PGPORT", "5432"),
-    username: ENV.fetch("TEST_USER") { ENV.fetch("USER", "pg_enum") },
-    password: ENV["TEST_PASSWORD"]
-  )
+  config = db_config_hash.except(:database)
+
+  if ActiveRecord.constants.include?(:DatabaseConfigurations)
+    config = ActiveRecord::DatabaseConfigurations::HashConfig.new("test", "primary", config)
+  end
+
+  ActiveRecord::Base.establish_connection(config)
 end
 
 namespace :spec do
@@ -35,6 +38,8 @@ namespace :spec do
       conn.drop_database ENV.fetch("TEST_DATABASE", "pg_enum_test")
     end
   end
+
+  task reset: [:teardown, :setup]
 end
 
 task spec: %w[spec:setup spec:run spec:teardown]

data/activerecord-pg_enum.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
 
   spec.add_development_dependency "appraisal"
-  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"

data/gemfiles/4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.3)
+    activerecord-pg_enum (1.2.0)
       activerecord (>= 4.1.0)
       activesupport
       pg
@@ -27,15 +27,15 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (5.0.1.20140414130214)
-    builder (3.2.3)
+    builder (3.2.4)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     json (1.8.6)
     method_source (0.9.2)
-    minitest (5.11.3)
+    minitest (5.14.2)
     pg (0.21.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -56,7 +56,7 @@ GEM
     rspec-support (3.8.2)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -66,7 +66,7 @@ DEPENDENCIES
   activerecord (>= 4.1.0, < 4.2.0)
   activerecord-pg_enum!
   appraisal
-  bundler (~> 1.15)
+  bundler (~> 1.17)
   i18n (~> 0.7)
   pg (~> 0.15)
   pry

data/gemfiles/4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.3)
+    activerecord-pg_enum (1.2.0)
       activerecord (>= 4.1.0)
       activesupport
       pg
@@ -9,14 +9,14 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.11.1)
-      activesupport (= 4.2.11.1)
+    activemodel (4.2.11.3)
+      activesupport (= 4.2.11.3)
       builder (~> 3.1)
-    activerecord (4.2.11.1)
-      activemodel (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
+    activerecord (4.2.11.3)
+      activemodel (= 4.2.11.3)
+      activesupport (= 4.2.11.3)
       arel (~> 6.0)
-    activesupport (4.2.11.1)
+    activesupport (4.2.11.3)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -26,14 +26,14 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (6.0.4)
-    builder (3.2.3)
+    builder (3.2.4)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
-    minitest (5.11.3)
+    minitest (5.14.2)
     pg (0.21.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -54,7 +54,7 @@ GEM
     rspec-support (3.8.2)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -64,7 +64,7 @@ DEPENDENCIES
   activerecord (>= 4.2.0, < 5.0.0)
   activerecord-pg_enum!
   appraisal
-  bundler (~> 1.15)
+  bundler (~> 1.17)
   i18n (~> 0.7)
   pg (~> 0.15)
   pry

data/gemfiles/5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.3)
+    activerecord-pg_enum (1.2.0)
       activerecord (>= 4.1.0)
       activesupport
       pg
@@ -9,13 +9,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.0.7.1)
-      activesupport (= 5.0.7.1)
-    activerecord (5.0.7.1)
-      activemodel (= 5.0.7.1)
-      activesupport (= 5.0.7.1)
+    activemodel (5.0.7.2)
+      activesupport (= 5.0.7.2)
+    activerecord (5.0.7.2)
+      activemodel (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
       arel (~> 7.0)
-    activesupport (5.0.7.1)
+    activesupport (5.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -26,13 +26,13 @@ GEM
       thor (>= 0.14.0)
     arel (7.1.4)
     coderay (1.1.2)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
     i18n (1.5.1)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
-    minitest (5.11.3)
-    pg (1.1.4)
+    minitest (5.14.2)
+    pg (1.2.3)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -52,7 +52,7 @@ GEM
     rspec-support (3.8.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -62,7 +62,7 @@ DEPENDENCIES
   activerecord (>= 5.0.0, < 5.1.0)
   activerecord-pg_enum!
   appraisal
-  bundler (~> 1.15)
+  bundler (~> 1.17)
   i18n (= 1.5.1)
   pry
   rake (~> 10.0)

data/gemfiles/5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.3)
+    activerecord-pg_enum (1.2.0)
       activerecord (>= 4.1.0)
       activesupport
       pg
@@ -9,13 +9,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.6)
-      activesupport (= 5.1.6)
-    activerecord (5.1.6)
-      activemodel (= 5.1.6)
-      activesupport (= 5.1.6)
+    activemodel (5.1.7)
+      activesupport (= 5.1.7)
+    activerecord (5.1.7)
+      activemodel (= 5.1.7)
+      activesupport (= 5.1.7)
       arel (~> 8.0)
-    activesupport (5.1.6)
+    activesupport (5.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -26,13 +26,13 @@ GEM
       thor (>= 0.14.0)
     arel (8.0.0)
     coderay (1.1.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
-    i18n (1.1.0)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     method_source (0.9.0)
-    minitest (5.11.3)
-    pg (1.1.4)
+    minitest (5.14.2)
+    pg (1.2.3)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -52,7 +52,7 @@ GEM
     rspec-support (3.8.0)
     thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -62,7 +62,7 @@ DEPENDENCIES
   activerecord (>= 5.1.0, < 5.2.0)
   activerecord-pg_enum!
   appraisal
-  bundler (~> 1.15)
+  bundler (~> 1.17)
   pry
   rake (~> 10.0)
   rspec (~> 3.0)

data/gemfiles/5.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.3)
+    activerecord-pg_enum (1.2.0)
       activerecord (>= 4.1.0)
       activesupport
       pg
@@ -9,13 +9,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
+    activemodel (5.2.4.4)
+      activesupport (= 5.2.4.4)
+    activerecord (5.2.4.4)
+      activemodel (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       arel (>= 9.0)
-    activesupport (5.2.1)
+    activesupport (5.2.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -26,13 +26,13 @@ GEM
       thor (>= 0.14.0)
     arel (9.0.0)
     coderay (1.1.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
-    i18n (1.1.0)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     method_source (0.9.0)
-    minitest (5.11.3)
-    pg (1.1.4)
+    minitest (5.14.2)
+    pg (1.2.3)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -52,7 +52,7 @@ GEM
     rspec-support (3.8.0)
     thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -62,7 +62,7 @@ DEPENDENCIES
   activerecord (~> 5.2)
   activerecord-pg_enum!
   appraisal
-  bundler (~> 1.15)
+  bundler (~> 1.17)
   pry
   rake (~> 10.0)
   rspec (~> 3.0)

data/gemfiles/6.0.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "6.0.0"
+gem "activerecord", "< 6.1"
 
 gemspec path: "../"

data/gemfiles/6.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.3)
+    activerecord-pg_enum (1.2.0)
       activerecord (>= 4.1.0)
       activesupport
       pg
@@ -9,29 +9,29 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.0)
-      activesupport (= 6.0.0)
-    activerecord (6.0.0)
-      activemodel (= 6.0.0)
-      activesupport (= 6.0.0)
-    activesupport (6.0.0)
+    activemodel (6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activerecord (6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
+      zeitwerk (~> 2.2, >= 2.2.2)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
-    i18n (1.6.0)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
-    minitest (5.11.3)
-    pg (1.1.4)
+    minitest (5.14.2)
+    pg (1.2.3)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -51,18 +51,18 @@ GEM
     rspec-support (3.8.2)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
-    zeitwerk (2.1.9)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 6.0.0)
+  activerecord (< 6.1)
   activerecord-pg_enum!
   appraisal
-  bundler (~> 1.15)
+  bundler (~> 1.17)
   pry
   rake (~> 10.0)
   rspec (~> 3.0)

data/gemfiles/6.1.gemfile

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

data/gemfiles/6.1.gemfile.lock

@@ -0,0 +1,70 @@
+PATH
+  remote: ..
+  specs:
+    activerecord-pg_enum (1.2.0)
+      activerecord (>= 4.1.0)
+      activesupport
+      pg
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.1.0)
+      activesupport (= 6.1.0)
+    activerecord (6.1.0)
+      activemodel (= 6.1.0)
+      activesupport (= 6.1.0)
+    activesupport (6.1.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    appraisal (2.3.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.7)
+    diff-lcs (1.4.4)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    method_source (1.0.0)
+    minitest (5.14.2)
+    pg (1.2.3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (10.5.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    thor (1.0.1)
+    tzinfo (2.0.3)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 6.1)
+  activerecord-pg_enum!
+  appraisal
+  bundler (~> 1.17)
+  pry
+  rake (~> 10.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   1.17.3

data/gemfiles/edge.gemfile.lock

@@ -1,72 +1,93 @@
 GIT
   remote: https://github.com/rails/rails.git
-  revision: dc796a0d407dfaf84abd464fc1aa2966cddb51e0
+  revision: 46337faa795fa40dedb1b9b906bec1793358d7f3
   branch: master
   specs:
-    actioncable (6.0.0.alpha)
-      actionpack (= 6.0.0.alpha)
+    actioncable (6.2.0.alpha)
+      actionpack (= 6.2.0.alpha)
+      activesupport (= 6.2.0.alpha)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (6.0.0.alpha)
-      actionpack (= 6.0.0.alpha)
-      actionview (= 6.0.0.alpha)
-      activejob (= 6.0.0.alpha)
+    actionmailbox (6.2.0.alpha)
+      actionpack (= 6.2.0.alpha)
+      activejob (= 6.2.0.alpha)
+      activerecord (= 6.2.0.alpha)
+      activestorage (= 6.2.0.alpha)
+      activesupport (= 6.2.0.alpha)
+      mail (>= 2.7.1)
+    actionmailer (6.2.0.alpha)
+      actionpack (= 6.2.0.alpha)
+      actionview (= 6.2.0.alpha)
+      activejob (= 6.2.0.alpha)
+      activesupport (= 6.2.0.alpha)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.0.alpha)
-      actionview (= 6.0.0.alpha)
-      activesupport (= 6.0.0.alpha)
-      rack (~> 2.0)
+    actionpack (6.2.0.alpha)
+      actionview (= 6.2.0.alpha)
+      activesupport (= 6.2.0.alpha)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (6.0.0.alpha)
-      activesupport (= 6.0.0.alpha)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.2.0.alpha)
+      actionpack (= 6.2.0.alpha)
+      activerecord (= 6.2.0.alpha)
+      activestorage (= 6.2.0.alpha)
+      activesupport (= 6.2.0.alpha)
+      nokogiri (>= 1.8.5)
+    actionview (6.2.0.alpha)
+      activesupport (= 6.2.0.alpha)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (6.0.0.alpha)
-      activesupport (= 6.0.0.alpha)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.2.0.alpha)
+      activesupport (= 6.2.0.alpha)
       globalid (>= 0.3.6)
-    activemodel (6.0.0.alpha)
-      activesupport (= 6.0.0.alpha)
-    activerecord (6.0.0.alpha)
-      activemodel (= 6.0.0.alpha)
-      activesupport (= 6.0.0.alpha)
-    activestorage (6.0.0.alpha)
-      actionpack (= 6.0.0.alpha)
-      activerecord (= 6.0.0.alpha)
+    activemodel (6.2.0.alpha)
+      activesupport (= 6.2.0.alpha)
+    activerecord (6.2.0.alpha)
+      activemodel (= 6.2.0.alpha)
+      activesupport (= 6.2.0.alpha)
+    activestorage (6.2.0.alpha)
+      actionpack (= 6.2.0.alpha)
+      activejob (= 6.2.0.alpha)
+      activerecord (= 6.2.0.alpha)
+      activesupport (= 6.2.0.alpha)
       marcel (~> 0.3.1)
-    activesupport (6.0.0.alpha)
+      mimemagic (~> 0.3.2)
+    activesupport (6.2.0.alpha)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    rails (6.0.0.alpha)
-      actioncable (= 6.0.0.alpha)
-      actionmailer (= 6.0.0.alpha)
-      actionpack (= 6.0.0.alpha)
-      actionview (= 6.0.0.alpha)
-      activejob (= 6.0.0.alpha)
-      activemodel (= 6.0.0.alpha)
-      activerecord (= 6.0.0.alpha)
-      activestorage (= 6.0.0.alpha)
-      activesupport (= 6.0.0.alpha)
-      bundler (>= 1.3.0)
-      railties (= 6.0.0.alpha)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    rails (6.2.0.alpha)
+      actioncable (= 6.2.0.alpha)
+      actionmailbox (= 6.2.0.alpha)
+      actionmailer (= 6.2.0.alpha)
+      actionpack (= 6.2.0.alpha)
+      actiontext (= 6.2.0.alpha)
+      actionview (= 6.2.0.alpha)
+      activejob (= 6.2.0.alpha)
+      activemodel (= 6.2.0.alpha)
+      activerecord (= 6.2.0.alpha)
+      activestorage (= 6.2.0.alpha)
+      activesupport (= 6.2.0.alpha)
+      bundler (>= 1.15.0)
+      railties (= 6.2.0.alpha)
       sprockets-rails (>= 2.0.0)
-    railties (6.0.0.alpha)
-      actionpack (= 6.0.0.alpha)
-      activesupport (= 6.0.0.alpha)
+    railties (6.2.0.alpha)
+      actionpack (= 6.2.0.alpha)
+      activesupport (= 6.2.0.alpha)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (~> 1.0)
 
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.3)
+    activerecord-pg_enum (1.2.0)
       activerecord (>= 4.1.0)
       activesupport
       pg
@@ -74,75 +95,75 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    appraisal (2.2.0)
+    appraisal (2.3.0)
       bundler
       rake
       thor (>= 0.14.0)
-    builder (3.2.3)
-    coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    crass (1.0.4)
-    diff-lcs (1.3)
-    erubi (1.7.1)
-    globalid (0.4.1)
+    builder (3.2.4)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.7)
+    crass (1.0.6)
+    diff-lcs (1.4.4)
+    erubi (1.10.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.1.0)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    loofah (2.2.2)
+    loofah (2.8.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.2)
+    marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.0)
-    mimemagic (0.3.2)
-    mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    nio4r (2.3.1)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
-    pg (1.1.4)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rack (2.0.5)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.2)
+    nio4r (2.5.4)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    pg (1.2.3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
     rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    sprockets (3.7.2)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    websocket-driver (0.7.0)
+    thor (1.0.1)
+    tzinfo (2.0.3)
+      concurrent-ruby (~> 1.0)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -150,7 +171,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord-pg_enum!
   appraisal
-  bundler (~> 1.15)
+  bundler (~> 1.17)
   pry
   rails!
   rake (~> 10.0)

data/lib/active_record/pg_enum.rb

@@ -3,7 +3,7 @@ require "active_support/lazy_load_hooks"
 
 module ActiveRecord
   module PGEnum
-    KNOWN_VERSIONS = %w[4.1 4.2 5.0 5.1 5.2 6.0].map { |v| Gem::Version.new(v) }
+    KNOWN_VERSIONS = %w[4.1 4.2 5.0 5.1 5.2 6.0 6.1].map { |v| Gem::Version.new(v) }
 
     class << self
       attr_reader :enabled_version
@@ -25,6 +25,10 @@ module ActiveRecord
         monkeypatches[patch] = block
       end
 
+      def detected_version
+        approximate_version Gem.loaded_specs["activerecord"].version
+      end
+
       private
 
       def monkeypatches

data/lib/active_record/pg_enum/4.1/table_definition.rb

@@ -3,6 +3,7 @@ module ActiveRecord
     register :table_definition do
       require "active_record/connection_adapters/postgresql_adapter"
       ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::TableDefinition.include TableDefinition
+      ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::Table.include TableDefinition
     end
 
     module TableDefinition

data/lib/active_record/pg_enum/4.2/table_definition.rb

@@ -5,6 +5,7 @@ module ActiveRecord
     register :table_definition do
       require "active_record/connection_adapters/postgresql_adapter"
       ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition.include TableDefinition
+      ActiveRecord::ConnectionAdapters::PostgreSQL::Table.include TableDefinition
     end
   end
 end

data/lib/active_record/pg_enum/6.0/table_definition.rb

@@ -1,2 +1,18 @@
 require "active_record/pg_enum/4.2/table_definition"
 
+module ActiveRecord
+  module PGEnum
+    module TableDefinition
+      # Create an enum column inside a TableDefinition
+      #
+      # Example:
+      #
+      #   create_table :orders do |t|
+      #     t.enum :status, as: "status_type"
+      #   end
+      def enum(name, as:, **options)
+        column(name, as, **options)
+      end
+    end
+  end
+end

data/lib/active_record/pg_enum/6.1/prepare_column_options.rb

@@ -0,0 +1 @@
+require "active_record/pg_enum/5.2/prepare_column_options"

data/lib/active_record/pg_enum/6.1/schema_dumper.rb

@@ -0,0 +1 @@
+require "active_record/pg_enum/5.2/schema_dumper"

data/lib/active_record/pg_enum/6.1/table_definition.rb

@@ -0,0 +1 @@
+require "active_record/pg_enum/6.0/table_definition"

data/lib/active_record/pg_enum/command_recorder.rb

@@ -34,12 +34,31 @@ module ActiveRecord
         record(:add_enum_value, args, &block)
       end
 
+      def rename_enum(name, options = {})
+        record(:rename_enum, [name, options])
+      end
+
+      def rename_enum_value(type, options = {})
+        record(:rename_enum_value, [type, options])
+      end
+
       private
 
       def invert_create_enum(args)
         [:drop_enum, args]
       end
 
+      def invert_rename_enum_value(args)
+        type, args = args
+        reversed   = %i[from to].zip(args.values_at(:to, :from))
+
+        [:rename_enum_value, [type, Hash[reversed]]]
+      end
+
+      def invert_rename_enum(args)
+        [:rename_enum, [args.last[:to], to: args.first]]
+      end
+
       def invert_drop_enum(args)
         raise ActiveRecord::IrreversibleMigration, "drop_enum is only reversible if given a list of values" unless args.length > 1
         [:create_enum, args]

data/lib/active_record/pg_enum/postgresql_adapter.rb

@@ -18,8 +18,8 @@ module ActiveRecord
           FROM pg_type t
           JOIN pg_enum e ON t.oid = e.enumtypid
           JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace
-          WHERE n.nspname = 'public'
-          GROUP BY enum_name
+          WHERE n.nspname = ANY (current_schemas(false))
+          GROUP BY enum_name;
         SQL
 
         coltype = res.column_types["enum_value"]
@@ -31,10 +31,10 @@ module ActiveRecord
           proc { |values| coltype.type_cast(values) }
         end
 
-        res.rows.inject({}) do |memo, (name, values)|
-          memo[name] = deserialize.call(values)
-          memo
-        end
+        res.rows
+          .map { |name, values| [name, values] }
+          .sort { |a, b| a.first <=> b.first }
+          .each_with_object({}) { |(name, values), memo| memo[name] = deserialize.call(values) }
       end
     end
   end

data/lib/active_record/pg_enum/schema_statements.rb

@@ -24,6 +24,14 @@ module ActiveRecord
         }
       end
 
+      # Rename an existing ENUM type
+      def rename_enum(name, options = {})
+        to = options.fetch(:to) { raise ArgumentError, ":to is required" }
+        execute("ALTER TYPE #{name} RENAME TO #{to}").tap {
+          reload_type_map
+        }
+      end
+
       # Add a new value to an existing ENUM type.
       # Only one value at a time is supported by PostgreSQL.
       #
@@ -34,7 +42,8 @@ module ActiveRecord
       # Example:
       #
       #   add_enum_value("foo_type", "quux", before: "bar")
-      def add_enum_value(type, value, before: nil, after: nil)
+      def add_enum_value(type, value, options = {})
+        before, after = options.values_at(:before, :after)
         cmd = "ALTER TYPE #{type} ADD VALUE '#{value}'"
 
         if before && after
@@ -47,6 +56,26 @@ module ActiveRecord
 
         execute(cmd).tap { reload_type_map }
       end
+
+      # Change the label of an existing ENUM value
+      #
+      # Options:
+      #   from: The original label string
+      #   to:   The desired label string
+      #
+      # Example:
+      #
+      #   rename_enum_value "foo_type", from: "quux", to: "Quux"
+      #
+      # Note: This feature requires PostgreSQL 10 or later
+      def rename_enum_value(type, options = {})
+        from = options.fetch(:from) { raise ArgumentError, ":from is required" }
+        to   = options.fetch(:to)   { raise ArgumentError, ":to is required" }
+
+        execute("ALTER TYPE #{type} RENAME VALUE '#{from}' TO '#{to}'").tap {
+          reload_type_map
+        }
+      end
     end
   end
 end

data/lib/active_record/pg_enum/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module PGEnum
-    VERSION = "1.0.3"
+    VERSION = "1.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-pg_enum
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.2.1
 platform: ruby
 authors:
 - Adam Lassek
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-10-13 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - adam@doubleprime.net
 executables: []
@@ -155,6 +155,8 @@ files:
 - gemfiles/5.2.gemfile.lock
 - gemfiles/6.0.gemfile
 - gemfiles/6.0.gemfile.lock
+- gemfiles/6.1.gemfile
+- gemfiles/6.1.gemfile.lock
 - gemfiles/edge.gemfile
 - gemfiles/edge.gemfile.lock
 - lib/active_record/pg_enum.rb
@@ -181,6 +183,9 @@ files:
 - lib/active_record/pg_enum/6.0/prepare_column_options.rb
 - lib/active_record/pg_enum/6.0/schema_dumper.rb
 - lib/active_record/pg_enum/6.0/table_definition.rb
+- lib/active_record/pg_enum/6.1/prepare_column_options.rb
+- lib/active_record/pg_enum/6.1/schema_dumper.rb
+- lib/active_record/pg_enum/6.1/table_definition.rb
 - lib/active_record/pg_enum/command_recorder.rb
 - lib/active_record/pg_enum/postgresql_adapter.rb
 - lib/active_record/pg_enum/schema_statements.rb
@@ -194,7 +199,7 @@ metadata:
   changelog_uri: https://github.com/alassek/activerecord-pg_enum/blob/master/CHANGELOG.md
   pgp_keys_uri: https://keybase.io/alassek/pgp_keys.asc
   signatures_uri: https://keybase.pub/alassek/gems/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -209,8 +214,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Integrate PostgreSQL's enumerated types with the Rails enum feature
 test_files: []