From b9b289fe8404fa3f737add126e53d2dfdbf4d23c Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Wed, 7 Jun 2023 11:33:15 +0200 Subject: [PATCH 1/2] feat: fix deprecation for AbstractPlatform->getIsNullExpression() --- src/SoftDeleteable/Filter/SoftDeleteableFilter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SoftDeleteable/Filter/SoftDeleteableFilter.php b/src/SoftDeleteable/Filter/SoftDeleteableFilter.php index 9958099006..f37be7d11e 100644 --- a/src/SoftDeleteable/Filter/SoftDeleteableFilter.php +++ b/src/SoftDeleteable/Filter/SoftDeleteableFilter.php @@ -71,7 +71,7 @@ public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAli $column = $quoteStrategy->getColumnName($config['fieldName'], $targetEntity, $platform); - $addCondSql = $platform->getIsNullExpression($targetTableAlias.'.'.$column); + $addCondSql = $targetTableAlias.'.'.$column . ' IS NULL'; if (isset($config['timeAware']) && $config['timeAware']) { $addCondSql = "({$addCondSql} OR {$targetTableAlias}.{$column} > {$platform->getCurrentTimestampSQL()})"; } From a5643ab572cac1ef489557c223a9b4b24580310c Mon Sep 17 00:00:00 2001 From: chris Date: Mon, 19 Jun 2023 16:19:26 +0200 Subject: [PATCH 2/2] Update src/SoftDeleteable/Filter/SoftDeleteableFilter.php Co-authored-by: Javier Spagnoletti --- src/SoftDeleteable/Filter/SoftDeleteableFilter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SoftDeleteable/Filter/SoftDeleteableFilter.php b/src/SoftDeleteable/Filter/SoftDeleteableFilter.php index f37be7d11e..e9dbd399ed 100644 --- a/src/SoftDeleteable/Filter/SoftDeleteableFilter.php +++ b/src/SoftDeleteable/Filter/SoftDeleteableFilter.php @@ -71,7 +71,7 @@ public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAli $column = $quoteStrategy->getColumnName($config['fieldName'], $targetEntity, $platform); - $addCondSql = $targetTableAlias.'.'.$column . ' IS NULL'; + $addCondSql = $targetTableAlias.'.'.$column.' IS NULL'; if (isset($config['timeAware']) && $config['timeAware']) { $addCondSql = "({$addCondSql} OR {$targetTableAlias}.{$column} > {$platform->getCurrentTimestampSQL()})"; }