From 65a639a66daa9066fa040e4343872069f1db77e3 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Wed, 5 Jun 2024 12:11:27 +0200 Subject: [PATCH 1/2] Pass additional arguments --- lib/arel/middleware/postgresql_adapter.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/arel/middleware/postgresql_adapter.rb b/lib/arel/middleware/postgresql_adapter.rb index b928e913..14b8463e 100644 --- a/lib/arel/middleware/postgresql_adapter.rb +++ b/lib/arel/middleware/postgresql_adapter.rb @@ -38,20 +38,20 @@ def query(sql, name = nil) end end - def exec_no_cache(sql, name, binds, async: false) + def exec_no_cache(sql, name, binds, async: false, **additional_arguments) Arel::Middleware.current_chain.execute(sql, binds) do |processed_sql, processed_binds| Arel::Middleware::Result.create( - data: super(processed_sql, name, processed_binds, async: async), + data: super(processed_sql, name, processed_binds, async: async, **additional_arguments), from: Arel::Middleware::PGResult, to: Arel::Middleware::PGResult, ) end end - def exec_cache(sql, name, binds, async: false) + def exec_cache(sql, name, binds, async: false, **additional_arguments) Arel::Middleware.current_chain.execute(sql, binds) do |processed_sql, processed_binds| Arel::Middleware::Result.create( - data: super(processed_sql, name, processed_binds, async: async), + data: super(processed_sql, name, processed_binds, async: async, **additional_arguments), from: Arel::Middleware::PGResult, to: Arel::Middleware::PGResult, ) From 0256ed8000bf4ced58d2597301cc49adf1096542 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Wed, 5 Jun 2024 14:20:03 +0200 Subject: [PATCH 2/2] Good guy: update version, gemspec, changelog --- CHANGELOG.md | 8 ++++++++ arel_toolkit.gemspec | 2 +- lib/arel_toolkit/version.rb | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac13d920..22903f38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [v0.7.0](https://github.com/mvgijssel/arel_toolkit/tree/v0.7.0) (2023-06-05) + +[Full Changelog](https://github.com/mvgijssel/arel_toolkit/compare/v0.6.0...v0.7.0) + +**Implemented enhancements:** + +- ActiveRecord 7.1 support + ## [v0.6.0](https://github.com/mvgijssel/arel_toolkit/tree/v0.6.0) (2023-04-17) [Full Changelog](https://github.com/mvgijssel/arel_toolkit/compare/v0.5.0...v0.6.0) diff --git a/arel_toolkit.gemspec b/arel_toolkit.gemspec index 9e813772..fad4f626 100644 --- a/arel_toolkit.gemspec +++ b/arel_toolkit.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |spec| spec.require_paths = ['lib'] spec.extensions = ['ext/pg_result_init/extconf.rb'] - spec.add_dependency 'activerecord', '>= 7.0', '< 8' + spec.add_dependency 'activerecord', '>= 7.1', '< 8' spec.add_dependency 'pg', '>= 1.1.4' spec.add_dependency 'pg_query', '~> 2.2' diff --git a/lib/arel_toolkit/version.rb b/lib/arel_toolkit/version.rb index 8b605e72..8cf962b0 100644 --- a/lib/arel_toolkit/version.rb +++ b/lib/arel_toolkit/version.rb @@ -1,3 +1,3 @@ module ArelToolkit - VERSION = '0.6.0'.freeze + VERSION = '0.7.0'.freeze end