activerecord-postgres_enum 1.7.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bb4e436ffccf3e85046e307bfb7e677c99169128cc524dcd96feb235ee367b3
-  data.tar.gz: c7c9c1a8c8d207371208382a3c13f33fba0c9181cb217d327112922eb4eec90a
+  metadata.gz: 3d36ad353392d74fe6bdd5aaeb03cc682cb0f84205b5502ecff4681dd5833afb
+  data.tar.gz: 3c854bb369675b9a188dc8b102d35053fbe942f5939ea8675ea0fb3cfe3f9848
 SHA512:
-  metadata.gz: 3df55af7787c9fb43356c5dfbbef7bac50165e579fbef7964b0f764de2683836b496eb7bc9f36e3db64db2bf9d5d9565feb23a784ab6ce07caf5f688e57e96d2
-  data.tar.gz: 19dff3e375b92c55ac056b4d4d1d789b016b49b13c208e1368df623187068eb51884cc7832226124aed69289d5fab67878ee8d31445979bdbb264a275390757a
+  metadata.gz: 8a95d1362c9bd42e9201c386e26908d3cb0ea7162554a2fd81e5d1b102ff4087d6b47dd5966d3770e00efea5d18e7e8438947f55118057b6dc223d4a070d8ccd
+  data.tar.gz: 827677270881d6e14b394fa043d8c40c6ac2f789f791d484ddf7f0d7f1cbdba365840b3c8e370002c3fb56db46a7f1ce493cb1a9d27fd2f99c4ccae9ad27cfb8

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

@@ -4,18 +4,20 @@ module ActiveRecord
   module PostgresEnum
     # provide support for writing out the 'create_enum' calls in schema.rb
     module SchemaDumper
-      def tables(stream)
-        dump_enums(stream)
+      unless ActiveRecord::PostgresEnum.rails_7?
+        def tables(stream)
+          types(stream)
 
-        super
+          super
+        end
       end
 
       private
 
-      def dump_enums(stream)
+      def types(stream)
         statements = []
-        if @connection.respond_to?(:enums)
-          @connection.enums.each do |name, values|
+        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
@@ -24,6 +26,14 @@ module ActiveRecord
           stream.puts
         end
       end
+
+      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
 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.7.0"
+    VERSION = "2.0.1"
   end
 end

data/lib/active_record/postgres_enum.rb

@@ -6,34 +6,59 @@ require "active_record/connection_adapters/postgresql/schema_statements"
 require "active_record/connection_adapters/postgresql_adapter"
 require "active_support/lazy_load_hooks"
 
+module ActiveRecord
+  module PostgresEnum
+    def self.rails_7?
+      ActiveRecord::VERSION::MAJOR == 7
+    end
+
+    def self.rails_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
-  require "active_record/postgres_enum/extensions"
+  ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend ActiveRecord::PostgresEnum::PostgreSQLAdapter
 
-  ActiveRecord::SchemaDumper.prepend ActiveRecord::PostgresEnum::SchemaDumper
+  ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.prepend(
+    ActiveRecord::PostgresEnum::SchemaDumper
+  )
 
-  ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend ActiveRecord::PostgresEnum::PostgreSQLAdapter
+  ActiveRecord::Migration::CommandRecorder.prepend ActiveRecord::PostgresEnum::CommandRecorder
 
-  if defined?(ActiveRecord::ConnectionAdapters::PostgreSQL::ColumnDumper)
-    ActiveRecord::ConnectionAdapters::PostgreSQL::ColumnDumper.prepend(
-      ActiveRecord::PostgresEnum::PostgreSQLAdapter::ColumnDumperExt
-    )
-  end
+  unless ActiveRecord::PostgresEnum.rails_7?
+    ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:enum] = {}
+
+    if ActiveRecord::PostgresEnum.rails_5?
+      ActiveRecord::ConnectionAdapters::PostgreSQLColumn.prepend(
+        ActiveRecord::PostgresEnum::Column
+      )
+    else
+      ActiveRecord::ConnectionAdapters::PostgreSQL::Column.prepend(
+        ActiveRecord::PostgresEnum::Column
+      )
+    end
 
-  if defined?(ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper)
-    ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.prepend(
-      ActiveRecord::PostgresEnum::PostgreSQLAdapter::SchemaDumperExt
+    ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition.include(
+      ActiveRecord::PostgresEnum::ColumnMethods
     )
-  end
 
-  ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:enum] = {
-    name: "enum"
-  }
+    ActiveRecord::ConnectionAdapters::PostgreSQL::Table.include(
+      ActiveRecord::PostgresEnum::ColumnMethods
+    )
 
-  ActiveRecord::Migration::CommandRecorder.prepend ActiveRecord::PostgresEnum::CommandRecorder
+    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.7.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Michael Merkushin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -146,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
@@ -173,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.2.32
 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, enum_name:, **options)
-          column(name, enum_name, **options)
-        end
-      end
-    end
-  end
-end