schema_plus_enums 0.1.8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58837ff52a7707b036411a1e39978df95c16d2342249cf1edd325859f0fc361a
-  data.tar.gz: a3193a3d5ece92b4731adc29a93b102431e6bcffb8ad845c59cd1822422809e2
+  metadata.gz: f6b529b06d1cc7b79298595971ba6d8e1f4dc301974b27250017a51cf161bb36
+  data.tar.gz: caa6540979727f313d75fd7dfd8da82aede46579d45c99ee57804663c26bff32
 SHA512:
-  metadata.gz: 7e06d1e595c6664d4b12e5d9cb83944af47fb85af0c32ed11c1be7d1693834fe0d32b781713808a0bf4eb94a6761bfb04513c965e212088c185ae9c16975b7c3
-  data.tar.gz: 957d46fe126b28d234eaeee3a47830c64eea44f3a2e46de80a7d178355a35d5ca05ec9417577274b79ad43a9e6def6f0fa8b0998e0d283e9561841700f57b456
+  metadata.gz: 3ceb96e6b73c848ed8e2e900d431f27b893db3b083551b7db11764e7465cdfe74426c5895fe5131060480d98b25a16bc9feeb57fb7532a6709d038fe335de920
+  data.tar.gz: 0f7a2d7b5fe615523c22f91f50d53ae410d87156e4bcc2f8ec4d87ca2f7bf24e3b4cb27d358a786dfacda4681a23fa69030f5c449034a4ac94a49cadc3f848c4

data/.github/workflows/prs.yml

@@ -0,0 +1,178 @@
+# This file was auto-generated by the schema_dev tool, based on the data in
+#                 ./schema_dev.yml
+# Please do not edit this file; any changes will be overwritten next time
+# schema_dev gets run.
+---
+name: CI PR Builds
+'on':
+  push:
+    branches:
+    - master
+  pull_request:
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+        - '2.5'
+        - '2.7'
+        - '3.0'
+        activerecord:
+        - '5.2'
+        - '6.0'
+        db:
+        - skip
+        dbversion:
+        - skip
+        exclude:
+        - ruby: '3.0'
+          activerecord: '5.2'
+        - db: skip
+          dbversion: skip
+        include:
+        - ruby: '2.5'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.5'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '2.5'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '2.5'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '2.5'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.5'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '2.5'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '2.5'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '2.7'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '2.7'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '2.7'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '2.7'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '2.7'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '2.7'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '3.0'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '3.0'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '3.0'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '12'
+    env:
+      BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord-${{ matrix.activerecord }}/Gemfile.${{ matrix.db }}"
+      POSTGRESQL_DB_HOST: 127.0.0.1
+      POSTGRESQL_DB_USER: schema_plus_test
+      POSTGRESQL_DB_PASS: database
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "${{ matrix.ruby }}"
+        bundler-cache: true
+    - name: Run bundle update
+      run: bundle update
+    - name: Start Postgresql
+      if: matrix.db == 'postgresql'
+      run: |
+        docker run --rm --detach \
+          -e POSTGRES_USER=$POSTGRESQL_DB_USER \
+          -e POSTGRES_PASSWORD=$POSTGRESQL_DB_PASS \
+          -p 5432:5432 \
+          --health-cmd "pg_isready -q" \
+          --health-interval 5s \
+          --health-timeout 5s \
+          --health-retries 5 \
+          --name database postgres:${{ matrix.dbversion }}
+    - name: Wait for database to start
+      if: "(matrix.db == 'postgresql' || matrix.db == 'mysql2')"
+      run: |
+        COUNT=0
+        ATTEMPTS=20
+        until [[ $COUNT -eq $ATTEMPTS ]]; do
+          [ "$(docker inspect -f {{.State.Health.Status}} database)" == "healthy" ] && break
+          echo $(( COUNT++ )) > /dev/null
+          sleep 2
+        done
+    - name: Create testing database
+      if: "(matrix.db == 'postgresql' || matrix.db == 'mysql2')"
+      run: bundle exec rake create_ci_database
+    - name: Run tests
+      run: bundle exec rake spec
+    - name: Shutdown database
+      if: always() && (matrix.db == 'postgresql' || matrix.db == 'mysql2')
+      run: docker stop database
+    - name: Coveralls Parallel
+      if: "${{ !env.ACT }}"
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: "${{ secrets.GITHUB_TOKEN }}"
+        flag-name: run-${{ matrix.ruby }}-${{ matrix.activerecord }}-${{ matrix.db }}-${{ matrix.dbversion }}
+        parallel: true
+  finish:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: Coveralls Finished
+      if: "${{ !env.ACT }}"
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: "${{ secrets.GITHUB_TOKEN }}"
+        parallel-finished: true

