Issue #3118730 by andypost, catch: Explicitly test for pg_trgm extention in installer

merge-requests/3172/head
xjm 2022-12-27 08:52:47 -06:00
parent 75035a0f82
commit 8f60c3922c
No known key found for this signature in database
GPG Key ID: 206B0B8743BDF4C2
2 changed files with 42 additions and 28 deletions

View File

@ -0,0 +1,42 @@
<?php
/**
* @file
* Install, update and uninstall functions for the pgsql module.
*/
use Drupal\Core\Database\Database;
/**
* Implements hook_requirements().
*/
function pgsql_requirements() {
$requirements = [];
// Test with PostgreSQL databases for the status of the pg_trgm extension.
if (Database::isActiveConnection()) {
$connection = Database::getConnection();
// Set the requirement just for postgres.
if ($connection->driver() == 'pgsql') {
$requirements['pgsql_extension_pg_trgm'] = [
'severity' => REQUIREMENT_OK,
'title' => t('PostgreSQL pg_trgm extension'),
'value' => t('Available'),
'description' => 'The pg_trgm PostgreSQL extension is present.',
];
// If the extension is not available, set the requirement error.
if (!$connection->schema()->extensionExists('pg_trgm')) {
$requirements['pgsql_extension_pg_trgm']['severity'] = REQUIREMENT_ERROR;
$requirements['pgsql_extension_pg_trgm']['value'] = t('Not created');
$requirements['pgsql_extension_pg_trgm']['description'] = t('The <a href=":pg_trgm">pg_trgm</a> PostgreSQL extension is not present. The extension is required by Drupal 10 to improve performance when using PostgreSQL. See <a href=":requirements">Drupal database server requirements</a> for more information.', [
':pg_trgm' => 'https://www.postgresql.org/docs/current/pgtrgm.html',
':requirements' => 'https://www.drupal.org/docs/system-requirements/database-server-requirements',
]);
}
}
}
return $requirements;
}

View File

@ -562,34 +562,6 @@ function system_requirements($phase) {
}
}
// Test with PostgreSQL databases for the status of the pg_trgm extension.
if ($phase === 'runtime' || $phase === 'update') {
if (Database::isActiveConnection()) {
$connection = Database::getConnection();
// Set the requirement just for postgres.
if ($connection->driver() == 'pgsql') {
$requirements['pgsql_extension_pg_trgm'] = [
'severity' => REQUIREMENT_OK,
'title' => t('PostgreSQL pg_trgm extension'),
'value' => t('Available'),
'description' => 'The pg_trgm PostgreSQL extension is present.',
];
// If the extension is not available, set the requirement error.
if (!$connection->schema()->extensionExists('pg_trgm')) {
$requirements['pgsql_extension_pg_trgm']['severity'] = REQUIREMENT_ERROR;
$requirements['pgsql_extension_pg_trgm']['value'] = t('Not created');
$requirements['pgsql_extension_pg_trgm']['description'] = t('The <a href=":pg_trgm">pg_trgm</a> PostgreSQL extension is not present. The extension is required by Drupal 10 to improve performance when using PostgreSQL. See <a href=":requirements">Drupal database server requirements</a> for more information.', [
':pg_trgm' => 'https://www.postgresql.org/docs/current/pgtrgm.html',
':requirements' => 'https://www.drupal.org/docs/system-requirements/database-server-requirements',
]);
}
}
}
}
if ($phase === 'runtime' || $phase === 'update') {
// Test database JSON support.
$requirements['database_support_json'] = [