activerecord-postgres_enum 1.5.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac2154f798abecd00d17ad2ddb22307b9567113d10bb6e46b93ac2696a166afe
-  data.tar.gz: 75925162b95e2e293bf6f6834dbc05bea188ad40b35aac7d7c5b3f0ac36caf59
+  metadata.gz: 3cef504021e0ff35024356c599daaed71ce72fe3be8d1c3b24fc038fa2b0b5ff
+  data.tar.gz: 7fbbe81954d2bdaeef201f1cc5abb4cdaefa216c3603ba7a8dd949ec06d8ea8a
 SHA512:
-  metadata.gz: 8a8599019f7412e927bce0a25c5ae26de5a7b0e197a7a4c5da54f53edcb888e4bb6b7e0414d20f461fa61b2f33f2927e7edd67542eb8e968ed4766d25a15a811
-  data.tar.gz: 1042bdcdd209e900527348265f906da95773635053118806ea7107f2496f6da39c3b885024d28b7fdcb292fb0868a11ed1aa277e37e9aeea8cab4389ba835599
+  metadata.gz: 847fc44c04be544a22d468e73dbba779324cfc3a32cbb615dc664090c45a870f963881d875c5b83f72e7808fae878861580ce031a8f105a8f4a34c90e3ea9d36
+  data.tar.gz: a87a1a3250627e1e0112c5fc3e8d4b0ad27a33d5099ca4b7f5bf65bc169e19ee505b43df63176c2f12df45f4eba061bf5b6b10abcb6a7338cd63ed4776032cf0

data/README.md

@@ -32,7 +32,7 @@ Or install it yourself as:
 create_enum :mood, %w(happy great been_better)
 
 create_table :person do
-  t.enum :person_mood, enum_name: :mood
+  t.enum :person_mood, enum_type: :mood
 end
 ```
 

data/lib/active_record/postgres_enum/column.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# frozen_string_literal: true
+
+module ActiveRecord
+  module PostgresEnum
+    module Column
+      def enum?
+        type == :enum
+      end
+    end
+  end
+end

data/lib/active_record/postgres_enum/column_methods.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module PostgresEnum
+    module ColumnMethods
+      # Enables `t.enum :my_field, enum_type: :my_enum_name` on migrations
+      def enum(name, enum_type:, **options)
+        column(name, enum_type, **options)
+      end
+    end
+  end
+end

data/lib/active_record/postgres_enum/enum_validator.rb

@@ -7,7 +7,7 @@ module ActiveRecord
         @enums ||= {}
         return @enums[attr_id] if @enums.key?(attr_id)
 
-        @enums[attr_id] ||= connection.enums.fetch(type.to_sym) do
+        @enums[attr_id] ||= connection.enum_types.fetch(type.to_sym) do
           raise "Enum `#{type}` not found in a database #{connection}"
         end
       end

data/lib/active_record/postgres_enum/postgresql_adapter.rb

@@ -3,26 +3,6 @@
 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,
@@ -36,14 +16,14 @@ module ActiveRecord
         ORDER BY t.typname
       SQL
 
-      def enums
+      def enum_types
         select_all(DEFINED_ENUMS_QUERY).each_with_object({}) do |row, memo|
           memo[row["typname"].to_sym] = row["enumlabels"].split("\t\t")
         end
       end
 
       def create_enum(name, values, force: false, if_not_exists: nil)
-        return if if_not_exists && enums.include?(name.to_sym)
+        return if if_not_exists && enum_types.include?(name.to_sym)
 
         drop_enum(name, cascade: force == :cascade, if_exists: true) if force
 
@@ -90,16 +70,6 @@ module ActiveRecord
         execute "ALTER TYPE #{name} RENAME VALUE #{quote existing_value} TO #{quote new_value}"
       end
 
-      def migration_keys
-        super + [:enum_name]
-      end
-
-      def prepare_column_options(column, types)
-        spec = super(column, types)
-        spec[:enum_name] = column.cast_type.enum_name.inspect if column.type == :enum
-        spec
-      end
-
       def rename_enum_value_supported?
         ActiveRecord::Base.connection.send(:postgresql_version) >= 100_000
       end

data/lib/active_record/postgres_enum/schema_dumper.rb

@@ -5,23 +5,30 @@ module ActiveRecord
     # provide support for writing out the 'create_enum' calls in schema.rb
     module SchemaDumper
       def tables(stream)
-        dump_enums(stream)
+        types(stream)
 
         super
       end
 
       private
 
-      def dump_enums(stream)
+      def types(stream)
         statements = []
