activerecord-postgres_enum 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8126b681a13ce0266aff512380576a00a47a93a7a018a507dbda0a18ffa7e775
-  data.tar.gz: 3190be425e34c6c3c7116b46afb5fa671e573d831afcbfb3b36ef8ef7b169d23
+  metadata.gz: 6a1b82a6fcd24c4c9811b824bbe1dc8db8043dc7285a6481a029d9b88fe92410
+  data.tar.gz: f7989568c9a5db1a33fac706e4baf98ffdbde8b6d23f9625182def8b1370b19f
 SHA512:
-  metadata.gz: 5e7e17e5b245b285ec234cf069d31c98d54e5f2f043247ef81956c72859a0f72ccb6ca28dccffcc2e6ac4d318a4fe916982c18a1a338b82f6ccebb1b0fcfd582
-  data.tar.gz: e03ab649fc29e58f7938da1a30648acebe23af42efde515b0241ceb338ec3f7d4e9638d6f15f07aa91a7b9c4fc477ef85521e8b912677ceeac3f3ef06daf6d30
+  metadata.gz: ce4d78fdc5af2ed94e53c749f365a1c1ef9c5a1a43c5aa2a56861db99381ee991749f6e51d5114182058c0b9936eef6a96cbbb390cda7b05760169312244cc57
+  data.tar.gz: aaed102da13bc6f8ccd8bd5994ea9d6c9ec88ff72cafd537ea225126f9ccb29ab570e5ab7958eecb747365f67b7d870386c1642264cfedec10a3887dd501c6b3

data/lib/active_record/postgres_enum/postgresql_adapter.rb

@@ -3,6 +3,26 @@
 module ActiveRecord
   module PostgresEnum
     module PostgreSQLAdapter
+      # For Rails >= 5.2
+      # https://github.com/rails/rails/blob/5-2-stable/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb
+      module SchemaDumperExt
+        def prepare_column_options(column)
+          spec = super
+          spec[:enum_name] = column.sql_type.inspect if column.type == :enum
+          spec
+        end
+      end
+
+      # For Rails <5.2
+      # https://github.com/rails/rails/blob/5-1-stable/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb
+      module ColumnDumperExt
+        def prepare_column_options(column)
+          spec = super
+          spec[:enum_name] = column.sql_type.inspect if column.type == :enum
+          spec
+        end
+      end
+
       DEFINED_ENUMS_QUERY = <<~SQL
         SELECT t.OID, t.typname, t.typtype, array_agg(e.enumlabel) as enumlabels
         FROM pg_type t

data/lib/active_record/postgres_enum/version.rb

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

data/lib/active_record/postgres_enum.rb

@@ -15,8 +15,21 @@ ActiveSupport.on_load(:active_record) do
   require "active_record/postgres_enum/extensions"
 
   ActiveRecord::SchemaDumper.prepend ActiveRecord::PostgresEnum::SchemaDumper
+
   ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend ActiveRecord::PostgresEnum::PostgreSQLAdapter
 
+  if defined?(ActiveRecord::ConnectionAdapters::PostgreSQL::ColumnDumper)
+    ActiveRecord::ConnectionAdapters::PostgreSQL::ColumnDumper.prepend(
+      ActiveRecord::PostgresEnum::PostgreSQLAdapter::ColumnDumperExt
+    )
+  end
+
+  if defined?(ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper)
+    ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.prepend(
+      ActiveRecord::PostgresEnum::PostgreSQLAdapter::SchemaDumperExt
+    )
+  end
+
   ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:enum] = {
     name: 'enum'
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres_enum
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Michael Merkushin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-09 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord