From d9d09b0f9081241000efbc7086c4fcf620750a2c Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Mon, 19 Apr 2021 14:17:53 +0100 Subject: [PATCH 1/2] Fix when quoting ActiveModel::Attribute --- CHANGELOG.md | 1 + lib/active_record/connection_adapters/sqlserver/quoting.rb | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b562aba3a..0e95179de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - [#879](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/879) Added visit method for HomogeneousIn - [#880](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/880) Handle any default column class when deduplicating - [#861](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/861) Fix Rails 6.1 database config +- [#885](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/885) Fix when quoting ActiveModel::Attribute #### Changed diff --git a/lib/active_record/connection_adapters/sqlserver/quoting.rb b/lib/active_record/connection_adapters/sqlserver/quoting.rb index 09d8226bc..c7f5550de 100644 --- a/lib/active_record/connection_adapters/sqlserver/quoting.rb +++ b/lib/active_record/connection_adapters/sqlserver/quoting.rb @@ -118,6 +118,8 @@ def _quote(value) value.quoted when String, ActiveSupport::Multibyte::Chars "#{QUOTED_STRING_PREFIX}#{super}" + when ActiveModel::Attribute + quote(value.value_for_database) else super end From 3f3c8e331f44b5156c9ea89e5ad03951ea8099d9 Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Mon, 19 Apr 2021 14:37:29 +0100 Subject: [PATCH 2/2] Updated changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e95179de..f9e468804 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ - [#879](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/879) Added visit method for HomogeneousIn - [#880](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/880) Handle any default column class when deduplicating - [#861](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/861) Fix Rails 6.1 database config -- [#885](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/885) Fix when quoting ActiveModel::Attribute +- [#885](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/885) Fix the quoting of ActiveModel attributes #### Changed