activerecord-pg_enum 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 552cd4fa6b85fd2002965150aca5e1f92f9752bfce9ab6628241dce0ef40406f
-  data.tar.gz: b7915cd86940a3f2c5b2e9053712369f639073e22123b7a3a173f5403539aca1
+  metadata.gz: 3bfa16f0e78242be4cacc81ef2205192c4983374507b9f58c0a18703999b2585
+  data.tar.gz: 65f30e4358092187ef836e268abeb68399c8883db28a77ea052b99ca0bab6406
 SHA512:
-  metadata.gz: 5b48750e4060fb131d1099ddf2198362e750901873e590ca488cb376e99ef30ab09c11857d9aa91ae9e0caea2903367a97bb34073f31f1ee1a9c4377cf9a27a5
-  data.tar.gz: 66fc8ee9467a8dc96445e5e5f8fdab62b77ad4740086b17fa1d3a673415c657f3fdccf5cc09898f8153534951ccfa88b644359b7ebb2ccb81fd187e5465b4655
+  metadata.gz: 0a85929872c43348615853cf3464f8b4c62f16a4c21adf1d482b60dac1ffc6e8b28326f472d979b0b0bcf0e1beb547d517ed6ba30e6716e3ad9a83e3813b8bc2
+  data.tar.gz: 9d6ab586a0dc827ddd4e6c38b3a3e98f6d25047917ffbe79035a81f1d42af0f67257ed249f598ffd5e01328dc34b7026345c0a75ff40b4f8504febe711802ca7

data/CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [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

@@ -133,6 +133,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/gemfiles/4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.3)
+    activerecord-pg_enum (1.0.4)
       activerecord (>= 4.1.0)
       activesupport
       pg

data/gemfiles/4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.3)
+    activerecord-pg_enum (1.0.4)
       activerecord (>= 4.1.0)
       activesupport
       pg

data/gemfiles/5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.3)
+    activerecord-pg_enum (1.0.4)
       activerecord (>= 4.1.0)
       activesupport
       pg

data/gemfiles/5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.3)
+    activerecord-pg_enum (1.0.4)
       activerecord (>= 4.1.0)
       activesupport
       pg

data/gemfiles/5.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.3)
+    activerecord-pg_enum (1.0.4)
       activerecord (>= 4.1.0)
       activesupport
       pg

data/gemfiles/6.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.3)
+    activerecord-pg_enum (1.0.4)
       activerecord (>= 4.1.0)
       activesupport
       pg

data/gemfiles/edge.gemfile.lock

@@ -66,7 +66,7 @@ GIT
 PATH
   remote: ..
   specs:
-    activerecord-pg_enum (1.0.3)
+    activerecord-pg_enum (1.0.4)
       activerecord (>= 4.1.0)
       activesupport
       pg

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/postgresql_adapter.rb

@@ -14,12 +14,11 @@ module ActiveRecord
       #   { "foo_type" => ["foo", "bar", "baz"] }
       def enum_types
         res = exec_query(<<-SQL.strip_heredoc, "SCHEMA")
-          SELECT t.typname AS enum_name, array_agg(e.enumlabel ORDER BY e.enumsortorder) AS enum_value
+          SELECT n.nspname AS schema, t.typname AS enum_name, array_agg(e.enumlabel ORDER BY e.enumsortorder) AS enum_value
           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
+          GROUP BY schema, enum_name
         SQL
 
         coltype = res.column_types["enum_value"]
@@ -31,10 +30,14 @@ module ActiveRecord
           proc { |values| coltype.type_cast(values) }
         end
 
-        res.rows.inject({}) do |memo, (name, values)|
-          memo[name] = deserialize.call(values)
-          memo
-        end
+        public_enums, custom = res.rows.partition { |schema, _, _| schema == "public" }
+        custom.map! { |schema, name, values| ["#{schema}.#{name}", values] }
+
+        public_enums
+          .map { |_, name, values| [name, values] }
+          .concat(custom)
+          .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/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module PGEnum
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   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.0.4
 platform: ruby
 authors:
 - Adam Lassek
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-13 00:00:00.000000000 Z
+date: 2019-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg