Issue #3265086 by mondrake, alexpott, pwolanin, VladimirAus, daffie, mfb,... (c6532d8c) · Commits · project / drupal

core/lib/Drupal/Core/Database/StatementInterface.php

+3 −3

Changes for core/lib/Drupal/Core/Database/StatementInterface.php: 3 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -7,12 +7,12 @@
		/**
		* Represents a prepared statement.
		*
		* Child implementations should either extend StatementWrapper:
		* Child implementations should either extend StatementWrapperIterator:
		* @code
		* class Drupal\mymodule\Driver\Database\mydriver\Statement extends Drupal\Core\Database\StatementWrapper {}
		* class Drupal\mymodule\Driver\Database\mydriver\Statement extends Drupal\Core\Database\StatementWrapperIterator {}
		* @endcode
		* or define their own class. If defining their own class, they will also have
		* to implement either the Iterator or IteratorAggregate interface before
		* to implement either the \Iterator or \IteratorAggregate interface before
		* Drupal\Core\Database\StatementInterface:
		* @code
		* class Drupal\mymodule\Driver\Database\mydriver\Statement implements Iterator, Drupal\Core\Database\StatementInterface {}

core/lib/Drupal/Core/Database/StatementIteratorTrait.php

0 → 100644

+145 −0

Changes for core/lib/Drupal/Core/Database/StatementIteratorTrait.php: 145 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		<?php

		namespace Drupal\Core\Database;

		/**
		* StatementInterface iterator trait.
		*
		* Implements the methods required by StatementInterface objects that implement
		* the \Iterator interface.
		*/
		trait StatementIteratorTrait {

		/**
		* Traces if rows can be fetched from the resultset.
		*/
		private bool $isResultsetIterable = FALSE;

		/**
		* The current row, retrieved in the current fetch format.
		*/
		private mixed $resultsetRow = NULL;

		/**
		* The key of the current row.
		*
		* This keeps the index of rows fetched from the underlying statement. It is
		* set to -1 when no rows have been fetched yet.
		*/
		private int $resultsetKey = -1;

		/**
		* Informs the iterator whether rows can be fetched from the resultset.
		*
		* @param bool $valid
		* The result of the execution of the client statement.
		*/
		protected function markResultsetIterable(bool $valid): void {
		$this->isResultsetIterable = $valid;
		$this->resultsetRow = NULL;
		if ($valid === TRUE) {
		$this->resultsetKey = -1;
		}
		}

		/**
		* Sets the current resultset row for the iterator, and increments the key.
		*
		* @param mixed $row
		* The last row fetched from the client statement.
		*/
		protected function setResultsetCurrentRow(mixed $row): void {
		$this->resultsetRow = $row;
		$this->resultsetKey++;
		}

		/**
		* Returns the row index of the current element in the resultset.
		*
		* @return int
		* The row index of the current element in the resultset.
		*/
		protected function getResultsetCurrentRowIndex(): int {
		return $this->resultsetKey;
		}

		/**
		* Informs the iterator that no more rows can be fetched from the resultset.
		*/
		protected function markResultsetFetchingComplete(): void {
		$this->markResultsetIterable(FALSE);
		}

		/**
		* Returns the current element.
		*
		* @see https://www.php.net/manual/en/iterator.current.php
		*
		* @internal This method should not be called directly.
		*/
		public function current(): mixed {
		return $this->resultsetRow;
		}

		/**
		* Returns the key of the current element.
		*
		* @see https://www.php.net/manual/en/iterator.key.php
		*
		* @internal This method should not be called directly.
		*/
		public function key(): mixed {
		return $this->resultsetKey;
		}

		/**
		* Rewinds back to the first element of the Iterator.
		*
		* This is the first method called when starting a foreach loop. It will not
		* be executed after foreach loops.
		*
		* @see https://www.php.net/manual/en/iterator.rewind.php
		*
		* @internal This method should not be called directly.
		*/
		public function rewind(): void {
		// Nothing to do: our DatabaseStatement can't be rewound. Error out when
		// attempted.
		// @todo convert the error to an exception in Drupal 11.
		if ($this->resultsetKey >= 0) {
		trigger_error('Attempted rewinding a StatementInterface object when fetching has already started. Refactor your code to avoid rewinding statement objects.', E_USER_WARNING);
		$this->markResultsetIterable(FALSE);
		}
		}

		/**
		* Moves the current position to the next element.
		*
		* This method is called after each foreach loop.
		*
		* @see https://www.php.net/manual/en/iterator.next.php
		*
		* @internal This method should not be called directly.
		*/
		public function next(): void {
		$this->fetch();
		}

		/**
		* Checks if current position is valid.
		*
		* This method is called after ::rewind() and ::next() to check if the
		* current position is valid.
		*
		* @see https://www.php.net/manual/en/iterator.valid.php
		*
		* @internal This method should not be called directly.
		*/
		public function valid(): bool {
		if ($this->isResultsetIterable && $this->resultsetKey === -1) {
		$this->fetch();
		}
		return $this->isResultsetIterable;
		}

		}

