sql_enum 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77e67bb36b77c10947ed386e5ee8d88b500e2b9e86e62a5b688747b81ad8a3e5
-  data.tar.gz: 99d61ac4776af2d3cf3f7e3c28c7ff8f931aeda99d915a29ae2578495b819b67
+  metadata.gz: a7a8723f0b471f08ceeade1092288485c811c8cdef91378456ceaff35820837c
+  data.tar.gz: 2ab5049a981c4b18244b66229125b5fe370ee856290ffa86c38fb6e959383cb1
 SHA512:
-  metadata.gz: 930d73715dcdb3ae76416d0600a9fe6ee7b09abaa699a1556cd6c71d88be6e39e4f8413a93c3b009485f2fb0cef63a8a202f2f9c28e2982360f2ae211fe0392d
-  data.tar.gz: 67928721dc4507edf4cf3f677041ffeb29f7c01d2f7808998ae6dc404e2b659f3e73ca05066a3b28c571654b58ce334b087c0e610c1e63fc7e9f30371871dfa8
+  metadata.gz: 46eaa353cfaff0414fd857f0a7a763f169ec89d26a182e648419f0b8546db2bbf5397a943993b5ab8d27a3865940ae504106c6c58c114ac4bd02f3a2e8f63d03
+  data.tar.gz: b9e8e4b15f749739b968078d827f7b485acde671b51866f1b960a8aa25922d9d4e13c0f833f90735e5474ff1f1cdd27a61abe5eb6d3f483cfeffff678eb2e8c4

data/.github/workflows/tests.yml

@@ -10,15 +10,16 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - '3.0'
-          - '3.1'
           - '3.2'
           - '3.3'
+          - '3.4'
+          - '4.0'
         rails:
-          - '6.1'
-          - '7.0'
           - '7.1'
-    runs-on: ubuntu-latest
+          - '7.2'
+          - '8.0'
+          - '8.1'
+    runs-on: ubuntu-22.04
 
     name: RSpec (Rails ${{ matrix.rails }}) (Ruby ${{ matrix.ruby }})
 
@@ -29,4 +30,4 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - name: Test
-        run: docker-compose run --rm rspec bundle exec appraisal rails-${{ matrix.rails }} rspec
+        run: docker compose run --rm rspec bundle exec appraisal rails-${{ matrix.rails }} rspec

data/.gitignore

