diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml index cc89fa9..04ccc80 100644 --- a/core/config/schema/core.data_types.schema.yml +++ b/core/config/schema/core.data_types.schema.yml @@ -445,6 +445,9 @@ field.storage_settings.string: case_sensitive: type: boolean label: 'Case sensitive' + is_alphanumeric: + type: boolean + label: 'US ASCII characters only' field.field_settings.string: type: mapping diff --git a/core/lib/Drupal/Core/Cache/DatabaseBackend.php b/core/lib/Drupal/Core/Cache/DatabaseBackend.php index b1144e4..ba35597 100644 --- a/core/lib/Drupal/Core/Cache/DatabaseBackend.php +++ b/core/lib/Drupal/Core/Cache/DatabaseBackend.php @@ -443,6 +443,7 @@ public function schemaDefinition() { 'description' => 'Primary Key: Unique cache ID.', 'type' => 'varchar', 'length' => 255, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => '', 'binary' => TRUE, @@ -483,6 +484,7 @@ public function schemaDefinition() { 'checksum' => array( 'description' => 'The tag invalidation checksum when this entry was saved.', 'type' => 'varchar', + 'is_alphanumeric' => TRUE, 'length' => 255, 'not null' => TRUE, ), diff --git a/core/lib/Drupal/Core/Cache/DatabaseCacheTagsChecksum.php b/core/lib/Drupal/Core/Cache/DatabaseCacheTagsChecksum.php index b6d9161..3cdaa0b 100644 --- a/core/lib/Drupal/Core/Cache/DatabaseCacheTagsChecksum.php +++ b/core/lib/Drupal/Core/Cache/DatabaseCacheTagsChecksum.php @@ -171,6 +171,7 @@ public function schemaDefinition() { 'description' => 'Namespace-prefixed tag string.', 'type' => 'varchar', 'length' => 255, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => '', ), diff --git a/core/lib/Drupal/Core/Config/DatabaseStorage.php b/core/lib/Drupal/Core/Config/DatabaseStorage.php index 6c33273..908a0f0 100644 --- a/core/lib/Drupal/Core/Config/DatabaseStorage.php +++ b/core/lib/Drupal/Core/Config/DatabaseStorage.php @@ -194,6 +194,7 @@ protected static function schemaDefinition() { 'description' => 'Primary Key: Config object collection.', 'type' => 'varchar', 'length' => 255, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => '', ), @@ -201,6 +202,7 @@ protected static function schemaDefinition() { 'description' => 'Primary Key: Config object name.', 'type' => 'varchar', 'length' => 255, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => '', ), diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php index d0aba49..75645c7 100644 --- a/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php +++ b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php @@ -144,6 +144,9 @@ protected function createFieldSql($name, $spec) { if (!empty($spec['binary'])) { $sql .= ' BINARY'; } + if (!empty($spec['is_alphanumeric'])) { + $sql .= ' CHARACTER SET ascii COLLATE ascii_general_ci'; + } } elseif (isset($spec['precision']) && isset($spec['scale'])) { $sql .= '(' . $spec['precision'] . ', ' . $spec['scale'] . ')'; diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php index 8817c87..d05a91b 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php @@ -32,6 +32,7 @@ class StringItem extends StringItemBase { public static function defaultStorageSettings() { return array( 'max_length' => 255, + 'is_alphanumeric' => FALSE, ) + parent::defaultStorageSettings(); } @@ -45,6 +46,7 @@ public static function schema(FieldStorageDefinitionInterface $field_definition) 'type' => 'varchar', 'length' => (int) $field_definition->getSetting('max_length'), 'binary' => $field_definition->getSetting('case_sensitive'), + 'is_alphanumeric' => $field_definition->getSetting('is_alphanumeric'), ), ), ); diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UuidItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UuidItem.php index e787029..1a97377 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UuidItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UuidItem.php @@ -29,6 +29,7 @@ class UuidItem extends StringItem { public static function defaultStorageSettings() { return array( 'max_length' => 128, + 'is_alphanumeric' => TRUE, ) + parent::defaultStorageSettings(); } diff --git a/core/lib/Drupal/Core/Menu/MenuTreeStorage.php b/core/lib/Drupal/Core/Menu/MenuTreeStorage.php index 2ce68f7..aa3a7a5 100644 --- a/core/lib/Drupal/Core/Menu/MenuTreeStorage.php +++ b/core/lib/Drupal/Core/Menu/MenuTreeStorage.php @@ -1195,6 +1195,7 @@ protected static function schemaDefinition() { 'description' => "The menu name. All links with the same menu name (such as 'tools') are part of the same menu.", 'type' => 'varchar', 'length' => 32, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => '', ), @@ -1208,6 +1209,7 @@ protected static function schemaDefinition() { 'description' => 'Unique machine name: the plugin ID.', 'type' => 'varchar', 'length' => 255, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, ), 'parent' => array( @@ -1215,11 +1217,13 @@ protected static function schemaDefinition() { 'type' => 'varchar', 'length' => 255, 'not null' => TRUE, + 'is_alphanumeric' => TRUE, 'default' => '', ), 'route_name' => array( 'description' => 'The machine name of a defined Symfony Route this menu item represents.', 'type' => 'varchar', + 'is_alphanumeric' => TRUE, 'length' => 255, ), 'route_param_key' => array( @@ -1283,6 +1287,7 @@ protected static function schemaDefinition() { 'description' => 'The name of the module that generated this link.', 'type' => 'varchar', 'length' => DRUPAL_EXTENSION_NAME_MAX_LENGTH, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => 'system', ), diff --git a/core/modules/aggregator/src/Entity/Feed.php b/core/modules/aggregator/src/Entity/Feed.php index 6f3d2e2..1f8a165 100644 --- a/core/modules/aggregator/src/Entity/Feed.php +++ b/core/modules/aggregator/src/Entity/Feed.php @@ -226,6 +226,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { $fields['hash'] = BaseFieldDefinition::create('string') ->setLabel(t('Hash')) + ->setOption('is_alphanumeric', TRUE) ->setDescription(t('Calculated hash of the feed data, used for validating cache.')); $fields['etag'] = BaseFieldDefinition::create('string') diff --git a/core/modules/aggregator/src/FeedInterface.php b/core/modules/aggregator/src/FeedInterface.php index 29c6782..738a3dc 100644 --- a/core/modules/aggregator/src/FeedInterface.php +++ b/core/modules/aggregator/src/FeedInterface.php @@ -170,7 +170,8 @@ public function getHash(); * Sets the calculated hash of the feed data, used for validating cache. * * @param string $hash - * A string containing the calculated hash of the feed. + * A string containing the calculated hash of the feed. Must be base64 + * encoded so it contains US ASCII characters only. * * @return \Drupal\aggregator\FeedInterface * The class instance that this method is called on. diff --git a/core/modules/aggregator/src/ItemsImporter.php b/core/modules/aggregator/src/ItemsImporter.php index 3098f08..1c1aaa2 100644 --- a/core/modules/aggregator/src/ItemsImporter.php +++ b/core/modules/aggregator/src/ItemsImporter.php @@ -9,6 +9,7 @@ use Drupal\aggregator\Plugin\AggregatorPluginManager; use Drupal\Component\Plugin\Exception\PluginException; +use Drupal\Component\Utility\Crypt; use Drupal\Core\Config\ConfigFactoryInterface; use Psr\Log\LoggerInterface; @@ -113,7 +114,7 @@ public function refresh(FeedInterface $feed) { // We store the hash of feed data in the database. When refreshing a // feed we compare stored hash and new hash calculated from downloaded // data. If both are equal we say that feed is not updated. - $hash = hash('sha256', $feed->source_string); + $hash = Crypt::hashBase64('sha256', $feed->source_string); $has_new_content = $success && ($feed->getHash() != $hash); if ($has_new_content) { diff --git a/core/modules/ban/ban.install b/core/modules/ban/ban.install index 7a5494f..d7a5b72 100644 --- a/core/modules/ban/ban.install +++ b/core/modules/ban/ban.install @@ -22,6 +22,7 @@ function ban_schema() { 'description' => 'IP address', 'type' => 'varchar', 'length' => 40, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => '', ), diff --git a/core/modules/comment/comment.install b/core/modules/comment/comment.install index 64aa6bd..c58d576 100644 --- a/core/modules/comment/comment.install +++ b/core/modules/comment/comment.install @@ -50,6 +50,7 @@ function comment_schema() { 'not null' => TRUE, 'default' => 'node', 'length' => EntityTypeInterface::ID_MAX_LENGTH, + 'is_alphanumeric' => TRUE, 'description' => 'The entity_type of the entity to which this comment is a reply.', ), 'field_name' => array( @@ -57,6 +58,7 @@ function comment_schema() { 'not null' => TRUE, 'default' => '', 'length' => FieldStorageConfig::NAME_MAX_LENGTH, + 'is_alphanumeric' => TRUE, 'description' => 'The field_name of the field that was used to add this comment.', ), 'cid' => array( diff --git a/core/modules/dblog/dblog.install b/core/modules/dblog/dblog.install index b7454c1..a855f4b 100644 --- a/core/modules/dblog/dblog.install +++ b/core/modules/dblog/dblog.install @@ -29,6 +29,7 @@ function dblog_schema() { 'length' => 64, 'not null' => TRUE, 'default' => '', + 'is_alphanumeric' => TRUE, 'description' => 'Type of log message, for example "user" or "page not found."', ), 'message' => array( @@ -73,6 +74,7 @@ function dblog_schema() { 'length' => 128, 'not null' => TRUE, 'default' => '', + 'is_alphanumeric' => TRUE, 'description' => 'Hostname of the user who triggered the event.', ), 'timestamp' => array( diff --git a/core/modules/file/file.install b/core/modules/file/file.install index 6e188c6..db2a965 100644 --- a/core/modules/file/file.install +++ b/core/modules/file/file.install @@ -22,6 +22,7 @@ function file_schema() { 'description' => 'The name of the module that is using the file.', 'type' => 'varchar', 'length' => DRUPAL_EXTENSION_NAME_MAX_LENGTH, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => '', ), @@ -29,12 +30,14 @@ function file_schema() { 'description' => 'The name of the object type in which the file is used.', 'type' => 'varchar', 'length' => 64, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => '', ), 'id' => array( 'description' => 'The primary key of the object using the file.', 'type' => 'varchar', + 'is_alphanumeric' => TRUE, 'length' => 64, 'not null' => TRUE, 'default' => 0, diff --git a/core/modules/file/src/Entity/File.php b/core/modules/file/src/Entity/File.php index 42de0ae..1cef61d 100644 --- a/core/modules/file/src/Entity/File.php +++ b/core/modules/file/src/Entity/File.php @@ -254,6 +254,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { $fields['filemime'] = BaseFieldDefinition::create('string') ->setLabel(t('File MIME type')) + ->setOption('is_numeric', TRUE) ->setDescription(t("The file's MIME type.")); $fields['filesize'] = BaseFieldDefinition::create('integer') diff --git a/core/modules/locale/locale.install b/core/modules/locale/locale.install index 81aadf5..bb56025 100644 --- a/core/modules/locale/locale.install +++ b/core/modules/locale/locale.install @@ -69,6 +69,7 @@ function locale_schema() { 'context' => array( 'type' => 'varchar', 'length' => 255, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => '', 'description' => 'The context this string applies to.', @@ -76,6 +77,7 @@ function locale_schema() { 'version' => array( 'type' => 'varchar', 'length' => 20, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => 'none', 'description' => 'Version of Drupal where the string was last used (for locales optimization).', @@ -105,6 +107,7 @@ function locale_schema() { 'language' => array( 'type' => 'varchar', 'length' => 12, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => '', 'description' => 'Language code. References {language}.langcode.', @@ -144,6 +147,7 @@ function locale_schema() { 'type' => array( 'type' => 'varchar', 'length' => 50, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => '', 'description' => 'The location type (file, config, path, etc).', @@ -158,6 +162,7 @@ function locale_schema() { 'version' => array( 'type' => 'varchar', 'length' => 20, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => 'none', 'description' => 'Version of Drupal where the location was found.', diff --git a/core/modules/menu_link_content/src/Entity/MenuLinkContent.php b/core/modules/menu_link_content/src/Entity/MenuLinkContent.php index 5570a2a..ea9adf0 100644 --- a/core/modules/menu_link_content/src/Entity/MenuLinkContent.php +++ b/core/modules/menu_link_content/src/Entity/MenuLinkContent.php @@ -250,6 +250,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { ->setLabel(t('Bundle')) ->setDescription(t('The content menu link bundle.')) ->setSetting('max_length', EntityTypeInterface::BUNDLE_MAX_LENGTH) + ->setSetting('is_alphanumeric', TRUE) ->setReadOnly(TRUE); $fields['title'] = BaseFieldDefinition::create('string') @@ -291,7 +292,8 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { $fields['menu_name'] = BaseFieldDefinition::create('string') ->setLabel(t('Menu name')) ->setDescription(t('The menu name. All links with the same menu name (such as "tools") are part of the same menu.')) - ->setDefaultValue('tools'); + ->setDefaultValue('tools') + ->setSetting('is_alphanumeric', TRUE); $fields['link'] = BaseFieldDefinition::create('link') ->setLabel(t('Link')) diff --git a/core/modules/node/node.install b/core/modules/node/node.install index fa0d245..59f4e84 100644 --- a/core/modules/node/node.install +++ b/core/modules/node/node.install @@ -56,6 +56,7 @@ function node_schema() { 'description' => 'The {language}.langcode of this node.', 'type' => 'varchar', 'length' => 12, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => '', ), diff --git a/core/modules/search/search.install b/core/modules/search/search.install index a298f2f..5b2a5da 100644 --- a/core/modules/search/search.install +++ b/core/modules/search/search.install @@ -22,6 +22,7 @@ function search_schema() { 'langcode' => array( 'type' => 'varchar', 'length' => '12', + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'description' => 'The {languages}.langcode of the item variant.', 'default' => '', @@ -29,6 +30,7 @@ function search_schema() { 'type' => array( 'type' => 'varchar', 'length' => 64, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'description' => 'Type of item, e.g. node.', ), @@ -69,6 +71,7 @@ function search_schema() { 'langcode' => array( 'type' => 'varchar', 'length' => '12', + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'description' => 'The {languages}.langcode of the item variant.', 'default' => '', @@ -76,6 +79,7 @@ function search_schema() { 'type' => array( 'type' => 'varchar', 'length' => 64, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'description' => 'The {search_dataset}.type of the searchable item to which the word belongs.', ), diff --git a/core/modules/shortcut/shortcut.install b/core/modules/shortcut/shortcut.install index c1a6883..594fcaf 100644 --- a/core/modules/shortcut/shortcut.install +++ b/core/modules/shortcut/shortcut.install @@ -24,6 +24,7 @@ function shortcut_schema() { 'length' => 32, 'not null' => TRUE, 'default' => '', + 'is_alphanumeric' => TRUE, 'description' => "The {shortcut_set}.set_name that will be displayed for this user.", ), ), diff --git a/core/modules/simpletest/simpletest.install b/core/modules/simpletest/simpletest.install index 47c0ee2..b8c631b 100644 --- a/core/modules/simpletest/simpletest.install +++ b/core/modules/simpletest/simpletest.install @@ -130,6 +130,7 @@ function simpletest_schema() { 'type' => 'varchar', 'length' => 255, 'not null' => TRUE, + 'is_alphanumeric' => TRUE, 'default' => '', 'description' => 'The message group this message belongs to. For example: warning, browser, user.', ), diff --git a/core/modules/system/src/Tests/Database/SchemaTest.php b/core/modules/system/src/Tests/Database/SchemaTest.php index a59b9d9..46997c8 100644 --- a/core/modules/system/src/Tests/Database/SchemaTest.php +++ b/core/modules/system/src/Tests/Database/SchemaTest.php @@ -49,6 +49,12 @@ function testSchema() { 'default' => "'\"funky default'\"", 'description' => 'Schema column description for string.', ), + 'test_field_string_is_alphanumeric' => array( + 'type' => 'varchar', + 'length' => 255, + 'is_alphanumeric' => TRUE, + 'description' => 'Schema column description for is_alphanumeric string.', + ), ), ); db_create_table('test_table', $table_specification); @@ -62,6 +68,17 @@ function testSchema() { // Assert that the column comment has been set. $this->checkSchemaComment($table_specification['fields']['test_field']['description'], 'test_table', 'test_field'); + // Make sure that varchard fields have the correct collation. + $columns = db_query('SHOW FULL COLUMNS FROM {test_table}'); + foreach ($columns as $column) { + if ($column->Field == 'test_field_string') { + $this->assertTrue($column->Collation == 'utf8_general_ci'); + } + if ($column->Field == 'test_field_string_is_alphanumeric') { + $this->assertTrue($column->Collation == 'ascii_general_ci'); + } + } + // An insert without a value for the column 'test_table' should fail. $this->assertFalse($this->tryInsert(), 'Insert without a default failed.'); diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 8355a2c..0d82135 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -684,6 +684,7 @@ function system_schema() { 'description' => "A string token generated against the current user's session id and the batch id, used to ensure that only the user who submitted the batch can effectively access it.", 'type' => 'varchar', 'length' => 64, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, ), 'timestamp' => array( @@ -716,6 +717,7 @@ function system_schema() { 'description' => 'Name of event (e.g. contact).', 'type' => 'varchar', 'length' => 64, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => '', ), @@ -723,6 +725,7 @@ function system_schema() { 'description' => 'Identifier of the visitor, such as an IP address or hostname.', 'type' => 'varchar', 'length' => 128, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => '', ), @@ -824,6 +827,7 @@ function system_schema() { 'type' => 'varchar', 'length' => 255, 'not null' => TRUE, + 'is_alphanumeric' => TRUE, 'default' => '', 'description' => 'The queue name.', ), @@ -861,6 +865,7 @@ function system_schema() { 'description' => 'Primary Key: Machine name of this route', 'type' => 'varchar', 'length' => 255, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => '', ), @@ -916,6 +921,7 @@ function system_schema() { 'value' => array( 'description' => 'A value for the semaphore.', 'type' => 'varchar', + 'is_alphanumeric' => TRUE, 'length' => 255, 'not null' => TRUE, 'default' => '' @@ -960,12 +966,14 @@ function system_schema() { 'description' => "A session ID (hashed). The value is generated by Drupal's session handlers.", 'type' => 'varchar', 'length' => 128, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, ), 'hostname' => array( 'description' => 'The IP address that last used this session ID (sid).', 'type' => 'varchar', 'length' => 128, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => '', ), @@ -1024,6 +1032,7 @@ function system_schema() { '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', 'length' => 12, + 'is_alphanumeric' => TRUE, 'not null' => TRUE, 'default' => '', ),