diff --git a/core/includes/database.inc b/core/includes/database.inc index 5cfacd4..6d5318b 100644 --- a/core/includes/database.inc +++ b/core/includes/database.inc @@ -321,8 +321,6 @@ function db_query_range($query, $from, $count, array $args = array(), array $opt * The name of the temporary table. * * @see \Drupal\Core\Database\Connection::defaultOptions() - * - * @deprecated in Drupal 8.0.x, will be removed before 8.1.0. */ function db_query_temporary($query, array $args = array(), array $options = array()) { if (empty($options['target'])) { diff --git a/core/lib/Drupal/Core/Database/Query/Select.php b/core/lib/Drupal/Core/Database/Query/Select.php index 7b7b1ef..2c83194 100644 --- a/core/lib/Drupal/Core/Database/Query/Select.php +++ b/core/lib/Drupal/Core/Database/Query/Select.php @@ -573,8 +573,8 @@ public function execute() { * {@inheritdoc} */ public function executeTemporary() { - // If validation fails, simply return NULL. - // Note that validation routines in preExecute() may throw exceptions instead. + // If validation fails, simply return NULL. Note that validation routines in + // preExecute() may throw exceptions instead. if (!$this->preExecute()) { return NULL; } diff --git a/core/lib/Drupal/Core/Database/Query/SelectInterface.php b/core/lib/Drupal/Core/Database/Query/SelectInterface.php index 2847fe3..649446e 100644 --- a/core/lib/Drupal/Core/Database/Query/SelectInterface.php +++ b/core/lib/Drupal/Core/Database/Query/SelectInterface.php @@ -489,10 +489,10 @@ public function preExecute(SelectInterface $query = NULL); public function execute(); /** - * Executes a SELECT query string and saves the result set to a temporary table. + * Executes a SELECT query string and saves the results in a temporary table. * - * @return string - * The name of the temporary table. + * @return string|null + * The name of the temporary table, or NULL if the query was not successful. */ public function executeTemporary();