activerecord-pg_enum 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bfa16f0e78242be4cacc81ef2205192c4983374507b9f58c0a18703999b2585
-  data.tar.gz: 65f30e4358092187ef836e268abeb68399c8883db28a77ea052b99ca0bab6406
+  metadata.gz: a1844d2fc0b6e855491cfe6790138f17bbcdf042868893239607e56a6eb4db9e
+  data.tar.gz: 1f486a2ec6d9a3a817cd8e94ed7f086a235f511c53ce785af69dcc1a9fd710e3
 SHA512:
-  metadata.gz: 0a85929872c43348615853cf3464f8b4c62f16a4c21adf1d482b60dac1ffc6e8b28326f472d979b0b0bcf0e1beb547d517ed6ba30e6716e3ad9a83e3813b8bc2
-  data.tar.gz: 9d6ab586a0dc827ddd4e6c38b3a3e98f6d25047917ffbe79035a81f1d42af0f67257ed249f598ffd5e01328dc34b7026345c0a75ff40b4f8504febe711802ca7
+  metadata.gz: bd9431f58919e64098348d4604da5291ea9a52b285adcc70d706af6eadd5465c2cb46a0d5ab5a442b0e2251879090e8cff84b919c8faa3816446306b4b166a19
+  data.tar.gz: 86b55af7a6e30f2168551cf557709f7ebacd382fdde08b4eab391457d6537e2a8a068cb54e9373f28bcce6eab366ad3c09cbbc96e0cf2add0c0d6ca0543b157b

data/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.0.5] - 2019-11-22
+### Fixed
+- Don't include schema name in dumped enum types to be consistent with the way tables are dumped (@TylerRick)
+
 ## [1.0.4] - 2019-11-16
 ### Fixed
 - Dump enums declared in non-public schemas

data/Rakefile

@@ -10,13 +10,8 @@ end
 
 task :connection do
   require "active_record"
-
-  ActiveRecord::Base.establish_connection(
-    adapter:  "postgresql",
-    port:     ENV.fetch("PGPORT", "5432"),
-    username: ENV.fetch("TEST_USER") { ENV.fetch("USER", "pg_enum") },
-    password: ENV["TEST_PASSWORD"]
-  )
+  require_relative "spec/support/connection_config"
+  ActiveRecord::Base.establish_connection(db_config.except(:database))
 end
 
 namespace :spec do

data/gemfiles/4.1.gemfile.lock

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

data/gemfiles/4.2.gemfile.lock

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

data/gemfiles/5.0.gemfile.lock

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

data/gemfiles/5.1.gemfile.lock

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

data/gemfiles/5.2.gemfile.lock

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

data/gemfiles/6.0.gemfile.lock

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

data/gemfiles/edge.gemfile.lock

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

data/lib/active_record/pg_enum/postgresql_adapter.rb

@@ -14,11 +14,12 @@ module ActiveRecord
       #   { "foo_type" => ["foo", "bar", "baz"] }
       def enum_types
         res = exec_query(<<-SQL.strip_heredoc, "SCHEMA")
-          SELECT n.nspname AS schema, t.typname AS enum_name, array_agg(e.enumlabel ORDER BY e.enumsortorder) AS enum_value
+          SELECT 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
-          GROUP BY schema, enum_name
+          WHERE n.nspname = ANY (current_schemas(false))
+          GROUP BY enum_name;
         SQL
 
         coltype = res.column_types["enum_value"]
@@ -30,12 +31,8 @@ module ActiveRecord
           proc { |values| coltype.type_cast(values) }
         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)
+        res.rows
+          .map { |name, values| [name, values] }
           .sort { |a, b| a.first <=> b.first }
           .each_with_object({}) { |(name, values), memo| memo[name] = deserialize.call(values) }
       end

data/lib/active_record/pg_enum/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module PGEnum
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-pg_enum
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Adam Lassek
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-17 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -209,7 +209,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Integrate PostgreSQL's enumerated types with the Rails enum feature