activerecord-postgres_enum 0.5.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a1b82a6fcd24c4c9811b824bbe1dc8db8043dc7285a6481a029d9b88fe92410
-  data.tar.gz: f7989568c9a5db1a33fac706e4baf98ffdbde8b6d23f9625182def8b1370b19f
+  metadata.gz: 11be6863582ca701d4d5d01e48fef1c95c6654c5889d6c82823e7eeb7e548667
+  data.tar.gz: c7324a3933d4345cb222d3378dcd74815a7860ec5d4c90e01bf4cb213c986b61
 SHA512:
-  metadata.gz: ce4d78fdc5af2ed94e53c749f365a1c1ef9c5a1a43c5aa2a56861db99381ee991749f6e51d5114182058c0b9936eef6a96cbbb390cda7b05760169312244cc57
-  data.tar.gz: aaed102da13bc6f8ccd8bd5994ea9d6c9ec88ff72cafd537ea225126f9ccb29ab570e5ab7958eecb747365f67b7d870386c1642264cfedec10a3887dd501c6b3
+  metadata.gz: 4a65ec7099464c6f1fd5863efdad17316702cc4a0427c2ed6008a42e059f72c22d094b79a564c6880da5072c3cd3f0db3bd36ddf4bde1e8a847fa5391623c1e9
+  data.tar.gz: '099ee04842e690d703ff3e859067c5b07c22bc52a03166caedce11f03060365b11f6140d7e614d83cd692eef8b4a8bc06f3ace730d17a68a5913953d91c5c11a'

data/README.md

@@ -53,15 +53,28 @@ rename_enum :mood, :emotions
 To add a value into existing enum:
 
 ```ruby
-add_enum_value :mood, "crazy"
+add_enum_value :mood, "pensive"
+```
+
+To add a new enum column to an existing table:
+
+```ruby
+def change
+  create_enum :product_type, %w[one-off subscription]
+
+  add_column :products, :type, :product_type
+end
 ```
 
 To rename a value:
 
 ```ruby
-rename_enum_value :mood, "crazy", "nutty"
+rename_enum_value :mood, "pensive", "wistful"
 ```
 
+**NB:** To stop Postgres complaining about adding enum values inside a transaction, use [`disable_ddl_transaction!`](https://api.rubyonrails.org/classes/ActiveRecord/Migration.html#method-c-disable_ddl_transaction-21) in your migration.
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/active_record/postgres_enum.rb

@@ -9,6 +9,7 @@ require "active_support/lazy_load_hooks"
 require "active_record/postgres_enum/version"
 require "active_record/postgres_enum/postgresql_adapter"
 require "active_record/postgres_enum/schema_dumper"
+require "active_record/postgres_enum/command_recorder"
 require "active_record/postgres_enum/enum_validator"
 
 ActiveSupport.on_load(:active_record) do
@@ -33,4 +34,6 @@ ActiveSupport.on_load(:active_record) do
   ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:enum] = {
     name: 'enum'
   }
+
+  ActiveRecord::Migration::CommandRecorder.prepend ActiveRecord::PostgresEnum::CommandRecorder
 end

data/lib/active_record/postgres_enum/command_recorder.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module PostgresEnum
+    module CommandRecorder
+      def create_enum(name, values)
+        record(:create_enum, [name, values])
+      end
+
+      def invert_create_enum(args)
+        [:drop_enum, args.first]
+      end
+
+      def rename_enum(name, new_name)
+        record(:rename_enum, [name, new_name])
+      end
+
+      def invert_rename_enum(args)
+        [:rename_enum, args.reverse]
+      end
+
+      def rename_enum_value(name, existing_value, new_value)
+        record(:rename_enum_value, [name, existing_value, new_value])
+      end
+
+      def invert_rename_enum_value(args)
+        [:rename_enum_value, [args.first] + args.last(2).reverse]
+      end
+    end
+  end
+end

data/lib/active_record/postgres_enum/extensions.rb

@@ -7,9 +7,9 @@ module ActiveRecord
         class Enum < Type::Value # :nodoc:
           attr_reader :enum_name
 
-          def initialize(options = {})
-            @enum_name = options.delete(:enum_name).to_sym
-            super
+          def initialize(enum_name:, **kwargs)
+            @enum_name = enum_name.to_sym
+            super(**kwargs)
           end
         end
 

data/lib/active_record/postgres_enum/postgresql_adapter.rb

@@ -24,7 +24,11 @@ module ActiveRecord
       end
 
       DEFINED_ENUMS_QUERY = <<~SQL
-        SELECT t.OID, t.typname, t.typtype, array_agg(e.enumlabel) as enumlabels
+        SELECT
+          t.OID,
+          t.typname,
+          t.typtype,
+          array_to_string(array_agg(e.enumlabel ORDER BY e.enumsortorder), '\t\t', '') as enumlabels
         FROM pg_type t
         LEFT JOIN pg_enum e ON e.enumtypid = t.oid
         WHERE typtype = 'e'
@@ -34,12 +38,12 @@ module ActiveRecord
 
       def enums
         select_all(DEFINED_ENUMS_QUERY).each_with_object({}) do |row, memo|
-          memo[row["typname"].to_sym] = row['enumlabels'].gsub(/[{}]/, '').gsub('NULL', '').split(',').sort
+          memo[row["typname"].to_sym] = row['enumlabels'].split("\t\t")
         end
       end
 
       def create_enum(name, values)
-        values = values.map { |v| "'#{v}'" }
+        values = values.map { |v| quote v }
         execute "CREATE TYPE #{name} AS ENUM (#{values.join(', ')})"
       end
 
@@ -51,14 +55,20 @@ module ActiveRecord
         execute "ALTER TYPE #{name} RENAME TO #{new_name}"
       end
 
-      def add_enum_value(name, value)
-        execute "ALTER TYPE #{name} ADD VALUE '#{value}'"
+      def add_enum_value(name, value, after: nil, before: nil)
+        sql = "ALTER TYPE #{name} ADD VALUE #{quote value}"
+        if after
+          sql += " AFTER #{quote after}"
+        elsif before
+          sql += " BEFORE #{quote before}"
+        end
+        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?
 
-        execute "ALTER TYPE #{name} RENAME VALUE '#{existing_value}' TO '#{new_value}'"
+        execute "ALTER TYPE #{name} RENAME VALUE #{quote existing_value} TO #{quote new_value}"
       end
 
       def migration_keys

data/lib/active_record/postgres_enum/schema_dumper.rb

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

data/lib/active_record/postgres_enum/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres_enum
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael Merkushin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,42 +106,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +152,7 @@ files:
 - LICENSE.txt
 - README.md
 - lib/active_record/postgres_enum.rb
+- lib/active_record/postgres_enum/command_recorder.rb
 - lib/active_record/postgres_enum/enum_validator.rb
 - lib/active_record/postgres_enum/extensions.rb
 - lib/active_record/postgres_enum/postgresql_adapter.rb
@@ -186,8 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Integrate PostgreSQL's enum data type into ActiveRecord's schema and migrations.