core/lib/Drupal/Core/Database/StatementPrefetch.php

+7 −0

Changes for core/lib/Drupal/Core/Database/StatementPrefetch.php: 7 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@

		namespace Drupal\Core\Database;

		@trigger_error('\Drupal\Core\Database\StatementPrefetch is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use \Drupal\Core\Database\StatementPrefetchIterator instead. See https://www.drupal.org/node/3265938', E_USER_DEPRECATED);

		use Drupal\Core\Database\Event\StatementExecutionEndEvent;
		use Drupal\Core\Database\Event\StatementExecutionStartEvent;

		@@ -11,6 +13,11 @@
		* This class behaves very similar to a StatementWrapper of a \PDOStatement
		* but as it always fetches every row it is possible to manipulate those
		* results.
		*
		* @deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use
		* \Drupal\Core\Database\StatementPrefetchIterator instead.
		*
		* @see https://www.drupal.org/node/3265938
		*/
		class StatementPrefetch implements \Iterator, StatementInterface {

core/lib/Drupal/Core/Database/StatementPrefetchIterator.php

0 → 100644

+413 −0

Changes for core/lib/Drupal/Core/Database/StatementPrefetchIterator.php: 413 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		<?php

		namespace Drupal\Core\Database;

		use Drupal\Core\Database\Event\StatementExecutionEndEvent;
		use Drupal\Core\Database\Event\StatementExecutionStartEvent;

		/**
		* An implementation of StatementInterface that prefetches all data.
		*
		* This class behaves very similar to a StatementWrapperIterator of a
		* \PDOStatement but as it always fetches every row it is possible to
		* manipulate those results.
		*
		* @todo use fully StatementIteratorTrait and remove \Iterator methods
		* implementations.
		*/
		class StatementPrefetchIterator implements \Iterator, StatementInterface {

		use StatementIteratorTrait;

		/**
		* Main data store.
		*
		* The resultset is stored as a \PDO::FETCH_ASSOC array.
		*/
		protected array $data = [];

		/**
		* The list of column names in this result set.
		*
		* @var string[]
		*/
		protected ?array $columnNames = NULL;

		/**
		* The number of rows matched by the last query.
		*/
		protected ?int $rowCount = NULL;

		/**
		* Holds the default fetch style.
		*/
		protected int $defaultFetchStyle = \PDO::FETCH_OBJ;

		/**
		* Holds fetch options.
		*
		* @var string[]
		*/
		protected array $fetchOptions = [
		'class' => 'stdClass',
		'constructor_args' => [],
		'object' => NULL,
		'column' => 0,
		];

		/**
		* Constructs a StatementPrefetchIterator object.
		*
		* @param object $clientConnection
		* Client database connection object, for example \PDO.
		* @param \Drupal\Core\Database\Connection $connection
		* The database connection.
		* @param string $queryString
		* The query string.
		* @param array $driverOptions
		* Driver-specific options.
		* @param bool $rowCountEnabled
		* (optional) Enables counting the rows matched. Defaults to FALSE.
		*/
		public function __construct(
		protected readonly object $clientConnection,
		protected readonly Connection $connection,
		protected string $queryString,
		protected array $driverOptions = [],
		protected readonly bool $rowCountEnabled = FALSE,
		) {
		}

		/**
		* {@inheritdoc}
		*/
		public function getConnectionTarget(): string {
		return $this->connection->getTarget();
		}

		/**
		* {@inheritdoc}
		*/
		public function execute($args = [], $options = []) {
		if (isset($options['fetch'])) {
		if (is_string($options['fetch'])) {
		// Default to an object. Note: db fields will be added to the object
		// before the constructor is run. If you need to assign fields after
		// the constructor is run. See https://www.drupal.org/node/315092.
		$this->setFetchMode(\PDO::FETCH_CLASS, $options['fetch']);
		}
		else {
		$this->setFetchMode($options['fetch']);
		}
		}

		if ($this->connection->isEventEnabled(StatementExecutionStartEvent::class)) {
		$startEvent = new StatementExecutionStartEvent(
		spl_object_id($this),
		$this->connection->getKey(),
		$this->connection->getTarget(),
		$this->getQueryString(),
		$args ?? [],
		$this->connection->findCallerFromDebugBacktrace()
		);
		$this->connection->dispatchEvent($startEvent);
		}

		// Prepare the query.
		$statement = $this->getStatement($this->queryString, $args);
		if (!$statement) {
		$this->throwPDOException();
		}

		$return = $statement->execute($args);
		if (!$return) {
		$this->throwPDOException();
		}

		// Fetch all the data from the reply, in order to release any lock as soon
		// as possible.
		$this->data = $statement->fetchAll(\PDO::FETCH_ASSOC);
		$this->rowCount = $this->rowCountEnabled ? $statement->rowCount() : NULL;
		// Destroy the statement as soon as possible. See the documentation of
		// \Drupal\sqlite\Driver\Database\sqlite\Statement for an explanation.
		unset($statement);
		$this->markResultsetIterable($return);

		$this->columnNames = count($this->data) > 0 ? array_keys($this->data[0]) : [];

		if (isset($startEvent) && $this->connection->isEventEnabled(StatementExecutionEndEvent::class)) {
		$this->connection->dispatchEvent(new StatementExecutionEndEvent(
		$startEvent->statementObjectId,
		$startEvent->key,
		$startEvent->target,
		$startEvent->queryString,
		$startEvent->args,
		$startEvent->caller,
		$startEvent->time
		));
		}

		return $return;
		}

		/**
		* Throw a PDO Exception based on the last PDO error.
		*/
		protected function throwPDOException(): void {
		$error_info = $this->connection->errorInfo();
		// We rebuild a message formatted in the same way as PDO.
		$exception = new \PDOException("SQLSTATE[" . $error_info[0] . "]: General error " . $error_info[1] . ": " . $error_info[2]);
		$exception->errorInfo = $error_info;
		throw $exception;
		}

		/**
		* Grab a PDOStatement object from a given query and its arguments.
		*
		* Some drivers (including SQLite) will need to perform some preparation
		* themselves to get the statement right.
		*
		* @param $query
		* The query.
		* @param array\|null $args
		* An array of arguments. This can be NULL.
		*
		* @return object
		* A PDOStatement object.
		*/
		protected function getStatement(string $query, ?array &$args = []): object {
		return $this->connection->prepare($query, $this->driverOptions);
		}

		/**
		* {@inheritdoc}
		*/
		public function getQueryString() {
		return $this->queryString;
		}

		/**
		* {@inheritdoc}
		*/
		public function setFetchMode($mode, $a1 = NULL, $a2 = []) {
		$this->defaultFetchStyle = $mode;
		switch ($mode) {
		case \PDO::FETCH_CLASS:
		$this->fetchOptions['class'] = $a1;
		if ($a2) {
		$this->fetchOptions['constructor_args'] = $a2;
		}
		break;

		case \PDO::FETCH_COLUMN:
		$this->fetchOptions['column'] = $a1;
		break;

		case \PDO::FETCH_INTO:
		$this->fetchOptions['object'] = $a1;
		break;
		}
		}

		/**
		* {@inheritdoc}
		*/
		public function rowCount() {
		// SELECT query should not use the method.
		if ($this->rowCountEnabled) {
		return $this->rowCount;
		}
		else {
		throw new RowCountException();
		}
		}

		/**
		* {@inheritdoc}
		*/
		public function fetch($fetch_style = NULL, $cursor_orientation = \PDO::FETCH_ORI_NEXT, $cursor_offset = NULL) {
		$currentKey = $this->getResultsetCurrentRowIndex();

		// We can remove the current record from the prefetched data, before
		// moving to the next record.
		unset($this->data[$currentKey]);
		$currentKey++;
		if (!isset($this->data[$currentKey])) {
		$this->markResultsetFetchingComplete();
		return FALSE;
		}

		// Now, format the next prefetched record according to the required fetch
		// style.
		$rowAssoc = $this->data[$currentKey];
		switch ($fetch_style ?? $this->defaultFetchStyle) {
		case \PDO::FETCH_ASSOC:
		$row = $rowAssoc;
		break;

		case \PDO::FETCH_BOTH:
		// \PDO::FETCH_BOTH returns an array indexed by both the column name
		// and the column number.
		$row = $rowAssoc + array_values($rowAssoc);
		break;

		case \PDO::FETCH_NUM:
		$row = array_values($rowAssoc);
		break;

		case \PDO::FETCH_LAZY:
		// We do not do lazy as everything is fetched already. Fallback to
		// \PDO::FETCH_OBJ.
		case \PDO::FETCH_OBJ:
		$row = (object) $rowAssoc;
		break;

		case \PDO::FETCH_CLASS \| \PDO::FETCH_CLASSTYPE:
		$class_name = array_shift($rowAssoc);
		// Deliberate no break.
		case \PDO::FETCH_CLASS:
		if (!isset($class_name)) {
		$class_name = $this->fetchOptions['class'];
		}
		if (count($this->fetchOptions['constructor_args'])) {
		$reflector = new \ReflectionClass($class_name);
		$result = $reflector->newInstanceArgs($this->fetchOptions['constructor_args']);
		}
		else {
		$result = new $class_name();
		}
		foreach ($rowAssoc as $k => $v) {
		$result->$k = $v;
		}
		$row = $result;
		break;

		case \PDO::FETCH_INTO:
		foreach ($rowAssoc as $k => $v) {
		$this->fetchOptions['object']->$k = $v;
		}
		$row = $this->fetchOptions['object'];
		break;

		case \PDO::FETCH_COLUMN:
		if (isset($this->columnNames[$this->fetchOptions['column']])) {
		$row = $rowAssoc[$this->columnNames[$this->fetchOptions['column']]];
		}
		else {
		return FALSE;
		}
		break;

		}
		// @todo in Drupal 11, throw an exception if $row is undefined at this
		// point.
		if (!isset($row)) {
		return FALSE;
		}
		$this->setResultsetCurrentRow($row);
		return $row;
		}

		/**
		* {@inheritdoc}
		*/
		public function fetchColumn($index = 0) {
		if ($row = $this->fetch(\PDO::FETCH_ASSOC)) {
		return $row[$this->columnNames[$index]];
		}
		return FALSE;
		}

		/**
		* {@inheritdoc}
		*/
		public function fetchField($index = 0) {
		return $this->fetchColumn($index);
		}

		/**
		* {@inheritdoc}
		*/
		public function fetchObject(string $class_name = NULL, array $constructor_arguments = NULL) {
		if (!isset($class_name)) {
		return $this->fetch(\PDO::FETCH_OBJ);
		}
		$this->fetchOptions = [
		'class' => $class_name,
		'constructor_args' => $constructor_arguments,
		];
		return $this->fetch(\PDO::FETCH_CLASS);
		}

		/**
		* {@inheritdoc}
		*/
		public function fetchAssoc() {
		return $this->fetch(\PDO::FETCH_ASSOC);
		}

		/**
		* {@inheritdoc}
		*/
		public function fetchAll($mode = NULL, $column_index = NULL, $constructor_arguments = NULL) {
		$fetchStyle = $mode ?? $this->defaultFetchStyle;
		if (isset($column_index)) {
		$this->fetchOptions['column'] = $column_index;
		}
		if (isset($constructor_arguments)) {
		$this->fetchOptions['constructor_args'] = $constructor_arguments;
		}

		$result = [];
		while ($row = $this->fetch($fetchStyle)) {
		$result[] = $row;
		}
		return $result;
		}

		/**
		* {@inheritdoc}
		*/
		public function fetchCol($index = 0) {
		if (isset($this->columnNames[$index])) {
		$result = [];
		while ($row = $this->fetch(\PDO::FETCH_ASSOC)) {
		$result[] = $row[$this->columnNames[$index]];
		}
		return $result;
		}
		return [];
		}

		/**
		* {@inheritdoc}
		*/
		public function fetchAllKeyed($key_index = 0, $value_index = 1) {
		if (!isset($this->columnNames[$key_index]) \|\| !isset($this->columnNames[$value_index])) {
		return [];
		}

		$key = $this->columnNames[$key_index];
		$value = $this->columnNames[$value_index];

		$result = [];
		while ($row = $this->fetch(\PDO::FETCH_ASSOC)) {
		$result[$row[$key]] = $row[$value];
		}
		return $result;
		}

		/**
		* {@inheritdoc}
		*/
		public function fetchAllAssoc($key, $fetch_style = NULL) {
		$fetchStyle = $fetch_style ?? $this->defaultFetchStyle;

		$result = [];
		while ($row = $this->fetch($fetchStyle)) {
		$result[$this->data[$this->getResultsetCurrentRowIndex()][$key]] = $row;
		}
		return $result;
		}

		}

core/lib/Drupal/Core/Database/StatementWrapper.php

+7 −0

Changes for core/lib/Drupal/Core/Database/StatementWrapper.php: 7 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -7,8 +7,15 @@

		// cSpell:ignore maxlen driverdata INOUT

		@trigger_error('\Drupal\Core\Database\StatementWrapper is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use \Drupal\Core\Database\StatementWrapperIterator instead. See https://www.drupal.org/node/3265938', E_USER_DEPRECATED);

		/**
		* Implementation of StatementInterface encapsulating PDOStatement.
		*
		* @deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use
		* \Drupal\Core\Database\StatementWrapperIterator instead.
		*
		* @see https://www.drupal.org/node/3265938
		*/
		class StatementWrapper implements \IteratorAggregate, StatementInterface {