sql_enum 0.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4f885963c1a9b5c4d6612807ea7627f34fc455a730a45ed93fe380bc2a4d0ff
-  data.tar.gz: 8489d2a5a017117bb1d5a0d5bb88ccab8f11e4be19a915374ee3d12222d45f76
+  metadata.gz: a7a8723f0b471f08ceeade1092288485c811c8cdef91378456ceaff35820837c
+  data.tar.gz: 2ab5049a981c4b18244b66229125b5fe370ee856290ffa86c38fb6e959383cb1
 SHA512:
-  metadata.gz: 6f4ed451ed9dd0d9f6b0e0d5475efadea5bc1de0d3f19e54bfd2066dfb2685cdb7e9f601bd1ca5b977af17b0df19c89860b5ee2bc5791fbdaf19f2644bbd32de
-  data.tar.gz: c27592b8fc57952f8237d8dd19c21e50335b7f9a5de2081074a331b5972f7fa4eacbd61745e3da3424086f5f35e64a2df909d866973d96c3268fa758bdd2f36c
+  metadata.gz: 46eaa353cfaff0414fd857f0a7a763f169ec89d26a182e648419f0b8546db2bbf5397a943993b5ab8d27a3865940ae504106c6c58c114ac4bd02f3a2e8f63d03
+  data.tar.gz: b9e8e4b15f749739b968078d827f7b485acde671b51866f1b960a8aa25922d9d4e13c0f833f90735e5474ff1f1cdd27a61abe5eb6d3f483cfeffff678eb2e8c4

data/.env.local

@@ -0,0 +1 @@
+DATABASE_URL="mysql2://root:@mysql/"

data/.github/workflows/tests.yml

@@ -10,15 +10,16 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - '2.7'
-          - '3.0'
-          - '3.1'
           - '3.2'
+          - '3.3'
+          - '3.4'
+          - '4.0'
         rails:
-          - '6.0'
-          - '6.1'
-
-    runs-on: ubuntu-latest
+          - '7.1'
+          - '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