+        if @connection.respond_to?(:enum_types)
+          @connection.enum_types.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  ], force: :cascade"
+          stream.puts statements.join("\n\n")
+          stream.puts
         end
+      end
 
-        stream.puts statements.join("\n\n")
-        stream.puts
+      def prepare_column_options(column)
+        spec = super
+        spec[:enum_type] ||= "\"#{column.sql_type}\"" if column.enum?
+        spec
       end
     end
   end

data/lib/active_record/postgres_enum/schema_statements.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module PostgresEnum
+    module SchemaStatements
+      def type_to_sql(type, enum_type: nil, **kwargs)
+        if type.to_s == "enum"
+          enum_type
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/active_record/postgres_enum/version.rb

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

data/lib/active_record/postgres_enum.rb

@@ -9,31 +9,56 @@ 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"
 
-ActiveSupport.on_load(:active_record) do
-  require "active_record/postgres_enum/extensions"
+module ActiveRecord
+  module PostgresEnum
+    def self.rails_7?
+      Rails::VERSION::MAJOR == 7
+    end
 
-  ActiveRecord::SchemaDumper.prepend ActiveRecord::PostgresEnum::SchemaDumper
+    def self.rails_5?
+      Rails::VERSION::MAJOR == 5
+    end
+  end
+end
 
+ActiveSupport.on_load(:active_record) do
   ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend ActiveRecord::PostgresEnum::PostgreSQLAdapter
 
-  if defined?(ActiveRecord::ConnectionAdapters::PostgreSQL::ColumnDumper)
-    ActiveRecord::ConnectionAdapters::PostgreSQL::ColumnDumper.prepend(
-      ActiveRecord::PostgresEnum::PostgreSQLAdapter::ColumnDumperExt
-    )
-  end
+  ActiveRecord::Migration::CommandRecorder.prepend ActiveRecord::PostgresEnum::CommandRecorder
+
+  unless ActiveRecord::PostgresEnum.rails_7?
+    ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:enum] = {}
 
-  if defined?(ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper)
     ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.prepend(
-      ActiveRecord::PostgresEnum::PostgreSQLAdapter::SchemaDumperExt
+      ActiveRecord::PostgresEnum::SchemaDumper
     )
-  end
 
-  ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:enum] = {
-    name: "enum"
-  }
+    if ActiveRecord::PostgresEnum.rails_5?
+      ActiveRecord::ConnectionAdapters::PostgreSQLColumn.prepend(
+        ActiveRecord::PostgresEnum::Column
+      )
+    else
+      ActiveRecord::ConnectionAdapters::PostgreSQL::Column.prepend(
+        ActiveRecord::PostgresEnum::Column
+      )
+    end
 
-  ActiveRecord::Migration::CommandRecorder.prepend ActiveRecord::PostgresEnum::CommandRecorder
+    ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition.include(
+      ActiveRecord::PostgresEnum::ColumnMethods
+    )
+
+    ActiveRecord::ConnectionAdapters::PostgreSQL::Table.include(
+      ActiveRecord::PostgresEnum::ColumnMethods
+    )
+
+    ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaStatements.prepend(
+      ActiveRecord::PostgresEnum::SchemaStatements
+    )
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres_enum
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Michael Merkushin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-11 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -120,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.1'
 description: 
 email:
 - merkushin.m.s@gmail.com
@@ -152,11 +146,13 @@ files:
 - LICENSE.txt
 - README.md
 - lib/active_record/postgres_enum.rb
+- lib/active_record/postgres_enum/column.rb
+- lib/active_record/postgres_enum/column_methods.rb
 - lib/active_record/postgres_enum/command_recorder.rb
 - lib/active_record/postgres_enum/enum_validator.rb
-- lib/active_record/postgres_enum/extensions.rb
 - lib/active_record/postgres_enum/postgresql_adapter.rb
 - lib/active_record/postgres_enum/schema_dumper.rb
+- lib/active_record/postgres_enum/schema_statements.rb
 - lib/active_record/postgres_enum/version.rb
 - lib/activerecord/postgres_enum.rb
 homepage: https://github.com/bibendi/activerecord-postgres_enum
@@ -179,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Integrate PostgreSQL's enum data type into ActiveRecord's schema and migrations.

data/lib/active_record/postgres_enum/extensions.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord
-  module ConnectionAdapters
-    module PostgreSQL
-      module OID # :nodoc:
-        class Enum < Type::Value # :nodoc:
-          attr_reader :enum_name
-
-          def initialize(enum_name:, **kwargs)
-            @enum_name = enum_name.to_sym
-            super(**kwargs)
-          end
-        end
-
-        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"])
-          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))
-        end
-      end
-    end
-  end
-end