Skip to content
Snippets Groups Projects
Commit b74bb8fa authored by catch's avatar catch
Browse files

Issue #3214922 by murilohp, daffie: Add a requirements error in Drupal 10 when...

Issue #3214922 by murilohp, daffie: Add a requirements error in Drupal 10 when PostgreSQL is used and the pg_trgm extension is not installed or created
parent 1f171b93
No related branches found
No related tags found
38 merge requests!7471uncessary 5 files are moved from media-library folder to misc folder,!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!54479.5.x SF update,!5014Issue #3071143: Table Render Array Example Is Incorrect,!4868Issue #1428520: Improve menu parent link selection,!4289Issue #1344552 by marcingy, Niklas Fiekas, Ravi.J, aleevas, Eduardo Morales...,!4114Issue #2707291: Disable body-level scrolling when a dialog is open as a modal,!3630Issue #2815301 by Chi, DanielVeza, kostyashupenko, smustgrave: Allow to create...,!3291Issue #3336463: Rewrite rules for gzipped CSS and JavaScript aggregates never match,!3143Issue #3313342: [PHP 8.1] Deprecated function: strpos(): Passing null to parameter #1 LayoutBuilderUiCacheContext.php on line 28,!3102Issue #3164428 by DonAtt, longwave, sahil.goyal, Anchal_gupta, alexpott: Use...,!2853#3274419 Makes BaseFieldOverride inherit the internal property from the base field.,!2719Issue #3110137: Remove Classy from core.,!2437Issue #3238257 by hooroomoo, Wim Leers: Fragment link pointing to <textarea>...,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2074Issue #2707689: NodeForm::actions() checks for delete access on new entities,!2062Issue #3246454: Add weekly granularity to views date sort,!1974Issue #3036862 demonstration,!1591Issue #3199697: Add JSON:API Translation experimental module,!1484Exposed filters get values from URL when Ajax is on,!1255Issue #3238922: Refactor (if feasible) uses of the jQuery serialize function to use vanillaJS,!1254Issue #3238915: Refactor (if feasible) uses of the jQuery ready function to use VanillaJS,!1162Issue #3100350: Unable to save '/' root path alias,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!957Added throwing of InvalidPluginDefinitionException from getDefinition().,!925Issue #2339235: Remove taxonomy hard dependency on node module,!877Issue #2708101: Default value for link text is not saved,!873Issue #2875228: Site install not using batch API service,!872Draft: Issue #3221319: Race condition when creating menu links and editing content deletes menu links,!844Resolve #3036010 "Updaters",!712Issue #2909128: Autocomplete intermittent on Chrome Android,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493,!485Sets the autocomplete attribute for username/password input field on login form.,!30Issue #3182188: Updates composer usage to point at ./vendor/bin/composer
......@@ -41,6 +41,10 @@ public function __construct() {
'function' => 'checkStandardConformingStrings',
'arguments' => [],
];
$this->tasks[] = [
'function' => 'checkExtensions',
'arguments' => [],
];
$this->tasks[] = [
'function' => 'initializeDatabase',
'arguments' => [],
......@@ -238,6 +242,27 @@ protected function checkStandardConformingStringsSuccess() {
return ($standard_conforming_strings == 'on');
}
/**
* Generic function to check postgresql extensions.
*/
public function checkExtensions() {
$connection = Database::getConnection();
try {
if ($connection->schema()->extensionExists('pg_trgm')) {
$this->pass(t('PostgreSQL has the pg_trgm extension enabled.'));
}
else {
$this->fail(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',
]));
}
}
catch (\Exception $e) {
$this->fail(t('Drupal could not check for the pg_trgm extension: @error.', ['@error' => $e->getMessage()]));
}
}
/**
* Make PostgreSQL Drupal friendly.
*/
......
......@@ -539,17 +539,30 @@ function system_requirements($phase) {
}
// Test with PostgreSQL databases for the status of the pg_trgm extension.
if ($phase === 'runtime') {
if (Database::isActiveConnection() && (Database::getConnection()->driver() == 'pgsql') && !Database::getConnection()->schema()->extensionExists('pg_trgm')) {
$requirements['pgsql_extension_pg_trgm'] = [
'severity' => REQUIREMENT_WARNING,
'title' => t('PostgreSQL pg_trgm extension'),
'value' => t('Not created'),
'description' => t('The <a href=":pg_trgm">pg_trgm</a> PostgreSQL extension is not present. The extension will be 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') {
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',
]);
}
}
}
}
......
......@@ -143,6 +143,16 @@ public function testStatusPage() {
$session->pageTextNotContains('Deprecated themes enabled');
$session->pageTextNotContains('Deprecated themes found: Test deprecated theme.');
$this->assertSession()->elementNotExists('xpath', "//a[contains(@href, 'http://example.com/deprecated_theme')]");
// Check if pg_trgm extension is enabled on postgres.
if ($this->getDatabaseConnection()->databaseType() == 'pgsql') {
$this->assertSession()->pageTextContains('PostgreSQL pg_trgm extension');
$elements = $this->xpath('//details[@class="system-status-report__entry"]//div[contains(text(), :text)]', [
':text' => 'The pg_trgm PostgreSQL extension is present.',
]);
$this->assertCount(1, $elements);
$this->assertStringStartsWith('Available', $elements[0]->getParent()->getText());
}
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment