From b377b996d5dbd995d6da403eeb8f990cbe258850 Mon Sep 17 00:00:00 2001 From: Jeff Keen <jeff@keen.me> Date: Tue, 5 Nov 2024 18:06:22 -0600 Subject: [PATCH 1/3] account for rendering change in ruby 3.4 tests (#484) --- spec/schema_diff_spec.rb | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/spec/schema_diff_spec.rb b/spec/schema_diff_spec.rb index 64bfd480..ae6d0038 100644 --- a/spec/schema_diff_spec.rb +++ b/spec/schema_diff_spec.rb @@ -490,9 +490,15 @@ def self.name end it "returns error" do - expect(diff).to eq([ - 'SchemaDiff::EmployeeResource: default sort changed from [{:foo=>"asc"}] to [{:foo=>"desc"}].' - ]) + if RUBY_VERSION >= "3.4" + expect(diff).to eq([ + 'SchemaDiff::EmployeeResource: default sort changed from [{foo: "asc"}] to [{foo: "desc"}].' + ]) + else + expect(diff).to eq([ + 'SchemaDiff::EmployeeResource: default sort changed from [{:foo=>"asc"}] to [{:foo=>"desc"}].' + ]) + end end end @@ -1204,9 +1210,15 @@ def self.name end it "returns error" do - expect(diff).to eq([ - 'Endpoint "/schema_diff/employees" had incompatible sideload allowlist. Was [{:positions=>"department"}, "same"], now ["positions", "same"].' - ]) + if RUBY_VERSION >= "3.4" + expect(diff).to eq([ + 'Endpoint "/schema_diff/employees" had incompatible sideload allowlist. Was [{positions: "department"}, "same"], now ["positions", "same"].' + ]) + else + expect(diff).to eq([ + 'Endpoint "/schema_diff/employees" had incompatible sideload allowlist. Was [{:positions=>"department"}, "same"], now ["positions", "same"].' + ]) + end end end end From 68e2492032692d8bb928a733f8b0f8710be31c49 Mon Sep 17 00:00:00 2001 From: Edward Faulkner <edward@eaf4.com> Date: Tue, 5 Nov 2024 19:10:56 -0500 Subject: [PATCH 2/3] fix: Gem version check (#483) --- lib/graphiti/adapters/active_record.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/graphiti/adapters/active_record.rb b/lib/graphiti/adapters/active_record.rb index 366ac71a..c474c183 100644 --- a/lib/graphiti/adapters/active_record.rb +++ b/lib/graphiti/adapters/active_record.rb @@ -304,7 +304,7 @@ def destroy(model_instance) end def close - if ::ActiveRecord.version > "7.2" + if ::ActiveRecord.version > Gem::Version.new("7.2") ::ActiveRecord::Base.connection_handler.clear_active_connections! else ::ActiveRecord::Base.clear_active_connections! From 7ce9cdbf8908f93071247d1298cf53ec5da98c9e Mon Sep 17 00:00:00 2001 From: semantic-release-bot <semantic-release-bot@martynus.net> Date: Wed, 6 Nov 2024 00:12:46 +0000 Subject: [PATCH 3/3] 1.7.6 CHANGELOG [skip ci] ## [1.7.6](https://github.com/graphiti-api/graphiti/compare/v1.7.5...v1.7.6) (2024-11-06) ### Bug Fixes * Gem version check ([#483](https://github.com/graphiti-api/graphiti/issues/483)) ([68e2492](https://github.com/graphiti-api/graphiti/commit/68e2492032692d8bb928a733f8b0f8710be31c49)) --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e84a3dd..f01d7c5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ graphiti changelog +## [1.7.6](https://github.com/graphiti-api/graphiti/compare/v1.7.5...v1.7.6) (2024-11-06) + + +### Bug Fixes + +* Gem version check ([#483](https://github.com/graphiti-api/graphiti/issues/483)) ([68e2492](https://github.com/graphiti-api/graphiti/commit/68e2492032692d8bb928a733f8b0f8710be31c49)) + ## [1.7.5](https://github.com/graphiti-api/graphiti/compare/v1.7.4...v1.7.5) (2024-09-16)