Issue #3341387 by acbramley, dww: Clean up the node_uid_revision handlers (477e383f) · Commits · project / drupal

core/modules/node/src/Plugin/views/UidRevisionTrait.php

0 → 100644

+38 −0

Original line number	Diff line number	Diff line
		<?php

		declare(strict_types=1);

		namespace Drupal\node\Plugin\views;

		/**
		* Checks for nodes that a user posted or created a revision on.
		*/
		trait UidRevisionTrait {

		/**
		* Checks for nodes that a user posted or created a revision on.
		*
		* @param array $uids
		* A list of user ids.
		* @param int $group
		* See \Drupal\views\Plugin\views\query\Sql::addWhereExpression() $group.
		*/
		public function uidRevisionQuery(array $uids, int $group = 0): void {
		$this->ensureMyTable();

		// As per https://www.php.net/manual/en/pdo.prepare.php "you cannot use a
		// named parameter marker of the same name more than once in a prepared
		// statement".
		$placeholder_1 = $this->placeholder() . '[]';
		$placeholder_2 = $this->placeholder() . '[]';

		$args = array_values($uids);

		$this->query->addWhereExpression($group, "$this->tableAlias.uid IN ($placeholder_1) OR
		EXISTS (SELECT 1 FROM {node_revision} nr WHERE nr.revision_uid IN ($placeholder_2) AND nr.nid = $this->tableAlias.nid)", [
		$placeholder_1 => $args,
		$placeholder_2 => $args,
		]);
		}

		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@

		namespace Drupal\node\Plugin\views\argument;

		use Drupal\node\Plugin\views\UidRevisionTrait;
		use Drupal\user\Plugin\views\argument\Uid;
		use Drupal\views\Attribute\ViewsArgument;

		@@ -15,13 +16,13 @@
		)]
		class UidRevision extends Uid {

		use UidRevisionTrait;

		/**
		* {@inheritdoc}
		*/
		public function query($group_by = FALSE) {
		$this->ensureMyTable();
		$placeholder = $this->placeholder();
		$this->query->addWhereExpression(0, "$this->tableAlias.uid = $placeholder OR ((SELECT COUNT(DISTINCT vid) FROM {node_revision} nr WHERE nr.revision_uid = $placeholder AND nr.nid = $this->tableAlias.nid) > 0)", [$placeholder => $this->argument]);
		$this->uidRevisionQuery([$this->argument]);
		}

		}

+4 −9

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@

		namespace Drupal\node\Plugin\views\filter;

		use Drupal\node\Plugin\views\UidRevisionTrait;
		use Drupal\user\Plugin\views\filter\Name;
		use Drupal\views\Attribute\ViewsFilter;

		@@ -13,19 +14,13 @@
		#[ViewsFilter("node_uid_revision")]
		class UidRevision extends Name {

		use UidRevisionTrait;

		/**
		* {@inheritdoc}
		*/
		public function query($group_by = FALSE) {
		$this->ensureMyTable();

		$placeholder = $this->placeholder() . '[]';

		$args = array_values($this->value);

		$this->query->addWhereExpression($this->options['group'], "$this->tableAlias.uid IN($placeholder) OR
		((SELECT COUNT(DISTINCT vid) FROM {node_revision} nr WHERE nr.revision_uid IN ($placeholder) AND nr.nid = $this->tableAlias.nid) > 0)", [$placeholder => $args],
		$args);
		$this->uidRevisionQuery($this->value, $this->options['group']);
		}

		}