@@ -11,3 +11,6 @@
 .rspec_status
 
 gemfiles/*.lock
+.env.local
+*.gem
+/.claude

data/Appraisals

@@ -1,12 +1,15 @@
-appraise "rails-6.0" do
-  gem "rails", "~> 6.0.0"
+appraise "rails-7.1" do
+  gem "rails", "~> 7.1.0"
 end
 
-appraise "rails-6.1" do
-  gem "rails", "~> 6.1.0"
+appraise "rails-7.2" do
+  gem "rails", "~> 7.2.0"
 end
 
-# Rails 7.0 doesn't work yet
-# appraise "rails-7.0" do
-#   gem "rails", "~> 7.0"
-# end
+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
 
@@ -6,4 +6,5 @@ RUN mkdir -p lib/sql_enum gemfiles
 COPY lib/sql_enum/version.rb  ./lib/sql_enum/
 COPY gemfiles/*.gemfile gemfiles/
 COPY sql_enum.gemspec Gemfile Gemfile.lock Appraisals ./
-RUN bundle install && exec appraisal install
+RUN bundle install && \
+    bundle exec appraisal install

data/Gemfile

@@ -1,6 +1,6 @@
-source "https://gem-proxy.chime.com"
+source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in sql_enum.gemspec
 gemspec

data/Gemfile.lock

@@ -1,43 +1,65 @@
 PATH
   remote: .
   specs:
-    sql_enum (0.4.0)
-      activerecord (>= 6.0, < 7.0)
-      activesupport (>= 6.0, < 7.0)
+    sql_enum (2.0.0)
+      activerecord (>= 7.1.0)
+      activesupport (>= 7.1.0)
       mysql2
 
 GEM
-  remote: https://gem-proxy.chime.com/
+  remote: https://rubygems.org/
   specs:
-    activemodel (6.1.7.6)
-      activesupport (= 6.1.7.6)
-    activerecord (6.1.7.6)
-      activemodel (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
-    activesupport (6.1.7.6)
-      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)
-      zeitwerk (~> 2.3)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
-    concurrent-ruby (1.2.2)
-    debug (1.8.0)
-      irb (>= 1.5.0)
-      reline (>= 0.3.1)
+    awesome_print (1.9.2)
+    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.6.0)
-    irb (1.7.4)
-      reline (>= 0.3.6)
-    minitest (5.19.0)
+    io-console (0.7.2)
+    irb (1.11.1)
+      rdoc
+      reline (>= 0.4.2)
+    json (2.18.1)
+    logger (1.7.0)
+    minitest (6.0.1)
+      prism (~> 1.5)
     mysql2 (0.5.5)
-    rake (13.0.6)
-    reline (0.3.8)
+    prism (1.9.0)
+    psych (5.1.2)
+      stringio
+    rake (13.1.0)
+    rdoc (6.6.3.1)
+      psych (>= 4.0.0)
+    reline (0.4.2)
       io-console (~> 0.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -52,10 +74,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
-    thor (1.2.2)
+    securerandom (0.4.1)
+    stringio (3.1.0)
+    thor (1.3.0)
+    timeout (0.6.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.11)
+    uri (1.1.1)
 
 PLATFORMS
   ruby
@@ -63,6 +88,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  awesome_print
   bundler
   debug
   rake (~> 13.0)
@@ -70,4 +96,4 @@ DEPENDENCIES
   sql_enum!
 
 BUNDLED WITH
-   2.2.30
+   2.5.5

data/README.md

@@ -2,6 +2,12 @@
 
 Enables usage of native sql enums with ActiveRecord
 
+## NOTE
+
+Version 2.0 of this gem requires Rails 7.1+ and Ruby 3.2+.
+
+For Rails 7.0 and 7.1, use version 1.0. For Rails versions below 7, use version 0.4.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -24,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
@@ -52,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/docker-compose.yml

@@ -12,12 +12,13 @@ services:
 
   mysql:
     image: mysql:5.7
+    platform: linux/amd64
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
       - MYSQL_DATABASE
       - MYSQL_USER
       - MYSQL_PASSWORD
     healthcheck:
-      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
       timeout: 20s
       retries: 10

data/gemfiles/{rails_5.1.gemfile → rails_7.1.gemfile}

@@ -1,7 +1,7 @@
 # This file was generated by Appraisal
 
-source "https://gem-proxy.chime.com"
+source "https://rubygems.org"
 
-gem "rails", "~> 5.1.0"
+gem "rails", "~> 7.1.0"
 
 gemspec path: "../"

data/gemfiles/{rails_5.2.gemfile → rails_7.2.gemfile}

@@ -1,7 +1,7 @@
 # This file was generated by Appraisal
 
-source "https://gem-proxy.chime.com"
+source "https://rubygems.org"
 
-gem "rails", "~> 5.2.0"
+gem "rails", "~> 7.2.0"
 
 gemspec path: "../"

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

@@ -1,7 +1,7 @@
 # This file was generated by Appraisal
 
-source "https://gem-proxy.chime.com"
+source "https://rubygems.org"
 
-gem "rails", "~> 6.0.0"
+gem "rails", "~> 8.0.0"
 
 gemspec path: "../"

data/gemfiles/{rails_6.1.gemfile → rails_8.1.gemfile}

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

data/lib/active_record/connection_adapters/abstract_mysql.rb

@@ -1,22 +1,18 @@
-# This module fails in Rails 7.0 becuase the method being modified has been
-# changed to a class method.
-
 module ActiveRecord
   module ConnectionAdapters
     class AbstractMysqlAdapter
-      def initialize_type_map_with_enum(m = type_map)
-        initialize_without_enum(m)
-        register_enum_type(m)
-      end
-
-      alias_method :initialize_without_enum, :initialize_type_map
-      alias_method :initialize_type_map, :initialize_type_map_with_enum
-
-      def register_enum_type(mapping)
-        mapping.register_type(%r(enum)i) do |sql_type|
-          Type::Enum.new(limit: sql_type.scan(/'(.*?)'/).flatten)
+      class << self
+        def register_enum_type(mapping)
+          mapping.register_type(%r(enum)i) do |sql_type|
+            Type::Enum.new(limit: sql_type.to_s.scan(/'(.*?)'/).flatten)
+          end
         end
       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

@@ -1,6 +1,9 @@
 module SqlEnum
   module ClassMethods
     def sql_enum(column_name, options = {})
+      # skip redefinitions
+      return if defined_enums.key?(column_name.to_s)
+
       # Query values
       enum_column = EnumColumn.new(table_name, column_name)
       values_map = enum_column.values.to_h { |value| [value.to_sym, value.to_s] }
@@ -10,15 +13,19 @@ 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) }
-      case method(:decorate_attribute_type).arity
-      when 2 # Rails 5.1, 5.2, 6.0
-        decorate_attribute_type(column_name, :enum, &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
-        decorate_attribute_type(column_name, &type_definition)
+        attribute(column_name, &enum_type)
       end
 
       prefix_str = format_affix(column_name, prefix, suffix: '_')
@@ -26,8 +33,8 @@ module SqlEnum
 
       # Fix query methods to compare symbols to symbols
       values_map.each_value do |value|
-        method_name = "#{prefix_str}#{value}#{suffix_str}"
-        define_method("#{method_name}?") { self[column_name] == value.to_sym }
+        method_name = "#{prefix_str}#{value}#{suffix_str}?"
+        define_method(method_name) { self[column_name] == value.to_sym }
       end
     end
 

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 = "0.4.0"
+  VERSION = "2.0.0"
 end

data/sql_enum.gemspec

@@ -25,11 +25,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", ">= 6.0", "< 7.0"
-  spec.add_dependency "activerecord", ">= 6.0", "< 7.0"
+  spec.required_ruby_version = ">= 3.2.0"
+
   spec.add_dependency "mysql2"
+  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"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "debug"
   spec.add_development_dependency "rake", "~> 13.0"

metadata

@@ -1,63 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: sql_enum
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Fletcher Fowler
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
-    - - "<"
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -65,7 +66,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -134,7 +135,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description:
 email:
 - fletch@fzf.me
 executables: []
@@ -142,6 +142,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".env"
+- ".env.local"
 - ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rspec"
@@ -157,11 +158,10 @@ files:
 - bin/console
 - bin/setup
 - docker-compose.yml
-- gemfiles/rails_5.1.gemfile
-- gemfiles/rails_5.2.gemfile
-- gemfiles/rails_6.0.gemfile
-- 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
@@ -180,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
@@ -188,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.1.6
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Enable using native sql enums
 test_files: []

data/gemfiles/rails_7.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://gem-proxy.chime.com"
-
-gem "rails", "~> 7.0.0"
-
-gemspec path: "../"