data/.gitignore

@@ -2,6 +2,7 @@
 /tmp
 /pkg
 /Gemfile.local
+/.idea
 
 *.lock
 *.log

data/.simplecov

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+SimpleCov.configure do
+  enable_coverage :branch
+  add_filter '/spec/'
+
+  add_group 'Binaries', '/bin/'
+  add_group 'Libraries', '/lib/'
+
+  if ENV['CI']
+    require 'simplecov-lcov'
+
+    SimpleCov::Formatter::LcovFormatter.config do |c|
+      c.report_with_single_file = true
+      c.single_report_path = 'coverage/lcov.info'
+    end
+
+    formatter SimpleCov::Formatter::LcovFormatter
+  end
+end

data/Gemfile

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 source "http://rubygems.org"
 
 gemspec
 
-File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local
+gemfile_local = File.expand_path '../Gemfile.local', __FILE__
+eval File.read(gemfile_local), binding, gemfile_local if File.exist? gemfile_local

data/README.md

@@ -1,6 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/schema_plus_enums.svg)](http://badge.fury.io/rb/schema_plus_enums)
-[![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_plus_enums.svg)](http://travis-ci.org/SchemaPlus/schema_plus_enums)
-[![Coverage Status](https://img.shields.io/coveralls/SchemaPlus/schema_plus_enums.svg)](https://coveralls.io/r/SchemaPlus/schema_plus_enums)
+[![Build Status](https://github.com/SchemaPlus/schema_plus_enums/actions/workflows/pr.yml/badge.svg)](http://github.com/SchemaPlus/schema_plus_enums/actions)
+[![Coverage Status](https://coveralls.io/github/SchemaPlus/schema_plus_enums/badge.svg)](https://coveralls.io/github/SchemaPlus/schema_plus_enums)
 
 # SchemaPlus::Enums
 
@@ -28,18 +28,11 @@ SchemaPlus::Enums is tested on:
 
 <!-- SCHEMA_DEV: MATRIX - begin -->
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
-* ruby **2.2.7** with activerecord **4.2**, using **postgresql**
-* ruby **2.2.7** with activerecord **5.0**, using **postgresql**
-* ruby **2.2.7** with activerecord **5.1**, using **postgresql**
-* ruby **2.2.7** with activerecord **5.2**, using **postgresql**
-* ruby **2.3.4** with activerecord **4.2**, using **postgresql**
-* ruby **2.3.4** with activerecord **5.0**, using **postgresql**
-* ruby **2.3.4** with activerecord **5.1**, using **postgresql**
-* ruby **2.3.4** with activerecord **5.2**, using **postgresql**
-* ruby **2.4.1** with activerecord **4.2**, using **postgresql**
-* ruby **2.4.1** with activerecord **5.0**, using **postgresql**
-* ruby **2.4.1** with activerecord **5.1**, using **postgresql**
-* ruby **2.4.1** with activerecord **5.2**, using **postgresql**
+* ruby **2.5** with activerecord **5.2**, using **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **2.5** with activerecord **6.0**, using **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **2.7** with activerecord **5.2**, using **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **2.7** with activerecord **6.0**, using **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **3.0** with activerecord **6.0**, using **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
@@ -53,13 +46,32 @@ create_enum :color, 'red', 'green', 'blue' # default schema is 'public'
 create_enum :color, 'cyan', 'magenta', 'yellow', 'black', schema: 'cmyk'
 ```
 
-And can be altered: (added a new value)
+New values can be added
 
 ```ruby
-alter_enum :color, 'black'
-alter_enum :color, 'purple', after: 'red'
-alter_enum :color, 'pink', before: 'purple'
-alter_enum :color, 'white', schema: 'public'
+add_enum_value :color, 'black'
+add_enum_value :color, 'red', if_not_exists: true
+add_enum_value :color, 'purple', after: 'red'
+add_enum_value :color, 'pink', before: 'purple'
+add_enum_value :color, 'white', schema: 'cmyk'
+```
+     
+Values can be dropped
+```ruby
+remove_enum_value :color, 'black'
+remove_enum_value :color, 'black', schema: 'cmyk'
+```
+
+Values can be renamed
+```ruby
+rename_enum_value :color, 'red', 'orange'
+rename_enum_value :color, 'red', 'orange', schema: 'cmyk'
+```
+
+The enum can be renamed
+```ruby
+rename_enum :color, :hue
+rename_enum :color, :hue, schema: 'cmyk'
 ```
 
 And can be dropped:
@@ -71,15 +83,16 @@ drop_enum :color, schema: 'cmyk'
 
 ## Release Notes
 
-* 0.1.8 - Update dependencies to include AR 5.2.
-* 0.1.7 - Update dependencies to include AR 5.1.*  Thanks to [@patleb](https://github.com/patleb)
-* 0.1.6 - Update dependencies to include AR 5.1.  Thanks to [@willsoto](https://github.com/willsoto)
-* 0.1.5 - Update dependencies to include AR 5.0.  Thanks to [@jimcavoli](https://github.com/jimcavoli)
-* 0.1.4 - Missing require
-* 0.1.3 - Explicit gem dependencies
-* 0.1.2 - Upgrade schema_plus_core dependency
-* 0.1.1 - Clean up and sort dumper output.  Thanks to [@pik](https://github.com/pik)
-* 0.1.0 - Initial release, pulled from schema_plus 1.x
+* **1.0.0** - Add AR 6.0, Ruby 3.0, and drop AR < 5.2 and Ruby < 2.5. Also add new functionality
+* **0.1.8** - Update dependencies to include AR 5.2.
+* **0.1.7** - Update dependencies to include AR 5.1.*  Thanks to [@patleb](https://github.com/patleb)
+* **0.1.6** - Update dependencies to include AR 5.1.  Thanks to [@willsoto](https://github.com/willsoto)
+* **0.1.5** - Update dependencies to include AR 5.0.  Thanks to [@jimcavoli](https://github.com/jimcavoli)
+* **0.1.4** - Missing require
+* **0.1.3** - Explicit gem dependencies
+* **0.1.2** - Upgrade schema_plus_core dependency
+* **0.1.1** - Clean up and sort dumper output.  Thanks to [@pik](https://github.com/pik)
+* **0.1.0** - Initial release, pulled from schema_plus 1.x
 
 ## Development & Testing
 
@@ -94,7 +107,7 @@ Some things to know about to help you develop and test:
 * **schema_dev**:  SchemaPlus::Enums uses [schema_dev](https://github.com/SchemaPlus/schema_dev) to
   facilitate running rspec tests on the matrix of ruby, activerecord, and database
   versions that the gem supports, both locally and on
-  [travis-ci](http://travis-ci.org/SchemaPlus/schema_plus_enums)
+  [github actions](https://github.com/SchemaPlus/schema_plus_enums/actions)
 
   To to run rspec locally on the full matrix, do:
 
@@ -106,7 +119,6 @@ Some things to know about to help you develop and test:
   The matrix of configurations is specified in `schema_dev.yml` in
   the project root.
 
-
 <!-- SCHEMA_DEV: TEMPLATE USES SCHEMA_DEV - end -->
 
 <!-- SCHEMA_DEV: TEMPLATE USES SCHEMA_PLUS_CORE - begin -->

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/gemfiles/Gemfile.base

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
-gemspec :path => File.expand_path('..', __FILE__)
+gemspec path: File.expand_path('..', __FILE__)
 
 File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local

data/gemfiles/activerecord-5.2/Gemfile.base

@@ -1,3 +1,4 @@
-eval File.read File.expand_path('../../Gemfile.base', __FILE__)
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
 
 gem "activerecord", ">= 5.2.0.beta0", "< 5.3"

data/gemfiles/activerecord-5.2/Gemfile.postgresql

@@ -1,5 +1,5 @@
-require "pathname"
-eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
 
 platform :ruby do
   gem "pg"

data/gemfiles/activerecord-6.0/Gemfile.base

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 6.0", "< 6.1"

data/gemfiles/activerecord-6.0/Gemfile.postgresql

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/lib/schema_plus/enums/active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Enums
   module ActiveRecord
     module ConnectionAdapters
@@ -28,30 +30,93 @@ module SchemaPlus::Enums
           end
         end
 
-        def create_enum(name, *values)
-          options = values.extract_options!
+        def create_enum(name, *values, **options)
           list = values.map { |value| escape_enum_value(value) }
+
+          if options[:force]
+            drop_enum(name,
+                      cascade:   options[:force] == :cascade,
+                      if_exists: true,
+                      schema:    options[:schema])
+          end
+
           execute "CREATE TYPE #{enum_name(name, options[:schema])} AS ENUM (#{list.join(',')})"
         end
 
-        def alter_enum(name, value, options = {})
-          opts = case
-                 when options[:before] then "BEFORE #{escape_enum_value(options[:before])}"
-                 when options[:after] then "AFTER #{escape_enum_value(options[:after])}"
+        def alter_enum(name, value, **options)
+          ActiveSupport::Deprecation.warn "alter_enum is deprecated. use add_enum_value instead"
+
+          add_enum_value(name, value, **options)
+        end
+
+        def add_enum_value(name, value, **options)
+          sql = +"ALTER TYPE #{enum_name(name, options[:schema])} ADD VALUE "
+          sql << 'IF NOT EXISTS ' if options[:if_not_exists]
+          sql << escape_enum_value(value)
+          sql << case
+                 when options[:before] then " BEFORE #{escape_enum_value(options[:before])}"
+                 when options[:after] then " AFTER #{escape_enum_value(options[:after])}"
                  else
                    ''
                  end
-          execute "ALTER TYPE #{enum_name(name, options[:schema])} ADD VALUE #{escape_enum_value(value)} #{opts}"
+          execute sql
+        end
+
+        def remove_enum_value(name, value, **options)
+          sql = <<~SQL
+            DELETE FROM pg_enum
+            WHERE enumlabel=#{escape_enum_value(value)}
+            AND enumtypid = (
+              SELECT T.oid 
+              FROM pg_type T
+              JOIN pg_namespace N ON N.oid = T.typnamespace
+              WHERE T.typname = #{quote name} AND N.nspname = #{quote schema_name(options[:schema])}
+            )
+          SQL
+          execute sql
+        end
+
+        def rename_enum_value(name, value, new_value, **options)
+          raise "Renaming enum values is only supported in PostgreSQL 10.0+" unless rename_enum_value_supported?
+
+          sql = <<~SQL
+            ALTER TYPE #{enum_name(name, options[:schema])}
+            RENAME VALUE #{escape_enum_value(value)}
+            TO #{escape_enum_value(new_value)}
+          SQL
+
+          execute sql
         end
 
-        def drop_enum(name, options = {})
-          execute "DROP TYPE #{enum_name(name, options[:schema])}"
+        def rename_enum(name, new_name, **options)
+          execute "ALTER TYPE #{enum_name(name, options[:schema])} RENAME TO #{new_name}"
+        end
+
+        def drop_enum(name, **options)
+          sql = +'DROP TYPE '
+          sql << 'IF EXISTS ' if options[:if_exists]
+          sql << enum_name(name, options[:schema])
+          sql << ' CASCADE' if options[:cascade]
+
+          execute sql
         end
 
         private
 
+        def rename_enum_value_supported?
+          unless defined? @rename_enum_value_supported
+            version                      = select_value("SHOW server_version").match(/(\d+\.\d+)/)[1]
+            @rename_enum_value_supported = Gem::Version.new(version) >= Gem::Version.new('10.0')
+          end
+          @rename_enum_value_supported
+        end
+
+        def schema_name(schema)
+          schema || 'public'
+        end
+
         def enum_name(name, schema)
-          [schema || 'public', name].map { |s|
+          [schema_name(schema), name].map { |s|
             %Q{"#{s}"}
           }.join('.')
         end
@@ -60,10 +125,7 @@ module SchemaPlus::Enums
           escaped_value = value.to_s.sub("'", "''")
           "'#{escaped_value}'"
         end
-
-
       end
     end
   end
 end
-

data/lib/schema_plus/enums/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Enums
   module Middleware
 
@@ -7,7 +9,7 @@ module SchemaPlus::Enums
         module Postgresql
 
           def after(env)
-            env.connection.enums.sort_by(&its[1]).each do |schema, name, values|
+            env.connection.enums.sort_by { |it| it[1] }.each do |schema, name, values|
               params = [name.inspect]
               params << values.map(&:inspect).join(', ')
               params << ":schema => #{schema.inspect}" if schema != 'public'

data/lib/schema_plus/enums/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Enums
-    VERSION = "0.1.8"
+    VERSION = "1.0.0"
   end
 end

data/lib/schema_plus/enums.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 require 'schema_plus/core'
-require 'its-it'
 
 require_relative 'enums/active_record'
 require_relative 'enums/middleware'

data/lib/schema_plus_enums.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative 'schema_plus/enums'

data/schema_dev.yml

@@ -1,11 +1,11 @@
 ruby:
-    - 2.2.7
-    - 2.3.4
-    - 2.4.1
+    - 2.5
+    - 2.7
+    - 3.0
 activerecord:
-    - 4.2
-    - 5.0
-    - 5.1
     - 5.2
+    - 6.0
 db:
     - postgresql
+dbversions:
+    postgresql: ['9.6','10', '11', '12']

data/schema_plus_enums.gemspec

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'schema_plus/enums/version'
@@ -18,14 +19,13 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "activerecord", ">= 4.2", "< 5.3"
-  gem.add_dependency "schema_plus_core"
-  gem.add_dependency "its-it", "~> 1.2"
+  gem.required_ruby_version = '>= 2.5'
+
+  gem.add_dependency 'activerecord', '>= 5.2', '< 6.1'
+  gem.add_dependency 'schema_plus_core', '~> 3.0.0'
 
-  gem.add_development_dependency "bundler", "~> 1.7"
-  gem.add_development_dependency "rake", "~> 10.0"
-  gem.add_development_dependency "rspec", "~> 3.0"
-  gem.add_development_dependency "schema_dev", "~> 3.6"
-  gem.add_development_dependency "simplecov"
-  gem.add_development_dependency "simplecov-gem-profile"
+  gem.add_development_dependency 'bundler'
+  gem.add_development_dependency 'rake', '~> 13.0'
+  gem.add_development_dependency 'rspec', '~> 3.0'
+  gem.add_development_dependency 'schema_dev', '~> 4.1'
 end

data/spec/enum_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 def enum_fields(name, schema = 'public')
@@ -16,7 +18,9 @@ def enum_fields(name, schema = 'public')
 end
 
 describe 'enum', :postgresql => :only do
-  before(:all) do ActiveRecord::Migration.verbose = false end
+  before(:all) do
+    ActiveRecord::Migration.verbose = false
+  end
 
   let(:migration) { ActiveRecord::Migration }
 
@@ -73,7 +77,7 @@ describe 'enum', :postgresql => :only do
       end
     end
 
-    it 'should escape schame name and enum name' do
+    it 'should escape scheme name and enum name' do
       begin
         migration.execute 'CREATE SCHEMA "select"'
         migration.create_enum 'where', *%|red green blue|, schema: 'select'
@@ -83,24 +87,92 @@ describe 'enum', :postgresql => :only do
       end
     end
 
+    context 'when force: true is passed' do
+      it 'removes the existing enum' do
+        allow(migration.connection).to receive(:drop_enum)
+
+        migration.create_enum 'color', *%w|red green blue|, force: true
+
+        expect(migration.connection).to have_received(:drop_enum).with(
+          'color', { cascade: false, if_exists: true, schema: nil }
+        )
+
+        migration.execute 'DROP TYPE IF EXISTS color'
+      end
+    end
+
+    context 'when force: :cascade is passed' do
+      it 'removes the existing enum' do
+        allow(migration.connection).to receive(:drop_enum)
+
+        migration.create_enum 'color', *%w|red green blue|, force: :cascade
+
+        expect(migration.connection).to have_received(:drop_enum).with(
+          'color', { cascade: true, if_exists: true, schema: nil }
+        )
+
+        migration.execute 'DROP TYPE IF EXISTS color'
+      end
+    end
+
+    context 'when force: :cascade is passed with a schema' do
+      it 'removes the existing enum' do
+        allow(migration.connection).to receive(:drop_enum)
+
+        migration.create_enum 'color', *%w|red green blue|, force: :cascade, schema: 'public'
+
+        expect(migration.connection).to have_received(:drop_enum).with(
+          'color', { cascade: true, if_exists: true, schema: 'public' }
+        )
+
+        migration.execute 'DROP TYPE IF EXISTS color'
+      end
+    end
   end
 
   describe 'alter_enum' do
-    before(:each) do migration.create_enum('color', 'red', 'green', 'blue') end
-    after(:each) do migration.execute 'DROP TYPE IF EXISTS color' end
+    before do
+      migration.create_enum('color', 'red', 'green', 'blue')
+      allow(ActiveSupport::Deprecation).to receive(:warn)
+      allow(migration.connection).to receive(:add_enum_value)
+    end
+    after do
+      migration.execute 'DROP TYPE IF EXISTS color'
+    end
 
-    it 'should add new value after all values' do
+    it 'calls add_enum_value' do
+      migration.alter_enum('color', 'magenta')
+
+      expect(migration.connection).to have_received(:add_enum_value)
+    end
+
+    it 'sends a deprecation warning' do
       migration.alter_enum('color', 'magenta')
+
+      expect(ActiveSupport::Deprecation).to have_received(:warn)
+    end
+  end
+
+  describe 'add_enum_value' do
+    before do
+      migration.create_enum('color', 'red', 'green', 'blue')
+    end
+    after do
+      migration.execute 'DROP TYPE IF EXISTS color'
+    end
+
+    it 'should add new value after all values' do
+      migration.add_enum_value('color', 'magenta')
       expect(enum_fields('color')).to eq(%w|red green blue magenta|)
     end
 
     it 'should add new value after existed' do
-      migration.alter_enum('color', 'magenta', after: 'red')
+      migration.add_enum_value('color', 'magenta', after: 'red')
       expect(enum_fields('color')).to eq(%w|red magenta green blue|)
     end
 
     it 'should add new value before existed' do
-      migration.alter_enum('color', 'magenta', before: 'green')
+      migration.add_enum_value('color', 'magenta', before: 'green')
       expect(enum_fields('color')).to eq(%w|red magenta green blue|)
     end
 
@@ -108,13 +180,125 @@ describe 'enum', :postgresql => :only do
       begin
         migration.execute 'CREATE SCHEMA colors'
         migration.create_enum('color', 'red', schema: 'colors')
-        migration.alter_enum('color', 'green', schema: 'colors')
+        migration.add_enum_value('color', 'green', schema: 'colors')
 
         expect(enum_fields('color', 'colors')).to eq(%w|red green|)
       ensure
         migration.execute 'DROP SCHEMA colors CASCADE'
       end
     end
+
+    context 'without if_not_exists: true' do
+      it 'raises a DB error if the value exists' do
+        expect {
+          migration.add_enum_value('color', 'red')
+        }.to raise_error(ActiveRecord::StatementInvalid)
+      end
+    end
+
+    context 'with if_not_exists: true' do
+      it 'does not raise a DB error if the value exists' do
+        expect {
+          migration.add_enum_value('color', 'red', if_not_exists: true)
+        }.to_not raise_error
+      end
+    end
+  end
+
+  describe 'remove_enum_value' do
+    before do
+      migration.create_enum('color', 'red', 'green', 'blue')
+    end
+    after do
+      migration.execute 'DROP TYPE IF EXISTS color'
+    end
+
+    it 'removes the value' do
+      expect {
+        migration.remove_enum_value('color', 'green')
+      }.to change {
+        enum_fields('color')
+      }.to(%w[red blue])
+    end
+
+    context 'when the enum is in a schema' do
+      before do
+        migration.execute "CREATE SCHEMA colors; CREATE TYPE colors.color AS ENUM ('red', 'magenta', 'blue')"
+      end
+      after do
+        migration.execute "DROP SCHEMA colors CASCADE"
+      end
+
+      it 'should rename the enum within given name and schema' do
+        expect {
+          migration.remove_enum_value('color', 'blue', schema: 'colors')
+        }.to change {
+          enum_fields('color', 'colors')
+        }.to(%w[red magenta])
+      end
+    end
+  end
+
+  describe 'rename_enum_value' do
+    before do
+      migration.create_enum('color', 'red', 'green', 'blue')
+    end
+    after do
+      migration.execute 'DROP TYPE IF EXISTS color'
+    end
+
+    context 'when postgresql version is >= 10', pg_version: '>= 10.0' do
+      it 'renames the value' do
+        expect {
+          migration.rename_enum_value('color', 'green', 'orange')
+        }.to change {
+          enum_fields('color')
+        }.to(%w[red orange blue])
+      end
+    end
+
+    context 'when postgresql version is < 10', pg_version: '< 10.0' do
+      it 'raises an error' do
+        expect {
+          migration.rename_enum_value('color', 'green', 'orange')
+        }.to raise_error(/Renaming enum values is only supported/)
+      end
+    end
+  end
+
+  describe 'rename_enum' do
+    before do
+      migration.create_enum('color', 'red', 'green', 'blue')
+    end
+    after do
+      migration.execute 'DROP TYPE IF EXISTS color'
+      migration.execute 'DROP TYPE IF EXISTS shade'
+    end
+
+    it 'renames the enum' do
+      expect {
+        migration.rename_enum('color', 'shade')
+      }.to change {
+        migration.enums.map(&:second)
+      }.from(contain_exactly('color')).to(contain_exactly('shade'))
+    end
+
+    context 'when the enum is in a schema' do
+      before do
+        migration.execute "CREATE SCHEMA colors; CREATE TYPE colors.color AS ENUM ('red', 'blue')"
+      end
+      after do
+        migration.execute "DROP SCHEMA colors CASCADE"
+      end
+
+      it 'should rename the enum within given name and schema' do
+        expect {
+          migration.rename_enum('color', 'shade', schema: 'colors')
+        }.to change {
+          enum_fields('shade', 'colors')
+        }.from(nil).to(%w[red blue])
+      end
+    end
   end
 
   describe 'drop_enum' do
@@ -137,5 +321,40 @@ describe 'enum', :postgresql => :only do
         migration.execute "DROP SCHEMA colors CASCADE"
       end
     end
+
+    context 'when the enum does not exist' do
+      it 'should fail when if_exists: true is not passed' do
+        expect {
+          migration.drop_enum('color')
+        }.to raise_error(ActiveRecord::StatementInvalid)
+      end
+
+      it 'should fail silently when if_exists: true is passed' do
+        expect {
+          migration.drop_enum('color', if_exists: true)
+        }.to_not raise_error
+      end
+    end
+
+    context 'when cascade: true is passed' do
+      it 'cascades through and drops columns' do
+        migration.create_enum 'color', %w[red blue green]
+        migration.create_table :posts do |t|
+          t.column :text_color, :color
+        end
+
+        expect {
+          migration.drop_enum 'color', cascade: true
+        }.to change {
+          migration.columns('posts').map(&:name)
+        }.from(include('text_color')).to not_include('text_color')
+      end
+    end
+  end
+
+  describe 'create_table' do
+    before do
+      migration.create_enum 'color', *%w|red green blue|, force: true
+    end
   end
 end

data/spec/schema_dumper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'stringio'
 

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 require 'simplecov'
-require 'simplecov-gem-profile'
-SimpleCov.start "gem"
+SimpleCov.start
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -12,11 +13,31 @@ require 'schema_dev/rspec'
 
 SchemaDev::Rspec.setup
 
-Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
+Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
+
+RSpec::Matchers.define_negated_matcher :not_include, :include
 
 RSpec.configure do |config|
   config.warnings = true
+
+  config.filter_run_excluding pg_version: lambda { |v|
+    version = ActiveRecord::Base.connection.select_value("SHOW server_version").match(/(\d+\.\d+)/)[1]
+    postgresql_version = Gem::Version.new(version)
+    test = Gem::Requirement.new(v)
+    !test.satisfied_by?(postgresql_version)
+  }
+
+  config.after do
+    ActiveRecord::Base.connection.tap do |c|
+      c.enums.each do |p, e, _|
+        c.drop_enum e, schema: p, cascade: true
+      end
+
+      c.tables.each do |t|
+        c.drop_table t, cascade: true
+      end
+    end
+  end
 end
 
 SimpleCov.command_name "[ruby #{RUBY_VERSION} - ActiveRecord #{::ActiveRecord::VERSION::STRING} - #{ActiveRecord::Base.connection.adapter_name}]"
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_enums
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 1.0.0
 platform: ruby
 authors:
 - ronen barzel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-15 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,76 +16,62 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: schema_plus_core
-  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'
-- !ruby/object:Gem::Dependency
-  name: its-it
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -106,42 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov-gem-profile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 description: Adds support for enum data types in ActiveRecord
 email:
 - ronen@barzel.org
@@ -149,21 +107,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/prs.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".simplecov"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - gemfiles/Gemfile.base
-- gemfiles/activerecord-4.2/Gemfile.base
-- gemfiles/activerecord-4.2/Gemfile.postgresql
-- gemfiles/activerecord-5.0/Gemfile.base
-- gemfiles/activerecord-5.0/Gemfile.postgresql
-- gemfiles/activerecord-5.1/Gemfile.base
-- gemfiles/activerecord-5.1/Gemfile.postgresql
 - gemfiles/activerecord-5.2/Gemfile.base
 - gemfiles/activerecord-5.2/Gemfile.postgresql
+- gemfiles/activerecord-6.0/Gemfile.base
+- gemfiles/activerecord-6.0/Gemfile.postgresql
 - lib/schema_plus/enums.rb
 - lib/schema_plus/enums/active_record.rb
 - lib/schema_plus/enums/middleware.rb
@@ -178,7 +133,7 @@ homepage: https://github.com/SchemaPlus/schema_plus_enums
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -186,16 +141,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Adds support for enum data types in ActiveRecord
 test_files:

data/.travis.yml

@@ -1,21 +0,0 @@
-# This file was auto-generated by the schema_dev tool, based on the data in
-#                 ./schema_dev.yml
-# Please do not edit this file; any changes will be overwritten next time
-# schema_dev gets run.
----
-sudo: false
-rvm:
-- 2.2.7
-- 2.3.4
-- 2.4.1
-gemfile:
-- gemfiles/activerecord-4.2/Gemfile.postgresql
-- gemfiles/activerecord-5.0/Gemfile.postgresql
-- gemfiles/activerecord-5.1/Gemfile.postgresql
-- gemfiles/activerecord-5.2/Gemfile.postgresql
-env: POSTGRESQL_DB_USER=postgres
-addons:
-  postgresql: '9.4'
-before_script: bundle exec rake create_databases
-after_script: bundle exec rake drop_databases
-script: bundle exec rake travis

data/gemfiles/activerecord-4.2/Gemfile.base

@@ -1,3 +0,0 @@
-eval File.read File.expand_path('../../Gemfile.base', __FILE__)
-
-gem "activerecord", "~> 4.2.6"

data/gemfiles/activerecord-4.2/Gemfile.postgresql

@@ -1,10 +0,0 @@
-require "pathname"
-eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
-
-platform :ruby do
-  gem "pg", "< 1"
-end
-
-platform :jruby do
-  gem 'activerecord-jdbcpostgresql-adapter'
-end

data/gemfiles/activerecord-5.0/Gemfile.base

@@ -1,3 +0,0 @@
-eval File.read File.expand_path('../../Gemfile.base', __FILE__)
-
-gem "activerecord", "~> 5.0.1"

data/gemfiles/activerecord-5.0/Gemfile.postgresql

@@ -1,10 +0,0 @@
-require "pathname"
-eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
-
-platform :ruby do
-  gem "pg", "< 1"
-end
-
-platform :jruby do
-  gem 'activerecord-jdbcpostgresql-adapter'
-end

data/gemfiles/activerecord-5.1/Gemfile.base

@@ -1,3 +0,0 @@
-eval File.read File.expand_path('../../Gemfile.base', __FILE__)
-
-gem "activerecord", "~> 5.1.0"

data/gemfiles/activerecord-5.1/Gemfile.postgresql

@@ -1,10 +0,0 @@
-require "pathname"
-eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
-
-platform :ruby do
-  gem "pg", "< 1"
-end
-
-platform :jruby do
-  gem 'activerecord-jdbcpostgresql-adapter'
-end