From 8a56839014b428e93101854e4f1c589fc804e76f Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sun, 2 Jun 2019 09:01:15 +0100
Subject: [PATCH] Issue #2947946 by voleger, andypost, mondrake: Create change
 record for all deprecated db_* functions

---
 core/includes/database.inc                    | 300 ++++++++++--------
 .../Core/Database/DatabaseLegacyTest.php      |  78 ++---
 2 files changed, 211 insertions(+), 167 deletions(-)

diff --git a/core/includes/database.inc b/core/includes/database.inc
index 04132b81e7..9f0f9939d7 100644
--- a/core/includes/database.inc
+++ b/core/includes/database.inc
@@ -80,16 +80,17 @@ function db_query($query, array $args = [], array $options = []) {
  * @return \Drupal\Core\Database\StatementInterface
  *   A prepared statement object, already executed.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
- *   call queryRange() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container
+ *   and call queryRange() on it. For example,
  *   $injected_database->queryRange($query, $from, $count, $args, $options);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::queryRange()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_query_range($query, $from, $count, array $args = [], array $options = []) {
-  @trigger_error('db_query_range() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call queryRange() on it. For example, $injected_database->queryRange($query, $from, $count, $args, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_query_range() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call queryRange() on it. For example, $injected_database->queryRange($query, $from, $count, $args, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options))->queryRange($query, $from, $count, $args, $options);
 }
 
@@ -113,16 +114,17 @@ function db_query_range($query, $from, $count, array $args = [], array $options
  * @return string
  *   The name of the temporary table.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
- *   call queryTemporary() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container
+ *   and call queryTemporary() on it. For example,
  *   $injected_database->queryTemporary($query, $args, $options);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::queryTemporary()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_query_temporary($query, array $args = [], array $options = []) {
-  @trigger_error('db_query_temporary() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call queryTemporary() on it. For example, $injected_database->queryTemporary($query, $args, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_query_temporary() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call queryTemporary() on it. For example, $injected_database->queryTemporary($query, $args, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options))->queryTemporary($query, $args, $options);
 }
 
@@ -142,11 +144,12 @@ function db_query_temporary($query, array $args = [], array $options = []) {
  *   call insert() on it. For example,
  *   $injected_database->insert($table, $options);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::insert()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_insert($table, array $options = []) {
-  @trigger_error('db_insert() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call insert() on it. For example, $injected_database->insert($table, $options); See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_insert() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call insert() on it. For example, $injected_database->insert($table, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options, FALSE))->insert($table, $options);
 }
 
@@ -166,11 +169,12 @@ function db_insert($table, array $options = []) {
  *   call merge() on it. For example,
  *   $injected_database->merge($table, $options);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::merge()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_merge($table, array $options = []) {
-  @trigger_error('db_merge() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call merge() on it. For example, $injected_database->merge($table, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_merge() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call merge() on it. For example, $injected_database->merge($table, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options, FALSE))->merge($table, $options);
 }
 
@@ -190,11 +194,12 @@ function db_merge($table, array $options = []) {
  *   call update() on it. For example,
  *   $injected_database->update($table, $options);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::update()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_update($table, array $options = []) {
-  @trigger_error('db_update() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call call update() on it. For example, $injected_database->update($table, $options); See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_update() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call call update() on it. For example, $injected_database->update($table, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options, FALSE))->update($table, $options);
 }
 
@@ -214,11 +219,12 @@ function db_update($table, array $options = []) {
  *   call delete() on it. For example,
  *   $injected_database->delete($table, $options);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::delete()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_delete($table, array $options = []) {
-  @trigger_error('db_delete is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call delete() on it. For example, $injected_database->delete($table, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_delete is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call delete() on it. For example, $injected_database->delete($table, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options, FALSE))->delete($table, $options);
 }
 
@@ -238,11 +244,12 @@ function db_delete($table, array $options = []) {
  *   call truncate() on it. For example,
  *   $injected_database->truncate($table, $options);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::truncate()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_truncate($table, array $options = []) {
-  @trigger_error('db_truncate() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call truncate() on it. For example, $injected_database->truncate($table, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_truncate() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call truncate() on it. For example, $injected_database->truncate($table, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options, FALSE))->truncate($table, $options);
 }
 
@@ -266,11 +273,12 @@ function db_truncate($table, array $options = []) {
  *   call select() on it. For example,
  *   $injected_database->select($table, $alias, $options);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::select()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_select($table, $alias = NULL, array $options = []) {
-  @trigger_error('db_select() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call call select() on it. For example, $injected_database->db_select($table, $alias, $options); See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_select() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call select() on it. For example, $injected_database->db_select($table, $alias, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options))->select($table, $alias, $options);
 }
 
@@ -286,16 +294,17 @@ function db_select($table, $alias = NULL, array $options = []) {
  * @return \Drupal\Core\Database\Transaction
  *   A new Transaction object for this connection.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ * @deprecated in drupal:8.0.x and will be removed from drupal:9.0.0. Instead, get
  *   a database connection injected into your service from the container and
  *   call startTransaction() on it. For example,
  *   $injected_database->startTransaction($name);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::startTransaction()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_transaction($name = NULL, array $options = []) {
-  @trigger_error('db_transaction is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call startTransaction() on it. For example, $injected_database->startTransaction($name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_transaction is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call startTransaction() on it. For example, $injected_database->startTransaction($name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options))->startTransaction($name);
 }
 
@@ -308,11 +317,13 @@ function db_transaction($name = NULL, array $options = []) {
  * @return string|null
  *   The key of the formerly active database.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Use
  * \Drupal\Core\Database\Database::setActiveConnection().
+ *
+ * @see https://www.drupal.org/node/2993033
  */
 function db_set_active($key = 'default') {
-  @trigger_error('db_set_active() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use \Drupal\Core\Database\Database::setActiveConnection() instead. See https://www.drupal.org/node/2944084.', E_USER_DEPRECATED);
+  @trigger_error('db_set_active() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Use \Drupal\Core\Database\Database::setActiveConnection() instead. See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::setActiveConnection($key);
 }
 
@@ -327,15 +338,16 @@ function db_set_active($key = 'default') {
  * @return string
  *   The escaped table name as a string.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
- *   call escapeTable() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container
+ *   and call escapeTable() on it. For example,
  *   $injected_database->escapeTable($table);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::escapeTable()
  */
 function db_escape_table($table) {
-  @trigger_error('db_escape_table() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call escapeTable() on it. For example, $injected_database->escapeTable($table). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_escape_table() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call escapeTable() on it. For example, $injected_database->escapeTable($table). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->escapeTable($table);
 }
 
@@ -350,15 +362,16 @@ function db_escape_table($table) {
  * @return string
  *   The escaped field name as a string.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
- *   call escapeField() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container
+ *   and call escapeField() on it. For example,
  *   $injected_database->escapeField($field);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::escapeField()
  */
 function db_escape_field($field) {
-  @trigger_error('db_escape_field() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call escapeField() on it. For example, $injected_database->escapeField($field). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_escape_field() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call escapeField() on it. For example, $injected_database->escapeField($field). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->escapeField($field);
 }
 
@@ -392,15 +405,16 @@ function db_escape_field($field) {
  * @return string
  *   The escaped string.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
- *   call escapeLike() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container
+ *   and call escapeLike() on it. For example,
  *   $injected_database->escapeLike($string);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::escapeLike()
  */
 function db_like($string) {
-  @trigger_error('db_like() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call escapeLike() on it. For example, $injected_database->escapeLike($string). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_like() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call escapeLike() on it. For example, $injected_database->escapeLike($string). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->escapeLike($string);
 }
 
@@ -410,14 +424,15 @@ function db_like($string) {
  * @return string
  *   The name of the currently active database driver.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
- *   call driver() on it. For example, $injected_database->driver($string);
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container
+ *   and call driver() on it. For example, $injected_database->driver($string);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::driver()
  */
 function db_driver() {
-  @trigger_error('db_driver() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call driver() on it. For example, $injected_database->driver($string). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_driver() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call driver() on it. For example, $injected_database->driver($string). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->driver();
 }
 
@@ -428,13 +443,14 @@ function db_driver() {
  *   An array of options to control which connection is closed. Only the target
  *   key has any meaning in this case.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Use
  *   \Drupal\Core\Database\Database::closeConnection($target).
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Database::closeConnection()
  */
 function db_close(array $options = []) {
-  @trigger_error('db_close() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use \Drupal\Core\Database\Database::closeConnection() instead. See https://www.drupal.org/node/2993033.', E_USER_DEPRECATED);
+  @trigger_error('db_close() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Use \Drupal\Core\Database\Database::closeConnection() instead. See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   Database::closeConnection(_db_get_target($options));
 }
 
@@ -488,14 +504,16 @@ function _db_get_target(array &$options, $allow_replica = TRUE) {
  * @return int
  *   An integer number larger than any number returned before for this sequence.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
- *   call nextId() on it. For example, $injected_database->nextId($existing_id);
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container
+ *   and call nextId() on it.
+ *   For example, $injected_database->nextId($existing_id);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::nextId()
  */
 function db_next_id($existing_id = 0) {
-  @trigger_error('db_next_id() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call nextId() on it. For example, $injected_database->nextId($existing_id). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_next_id() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call nextId() on it. For example, $injected_database->nextId($existing_id). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->nextId($existing_id);
 }
 
@@ -505,14 +523,15 @@ function db_next_id($existing_id = 0) {
  * @return \Drupal\Core\Database\Query\Condition
  *   A new Condition object, set to "OR" all conditions together.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Create
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Create
  *   a \Drupal\Core\Database\Query\Condition object, specifying an OR
  *   conjunction: new Condition('OR');
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Query\Condition
  */
 function db_or() {
-  @trigger_error('db_or() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying an OR conjunction: new Condition(\'OR\'), instead. See https://www.drupal.org/node/2993033.', E_USER_DEPRECATED);
+  @trigger_error('db_or() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying an OR conjunction: new Condition(\'OR\'), instead. See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return new Condition('OR');
 }
 
@@ -522,14 +541,15 @@ function db_or() {
  * @return \Drupal\Core\Database\Query\Condition
  *   A new Condition object, set to "AND" all conditions together.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Create
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Create
  *   a \Drupal\Core\Database\Query\Condition object, specifying an AND
  *   conjunction: new Condition('AND');
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Query\Condition
  */
 function db_and() {
-  @trigger_error('db_and() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying an AND conjunction: new Condition(\'AND\'), instead. See https://www.drupal.org/node/2993033.', E_USER_DEPRECATED);
+  @trigger_error('db_and() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying an AND conjunction: new Condition(\'AND\'), instead. See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return new Condition('AND');
 }
 
@@ -539,14 +559,15 @@ function db_and() {
  * @return \Drupal\Core\Database\Query\Condition
  *   A new Condition object, set to "XOR" all conditions together.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Create
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Create
  *   a \Drupal\Core\Database\Query\Condition object, specifying a XOR
  *   conjunction: new Condition('XOR');
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Query\Condition
  */
 function db_xor() {
-  @trigger_error('db_xor() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying a XOR conjunction: new Condition(\'XOR\'), instead. See https://www.drupal.org/node/2993033.', E_USER_DEPRECATED);
+  @trigger_error('db_xor() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying a XOR conjunction: new Condition(\'XOR\'), instead. See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return new Condition('XOR');
 }
 
@@ -563,14 +584,15 @@ function db_xor() {
  * @return \Drupal\Core\Database\Query\Condition
  *   A new Condition object, set to the specified conjunction.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Create
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Create
  *   a \Drupal\Core\Database\Query\Condition object, specifying the desired
  *   conjunction: new Condition($conjunction);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Query\Condition
  */
 function db_condition($conjunction) {
-  @trigger_error('db_condition() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying the desired conjunction: new Condition($conjunction), instead. See https://www.drupal.org/node/2993033.', E_USER_DEPRECATED);
+  @trigger_error('db_condition() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying the desired conjunction: new Condition($conjunction), instead. See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return new Condition($conjunction);
 }
 
@@ -592,15 +614,16 @@ function db_condition($conjunction) {
  * @param array $table
  *   A Schema API table definition array.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call createTable() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call createTable() on it. For example,
  *   $injected_database->schema()->createTable($name, $table);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::createTable()
  */
 function db_create_table($name, $table) {
-  @trigger_error('db_create_table() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call createTable() on it. For example, $injected_database->schema()->createTable($name, $table). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_create_table() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call createTable() on it. For example, $injected_database->schema()->createTable($name, $table). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->createTable($name, $table);
 }
 
@@ -616,15 +639,16 @@ function db_create_table($name, $table) {
  * @return array
  *   An array of field names.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call fieldNames() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call fieldNames() on it. For example,
  *   $injected_database->schema()->fieldNames($fields);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::fieldNames()
  */
 function db_field_names($fields) {
-  @trigger_error('db_field_names() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call fieldNames() on it. For example, $injected_database->schema()->fieldNames($fields). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_field_names() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call fieldNames() on it. For example, $injected_database->schema()->fieldNames($fields). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->fieldNames($fields);
 }
 
@@ -639,15 +663,16 @@ function db_field_names($fields) {
  * @return bool
  *   TRUE if the given index exists, otherwise FALSE.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call indexExists() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call indexExists() on it. For example,
  *   $injected_database->schema()->indexExists($table, $name);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::indexExists()
  */
 function db_index_exists($table, $name) {
-  @trigger_error('db_index_exists() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call indexExists() on it. For example, $injected_database->schema()->indexExists($table, $name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_index_exists() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call indexExists() on it. For example, $injected_database->schema()->indexExists($table, $name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->indexExists($table, $name);
 }
 
@@ -660,16 +685,17 @@ function db_index_exists($table, $name) {
  * @return bool
  *   TRUE if the given table exists, otherwise FALSE.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call tableExists() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call tableExists() on it. For example,
  *   $injected_database->schema()->tableExists($table);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::tableExists()
  */
 function db_table_exists($table) {
   @trigger_error(
-    'db_table_exists() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use $injected_database->schema()->tableExists($table) instead. See https://www.drupal.org/node/2947929.',
+    'db_table_exists() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Use $injected_database->schema()->tableExists($table) instead. See https://www.drupal.org/node/2993033',
     E_USER_DEPRECATED
   );
 
@@ -687,15 +713,16 @@ function db_table_exists($table) {
  * @return bool
  *   TRUE if the given column exists, otherwise FALSE.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call fieldExists() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call fieldExists() on it. For example,
  *   $injected_database->schema()->fieldExists($table, $field);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::fieldExists()
  */
 function db_field_exists($table, $field) {
-  @trigger_error('db_field_exists() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call fieldExists() on it. For example, $injected_database->schema()->fieldExists($table, $field). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_field_exists() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call fieldExists() on it. For example, $injected_database->schema()->fieldExists($table, $field). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->fieldExists($table, $field);
 }
 
@@ -708,16 +735,17 @@ function db_field_exists($table, $field) {
  * @return array
  *   Array, both the keys and the values are the matching tables.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call findTables() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call findTables() on it. For example,
  *   $injected_database->schema()->findTables($table_expression);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::findTables()
  */
 function db_find_tables($table_expression) {
   @trigger_error(
-    'db_find_tables() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use $injected_database->schema()->findTables($table_expression) instead. See https://www.drupal.org/node/2993033',
+    'db_find_tables() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Use $injected_database->schema()->findTables($table_expression) instead. See https://www.drupal.org/node/2993033',
     E_USER_DEPRECATED
   );
   return Database::getConnection()->schema()->findTables($table_expression);
@@ -731,15 +759,16 @@ function db_find_tables($table_expression) {
  * @param $new_name
  *   The new name for the table.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call renameTable() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call renameTable() on it. For example,
  *   $injected_database->schema()->renameTable($table, $new_name);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::renameTable()
  */
 function db_rename_table($table, $new_name) {
-  @trigger_error('db_rename_table() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call renameTable() on it. For example, $injected_database->schema()->renameTable($table, $new_name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_rename_table() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call renameTable() on it. For example, $injected_database->schema()->renameTable($table, $new_name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->renameTable($table, $new_name);
 }
 
@@ -749,15 +778,16 @@ function db_rename_table($table, $new_name) {
  * @param $table
  *   The table to be dropped.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call dropTable() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call dropTable() on it. For example,
  *   $injected_database->schema()->dropTable($table);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::dropTable()
  */
 function db_drop_table($table) {
-  @trigger_error('db_drop_table() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use \Drupal\Core\Database\Database::getConnection()->schema()->dropTable() instead. See https://www.drupal.org/node/2987737', E_USER_DEPRECATED);
+  @trigger_error('db_drop_table() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Use \Drupal\Core\Database\Database::getConnection()->schema()->dropTable() instead. See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->dropTable($table);
 }
 
@@ -780,16 +810,17 @@ function db_drop_table($table) {
  *   MUST specify at least one key or index including it in this array. See
  *   \Drupal\Core\Database\Schema::changeField() for more explanation why.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call addField() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call addField() on it. For example,
  *   $injected_database->schema()->addField($table, $field, $spec, $keys_new);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::addField()
  * @see \Drupal\Core\Database\Schema::changeField()
  */
 function db_add_field($table, $field, $spec, $keys_new = []) {
-  @trigger_error('db_add_field() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addField() on it. For example, $injected_database->schema()->addField($table, $field, $spec, $keys_new). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_add_field() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addField() on it. For example, $injected_database->schema()->addField($table, $field, $spec, $keys_new). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->addField($table, $field, $spec, $keys_new);
 }
 
@@ -805,15 +836,16 @@ function db_add_field($table, $field, $spec, $keys_new = []) {
  *   TRUE if the field was successfully dropped, FALSE if there was no field by
  *   that name to begin with.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call dropField() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call dropField() on it. For example,
  *   $injected_database->schema()->dropField($table, $field);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::dropField()
  */
 function db_drop_field($table, $field) {
-  @trigger_error('db_drop_field() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropField() on it. For example, $injected_database->schema()->dropField($table, $field). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_drop_field() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropField() on it. For example, $injected_database->schema()->dropField($table, $field). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->dropField($table, $field);
 }
 
@@ -827,16 +859,18 @@ function db_drop_field($table, $field) {
  * @param $default
  *   Default value to be set. NULL for 'default NULL'.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call changeField() on it, passing a full field
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call changeField() on it, passing a full field
  *   specification. For example,
- *   $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new);
+ *   $injected_database->schema()
+ *     ->changeField($table, $field, $field_new, $spec, $keys_new);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::changeField()
  */
 function db_field_set_default($table, $field, $default) {
-  @trigger_error('db_field_set_default() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it, passing a full field specification. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_field_set_default() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it, passing a full field specification. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->fieldSetDefault($table, $field, $default);
 }
 
@@ -848,16 +882,18 @@ function db_field_set_default($table, $field, $default) {
  * @param $field
  *   The field to be altered.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call changeField() on it, passing a full field
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call changeField() on it, passing a full field
  *   specification. For example,
- *   $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new);
+ *   $injected_database->schema()
+ *     ->changeField($table, $field, $field_new, $spec, $keys_new);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::changeField()
  */
 function db_field_set_no_default($table, $field) {
-  @trigger_error('db_field_set_no_default() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it, passing a full field specification. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_field_set_no_default() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it, passing a full field specification. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->fieldSetNoDefault($table, $field);
 }
 
@@ -869,15 +905,16 @@ function db_field_set_no_default($table, $field) {
  * @param $fields
  *   Array of fields for the primary key.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call addPrimaryKey() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call addPrimaryKey() on it. For example,
  *   $injected_database->schema()->addPrimaryKey($table, $fields);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::addPrimaryKey()
  */
 function db_add_primary_key($table, $fields) {
-  @trigger_error('db_add_primary_key() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addPrimaryKey() on it. For example, $injected_database->schema()->addPrimaryKey($table, $fields). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_add_primary_key() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addPrimaryKey() on it. For example, $injected_database->schema()->addPrimaryKey($table, $fields). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->addPrimaryKey($table, $fields);
 }
 
@@ -891,15 +928,16 @@ function db_add_primary_key($table, $fields) {
  *   TRUE if the primary key was successfully dropped, FALSE if there was no
  *   primary key on this table to begin with.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call dropPrimaryKey() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call dropPrimaryKey() on it. For example,
  *   $injected_database->schema()->dropPrimaryKey($table);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::dropPrimaryKey()
  */
 function db_drop_primary_key($table) {
-  @trigger_error('db_drop_primary_key() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropPrimaryKey() on it. For example, $injected_database->schema()->dropPrimaryKey($table). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_drop_primary_key() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropPrimaryKey() on it. For example, $injected_database->schema()->dropPrimaryKey($table). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->dropPrimaryKey($table);
 }
 
@@ -913,15 +951,16 @@ function db_drop_primary_key($table) {
  * @param array $fields
  *   An array of field names.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call addUniqueKey() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call addUniqueKey() on it. For example,
  *   $injected_database->schema()->addUniqueKey($table, $name, $fields);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::addUniqueKey()
  */
 function db_add_unique_key($table, $name, $fields) {
-  @trigger_error('db_add_unique_key() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addUniqueKey() on it. For example, $injected_database->schema()->addUniqueKey($table, $name, $fields). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_add_unique_key() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addUniqueKey() on it. For example, $injected_database->schema()->addUniqueKey($table, $name, $fields). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->addUniqueKey($table, $name, $fields);
 }
 
@@ -937,15 +976,16 @@ function db_add_unique_key($table, $name, $fields) {
  *   TRUE if the key was successfully dropped, FALSE if there was no key by
  *   that name to begin with.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call dropUniqueKey() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call dropUniqueKey() on it. For example,
  *   $injected_database->schema()->dropUniqueKey($table, $name);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::dropUniqueKey()
  */
 function db_drop_unique_key($table, $name) {
-  @trigger_error('db_drop_unique_key() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropUniqueKey() on it. For example, $injected_database->schema()->dropUniqueKey($table, $name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_drop_unique_key() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropUniqueKey() on it. For example, $injected_database->schema()->dropUniqueKey($table, $name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->dropUniqueKey($table, $name);
 }
 
@@ -963,11 +1003,12 @@ function db_drop_unique_key($table, $name) {
  *   definition. See \Drupal\Core\Database\Schema::addIndex() for how to obtain
  *   this specification.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call addIndex() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call addIndex() on it. For example,
  *   $injected_database->schema()->addIndex($table, $name, $fields, $spec);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see hook_schema()
  * @see schemaapi
  * @see \Drupal\Core\Database\Schema::addIndex()
@@ -989,15 +1030,16 @@ function db_add_index($table, $name, $fields, array $spec) {
  *   TRUE if the index was successfully dropped, FALSE if there was no index
  *   by that name to begin with.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call dropIndex() on it. For example,
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call dropIndex() on it. For example,
  *   $injected_database->schema()->dropIndex($table, $name);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::dropIndex()
  */
 function db_drop_index($table, $name) {
-  @trigger_error('db_drop_index() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropIndex() on it. For example, $injected_database->schema()->dropIndex($table, $name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_drop_index() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropIndex() on it. For example, $injected_database->schema()->dropIndex($table, $name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->dropIndex($table, $name);
 }
 
@@ -1063,15 +1105,17 @@ function db_drop_index($table, $name) {
  *   with changing the field. The format is the same as a table specification
  *   but without the 'fields' element.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call changeField() on it. For example,
- *   $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new);
+ * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call changeField() on it. For example,
+ *   $injected_database->schema()
+ *     ->changeField($table, $field, $field_new, $spec, $keys_new);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::changeField()
  */
 function db_change_field($table, $field, $field_new, $spec, $keys_new = []) {
-  @trigger_error("Deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it. For example, \$injected_database->schema()->changeField(\$table, \$field, \$field_new, \$spec, \$keys_new). See https://www.drupal.org/node/2993033", E_USER_DEPRECATED);
+  @trigger_error('db_change_field() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->changeField($table, $field, $field_new, $spec, $keys_new);
 }
 
@@ -1084,13 +1128,13 @@ function db_change_field($table, $field, $field_new, $spec, $keys_new = []) {
  * server (A replica server is traditionally referred to as
  * a "slave" in database server documentation).
  *
- * @deprecated as of Drupal 8.7.x, will be removed in Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0, will be removed from drupal:9.0.0. Use
  *   \Drupal::service('database.replica_kill_switch')->trigger() instead.
  *
  * @see https://www.drupal.org/node/2997500
  * @see https://www.drupal.org/node/2275877
  */
 function db_ignore_replica() {
-  @trigger_error('db_ignore_replica() is deprecated in Drupal 8.7.x and will be removed before Drupal 9.0.0. Use \Drupal\Core\Database\ReplicaKillSwitch::trigger() instead. See https://www.drupal.org/node/2997500', E_USER_DEPRECATED);
+  @trigger_error('db_ignore_replica() is deprecated in drupal:8.7.0. It will be removed from drupal:9.0.0. Use \Drupal\Core\Database\ReplicaKillSwitch::trigger() instead. See https://www.drupal.org/node/2997500', E_USER_DEPRECATED);
   \Drupal::service('database.replica_kill_switch')->trigger();
 }
diff --git a/core/tests/Drupal/KernelTests/Core/Database/DatabaseLegacyTest.php b/core/tests/Drupal/KernelTests/Core/Database/DatabaseLegacyTest.php
index 9fa3fc0224..5867a07267 100644
--- a/core/tests/Drupal/KernelTests/Core/Database/DatabaseLegacyTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Database/DatabaseLegacyTest.php
@@ -31,7 +31,7 @@ class DatabaseLegacyTest extends DatabaseTestBase {
   /**
    * Tests deprecation of the db_and() function.
    *
-   * @expectedDeprecation db_and() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying an AND conjunction: new Condition('AND'), instead. See https://www.drupal.org/node/2993033.
+   * @expectedDeprecation db_and() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying an AND conjunction: new Condition('AND'), instead. See https://www.drupal.org/node/2993033
    */
   public function testDbAnd() {
     $this->assertInstanceOf(Condition::class, db_and());
@@ -40,7 +40,7 @@ public function testDbAnd() {
   /**
    * Tests deprecation of the db_condition() function.
    *
-   * @expectedDeprecation db_condition() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying the desired conjunction: new Condition($conjunction), instead. See https://www.drupal.org/node/2993033.
+   * @expectedDeprecation db_condition() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying the desired conjunction: new Condition($conjunction), instead. See https://www.drupal.org/node/2993033
    */
   public function testDbCondition() {
     $this->assertInstanceOf(Condition::class, db_condition('AND'));
@@ -49,7 +49,7 @@ public function testDbCondition() {
   /**
    * Tests deprecation of the db_or() function.
    *
-   * @expectedDeprecation db_or() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying an OR conjunction: new Condition('OR'), instead. See https://www.drupal.org/node/2993033.
+   * @expectedDeprecation db_or() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying an OR conjunction: new Condition('OR'), instead. See https://www.drupal.org/node/2993033
    */
   public function testDbOr() {
     $this->assertInstanceOf(Condition::class, db_or());
@@ -58,7 +58,7 @@ public function testDbOr() {
   /**
    * Tests deprecation of the db_xor() function.
    *
-   * @expectedDeprecation db_xor() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying a XOR conjunction: new Condition('XOR'), instead. See https://www.drupal.org/node/2993033.
+   * @expectedDeprecation db_xor() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying a XOR conjunction: new Condition('XOR'), instead. See https://www.drupal.org/node/2993033
    */
   public function testDbXor() {
     $this->assertInstanceOf(Condition::class, db_xor());
@@ -67,7 +67,7 @@ public function testDbXor() {
   /**
    * Tests the db_table_exists() function.
    *
-   * @expectedDeprecation db_table_exists() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use $injected_database->schema()->tableExists($table) instead. See https://www.drupal.org/node/2947929.
+   * @expectedDeprecation db_table_exists() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Use $injected_database->schema()->tableExists($table) instead. See https://www.drupal.org/node/2993033
    */
   public function testDbTableExists() {
     $this->assertTrue(db_table_exists('test'));
@@ -76,7 +76,7 @@ public function testDbTableExists() {
   /**
    * Tests the db_find_tables() function.
    *
-   * @expectedDeprecation db_find_tables() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use $injected_database->schema()->findTables($table_expression) instead. See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_find_tables() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Use $injected_database->schema()->findTables($table_expression) instead. See https://www.drupal.org/node/2993033
    */
   public function testDbFindTables() {
     $expected = [
@@ -89,7 +89,7 @@ public function testDbFindTables() {
   /**
    * Tests the db_set_active() function.
    *
-   * @expectedDeprecation db_set_active() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use \Drupal\Core\Database\Database::setActiveConnection() instead. See https://www.drupal.org/node/2944084.
+   * @expectedDeprecation db_set_active() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Use \Drupal\Core\Database\Database::setActiveConnection() instead. See https://www.drupal.org/node/2993033
    */
   public function testDbSetActive() {
     $get_active_db = $this->connection->getKey();
@@ -99,7 +99,7 @@ public function testDbSetActive() {
   /**
    * Tests the db_drop_table() function.
    *
-   * @expectedDeprecation db_drop_table() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use \Drupal\Core\Database\Database::getConnection()->schema()->dropTable() instead. See https://www.drupal.org/node/2987737
+   * @expectedDeprecation db_drop_table() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Use \Drupal\Core\Database\Database::getConnection()->schema()->dropTable() instead. See https://www.drupal.org/node/2993033
    */
   public function testDbDropTable() {
     $this->assertFalse(db_drop_table('temp_test_table'));
@@ -108,7 +108,7 @@ public function testDbDropTable() {
   /**
    * Tests deprecation of the db_next_id() function.
    *
-   * @expectedDeprecation db_next_id() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call nextId() on it. For example, $injected_database->nextId($existing_id). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_next_id() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call nextId() on it. For example, $injected_database->nextId($existing_id). See https://www.drupal.org/node/2993033
    */
   public function testDbNextId() {
     $this->installSchema('system', 'sequences');
@@ -118,7 +118,7 @@ public function testDbNextId() {
   /**
    * Tests the db_change_field() function is deprecated.
    *
-   * @expectedDeprecation Deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_change_field() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033
    */
   public function testDbChangeField() {
     $spec = [
@@ -135,7 +135,7 @@ public function testDbChangeField() {
   /**
    * Tests deprecation of the db_field_set_default() function.
    *
-   * @expectedDeprecation db_field_set_default() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it, passing a full field specification. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_field_set_default() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it, passing a full field specification. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033
    * @expectedDeprecation fieldSetDefault() is deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035
    */
   public function testDbFieldSetDefault() {
@@ -145,7 +145,7 @@ public function testDbFieldSetDefault() {
   /**
    * Tests deprecation of the db_field_set_no_default() function.
    *
-   * @expectedDeprecation db_field_set_no_default() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it, passing a full field specification. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_field_set_no_default() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it, passing a full field specification. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033
    * @expectedDeprecation fieldSetNoDefault() is deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035
    */
   public function testDbFieldSetNoDefault() {
@@ -208,7 +208,7 @@ public function testSchemaFieldDefaultChange() {
   /**
    * Tests deprecation of the db_transaction() function.
    *
-   * @expectedDeprecation db_transaction is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call startTransaction() on it. For example, $injected_database->startTransaction($name). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_transaction is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call startTransaction() on it. For example, $injected_database->startTransaction($name). See https://www.drupal.org/node/2993033
    */
   public function testDbTransaction() {
     $this->assertInstanceOf(Transaction::class, db_transaction());
@@ -217,7 +217,7 @@ public function testDbTransaction() {
   /**
    * Tests the db_close() function.
    *
-   * @expectedDeprecation db_close() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use \Drupal\Core\Database\Database::closeConnection() instead. See https://www.drupal.org/node/2993033.
+   * @expectedDeprecation db_close() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Use \Drupal\Core\Database\Database::closeConnection() instead. See https://www.drupal.org/node/2993033
    */
   public function testDbClose() {
     $this->assertTrue(Database::isActiveConnection(), 'Database connection is active');
@@ -228,7 +228,7 @@ public function testDbClose() {
   /**
    * Tests deprecation of the db_add_field() function.
    *
-   * @expectedDeprecation db_add_field() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addField() on it. For example, $injected_database->schema()->addField($table, $field, $spec, $keys_new). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_add_field() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addField() on it. For example, $injected_database->schema()->addField($table, $field, $spec, $keys_new). See https://www.drupal.org/node/2993033
    */
   public function testDbAddField() {
     $this->assertFalse($this->connection->schema()->fieldExists('test', 'anint'));
@@ -244,7 +244,7 @@ public function testDbAddField() {
   /**
    * Tests deprecation of the db_drop_field() function.
    *
-   * @expectedDeprecation db_drop_field() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropField() on it. For example, $injected_database->schema()->dropField($table, $field). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_drop_field() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropField() on it. For example, $injected_database->schema()->dropField($table, $field). See https://www.drupal.org/node/2993033
    */
   public function testDbDropField() {
     $this->assertTrue($this->connection->schema()->fieldExists('test', 'age'));
@@ -255,7 +255,7 @@ public function testDbDropField() {
   /**
    * Tests deprecation of the db_field_exists() function.
    *
-   * @expectedDeprecation db_field_exists() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call fieldExists() on it. For example, $injected_database->schema()->fieldExists($table, $field). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_field_exists() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call fieldExists() on it. For example, $injected_database->schema()->fieldExists($table, $field). See https://www.drupal.org/node/2993033
    */
   public function testDbFieldExists() {
     $this->assertTrue(db_field_exists('test', 'age'));
@@ -264,7 +264,7 @@ public function testDbFieldExists() {
   /**
    * Tests deprecation of the db_field_names() function.
    *
-   * @expectedDeprecation db_field_names() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call fieldNames() on it. For example, $injected_database->schema()->fieldNames($fields). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_field_names() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call fieldNames() on it. For example, $injected_database->schema()->fieldNames($fields). See https://www.drupal.org/node/2993033
    */
   public function testDbFieldNames() {
     $this->assertSame(['test_field'], db_field_names(['test_field']));
@@ -273,7 +273,7 @@ public function testDbFieldNames() {
   /**
    * Tests deprecation of the db_create_table() function.
    *
-   * @expectedDeprecation db_create_table() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call createTable() on it. For example, $injected_database->schema()->createTable($name, $table). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_create_table() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call createTable() on it. For example, $injected_database->schema()->createTable($name, $table). See https://www.drupal.org/node/2993033
    */
   public function testDbCreateTable() {
     $name = 'test_create_table';
@@ -294,7 +294,7 @@ public function testDbCreateTable() {
   /**
    * Tests deprecation of the db_merge() function.
    *
-   * @expectedDeprecation db_merge() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call merge() on it. For example, $injected_database->merge($table, $options). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_merge() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call merge() on it. For example, $injected_database->merge($table, $options). See https://www.drupal.org/node/2993033
    */
   public function testDbMerge() {
     $this->assertInstanceOf(Merge::class, db_merge('test'));
@@ -303,7 +303,7 @@ public function testDbMerge() {
   /**
    * Tests deprecation of the db_driver() function.
    *
-   * @expectedDeprecation db_driver() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call driver() on it. For example, $injected_database->driver($string). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_driver() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call driver() on it. For example, $injected_database->driver($string). See https://www.drupal.org/node/2993033
    */
   public function testDbDriver() {
     $this->assertNotNull(db_driver());
@@ -312,7 +312,7 @@ public function testDbDriver() {
   /**
    * Tests deprecation of the db_escape_field() function.
    *
-   * @expectedDeprecation db_escape_field() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call escapeField() on it. For example, $injected_database->escapeField($field). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_escape_field() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call escapeField() on it. For example, $injected_database->escapeField($field). See https://www.drupal.org/node/2993033
    */
   public function testDbEscapeField() {
     $this->assertNotNull(db_escape_field('test'));
@@ -321,7 +321,7 @@ public function testDbEscapeField() {
   /**
    * Tests deprecation of the db_like() function.
    *
-   * @expectedDeprecation db_like() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call escapeLike() on it. For example, $injected_database->escapeLike($string). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_like() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call escapeLike() on it. For example, $injected_database->escapeLike($string). See https://www.drupal.org/node/2993033
    */
   public function testDbLike() {
     $this->assertSame('test\%', db_like('test%'));
@@ -330,7 +330,7 @@ public function testDbLike() {
   /**
    * Tests deprecation of the db_escape_table() function.
    *
-   * @expectedDeprecation db_escape_table() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call escapeTable() on it. For example, $injected_database->escapeTable($table). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_escape_table() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call escapeTable() on it. For example, $injected_database->escapeTable($table). See https://www.drupal.org/node/2993033
    */
   public function testDbEscapeTable() {
     $this->assertNotNull(db_escape_table('test'));
@@ -339,7 +339,7 @@ public function testDbEscapeTable() {
   /**
    * Tests deprecation of the db_rename_table() function.
    *
-   * @expectedDeprecation db_rename_table() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call renameTable() on it. For example, $injected_database->schema()->renameTable($table, $new_name). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_rename_table() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call renameTable() on it. For example, $injected_database->schema()->renameTable($table, $new_name). See https://www.drupal.org/node/2993033
    */
   public function testDbRenameTable() {
     $this->assertTrue($this->connection->schema()->tableExists('test'));
@@ -350,7 +350,7 @@ public function testDbRenameTable() {
   /**
    * Tests deprecation of the db_drop_index() function.
    *
-   * @expectedDeprecation db_drop_index() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropIndex() on it. For example, $injected_database->schema()->dropIndex($table, $name). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_drop_index() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropIndex() on it. For example, $injected_database->schema()->dropIndex($table, $name). See https://www.drupal.org/node/2993033
    */
   public function testDbDropIndex() {
     $this->assertFalse(db_drop_index('test', 'no_such_index'));
@@ -359,7 +359,7 @@ public function testDbDropIndex() {
   /**
    * Tests deprecation of the db_index_exists() function.
    *
-   * @expectedDeprecation db_index_exists() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call indexExists() on it. For example, $injected_database->schema()->indexExists($table, $name). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_index_exists() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call indexExists() on it. For example, $injected_database->schema()->indexExists($table, $name). See https://www.drupal.org/node/2993033
    */
   public function testDbIndexExists() {
     $this->assertFalse(db_index_exists('test', 'no_such_index'));
@@ -368,7 +368,7 @@ public function testDbIndexExists() {
   /**
    * Tests deprecation of the db_drop_unique_key() function.
    *
-   * @expectedDeprecation db_drop_unique_key() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropUniqueKey() on it. For example, $injected_database->schema()->dropUniqueKey($table, $name). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_drop_unique_key() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropUniqueKey() on it. For example, $injected_database->schema()->dropUniqueKey($table, $name). See https://www.drupal.org/node/2993033
    */
   public function testDbDropUniqueKey() {
     $this->assertTrue(db_drop_unique_key('test', 'name'));
@@ -377,7 +377,7 @@ public function testDbDropUniqueKey() {
   /**
    * Tests deprecation of the db_add_unique_key() function.
    *
-   * @expectedDeprecation db_add_unique_key() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addUniqueKey() on it. For example, $injected_database->schema()->addUniqueKey($table, $name, $fields). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_add_unique_key() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addUniqueKey() on it. For example, $injected_database->schema()->addUniqueKey($table, $name, $fields). See https://www.drupal.org/node/2993033
    */
   public function testDbAddUniqueKey() {
     db_add_unique_key('test', 'age', ['age']);
@@ -386,7 +386,7 @@ public function testDbAddUniqueKey() {
   /**
    * Tests deprecation of the db_drop_primary_key() function.
    *
-   * @expectedDeprecation db_drop_primary_key() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropPrimaryKey() on it. For example, $injected_database->schema()->dropPrimaryKey($table). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_drop_primary_key() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropPrimaryKey() on it. For example, $injected_database->schema()->dropPrimaryKey($table). See https://www.drupal.org/node/2993033
    */
   public function testDbDropPrimaryKey() {
     $this->assertTrue(db_drop_primary_key('test_people'));
@@ -395,7 +395,7 @@ public function testDbDropPrimaryKey() {
   /**
    * Tests deprecation of the db_add_primary_key() function.
    *
-   * @expectedDeprecation db_add_primary_key() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addPrimaryKey() on it. For example, $injected_database->schema()->addPrimaryKey($table, $fields). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_add_primary_key() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addPrimaryKey() on it. For example, $injected_database->schema()->addPrimaryKey($table, $fields). See https://www.drupal.org/node/2993033
    */
   public function testDbAddPrimaryKey() {
     $this->connection->schema()->dropPrimaryKey('test_people');
@@ -405,7 +405,7 @@ public function testDbAddPrimaryKey() {
   /**
    * Tests the db_update() function.
    *
-   * @expectedDeprecation db_update() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call call update() on it. For example, $injected_database->update($table, $options); See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_update() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call call update() on it. For example, $injected_database->update($table, $options). See https://www.drupal.org/node/2993033
    */
   public function testDbUpdate() {
     $this->assertInstanceOf(Update::class, db_update('test'));
@@ -423,7 +423,7 @@ public function testDbQuery() {
   /**
    * Tests deprecation of the db_delete() function.
    *
-   * @expectedDeprecation db_delete is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call delete() on it. For example, $injected_database->delete($table, $options). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_delete is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call delete() on it. For example, $injected_database->delete($table, $options). See https://www.drupal.org/node/2993033
    */
   public function testDbDelete() {
     $this->assertInstanceOf(Delete::class, db_delete('test'));
@@ -432,7 +432,7 @@ public function testDbDelete() {
   /**
    * Tests deprecation of the db_truncate() function.
    *
-   * @expectedDeprecation db_truncate() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call truncate() on it. For example, $injected_database->truncate($table, $options). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_truncate() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call truncate() on it. For example, $injected_database->truncate($table, $options). See https://www.drupal.org/node/2993033
    */
   public function testDbTruncate() {
     $this->assertInstanceOf(Truncate::class, db_truncate('test'));
@@ -459,7 +459,7 @@ public function testDbOptionsTargetInSelect() {
   /**
    * Tests deprecation of the db_query_temporary() function.
    *
-   * @expectedDeprecation db_query_temporary() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call queryTemporary() on it. For example, $injected_database->queryTemporary($query, $args, $options). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_query_temporary() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call queryTemporary() on it. For example, $injected_database->queryTemporary($query, $args, $options). See https://www.drupal.org/node/2993033
    */
   public function testDbQueryTemporary() {
     $expected = $this->connection->select('test')->countQuery()->execute()->fetchField();
@@ -471,7 +471,7 @@ public function testDbQueryTemporary() {
   /**
    * Tests deprecation of the db_query_range() function.
    *
-   * @expectedDeprecation db_query_range() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call queryRange() on it. For example, $injected_database->queryRange($query, $from, $count, $args, $options). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_query_range() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call queryRange() on it. For example, $injected_database->queryRange($query, $from, $count, $args, $options). See https://www.drupal.org/node/2993033
    */
   public function testDbQueryRange() {
     $count = count(db_query_range('SELECT name FROM {test}', 1, 3)->fetchAll());
@@ -501,7 +501,7 @@ public function testDbAddIndex() {
   /**
    * Tests the db_insert() function.
    *
-   * @expectedDeprecation db_insert() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call insert() on it. For example, $injected_database->insert($table, $options); See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_insert() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call insert() on it. For example, $injected_database->insert($table, $options). See https://www.drupal.org/node/2993033
    */
   public function testDbInsert() {
     $this->assertInstanceOf(Insert::class, db_insert('test'));
@@ -510,7 +510,7 @@ public function testDbInsert() {
   /**
    * Tests the db_select() function.
    *
-   * @expectedDeprecation db_select() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call call select() on it. For example, $injected_database->db_select($table, $alias, $options); See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_select() is deprecated in drupal:8.0.0. It will be removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call select() on it. For example, $injected_database->db_select($table, $alias, $options). See https://www.drupal.org/node/2993033
    */
   public function testDbSelect() {
     $this->assertInstanceOf(Select::class, db_select('test'));
@@ -519,7 +519,7 @@ public function testDbSelect() {
   /**
    * Tests the db_ignore_replica() function.
    *
-   * @expectedDeprecation db_ignore_replica() is deprecated in Drupal 8.7.x and will be removed before Drupal 9.0.0. Use \Drupal\Core\Database\ReplicaKillSwitch::trigger() instead. See https://www.drupal.org/node/2997500
+   * @expectedDeprecation db_ignore_replica() is deprecated in drupal:8.7.0. It will be removed from drupal:9.0.0. Use \Drupal\Core\Database\ReplicaKillSwitch::trigger() instead. See https://www.drupal.org/node/2997500
    */
   public function testDbIgnoreReplica() {
     $connection = Database::getConnectionInfo('default');
-- 
GitLab