Merge branch '5.x' into 6.x

# Conflicts:
#	CHANGELOG.md

Author: angrybrad

CHANGELOG.md

@@ -11,6 +11,7 @@
 - Fixed a bug that could occur when importing into a Matrix field with no blocks. ([#1622](https://github.com/craftcms/feed-me/pull/1622))
 - Fixed a bug that would happen when matching elements on the keywords `and` and `or`. ([#1629](https://github.com/craftcms/feed-me/pull/1629))
 - Fixes a bug where importing _only_ a title for a Matrix entry would result in that nested entry not being imported. ([#1630](https://github.com/craftcms/feed-me/pull/1630))
+- Fixed an issue that could occur when running garbage collection before importing a feed when using PostgreSQL. ([#1632](https://github.com/craftcms/feed-me/pull/1632))
 - Fixed a regression that happened in 5.3.0 where imports into relational field would not remove existing relations if it was required. ([#1623](https://github.com/craftcms/feed-me/pull/1623))
 - Fixed a regression where `EVENT_BEFORE_PROCESS_FEED` was called once per batch and not once per page. ([#1628](https://github.com/craftcms/feed-me/pull/1628))
 

src/services/Process.php

@@ -84,6 +84,14 @@ public function beforeProcessFeed(FeedModel $feed, array $feedData)
             $gc = Craft::$app->getGc();
             $gc->deleteAllTrashed = true;
             $gc->run(true);
+
+            // close DB connection so that \PDO::ATTR_EMULATE_PREPARES is set back to false;
+            // https://github.com/yiisoft/yii2/blob/2.0.52/framework/db/pgsql/QueryBuilder.php#L225
+            // this caused an SQL error when using pgsql and attempting to match existing elements
+            // based on e.g. title that consists of only a number;
+            // "SQLSTATE[42883]: Undefined function: 7 ERROR: operator does not exist: character varying = bigint LINE 8"
+            // "HINT: No operator matches the given name and argument types. You might need to add explicit type casts."
+            Craft::$app->getDb()->close();
         } else {
             Plugin::getInstance()->getLogs()->prune();
         }