@@ -12,3 +12,5 @@
 
 gemfiles/*.lock
 .env.local
+*.gem
+/.claude

data/Appraisals

@@ -1,11 +1,15 @@
-appraise "rails-6.1" do
-  gem "rails", "~> 6.1"
+appraise "rails-7.1" do
+  gem "rails", "~> 7.1.0"
 end
 
-appraise "rails-7.0" do
-  gem "rails", "~> 7.0"
+appraise "rails-7.2" do
+  gem "rails", "~> 7.2.0"
 end
 
-appraise "rails-7.1" do
-  gem "rails", "~> 7.1"
+appraise "rails-8.0" do
+  gem "rails", "~> 8.0.0"
+end
+
+appraise "rails-8.1" do
+  gem "rails", "~> 8.1.0"
 end

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.0
+FROM ruby:3.4
 
 WORKDIR /usr/src/app
 

data/Gemfile.lock

@@ -1,46 +1,63 @@
 PATH
   remote: .
   specs:
-    sql_enum (1.0.0)
-      activerecord (>= 6.1.0)
-      activesupport (>= 6.1.0)
+    sql_enum (2.0.0)
+      activerecord (>= 7.1.0)
+      activesupport (>= 7.1.0)
       mysql2
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.8)
-      activesupport (= 7.0.8)
-    activerecord (7.0.8)
-      activemodel (= 7.0.8)
-      activesupport (= 7.0.8)
-    activesupport (7.0.8)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activemodel (8.1.2)
+      activesupport (= 8.1.2)
+    activerecord (8.1.2)
+      activemodel (= 8.1.2)
+      activesupport (= 8.1.2)
+      timeout (>= 0.4.0)
+    activesupport (8.1.2)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      json
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
     awesome_print (1.9.2)
-    concurrent-ruby (1.2.3)
+    base64 (0.3.0)
+    bigdecimal (4.0.1)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
     debug (1.9.1)
       irb (~> 1.10)
       reline (>= 0.3.8)
     diff-lcs (1.5.0)
+    drb (2.2.3)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
     irb (1.11.1)
       rdoc
       reline (>= 0.4.2)
-    minitest (5.21.2)
+    json (2.18.1)
+    logger (1.7.0)
+    minitest (6.0.1)
+      prism (~> 1.5)
     mysql2 (0.5.5)
+    prism (1.9.0)
     psych (5.1.2)
       stringio
     rake (13.1.0)
-    rdoc (6.6.2)
+    rdoc (6.6.3.1)
       psych (>= 4.0.0)
     reline (0.4.2)
       io-console (~> 0.5)
@@ -57,10 +74,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
+    securerandom (0.4.1)
     stringio (3.1.0)
     thor (1.3.0)
+    timeout (0.6.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    uri (1.1.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -4,9 +4,9 @@ Enables usage of native sql enums with ActiveRecord
 
 ## NOTE
 
-Version 1.0 of this is compatible with Rails 7 and above.
+Version 2.0 of this gem requires Rails 7.1+ and Ruby 3.2+.
 
-For Rails versions below Rails 7, use version 0.4
+For Rails 7.0 and 7.1, use version 1.0. For Rails versions below 7, use version 0.4.
 
 ## Installation
 
@@ -30,7 +30,7 @@ Or install it yourself as:
 
 Use a part of table definition:
 ```ruby
-class CreateUsers < ActiveRecord::Migration[5.1]
+class CreateUsers < ActiveRecord::Migration[7.1]
   def change
     create_table :users do |t|
       t.enum :status, limit: [:active, :pending, :inactive], default: :active
@@ -58,7 +58,7 @@ end
 
 ### Testing
 
-Run `docker-compose run --rm rspec` to run the specs in a docker container alongside Mysql.
+Run `docker compose run --rm rspec` to run the specs in a docker container alongside Mysql.
 
 ## Contributing
 

data/gemfiles/rails_7.1.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 7.1"
+gem "rails", "~> 7.1.0"
 
 gemspec path: "../"

data/gemfiles/{rails_6.1.gemfile → rails_7.2.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.1"
+gem "rails", "~> 7.2.0"
 
 gemspec path: "../"

data/gemfiles/{rails_7.0.gemfile → rails_8.0.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 7.0"
+gem "rails", "~> 8.0.0"
 
 gemspec path: "../"

data/gemfiles/rails_8.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 8.1.0"
+
+gemspec path: "../"

data/lib/active_record/connection_adapters/abstract_mysql.rb

@@ -9,39 +9,10 @@ module ActiveRecord
         end
       end
 
-      # In Rails 6.1, registering the enum type is an instance method and is
-      # done on initialization, In Rails 7.0 it is a class method and
-      # the registration happens when the class is loaded. So, in Rails 6.1,
-      # we can override the `initialize_type_map` method to register the enum
-      # but in Rails 7.1, we need to call register_enum_type explicitly.
-
-      if SqlEnum.rails_version_match?("6.1")
-        module SqlEnumMapper
-          def initialize_type_map(m = type_map)
-            super(m)
-            AbstractMysqlAdapter.register_enum_type(m)
-          end
-        end
-
-        ActiveRecord::ConnectionAdapters::Mysql2Adapter.prepend(SqlEnumMapper)
-      end
-
-
-      if SqlEnum.rails_version_match?("7.0")
-        [
-          ActiveRecord::ConnectionAdapters::Mysql2Adapter::TYPE_MAP,
-          ActiveRecord::ConnectionAdapters::Mysql2Adapter::TYPE_MAP_WITH_BOOLEAN
-        ].each do |m|
-          AbstractMysqlAdapter.register_enum_type(m)
-        end
-      end
-
-      # Rails 7.1 drops the TYPE_MAP_WITH_BOOLEAN constant
-      if SqlEnum.rails_version_match?("7.1")
-          AbstractMysqlAdapter.register_enum_type(
-            ActiveRecord::ConnectionAdapters::Mysql2Adapter::TYPE_MAP
-          )
-      end
+      # Rails 7.1+ uses a single TYPE_MAP constant on the adapter class
+      AbstractMysqlAdapter.register_enum_type(
+        ActiveRecord::ConnectionAdapters::Mysql2Adapter::TYPE_MAP
+      )
     end
   end
 end

data/lib/active_record/connection_adapters/mysql2.rb

@@ -7,16 +7,17 @@ module ActiveRecord
         self.class::NATIVE_DATABASE_TYPES.merge(enum: {name: "enum"})
       end
 
-      def type_to_sql_with_enum(type, limit: nil, precision: nil, scale: nil, unsigned: nil, **)
-        if type.to_sym == :enum
-          "#{type}(#{limit.map{|n| "'#{n}'"}.join(",")})"
-        else
-          type_to_sql_without_enum(type, limit: limit, precision: precision, scale: scale, unsigned: unsigned)
+      module SqlEnumTypeToSql
+        def type_to_sql(type, limit: nil, **)
+          if type.to_sym == :enum
+            "#{type}(#{limit.map { |n| "'#{n}'" }.join(",")})"
+          else
+            super
+          end
         end
       end
 
-      alias_method :type_to_sql_without_enum, :type_to_sql
-      alias_method :type_to_sql, :type_to_sql_with_enum
+      prepend SqlEnumTypeToSql
     end
   end
 end

data/lib/sql_enum/class_methods.rb

@@ -13,11 +13,20 @@ module SqlEnum
       suffix = options.fetch(:_suffix, !!SqlEnum.configuration&.default_suffix)
 
       # Define enum using Rails enum
-      enum(column_name => values_map, _prefix: prefix, _suffix: suffix)
+      enum(column_name, values_map, prefix: prefix, suffix: suffix)
 
       # Override reader to return symbols
-      type_definition = ->(subtype) { EnumType.new(attr, send(column_name.to_s.pluralize), subtype) }
-      attribute(column_name, &type_definition)
+      col_name = column_name.to_s
+      enum_type = ->(subtype) do
+        subtype = subtype.subtype if ActiveRecord::Enum::EnumType === subtype
+        EnumType.new(col_name, send(col_name.pluralize), subtype)
+      end
+
+      if respond_to?(:decorate_attributes, true)
+        decorate_attributes([col_name]) { |_name, subtype| enum_type.call(subtype) }
+      else
+        attribute(column_name, &enum_type)
+      end
 
       prefix_str = format_affix(column_name, prefix, suffix: '_')
       suffix_str = format_affix(column_name, suffix, prefix: '_')

data/lib/sql_enum/enum_column.rb

@@ -9,15 +9,15 @@ module SqlEnum
     private
 
     def schema_values
-      ActiveRecord::Base.connection.exec_query(schema_values_query).rows.dig(0, 0)
+      if ActiveRecord::Base.respond_to?(:with_connection)
+        ActiveRecord::Base.with_connection { |conn| conn.exec_query(schema_values_query).rows.dig(0, 0) }
+      else
+        ActiveRecord::Base.connection.exec_query(schema_values_query).rows.dig(0, 0)
+      end
     end
 
     def database_name
-      if ActiveRecord::Base.respond_to?(:connection_db_config)
-        ActiveRecord::Base.connection_db_config.configuration_hash[:database]
-      else
-        ActiveRecord::Base.connection_config.values_at(:database, :database_name).find(&:present?)
-      end
+      ActiveRecord::Base.connection_db_config.configuration_hash[:database]
     end
 
     def schema_values_query

data/lib/sql_enum/version.rb

@@ -1,3 +1,3 @@
 module SqlEnum
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/lib/sql_enum.rb

@@ -7,10 +7,6 @@ module SqlEnum
     self.configuration ||= Configuration.new
     yield(configuration)
   end
-
-  def self.rails_version_match?(version_string)
-    ActiveSupport.version.to_s.start_with?(version_string)
-  end
 end
 
 require 'active_record'

data/sql_enum.gemspec

@@ -25,9 +25,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 3.2.0"
+
   spec.add_dependency "mysql2"
-  spec.add_dependency "activesupport", ">= 6.1.0"
-  spec.add_dependency "activerecord", ">= 6.1.0"
+  spec.add_dependency "activesupport", ">= 7.1.0"
+  spec.add_dependency "activerecord", ">= 7.1.0"
 
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "awesome_print"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sql_enum
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Fletcher Fowler
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-31 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -30,28 +29,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +135,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description:
 email:
 - fletch@fzf.me
 executables: []
@@ -160,9 +158,10 @@ files:
 - bin/console
 - bin/setup
 - docker-compose.yml
-- gemfiles/rails_6.1.gemfile
-- gemfiles/rails_7.0.gemfile
 - gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.2.gemfile
+- gemfiles/rails_8.0.gemfile
+- gemfiles/rails_8.1.gemfile
 - lib/active_record/connection_adapters/abstract_mysql.rb
 - lib/active_record/connection_adapters/mysql/column_methods.rb
 - lib/active_record/connection_adapters/mysql2.rb
@@ -181,7 +180,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/1debit/sql_enum
   source_code_uri: https://github.com/1debit/sql_enum
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -189,15 +187,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Enable using native sql enums
 test_files: []