Commit 9040dc80 authored by catch's avatar catch
Browse files

Issue #2664466 by dawehner, alexpott, kostyashupenko: url_alias table is only...

Issue #2664466 by dawehner, alexpott, kostyashupenko: url_alias table is only used by a core service but it depends on system install
parent fda31a65
......@@ -9,6 +9,7 @@
use Drupal\Core\Cache\Cache;
use Drupal\Core\Database\Connection;
use Drupal\Core\Database\SchemaObjectExistsException;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Language\LanguageInterface;
use Drupal\Core\Database\Query\Condition;
......@@ -21,6 +22,12 @@
* the same, and will both refer to the same internal system path.
*/
class AliasStorage implements AliasStorageInterface {
/**
* The table for the url_alias storage.
*/
const TABLE = 'url_alias';
/**
* The database connection.
*
......@@ -70,18 +77,43 @@ public function save($source, $alias, $langcode = LanguageInterface::LANGCODE_NO
// Insert or update the alias.
if (empty($pid)) {
$query = $this->connection->insert('url_alias')
->fields($fields);
$pid = $query->execute();
$try_again = FALSE;
try {
$query = $this->connection->insert(static::TABLE)
->fields($fields);
$pid = $query->execute();
}
catch (\Exception $e) {
// If there was an exception, try to create the table.
if (!$try_again = $this->ensureTableExists()) {
// If the exception happened for other reason than the missing table,
// propagate the exception.
throw $e;
}
}
// Now that the table has been created, try again if necessary.
if ($try_again) {
$query = $this->connection->insert(static::TABLE)
->fields($fields);
$pid = $query->execute();
}
$fields['pid'] = $pid;
$operation = 'insert';
}
else {
// Fetch the current values so that an update hook can identify what
// exactly changed.
$original = $this->connection->query('SELECT source, alias, langcode FROM {url_alias} WHERE pid = :pid', array(':pid' => $pid))->fetchAssoc();
try {
$original = $this->connection->query('SELECT source, alias, langcode FROM {url_alias} WHERE pid = :pid', array(':pid' => $pid))
->fetchAssoc();
}
catch (\Exception $e) {
$this->catchException($e);
$original = FALSE;
}
$fields['pid'] = $pid;
$query = $this->connection->update('url_alias')
$query = $this->connection->update(static::TABLE)
->fields($fields)
->condition('pid', $pid);
$pid = $query->execute();
......@@ -101,7 +133,7 @@ public function save($source, $alias, $langcode = LanguageInterface::LANGCODE_NO
* {@inheritdoc}
*/
public function load($conditions) {
$select = $this->connection->select('url_alias');
$select = $this->connection->select(static::TABLE);
foreach ($conditions as $field => $value) {
if ($field == 'source' || $field == 'alias') {
// Use LIKE for case-insensitive matching.
......@@ -111,12 +143,18 @@ public function load($conditions) {
$select->condition($field, $value);
}
}
return $select
->fields('url_alias')
->orderBy('pid', 'DESC')
->range(0, 1)
->execute()
->fetchAssoc();
try {
return $select
->fields(static::TABLE)
->orderBy('pid', 'DESC')
->range(0, 1)
->execute()
->fetchAssoc();
}
catch (\Exception $e) {
$this->catchException($e);
return FALSE;
}
}
/**
......@@ -124,7 +162,7 @@ public function load($conditions) {
*/
public function delete($conditions) {
$path = $this->load($conditions);
$query = $this->connection->delete('url_alias');
$query = $this->connection->delete(static::TABLE);
foreach ($conditions as $field => $value) {
if ($field == 'source' || $field == 'alias') {
// Use LIKE for case-insensitive matching.
......@@ -134,7 +172,13 @@ public function delete($conditions) {
$query->condition($field, $value);
}
}
$deleted = $query->execute();
try {
$deleted = $query->execute();
}
catch (\Exception $e) {
$this->catchException($e);
$deleted = FALSE;
}
// @todo Switch to using an event for this instead of a hook.
$this->moduleHandler->invokeAll('path_delete', array($path));
Cache::invalidateTags(['route_match']);
......@@ -146,8 +190,8 @@ public function delete($conditions) {
*/
public function preloadPathAlias($preloaded, $langcode) {
$langcode_list = [$langcode, LanguageInterface::LANGCODE_NOT_SPECIFIED];
$select = $this->connection->select('url_alias')
->fields('url_alias', ['source', 'alias']);
$select = $this->connection->select(static::TABLE)
->fields(static::TABLE, ['source', 'alias']);
if (!empty($preloaded)) {
$conditions = new Condition('OR');
......@@ -175,7 +219,13 @@ public function preloadPathAlias($preloaded, $langcode) {
$select->orderBy('pid', 'ASC');
$select->condition('langcode', $langcode_list, 'IN');
return $select->execute()->fetchAllKeyed();
try {
return $select->execute()->fetchAllKeyed();
}
catch (\Exception $e) {
$this->catchException($e);
return FALSE;
}
}
/**
......@@ -186,8 +236,8 @@ public function lookupPathAlias($path, $langcode) {
$langcode_list = [$langcode, LanguageInterface::LANGCODE_NOT_SPECIFIED];
// See the queries above. Use LIKE for case-insensitive matching.
$select = $this->connection->select('url_alias')
->fields('url_alias', ['alias'])
$select = $this->connection->select(static::TABLE)
->fields(static::TABLE, ['alias'])
->condition('source', $source, 'LIKE');
if ($langcode == LanguageInterface::LANGCODE_NOT_SPECIFIED) {
array_pop($langcode_list);
......@@ -201,7 +251,13 @@ public function lookupPathAlias($path, $langcode) {
$select->orderBy('pid', 'DESC');
$select->condition('langcode', $langcode_list, 'IN');
return $select->execute()->fetchField();
try {
return $select->execute()->fetchField();
}
catch (\Exception $e) {
$this->catchException($e);
return FALSE;
}
}
/**
......@@ -212,8 +268,8 @@ public function lookupPathSource($path, $langcode) {
$langcode_list = [$langcode, LanguageInterface::LANGCODE_NOT_SPECIFIED];
// See the queries above. Use LIKE for case-insensitive matching.
$select = $this->connection->select('url_alias')
->fields('url_alias', ['source'])
$select = $this->connection->select(static::TABLE)
->fields(static::TABLE, ['source'])
->condition('alias', $alias, 'LIKE');
if ($langcode == LanguageInterface::LANGCODE_NOT_SPECIFIED) {
array_pop($langcode_list);
......@@ -227,7 +283,13 @@ public function lookupPathSource($path, $langcode) {
$select->orderBy('pid', 'DESC');
$select->condition('langcode', $langcode_list, 'IN');
return $select->execute()->fetchField();
try {
return $select->execute()->fetchField();
}
catch (\Exception $e) {
$this->catchException($e);
return FALSE;
}
}
/**
......@@ -235,7 +297,7 @@ public function lookupPathSource($path, $langcode) {
*/
public function aliasExists($alias, $langcode, $source = NULL) {
// Use LIKE and NOT LIKE for case-insensitive matching.
$query = $this->connection->select('url_alias')
$query = $this->connection->select(static::TABLE)
->condition('alias', $this->connection->escapeLike($alias), 'LIKE')
->condition('langcode', $langcode);
if (!empty($source)) {
......@@ -243,45 +305,152 @@ public function aliasExists($alias, $langcode, $source = NULL) {
}
$query->addExpression('1');
$query->range(0, 1);
return (bool) $query->execute()->fetchField();
try {
return (bool) $query->execute()->fetchField();
}
catch (\Exception $e) {
$this->catchException($e);
return FALSE;
}
}
/**
* {@inheritdoc}
*/
public function languageAliasExists() {
return (bool) $this->connection->queryRange('SELECT 1 FROM {url_alias} WHERE langcode <> :langcode', 0, 1, array(':langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED))->fetchField();
try {
return (bool) $this->connection->queryRange('SELECT 1 FROM {url_alias} WHERE langcode <> :langcode', 0, 1, array(':langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED))->fetchField();
}
catch (\Exception $e) {
$this->catchException($e);
return FALSE;
}
}
/**
* {@inheritdoc}
*/
public function getAliasesForAdminListing($header, $keys = NULL) {
$query = $this->connection->select('url_alias')
$query = $this->connection->select(static::TABLE)
->extend('Drupal\Core\Database\Query\PagerSelectExtender')
->extend('Drupal\Core\Database\Query\TableSortExtender');
if ($keys) {
// Replace wildcards with PDO wildcards.
$query->condition('alias', '%' . preg_replace('!\*+!', '%', $keys) . '%', 'LIKE');
}
return $query
->fields('url_alias')
->orderByHeader($header)
->limit(50)
->execute()
->fetchAll();
try {
return $query
->fields(static::TABLE)
->orderByHeader($header)
->limit(50)
->execute()
->fetchAll();
}
catch (\Exception $e) {
$this->catchException($e);
return [];
}
}
/**
* {@inheritdoc}
*/
public function pathHasMatchingAlias($initial_substring) {
$query = $this->connection->select('url_alias', 'u');
$query = $this->connection->select(static::TABLE, 'u');
$query->addExpression(1);
return (bool) $query
->condition('u.source', $this->connection->escapeLike($initial_substring) . '%', 'LIKE')
->range(0, 1)
->execute()
->fetchField();
try {
return (bool) $query
->condition('u.source', $this->connection->escapeLike($initial_substring) . '%', 'LIKE')
->range(0, 1)
->execute()
->fetchField();
}
catch (\Exception $e) {
$this->catchException($e);
return FALSE;
}
}
/**
* Check if the table exists and create it if not.
*/
protected function ensureTableExists() {
try {
$database_schema = $this->connection->schema();
if (!$database_schema->tableExists(static::TABLE)) {
$schema_definition = $this->schemaDefinition();
$database_schema->createTable(static::TABLE, $schema_definition);
return TRUE;
}
}
// If another process has already created the table, attempting to recreate
// it will throw an exception. In this case just catch the exception and do
// nothing.
catch (SchemaObjectExistsException $e) {
return TRUE;
}
return FALSE;
}
/**
* Act on an exception when url_alias might be stale.
*
* If the table does not yet exist, that's fine, but if the table exists and
* yet the query failed, then the url_alias is stale and the exception needs
* to propagate.
*
* @param $e
* The exception.
*
* @throws \Exception
*/
protected function catchException(\Exception $e) {
if ($this->connection->schema()->tableExists(static::TABLE)) {
throw $e;
}
}
/**
* Defines the schema for the {url_alias} table.
*/
public static function schemaDefinition() {
return [
'description' => 'A list of URL aliases for Drupal paths; a user may visit either the source or destination path.',
'fields' => [
'pid' => [
'description' => 'A unique path alias identifier.',
'type' => 'serial',
'unsigned' => TRUE,
'not null' => TRUE,
],
'source' => [
'description' => 'The Drupal path this alias is for; e.g. node/12.',
'type' => 'varchar',
'length' => 255,
'not null' => TRUE,
'default' => '',
],
'alias' => [
'description' => 'The alias for this path; e.g. title-of-the-story.',
'type' => 'varchar',
'length' => 255,
'not null' => TRUE,
'default' => '',
],
'langcode' => [
'description' => "The language code this alias is for; if 'und', the alias will be used for unknown languages. Each Drupal path can have an alias for each supported language.",
'type' => 'varchar_ascii',
'length' => 12,
'not null' => TRUE,
'default' => '',
],
],
'primary key' => ['pid'],
'indexes' => [
'alias_langcode_pid' => ['alias', 'langcode', 'pid'],
'source_langcode_pid' => ['source', 'langcode', 'pid'],
],
];
}
}
......@@ -36,7 +36,6 @@ protected function setUp() {
parent::setUp();
// Install the Filter module.
$this->installSchema('system', 'url_alias');
// Create text format, associate CKEditor.
$filtered_html_format = FilterFormat::create(array(
......
......@@ -44,7 +44,6 @@ protected function setUp() {
parent::setUp();
// Install the Filter module.
$this->installSchema('system', 'url_alias');
// Create text format, associate CKEditor.
$filtered_html_format = FilterFormat::create(array(
......
......@@ -36,7 +36,6 @@ protected function setUp() {
parent::setUp();
// Install the Filter module.
$this->installSchema('system', 'url_alias');
// Add text formats.
$filtered_html_format = FilterFormat::create(array(
......
......@@ -71,7 +71,6 @@ protected function setUp() {
parent::setUp();
// Install the Filter module.
$this->installSchema('system', 'url_alias');
// Create a field.
$this->fieldName = 'field_textarea';
......
......@@ -24,7 +24,6 @@ protected function setUp() {
// Drupal\filter\FilterPermissions::permissions() builds an URL to output
// a link in the description.
$this->installSchema('system', 'url_alias');
$this->installEntitySchema('user');
......
......@@ -63,7 +63,7 @@ abstract class NormalizerTestBase extends KernelTestBase {
*/
protected function setUp() {
parent::setUp();
$this->installSchema('system', array('url_alias', 'router'));
$this->installSchema('system', array('router'));
$this->installEntitySchema('user');
$this->installEntitySchema('entity_test');
// If the concrete test sub-class installs the Node or Comment modules,
......
......@@ -39,7 +39,7 @@ protected function setUp() {
$this->installEntitySchema('menu_link_content');
$this->installEntitySchema('user');
$this->installSchema('system', ['url_alias', 'router']);
$this->installSchema('system', ['router']);
// Ensure that the weight of module_link_content is higher than system.
// @see menu_link_content_install()
......
......@@ -32,7 +32,7 @@ protected function setUp() {
parent::setUp();
$this->installEntitySchema('menu_link_content');
$this->installSchema('system', ['url_alias', 'router']);
$this->installSchema('system', ['router']);
// Ensure that the weight of module_link_content is higher than system.
// @see menu_link_content_install()
......
......@@ -29,7 +29,6 @@ class MigrateUrlAliasTest extends MigrateDrupal6TestBase {
*/
protected function setUp() {
parent::setUp();
$this->installSchema('system', ['url_alias']);
$this->executeMigration('d6_url_alias');
}
......
......@@ -26,7 +26,6 @@ class MigrateUrlAliasTest extends MigrateDrupal7TestBase {
*/
protected function setUp() {
parent::setUp();
$this->installSchema('system', ['url_alias']);
$this->executeMigration('d7_url_alias');
}
......
......@@ -124,8 +124,6 @@ public function testSimpleEntityType() {
* Tests a field whose associated in-place editor generates custom metadata.
*/
public function testEditorWithCustomMetadata() {
$this->installSchema('system', 'url_alias');
$this->editorManager = $this->container->get('plugin.manager.quickedit.editor');
$this->editorSelector = new EditorSelector($this->editorManager, $this->container->get('plugin.manager.field.formatter'));
$this->metadataGenerator = new MetadataGenerator($this->accessChecker, $this->editorSelector, $this->editorManager);
......
......@@ -25,7 +25,7 @@ protected function setUp() {
$this->installEntitySchema('entity_test_mulrev');
$this->installEntitySchema('user');
$this->installSchema('system', array('url_alias', 'router'));
$this->installSchema('system', array('router'));
$this->installConfig(array('field'));
\Drupal::service('router.builder')->rebuild();
\Drupal::moduleHandler()->invoke('rest', 'install');
......
......@@ -20,11 +20,6 @@
*/
class EntityAccessControlHandlerTest extends EntityLanguageTestBase {
protected function setUp() {
parent::setUp();
$this->installSchema('system', 'url_alias');
}
/**
* Asserts entity access correctly grants or denies access.
*/
......
......@@ -8,6 +8,7 @@
namespace Drupal\system\Tests\Path;
use Drupal\Core\Database\Connection;
use Drupal\Core\Path\AliasStorage;
/**
* Utility methods to generate sample data, database configuration, etc.
......@@ -92,7 +93,7 @@ public function tableDefinition() {
module_load_install('system');
$schema = system_schema();
$tables['url_alias'] = $schema['url_alias'];
$tables['url_alias'] = AliasStorage::schemaDefinition();
$tables['key_value'] = $schema['key_value'];
return $tables;
......
......@@ -62,7 +62,7 @@ class RequestPathTest extends KernelTestBase {
protected function setUp() {
parent::setUp();
$this->installSchema('system', array('sequences', 'url_alias'));
$this->installSchema('system', array('sequences'));
$this->pluginManager = $this->container->get('plugin.manager.condition');
......
......@@ -31,7 +31,7 @@ protected function setUp() {
\Drupal::unsetContainer();
parent::setUp();
$this->installSchema('system', ['router', 'url_alias']);
$this->installSchema('system', ['router']);
\Drupal::service('router.builder')->rebuild();
}
......
......@@ -86,8 +86,6 @@ protected function setUp() {
$this->cache = new MemoryBackend('data');
$this->pathProcessor = \Drupal::service('path_processor_manager');
$this->cacheTagsInvalidator = \Drupal::service('cache_tags.invalidator');
$this->installSchema('system', 'url_alias');
}
/**
......
......@@ -85,8 +85,6 @@ public function testClear() {
* Tests the generation of all system site information tokens.
*/
public function testSystemSiteTokenReplacement() {
// The use of the \Drupal::url() method requires the url_alias table to exist.
$this->installSchema('system', 'url_alias');
$url_options = array(
'absolute' => TRUE,
'language' => $this->interfaceLanguage,
......
......@@ -91,7 +91,6 @@ protected function setUp() {
$this->installSchema('system', [
'key_value_expire',
'sessions',
'url_alias',
]);
$this->installSchema('dblog', ['watchdog']);
$this->installEntitySchema('block_content');
......@@ -112,6 +111,9 @@ protected function setUp() {
$account = User::create(['mail' => 'q\'uote$dollar@example.com', 'name' => '$dollar']);
$account->save();
// Create url_alias (this will create 'url_alias').
$this->container->get('path.alias_storage')->save('/user/' . $account->id(), '/user/example');
// Create a cache table (this will create 'cache_discovery').
\Drupal::cache('discovery')->set('test', $this->data);
......@@ -124,6 +126,8 @@ protected function setUp() {
'cachetags',
'config',
'cache_bootstrap',
'cache_data',
'cache_default',
'cache_discovery',
'cache_entity',
'file_managed',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment