From 8fe6d7f75da79e731593fe355a7b5b019d7cf2f8 Mon Sep 17 00:00:00 2001 From: Hank Jordan Date: Sat, 1 May 2021 17:51:41 -0400 Subject: [PATCH 1/3] Fix #26085 Signed-off-by: Henry Jordan --- lib/private/DB/QueryBuilder/QuoteHelper.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/private/DB/QueryBuilder/QuoteHelper.php b/lib/private/DB/QueryBuilder/QuoteHelper.php index b50ff554a6..735f1596e0 100644 --- a/lib/private/DB/QueryBuilder/QuoteHelper.php +++ b/lib/private/DB/QueryBuilder/QuoteHelper.php @@ -57,6 +57,10 @@ class QuoteHelper { if ($string === null || $string === 'null' || $string === '*') { return $string; } + + if ($string instanceof \Doctrine\DBAL\Schema\Column) { + return $string->getName(); + } if (!is_string($string)) { throw new \InvalidArgumentException('Only strings, Literals and Parameters are allowed'); From 1f1501b0280833abcfff19b7d2990633b6b7e1c1 Mon Sep 17 00:00:00 2001 From: Hank Jordan Date: Mon, 3 May 2021 10:28:34 -0400 Subject: [PATCH 2/3] Update lib/private/DB/QueryBuilder/QuoteHelper.php Signed-off-by: Henry Jordan Co-authored-by: Julien Veyssier --- lib/private/DB/QueryBuilder/QuoteHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/DB/QueryBuilder/QuoteHelper.php b/lib/private/DB/QueryBuilder/QuoteHelper.php index 735f1596e0..9338d9f8a3 100644 --- a/lib/private/DB/QueryBuilder/QuoteHelper.php +++ b/lib/private/DB/QueryBuilder/QuoteHelper.php @@ -58,7 +58,7 @@ class QuoteHelper { return $string; } - if ($string instanceof \Doctrine\DBAL\Schema\Column) { + if ($string instanceof Column) { return $string->getName(); } From cd92caa2191661092b3901fd36088aef50109dfd Mon Sep 17 00:00:00 2001 From: Hank Jordan Date: Mon, 3 May 2021 10:32:26 -0400 Subject: [PATCH 3/3] Update QuoteHelper.php Signed-off-by: Henry Jordan Co-authored-by: Julien Veyssier --- lib/private/DB/QueryBuilder/QuoteHelper.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/private/DB/QueryBuilder/QuoteHelper.php b/lib/private/DB/QueryBuilder/QuoteHelper.php index 9338d9f8a3..6739672611 100644 --- a/lib/private/DB/QueryBuilder/QuoteHelper.php +++ b/lib/private/DB/QueryBuilder/QuoteHelper.php @@ -27,6 +27,8 @@ use OCP\DB\QueryBuilder\ILiteral; use OCP\DB\QueryBuilder\IParameter; use OCP\DB\QueryBuilder\IQueryFunction; +use Doctrine\DBAL\Schema\Column; + class QuoteHelper { /** * @param array|string|ILiteral|IParameter|IQueryFunction $strings string, Literal or Parameter