activerecord-postgres_enum 1.1.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11be6863582ca701d4d5d01e48fef1c95c6654c5889d6c82823e7eeb7e548667
-  data.tar.gz: c7324a3933d4345cb222d3378dcd74815a7860ec5d4c90e01bf4cb213c986b61
+  metadata.gz: 9e3664d257be105bae903d0b4183683768247f9a441afbcd6afc9290036ed8a5
+  data.tar.gz: ec213e9dbc12ed859ef762c3f8ef1982e0eb072da67d1d11e921d0e17f8bd560
 SHA512:
-  metadata.gz: 4a65ec7099464c6f1fd5863efdad17316702cc4a0427c2ed6008a42e059f72c22d094b79a564c6880da5072c3cd3f0db3bd36ddf4bde1e8a847fa5391623c1e9
-  data.tar.gz: '099ee04842e690d703ff3e859067c5b07c22bc52a03166caedce11f03060365b11f6140d7e614d83cd692eef8b4a8bc06f3ace730d17a68a5913953d91c5c11a'
+  metadata.gz: 7f6dd1f45d8168aed7199e1e0d8381be40e9a745c421aca1e1f39bf4f2d45400e943d4ed955acf12ed9f489a70662b8b126b2a0b9ef6ceef98b96115227cf08f
+  data.tar.gz: aaaad9f196e5ff222481bed5c732d596e6474566b8508e171e8fc5c6c6647b4d6c0d0a8f76060f7c6633004244d59e01689d68c7f2ce1bd84f9dfabb4e443cae

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/activerecord-postgres_enum.svg)](https://badge.fury.io/rb/activerecord-postgres_enum)
-[![Build Status](https://travis-ci.org/bibendi/activerecord-postgres_enum.svg?branch=master)](https://travis-ci.org/bibendi/activerecord-postgres_enum)
+[![Build Status](https://github.com/bibendi/activerecord-postgres_enum/workflows/Ruby/badge.svg?branch=master)](https://github.com/bibendi/activerecord-postgres_enum/actions?query=branch%3Amaster)
 
 # ActiveRecord::PostgresEnum
 
@@ -56,6 +56,14 @@ To add a value into existing enum:
 add_enum_value :mood, "pensive"
 ```
 
+To remove a value from existing enum:
+
+> :warning: Make sure that value is not used anywhere in the database.
+
+```ruby
+remove_enum_value :mood, "pensive"
+```
+
 To add a new enum column to an existing table:
 
 ```ruby

data/lib/active_record/postgres_enum.rb

@@ -32,7 +32,7 @@ ActiveSupport.on_load(:active_record) do
   end
 
   ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:enum] = {
-    name: 'enum'
+    name: "enum"
   }
 
   ActiveRecord::Migration::CommandRecorder.prepend ActiveRecord::PostgresEnum::CommandRecorder

data/lib/active_record/postgres_enum/extensions.rb

@@ -16,15 +16,15 @@ module ActiveRecord
         class TypeMapInitializer
           # We need to know the column name, and the default implementation discards it
           def register_enum_type(row)
-            register row['oid'], OID::Enum.new(enum_name: row['typname'])
+            register row["oid"], OID::Enum.new(enum_name: row["typname"])
           end
         end
       end
 
       module ColumnMethods # :nodoc:
         # Enables `t.enum :my_field, enum_name: :my_enum_name` on migrations
-        def enum(name, options = {})
-          column(name, options.delete(:enum_name), options.except(:enum_name))
+        def enum(name, enum_name:, **options)
+          column(name, enum_name, **options)
         end
       end
     end

data/lib/active_record/postgres_enum/postgresql_adapter.rb

@@ -38,25 +38,35 @@ module ActiveRecord
 
       def enums
         select_all(DEFINED_ENUMS_QUERY).each_with_object({}) do |row, memo|
-          memo[row["typname"].to_sym] = row['enumlabels'].split("\t\t")
+          memo[row["typname"].to_sym] = row["enumlabels"].split("\t\t")
         end
       end
 
-      def create_enum(name, values)
+      def create_enum(name, values, force: false, if_not_exists: nil)
+        return if if_not_exists && enums.include?(name.to_sym)
+
+        drop_enum(name, cascade: force == :cascade, if_exists: true) if force
+
         values = values.map { |v| quote v }
-        execute "CREATE TYPE #{name} AS ENUM (#{values.join(', ')})"
+        execute "CREATE TYPE #{name} AS ENUM (#{values.join(", ")})"
       end
 
-      def drop_enum(name)
-        execute "DROP TYPE #{name}"
+      def drop_enum(name, cascade: nil, if_exists: nil)
+        if_exists_statement = "IF EXISTS" if if_exists
+        cascade_statement = "CASCADE" if cascade
+
+        sql = "DROP TYPE #{if_exists_statement} #{name} #{cascade_statement}"
+        execute sql
       end
 
       def rename_enum(name, new_name)
         execute "ALTER TYPE #{name} RENAME TO #{new_name}"
       end
 
-      def add_enum_value(name, value, after: nil, before: nil)
-        sql = "ALTER TYPE #{name} ADD VALUE #{quote value}"
+      def add_enum_value(name, value, after: nil, before: nil, if_not_exists: nil)
+        if_not_exists_statement = "IF NOT EXISTS" if if_not_exists
+
+        sql = "ALTER TYPE #{name} ADD VALUE #{if_not_exists_statement} #{quote value}"
         if after
           sql += " AFTER #{quote after}"
         elsif before
@@ -65,6 +75,15 @@ module ActiveRecord
         execute sql
       end
 
+      def remove_enum_value(name, value)
+        sql = %{
+          DELETE FROM pg_enum
+          WHERE enumlabel=#{quote value}
+          AND enumtypid=(SELECT oid FROM pg_type WHERE typname='#{name}')
+        }
+        execute sql
+      end
+
       def rename_enum_value(name, existing_value, new_value)
         raise "Renaming enum values is only supported in PostgreSQL 10.0+" unless rename_enum_value_supported?
 

data/lib/active_record/postgres_enum/schema_dumper.rb

@@ -17,10 +17,10 @@ module ActiveRecord
 
         @connection.enums.each do |name, values|
           values = values.map { |v| "    #{v.inspect}," }.join("\n")
-          statements << "  create_enum #{name.inspect}, [\n#{values}\n  ]"
+          statements << "  create_enum #{name.inspect}, [\n#{values}\n  ], force: :cascade"
         end
 
-        stream.puts statements.join("\n")
+        stream.puts statements.join("\n\n")
         stream.puts
       end
     end

data/lib/active_record/postgres_enum/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module PostgresEnum
-    VERSION = "1.1.0"
+    VERSION = "1.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres_enum
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Michael Merkushin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -120,28 +120,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.58'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.58'
+        version: '0.10'
 description: 
 email:
 - merkushin.m.s@gmail.com
@@ -172,7 +172,7 @@ 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:
   - - ">="