Merge pull request #55 from k2nr/fix-for-activerecord-7.0.5

Make ulid-rails work with ActiveRecord v7.0.5

.env

@@ -1 +1 @@
-RUBY_VERSION=2.6
+RUBY_VERSION=2.7

.github/workflows/lint.yml

@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - master
+  workflow_dispatch:
 
 jobs:
   standardrb:

.github/workflows/test.yml

@@ -6,14 +6,16 @@ on:
   push:
     branches:
       - master
+  workflow_dispatch:
 
 jobs:
   tests:
+    name: ActiveRecord ${{ matrix.activerecord-version }} / Ruby ${{ matrix.ruby-version }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        activerecord-version: ["5.0", "5.1", "5.2", "6.0", "6.1", "7.0"]
+        activerecord-version: ["5.0", "5.1", "5.2", "6.0", "6.1", "7.0", "7.0.5"]
         ruby-version: ["2.7", "3.0", "3.1", "3.2"]
         exclude:
           - {activerecord-version: "5.0", ruby-version: "3.0"}
@@ -28,5 +30,7 @@ jobs:
           - {activerecord-version: "6.0", ruby-version: "3.1"}
     steps:
       - uses: actions/checkout@v3
-      - name: Test ActiveRecord ${{ matrix.activerecord-version }} and Ruby ${{ matrix.ruby-version }}
-        run: RUBY_VERSION=${{ matrix.ruby-version }} docker-compose run -e AR_VERSION=${{ matrix.activerecord-version }} test
+      - run: docker-compose run test
+        env:
+          RUBY_VERSION: ${{ matrix.ruby-version }}
+          AR_VERSION: ${{ matrix.activerecord-version }}

CHANGELOG.md

@@ -2,7 +2,10 @@
 
 ## Unreleased
 
+## 1.1.1
+
 - Drop support for ruby 2.6.
+- Fix compatibility with ActiveRecord 7.0.5+.
 
 ## 1.1.0
 

README.md

@@ -112,7 +112,7 @@ You need to specicfy `type` option
 
 Please note that this library doesn't work properly with `has_and_belongs_to_many` associations.
 
-Our recommendation is to be explicit and instead use the `has_many, through: join_class` association. 
+Our recommendation is to be explicit and instead use the `has_many, through: join_class` association.
 Notice that for it to work properly you must specify the `has_many` to the join class in the main classes of the association,
 and your join class must have `belongs_to` main classes defined as shown in the example below:
 

docker-compose.yml

@@ -1,8 +1,10 @@
 version: '3.6'
 services:
   test:
-    image: "ruby:${RUBY_VERSION}" 
+    image: "ruby:${RUBY_VERSION}"
     command: sh -c "rm -f Gemfile.lock && bundle install && bin/run_tests"
+    environment:
+      - AR_VERSION=${AR_VERSION}
     depends_on:
       pg12:
         condition: service_healthy
@@ -23,20 +25,20 @@ services:
       MYSQL_ROOT_PASSWORD: password
     command: --innodb-large-prefix --innodb-file-format=barracuda
     healthcheck:
-      test:  mysql --password=password -e "show databases;"
+      test: mysql --password=password -e "show databases;"
   mysql57:
     image: mysql:5.7
     environment:
       MYSQL_ROOT_PASSWORD: password
     healthcheck:
-      test:  mysql --password=password -e "show databases;"
+      test: mysql --password=password -e "show databases;"
   mysql80:
     image: mysql:8.0
     command: --default-authentication-plugin=mysql_native_password
     environment:
       MYSQL_ROOT_PASSWORD: password
     healthcheck:
-      test:  mysql --password=password -e "show databases;"
+      test: mysql --password=password -e "show databases;"
   pg12:
     image: postgres:12
     environment:

gemfiles/7.0.5.gemfile

@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "activesupport", "~> 7.0.5"
+gem "activemodel", "~> 7.0.5"
+gem "activerecord", "~> 7.0.5"
+gem "sqlite3", "~> 1.4"
+gem "mysql2", "~> 0.5"
+gem "pg", "~> 1.1"

gemfiles/7.0.gemfile

@@ -2,9 +2,9 @@ source "https://rubygems.org"
 
 gemspec path: ".."
 
-gem "activesupport", "~> 7.0.0"
-gem "activemodel", "~> 7.0.0"
-gem "activerecord", "~> 7.0.0"
+gem "activesupport", "~> 7.0.0", "< 7.0.5"
+gem "activemodel", "~> 7.0.0", "< 7.0.5"
+gem "activerecord", "~> 7.0.0", "< 7.0.5"
 gem "sqlite3", "~> 1.4"
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"

lib/ulid/rails/type.rb

@@ -23,9 +23,24 @@ def assert_valid_value(value)
       def deserialize(value)
         return nil if value.nil?
 
-        value = value.to_s if value.is_a?(Data)
-        value = value.unpack1("H*") if value.encoding == Encoding::ASCII_8BIT
-        value = value[2..-1] if value.start_with?("\\x")
+        case adapter
+        when "mysql2"
+          if value.is_a?(Data)
+            value = value.to_s
+          elsif value.is_a?(String)
+            value = value.unpack1("H*")
+          end
+        when "postgresql"
+          if value.is_a?(Data)
+            value = value.to_s
+            value = value.unpack1("H*")
+          end
+          value = value[2..-1] if value.start_with?("\\x")
+        when "sqlite3"
+          if value.is_a?(Data)
+            value = value.to_s
+          end
+        end
 
         value.length == 32 ? @formatter.format(value) : super
       end

lib/ulid/rails/version.rb

@@ -1,5 +1,5 @@
 module ULID
   module Rails
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end