activerecord-postgres_enum 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cef504021e0ff35024356c599daaed71ce72fe3be8d1c3b24fc038fa2b0b5ff
-  data.tar.gz: 7fbbe81954d2bdaeef201f1cc5abb4cdaefa216c3603ba7a8dd949ec06d8ea8a
+  metadata.gz: 3d36ad353392d74fe6bdd5aaeb03cc682cb0f84205b5502ecff4681dd5833afb
+  data.tar.gz: 3c854bb369675b9a188dc8b102d35053fbe942f5939ea8675ea0fb3cfe3f9848
 SHA512:
-  metadata.gz: 847fc44c04be544a22d468e73dbba779324cfc3a32cbb615dc664090c45a870f963881d875c5b83f72e7808fae878861580ce031a8f105a8f4a34c90e3ea9d36
-  data.tar.gz: a87a1a3250627e1e0112c5fc3e8d4b0ad27a33d5099ca4b7f5bf65bc169e19ee505b43df63176c2f12df45f4eba061bf5b6b10abcb6a7338cd63ed4776032cf0
+  metadata.gz: 8a95d1362c9bd42e9201c386e26908d3cb0ea7162554a2fd81e5d1b102ff4087d6b47dd5966d3770e00efea5d18e7e8438947f55118057b6dc223d4a070d8ccd
+  data.tar.gz: 827677270881d6e14b394fa043d8c40c6ac2f789f791d484ddf7f0d7f1cbdba365840b3c8e370002c3fb56db46a7f1ce493cb1a9d27fd2f99c4ccae9ad27cfb8

data/lib/active_record/postgres_enum/schema_dumper.rb

@@ -4,10 +4,12 @@ module ActiveRecord
   module PostgresEnum
     # provide support for writing out the 'create_enum' calls in schema.rb
     module SchemaDumper
-      def tables(stream)
-        types(stream)
+      unless ActiveRecord::PostgresEnum.rails_7?
+        def tables(stream)
+          types(stream)
 
-        super
+          super
+        end
       end
 
       private
@@ -25,10 +27,12 @@ module ActiveRecord
         end
       end
 
-      def prepare_column_options(column)
-        spec = super
-        spec[:enum_type] ||= "\"#{column.sql_type}\"" if column.enum?
-        spec
+      unless ActiveRecord::PostgresEnum.rails_7?
+        def prepare_column_options(column)
+          spec = super
+          spec[:enum_type] ||= "\"#{column.sql_type}\"" if column.enum?
+          spec
+        end
       end
     end
   end

data/lib/active_record/postgres_enum/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module PostgresEnum
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
   end
 end

data/lib/active_record/postgres_enum.rb

@@ -6,39 +6,39 @@ require "active_record/connection_adapters/postgresql/schema_statements"
 require "active_record/connection_adapters/postgresql_adapter"
 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/schema_statements"
-require "active_record/postgres_enum/column"
-require "active_record/postgres_enum/column_methods"
-require "active_record/postgres_enum/command_recorder"
-require "active_record/postgres_enum/enum_validator"
-
 module ActiveRecord
   module PostgresEnum
     def self.rails_7?
-      Rails::VERSION::MAJOR == 7
+      ActiveRecord::VERSION::MAJOR == 7
     end
 
     def self.rails_5?
-      Rails::VERSION::MAJOR == 5
+      ActiveRecord::VERSION::MAJOR == 5
     end
   end
 end
 
+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/schema_statements"
+require "active_record/postgres_enum/column"
+require "active_record/postgres_enum/column_methods"
+require "active_record/postgres_enum/command_recorder"
+require "active_record/postgres_enum/enum_validator"
+
 ActiveSupport.on_load(:active_record) do
   ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend ActiveRecord::PostgresEnum::PostgreSQLAdapter
 
+  ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.prepend(
+    ActiveRecord::PostgresEnum::SchemaDumper
+  )
+
   ActiveRecord::Migration::CommandRecorder.prepend ActiveRecord::PostgresEnum::CommandRecorder
 
   unless ActiveRecord::PostgresEnum.rails_7?
     ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:enum] = {}
 
-    ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.prepend(
-      ActiveRecord::PostgresEnum::SchemaDumper
-    )
-
     if ActiveRecord::PostgresEnum.rails_5?
       ActiveRecord::ConnectionAdapters::PostgreSQLColumn.prepend(
         ActiveRecord::PostgresEnum::Column

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres_enum
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Michael Merkushin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2021-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -136,7 +136,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-description: 
+description:
 email:
 - merkushin.m.s@gmail.com
 executables: []
@@ -160,7 +160,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -175,8 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Integrate PostgreSQL's enum data type into ActiveRecord's schema and migrations.
 test_files: []