Fixed #13130

craftcms · Apr 28, 2023 · bc46f3d · bc46f3d
1 parent 6387157
commit bc46f3d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - “Element query executed before Craft is fully initialized” warnings now include a stack trace.
 - Fixed a user enumeration timing attack vulnerability.
 - Fixed a SQL error that could occur when upgrading to Craft 4, if any `matrixblocks` table rows referenced nonexistent element IDs. ([#13121](https://github.com/craftcms/cms/issues/13121))
+- Fixed a SQL error that could occur when upgrading to Craft 4, if anything triggered an asset or volume query. ([#13130](https://github.com/craftcms/cms/issues/13130))
 - Fixed a SQL error that occurred when deleting a category group on PostgreSQL, when configured with a table prefix. ([#13127](https://github.com/craftcms/cms/issues/13127))
 - Fixed a JavaScript error that could occur on the control panel login form.
 

diff --git a/src/elements/db/AssetQuery.php b/src/elements/db/AssetQuery.php
@@ -900,7 +900,6 @@ protected function beforePrepare(): bool
             'assets.uploaderId',
             'assets.filename',
             'assets.kind',
-            'assets.alt',
             'assets.width',
             'assets.height',
             'assets.size',
@@ -910,6 +909,11 @@ protected function beforePrepare(): bool
             'volumeFolders.path AS folderPath',
         ]);
 
+        // todo: cleanup after next breakpoint
+        if (Craft::$app->getDb()->columnExists(Table::ASSETS, 'alt')) {
+            $this->query->addSelect(['assets.alt']);
+        }
+
         if ($this->volumeId) {
             if ($this->volumeId === ':empty:') {
                 $this->subQuery->andWhere(['assets.volumeId' => null]);

diff --git a/src/services/Volumes.php b/src/services/Volumes.php
@@ -586,14 +586,11 @@ public function pruneDeletedField(): void
      */
     private function _createVolumeQuery(): Query
     {
-        return (new Query())
+        $query = (new Query())
             ->select([
                 'id',
                 'name',
                 'handle',
-                'fs',
-                'transformFs',
-                'transformSubpath',
                 'titleTranslationMethod',
                 'titleTranslationKeyFormat',
                 'sortOrder',
@@ -603,6 +600,18 @@ private function _createVolumeQuery(): Query
             ->from([Table::VOLUMES])
             ->where(['dateDeleted' => null])
             ->orderBy(['sortOrder' => SORT_ASC]);
+
+        // todo: cleanup after next breakpoint
+        $db = Craft::$app->getDb();
+        if ($db->columnExists(Table::VOLUMES, 'fs')) {
+            $query->addSelect([
+                'fs',
+                'transformFs',
+                'transformSubpath',
+            ]);
+        }
+
+        return $query;
     }
 
     /**