Fix issue with pgsql when usage column is enabled

ethercreative · Oct 24, 2019 · 7f2773f · 7f2773f
1 parent cb8038b
commit 7f2773f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [Unreleased] 1.0.6
+### Fixed
+- Fix issue with pgsql when usage column is enabled
+
 ## 1.0.5 - 2019-06-26
 ### Added
 - Add 'Usage' column to tags index table (#10)

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "ether/tags",
   "description": "A tag manager for Craft 3",
   "type": "craft-plugin",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "keywords": [
     "craft",
     "cms",

diff --git a/src/elements/db/TagQuery.php b/src/elements/db/TagQuery.php
@@ -20,19 +20,22 @@
 class TagQuery extends \craft\elements\db\TagQuery
 {
 
-	protected function beforePrepare (): bool
+	protected function afterPrepare (): bool
 	{
 		if (!TagManager::getInstance()->getSettings()->enableUsage)
-			return parent::beforePrepare();
+			return parent::afterPrepare();
+
+		if (count($this->query->select) === 1 && strtoupper($this->query->select[0]) === 'COUNT(*)')
+			return parent::afterPrepare();
 
 		$getUsage = new Expression(
 			'(SELECT COUNT(*) FROM (SELECT [[r.sourceId]], [[r.sourceSiteId]] FROM {{%relations}} r WHERE [[r.targetId]] = [[elements.id]] GROUP BY [[r.sourceId]], [[r.sourceSiteId]]) as usage) as [[usage]]'
 		);
 
-		$this->addSelect($getUsage);
+		$this->query->addSelect(new Expression('[[subquery.usage]] as [[usage]]'));
 		$this->subQuery->addSelect($getUsage);
 
-		return parent::beforePrepare();
+		return parent::afterPrepare();
 	}
 
 }