Fixes an SQL issue that could occur when applying Project Config changes

mmikkel · Aug 21, 2020 · 5d941c8 · 5d941c8
1 parent a9a0066
commit 5d941c8
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Cache Flag Changelog
 
+## 1.2.3 - 2020-08-21
+
+### Fixed
+
+- Fixes an SQL issue that could occur when applying Project Config changes  
+
 ## 1.2.2 - 2020-08-21  
 
 ### Fixed

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "mmikkel/cache-flag",
     "description": "Cold template caches that can be flagged and automatically invalidated.",
     "type": "craft-plugin",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/services/ProjectConfig.php b/src/services/ProjectConfig.php
@@ -29,56 +29,59 @@ public function onProjectConfigChange(ConfigEvent $event)
 
         $uid = $event->tokenMatches[0];
 
-        $id = (new Query())
+        $query = (new Query())
             ->select(['id'])
             ->from(Flags::tableName())
-            ->where(['uid' => $uid])
-            ->scalar();
+            ->where(['uid' => $uid]);
 
-        $isNew = empty($id);
+        $source = \explode(':', $event->newValue['source']);
+        $sourceKey = $source[0] ?? null;
+        $sourceValue = $source[1] ?? null;
 
-        if ($isNew) {
-
-            $source = \explode(':', $event->newValue['source']);
-            $sourceKey = $source[0] ?? null;
-            $sourceValue = $source[1] ?? null;
+        if (!$sourceKey || !$sourceValue) {
+            return;
+        }
 
-            if (!$sourceKey || !$sourceValue) {
+        switch ($sourceKey) {
+            case 'section':
+                $column = 'sectionId';
+                $value = (int)Db::idByUid(Table::SECTIONS, $sourceValue);
+                break;
+            case 'categoryGroup':
+                $column = 'categoryGroupId';
+                $value = (int)Db::idByUid(Table::CATEGORYGROUPS, $sourceValue);
+                break;
+            case 'tagGroup':
+                $column = 'tagGroupId';
+                $value = (int)Db::idByUid(Table::TAGGROUPS, $sourceValue);
+                break;
+            case 'userGroup':
+                $column = 'userGroupId';
+                $value = (int)Db::idByUid(Table::USERGROUPS, $sourceValue);
+                break;
+            case 'volume':
+                $column = 'volumeId';
+                $value = (int)Db::idByUid(Table::VOLUMES, $sourceValue);
+                break;
+            case 'globalSet':
+                $column = 'globalSetId';
+                $value = (int)Db::idByUid(Table::GLOBALSETS, $sourceValue);
+                break;
+            case 'elementType':
+                $column = 'elementType';
+                $value = $sourceValue;
+                break;
+            default:
                 return;
-            }
+        }
 
-            switch ($sourceKey) {
-                case 'section':
-                    $column = 'sectionId';
-                    $value = (int)Db::idByUid(Table::SECTIONS, $sourceValue);
-                    break;
-                case 'categoryGroup':
-                    $column = 'categoryGroupId';
-                    $value = (int)Db::idByUid(Table::CATEGORYGROUPS, $sourceValue);
-                    break;
-                case 'tagGroup':
-                    $column = 'tagGroupId';
-                    $value = (int)Db::idByUid(Table::TAGGROUPS, $sourceValue);
-                    break;
-                case 'userGroup':
-                    $column = 'userGroupId';
-                    $value = (int)Db::idByUid(Table::USERGROUPS, $sourceValue);
-                    break;
-                case 'volume':
-                    $column = 'volumeId';
-                    $value = (int)Db::idByUid(Table::VOLUMES, $sourceValue);
-                    break;
-                case 'globalSet':
-                    $column = 'globalSetId';
-                    $value = (int)Db::idByUid(Table::GLOBALSETS, $sourceValue);
-                    break;
-                case 'elementType':
-                    $column = 'elementType';
-                    $value = $sourceValue;
-                    break;
-                default:
-                    return;
-            }
+        $query->orWhere([$column => $value]);
+
+        $id = $query->scalar();
+
+        $isNew = empty($id);
+
+        if ($isNew) {
 
             $flags = $event->newValue['flags'];
 
@@ -95,6 +98,7 @@ public function onProjectConfigChange(ConfigEvent $event)
             Craft::$app->db->createCommand()
                 ->update(Flags::tableName(), [
                     'flags' => $event->newValue['flags'],
+                    'uid' => $uid,
                 ], ['id' => $id])
                 ->execute();
         }