activerecord-postgres_enum 1.3.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e453014b2e32bcb23b20fd8c1f2dbb628690f303a61368bfad37564868244e4
-  data.tar.gz: 55b98925e297a91892c5c284e53564a6012cdb82e2494b93505974207e8d7de2
+  metadata.gz: 1df28277031794a3f9e309a5339cee4ba229b548932d64e50c28413902a00991
+  data.tar.gz: f0538fb0989288c4b692bbffc379fde0a26108a57ce6ff41d9320b3738008f7f
 SHA512:
-  metadata.gz: 45e0ba20aeaf52968c9022fca7aed356272ad2deb9883c98020d0bcdc17dfa73786fac4776f1f8cd02b45babe4a1344b5bcf9e516b8c3161275713910babc797
-  data.tar.gz: 66fd78a22198c3326b66ce410fac6782599164d3087473b1e3d5550e94801af37407d85786ca38c5f4c5c0503b5320dcde7c377a5d1ef3f94db72f4b236a73f2
+  metadata.gz: 6b724dfcf0872fc8abd7134b4f0bc6b7c885c82996841aa9762c7e53b912f9f969b0ac4d8dc912eac1049ca6ae7eb1298bfd57575a956a00c27e781150c8f735
+  data.tar.gz: 777b145a8bbaabed85431b408f630da1f80066e54311500e4fe3daa6ccf5039961c3ffa5a20a55501eb07313e2cfa96100305d26e97be569db7a07759c1cf5c8

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
 

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,20 +38,22 @@ 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, if_not_exists: nil)
+      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, cascade: nil, if_exists: nil)
-        if_exists_statement = 'IF EXISTS' if if_exists
-        cascade_statement = 'CASCADE' if cascade
+        if_exists_statement = "IF EXISTS" if if_exists
+        cascade_statement = "CASCADE" if cascade
 
         sql = "DROP TYPE #{if_exists_statement} #{name} #{cascade_statement}"
         execute sql
@@ -62,7 +64,7 @@ module ActiveRecord
       end
 
       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
+        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

data/lib/active_record/postgres_enum/schema_dumper.rb

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

data/lib/active_record/postgres_enum/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module PostgresEnum
-    VERSION = "1.3.0"
+    VERSION = "1.6.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres_enum
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Michael Merkushin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-26 00:00:00.000000000 Z
+date: 2021-08-03 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,29 +120,29 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.58'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.58'
-description: 
+        version: '1.1'
+description:
 email:
 - merkushin.m.s@gmail.com
 executables: []
@@ -164,7 +164,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -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:
   - - ">="
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Integrate PostgreSQL's enum data type into ActiveRecord's schema and migrations.
 test_files: []