From 47f81bc696af5b7e2b7b747d714ba4faa2226d50 Mon Sep 17 00:00:00 2001 From: Joey Tepperman Date: Tue, 18 Jan 2022 16:02:30 -0500 Subject: [PATCH 1/2] Fix `create_versions` migration to support Ruby3 --- lib/generators/paper_trail/install/install_generator.rb | 4 ++-- spec/generators/paper_trail/install_generator_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/generators/paper_trail/install/install_generator.rb b/lib/generators/paper_trail/install/install_generator.rb index 6fc82fe7..e36bb2b4 100644 --- a/lib/generators/paper_trail/install/install_generator.rb +++ b/lib/generators/paper_trail/install/install_generator.rb @@ -41,9 +41,9 @@ def create_migration_file # See /~https://github.com/paper-trail-gem/paper_trail/issues/651 def item_type_options if mysql? - ", { null: false, limit: 191 }" + ", null: false, limit: 191" else - ", { null: false }" + ", null: false" end end diff --git a/spec/generators/paper_trail/install_generator_spec.rb b/spec/generators/paper_trail/install_generator_spec.rb index 10365b2a..4e6e6f2f 100644 --- a/spec/generators/paper_trail/install_generator_spec.rb +++ b/spec/generators/paper_trail/install_generator_spec.rb @@ -33,9 +33,9 @@ }.call expected_item_type_options = lambda { if described_class::MYSQL_ADAPTERS.include?(ActiveRecord::Base.connection.class.name) - ", { null: false, limit: 191 }" + ", null: false, limit: 191" else - ", { null: false }" + ", null: false" end }.call expect(destination_root).to( From 2d018bb1d133248114d889ebec3047e897edb57d Mon Sep 17 00:00:00 2001 From: Joey Tepperman Date: Wed, 9 Mar 2022 15:57:14 -0500 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e255068e..ea4fba03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,8 @@ recommendations of [keepachangelog.com](http://keepachangelog.com/). ### Fixed -- None +- [#1366](/~https://github.com/paper-trail-gem/paper_trail/pull/1366) - + Fixed a bug where the `create_versions` migration lead to a broken `db/schema.rb` for Ruby 3 ### Dependencies