Update Feed Me integration

src/integrations/NodeFeedMeElement.php

@@ -119,23 +119,22 @@ protected function parseElementId($feedData, $fieldInfo): ?int
 
         $elementId = null;
 
-        // Because we can match on element attributes and custom fields, AND we're directly using SQL
-        // queries in our `where` below, we need to check if we need a prefix for custom fields accessing
-        // the content table.
-        $columnName = $match;
+        $query = (new Query())
+            ->select(['elements.id', 'elements_sites.elementId', 'elements_sites.title', 'elements_sites.slug', 'elements_sites.uri', 'elements_sites.content'])
+            ->from(['{{%elements}} elements'])
+            ->innerJoin('{{%elements_sites}} elements_sites', '[[elements_sites.elementId]] = [[elements.id]]')
+            ->andWhere(['dateDeleted' => null]);
+
+        // Check if we're query a column or a custom field
+        if (in_array($match, ['title', 'slug', 'uri'])) {
+            $query->andWhere(['=', $match, $value]);
+        } else {
+            $contentQuery = Craft::$app->getDb()->getQueryBuilder()->jsonContains('content', [$match => $value]);
 
-        if (Craft::$app->getFields()->getFieldByHandle($match)) {
-            $columnName = Craft::$app->getFields()->oldFieldColumnPrefix . $match;
+            $query->andWhere($contentQuery);
         }
 
-        $result = (new Query())
-            ->select(['elements.id', 'elements_sites.elementId'])
-            ->from(['{{%elements}} elements'])
-            ->innerJoin('{{%elements_sites}} elements_sites', '[[elements_sites.elementId]] = [[elements.id]]')
-            ->innerJoin('{{%content}} content', '[[content.elementId]] = [[elements.id]]')
-            ->where(['=', $columnName, $value])
-            ->andWhere(['dateDeleted' => null])
-            ->one();
+        $result = $query->one();
 
         if ($result) {
             $elementId = $result['id'];