summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathaniel Catchpole2015-06-02 17:00:14 +0100
committerNathaniel Catchpole2015-06-02 17:06:45 +0100
commit537da55a56a67173063aa78ba96dd72d2b8ab76c (patch)
treef40eb204429969eb645b1ee243775584903f447e
parent7d3e205b9ae1341a1929b8ec729d18b5bd57ec06 (diff)
Revert "Issue #1314214 by stefan.r, phayes, ergophobe, YesCT, damienwhaley, Tor Arne Thune, kbasarab, pfrenssen, basic, yannickoo, simolokid: MySQL driver does not support full UTF-8 (emojis, asian symbols, mathematical symbols)"
This reverts commit b105158ab75a593a59d26b10897f10fa1e7e5f1e.
-rw-r--r--core/lib/Drupal/Core/Database/Driver/mysql/Connection.php10
-rw-r--r--core/lib/Drupal/Core/Database/Driver/mysql/Schema.php6
-rw-r--r--core/modules/aggregator/src/FeedStorageSchema.php2
-rw-r--r--core/modules/block_content/src/BlockContentStorageSchema.php52
-rw-r--r--core/modules/block_content/src/Entity/BlockContent.php1
-rw-r--r--core/modules/file/src/Entity/File.php3
-rw-r--r--core/modules/file/src/FileStorageSchema.php2
-rw-r--r--core/modules/file/src/Plugin/Validation/Constraint/FileUriUnique.php31
-rw-r--r--core/modules/file/src/Tests/SaveTest.php18
-rw-r--r--core/modules/migrate/src/Plugin/migrate/id_map/Sql.php6
-rw-r--r--core/modules/migrate_drupal/src/Tests/Table/d6/System.php4
-rw-r--r--core/modules/node/src/Tests/NodeViewTest.php12
-rw-r--r--core/modules/system/src/Tests/Database/RegressionTest.php10
-rw-r--r--core/modules/system/src/Tests/Database/SchemaTest.php2
-rw-r--r--core/modules/system/tests/modules/database_test/database_test.install10
-rw-r--r--core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php5
-rw-r--r--core/modules/user/src/UserStorageSchema.php3
-rw-r--r--core/modules/user/user.module2
-rw-r--r--core/modules/views/src/Tests/ViewTestData.php2
-rw-r--r--core/scripts/dump-database-d6.sh5
-rw-r--r--core/tests/Drupal/Tests/Core/Routing/RoutingFixtures.php2
-rw-r--r--sites/default/default.settings.php4
22 files changed, 84 insertions, 108 deletions
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php b/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
index a94c0d3..e092a98 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
@@ -64,7 +64,7 @@ class Connection extends DatabaseConnection {
// Character set is added to dsn to ensure PDO uses the proper character
// set when escaping. This has security implications. See
// https://www.drupal.org/node/1201452 for further discussion.
- $dsn .= ';charset=utf8mb4';
+ $dsn .= ';charset=utf8';
if (!empty($connection_options['database'])) {
$dsn .= ';dbname=' . $connection_options['database'];
}
@@ -92,13 +92,13 @@ class Connection extends DatabaseConnection {
$pdo = new \PDO($dsn, $connection_options['username'], $connection_options['password'], $connection_options['pdo']);
// Force MySQL to use the UTF-8 character set. Also set the collation, if a
- // certain one has been set; otherwise, MySQL defaults to
- // 'utf8mb4_general_ci' for utf8mb4.
+ // certain one has been set; otherwise, MySQL defaults to 'utf8_general_ci'
+ // for UTF-8.
if (!empty($connection_options['collation'])) {
- $pdo->exec('SET NAMES utf8mb4 COLLATE ' . $connection_options['collation']);
+ $pdo->exec('SET NAMES utf8 COLLATE ' . $connection_options['collation']);
}
else {
- $pdo->exec('SET NAMES utf8mb4');
+ $pdo->exec('SET NAMES utf8');
}
// Set MySQL init_commands if not already defined. Default Drupal's MySQL
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
index 6326bcf..8237c79 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
@@ -87,7 +87,7 @@ class Schema extends DatabaseSchema {
// Provide defaults if needed.
$table += array(
'mysql_engine' => 'InnoDB',
- 'mysql_character_set' => 'utf8mb4',
+ 'mysql_character_set' => 'utf8',
);
$sql = "CREATE TABLE {" . $name . "} (\n";
@@ -108,8 +108,8 @@ class Schema extends DatabaseSchema {
$sql .= 'ENGINE = ' . $table['mysql_engine'] . ' DEFAULT CHARACTER SET ' . $table['mysql_character_set'];
// By default, MySQL uses the default collation for new tables, which is
- // 'utf8mb4_general_ci' for utf8mb4. If an alternate collation has been
- // set, it needs to be explicitly specified.
+ // 'utf8_general_ci' for utf8. If an alternate collation has been set, it
+ // needs to be explicitly specified.
// @see DatabaseConnection_mysql
if (!empty($info['collation'])) {
$sql .= ' COLLATE ' . $info['collation'];
diff --git a/core/modules/aggregator/src/FeedStorageSchema.php b/core/modules/aggregator/src/FeedStorageSchema.php
index 4d51bdb..d251ed5 100644
--- a/core/modules/aggregator/src/FeedStorageSchema.php
+++ b/core/modules/aggregator/src/FeedStorageSchema.php
@@ -33,7 +33,7 @@ class FeedStorageSchema extends SqlContentEntityStorageSchema {
break;
case 'title':
- $this->addSharedTableFieldIndex($storage_definition, $schema, TRUE);
+ $this->addSharedTableFieldUniqueKey($storage_definition, $schema);
break;
}
}
diff --git a/core/modules/block_content/src/BlockContentStorageSchema.php b/core/modules/block_content/src/BlockContentStorageSchema.php
new file mode 100644
index 0000000..c1674ae
--- /dev/null
+++ b/core/modules/block_content/src/BlockContentStorageSchema.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\block_content\BlockContentStorageSchema.
+ */
+
+namespace Drupal\block_content;
+
+use Drupal\Core\Entity\ContentEntityTypeInterface;
+use Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+
+/**
+ * Defines the block content schema handler.
+ */
+class BlockContentStorageSchema extends SqlContentEntityStorageSchema {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getEntitySchema(ContentEntityTypeInterface $entity_type, $reset = FALSE) {
+ $schema = parent::getEntitySchema($entity_type, $reset);
+
+ $schema['block_content_field_data']['unique keys'] += array(
+ 'block_content__info' => array('info', 'langcode'),
+ );
+
+ return $schema;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getSharedTableFieldSchema(FieldStorageDefinitionInterface $storage_definition, $table_name, array $column_mapping) {
+ $schema = parent::getSharedTableFieldSchema($storage_definition, $table_name, $column_mapping);
+ $field_name = $storage_definition->getName();
+
+ if ($table_name == 'block_content_field_data') {
+ switch ($field_name) {
+ case 'info':
+ // Improves the performance of the block_content__info index defined
+ // in getEntitySchema().
+ $schema['fields'][$field_name]['not null'] = TRUE;
+ break;
+ }
+ }
+
+ return $schema;
+ }
+
+}
diff --git a/core/modules/block_content/src/Entity/BlockContent.php b/core/modules/block_content/src/Entity/BlockContent.php
index cf5e21a..82e16f5 100644
--- a/core/modules/block_content/src/Entity/BlockContent.php
+++ b/core/modules/block_content/src/Entity/BlockContent.php
@@ -23,6 +23,7 @@ use Drupal\block_content\BlockContentInterface;
* bundle_label = @Translation("Custom block type"),
* handlers = {
* "storage" = "Drupal\Core\Entity\Sql\SqlContentEntityStorage",
+ * "storage_schema" = "Drupal\block_content\BlockContentStorageSchema",
* "access" = "Drupal\block_content\BlockContentAccessControlHandler",
* "list_builder" = "Drupal\block_content\BlockContentListBuilder",
* "view_builder" = "Drupal\block_content\BlockContentViewBuilder",
diff --git a/core/modules/file/src/Entity/File.php b/core/modules/file/src/Entity/File.php
index 511c5d5..8a5bd42 100644
--- a/core/modules/file/src/Entity/File.php
+++ b/core/modules/file/src/Entity/File.php
@@ -252,8 +252,7 @@ class File extends ContentEntityBase implements FileInterface {
->setLabel(t('URI'))
->setDescription(t('The URI to access the file (either local or remote).'))
->setSetting('max_length', 255)
- ->setSetting('case_sensitive', TRUE)
- ->addConstraint('FileUriUnique');
+ ->setSetting('case_sensitive', TRUE);
$fields['filemime'] = BaseFieldDefinition::create('string')
->setLabel(t('File MIME type'))
diff --git a/core/modules/file/src/FileStorageSchema.php b/core/modules/file/src/FileStorageSchema.php
index e0856f4..f253020 100644
--- a/core/modules/file/src/FileStorageSchema.php
+++ b/core/modules/file/src/FileStorageSchema.php
@@ -30,7 +30,7 @@ class FileStorageSchema extends SqlContentEntityStorageSchema {
break;
case 'uri':
- $this->addSharedTableFieldIndex($storage_definition, $schema, TRUE);
+ $this->addSharedTableFieldUniqueKey($storage_definition, $schema, TRUE);
break;
}
}
diff --git a/core/modules/file/src/Plugin/Validation/Constraint/FileUriUnique.php b/core/modules/file/src/Plugin/Validation/Constraint/FileUriUnique.php
deleted file mode 100644
index 1d79505..0000000
--- a/core/modules/file/src/Plugin/Validation/Constraint/FileUriUnique.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Plugin\Validation\Constraint\FileUriUnique.
- */
-
-namespace Drupal\file\Plugin\Validation\Constraint;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * Supports validating file URIs.
- *
- * @Plugin(
- * id = "FileUriUnique",
- * label = @Translation("File URI", context = "Validation")
- * )
- */
-class FileUriUnique extends Constraint {
-
- public $message = 'The file %value already exists. Enter a unique file URI.';
-
- /**
- * {@inheritdoc}
- */
- public function validatedBy() {
- return '\Drupal\Core\Validation\Plugin\Validation\Constraint\UniqueFieldValueValidator';
- }
-
-}
diff --git a/core/modules/file/src/Tests/SaveTest.php b/core/modules/file/src/Tests/SaveTest.php
index 7b4bb18..666b08d 100644
--- a/core/modules/file/src/Tests/SaveTest.php
+++ b/core/modules/file/src/Tests/SaveTest.php
@@ -8,9 +8,6 @@
namespace Drupal\file\Tests;
use Drupal\file\Entity\File;
-use Drupal\Core\Entity\EntityStorageException;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Entity\Sql\SqlEntityStorageInterface;
/**
* File saving tests.
@@ -60,27 +57,16 @@ class SaveTest extends FileManagedUnitTestBase {
// Try to insert a second file with the same name apart from case insensitivity
// to ensure the 'uri' index allows for filenames with different cases.
- $uppercase_values = array(
+ $uppercase_file = File::create(array(
'uid' => 1,
'filename' => 'DRUPLICON.txt',
'uri' => 'public://DRUPLICON.txt',
'filemime' => 'text/plain',
'status' => FILE_STATUS_PERMANENT,
- );
- $uppercase_file = File::create($uppercase_values);
+ ));
file_put_contents($uppercase_file->getFileUri(), 'hello world');
- $violations = $uppercase_file->validate();
- $this->assertEqual(count($violations), 0, 'No violations when adding an URI with an existing filename in upper case.');
$uppercase_file->save();
- // Ensure the database URI uniqueness constraint is triggered.
- $uppercase_file_duplicate = File::create($uppercase_values);
- file_put_contents($uppercase_file_duplicate->getFileUri(), 'hello world');
- $violations = $uppercase_file_duplicate->validate();
- $this->assertEqual(count($violations), 1);
- $this->assertEqual($violations[0]->getMessage(), t('The file %value already exists. Enter a unique file URI.', [
- '%value' => $uppercase_file_duplicate->getFileUri(),
- ]));
// Ensure that file URI entity queries are case sensitive.
$fids = \Drupal::entityQuery('file')
->condition('uri', $uppercase_file->getFileUri())
diff --git a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
index f1507a3..42488c7 100644
--- a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
+++ b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
@@ -261,12 +261,6 @@ class Sql extends PluginBase implements MigrateIdMapInterface {
foreach ($this->migration->getSourcePlugin()->getIds() as $id_definition) {
$mapkey = 'sourceid' . $count++;
$source_id_schema[$mapkey] = $this->getFieldSchema($id_definition);
-
- // With InnoDB, utf8mb4-based primary keys can't be over 191 characters.
- // Use ASCII-based primary keys instead.
- if (isset($source_id_schema[$mapkey]['type']) && $source_id_schema[$mapkey]['type'] == 'varchar') {
- $source_id_schema[$mapkey]['type'] = 'varchar_ascii';
- }
$pks[] = $mapkey;
}
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/System.php b/core/modules/migrate_drupal/src/Tests/Table/d6/System.php
index 5bf482f9..23bcbd6 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/System.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/System.php
@@ -26,7 +26,7 @@ class System extends DrupalDumpBase {
),
'fields' => array(
'filename' => array(
- 'type' => 'varchar_ascii',
+ 'type' => 'varchar',
'not null' => TRUE,
'length' => '255',
'default' => '',
@@ -916,4 +916,4 @@ class System extends DrupalDumpBase {
}
}
-#e15f00f5d9b1c571ee015c40f8fc7b00
+#8867fc0eccc6c8439bff0a269ec597ae
diff --git a/core/modules/node/src/Tests/NodeViewTest.php b/core/modules/node/src/Tests/NodeViewTest.php
index c60d44a..2281dd8 100644
--- a/core/modules/node/src/Tests/NodeViewTest.php
+++ b/core/modules/node/src/Tests/NodeViewTest.php
@@ -33,16 +33,4 @@ class NodeViewTest extends NodeTestBase {
$this->assertEqual($result[0]['href'], $node->url());
}
- /**
- * Tests that we store and retrieve multi-byte UTF-8 characters correctly.
- */
- public function testMultiByteUtf8() {
- $title = '🐝';
- $this->assertTrue(mb_strlen($title, 'utf-8') < strlen($title), 'Title has multi-byte characters.');
- $node = $this->drupalCreateNode(array('title' => $title));
- $this->drupalGet($node->urlInfo());
- $result = $this->xpath('//span[contains(@class, "field-name-title")]');
- $this->assertEqual((string) $result[0], $title, 'The passed title was returned.');
- }
-
}
diff --git a/core/modules/system/src/Tests/Database/RegressionTest.php b/core/modules/system/src/Tests/Database/RegressionTest.php
index 6f87d2a..81f962d 100644
--- a/core/modules/system/src/Tests/Database/RegressionTest.php
+++ b/core/modules/system/src/Tests/Database/RegressionTest.php
@@ -26,16 +26,16 @@ class RegressionTest extends DatabaseTestBase {
*/
function testRegression_310447() {
// That's a 255 character UTF-8 string.
- $job = str_repeat("é", 255);
+ $name = str_repeat("é", 255);
db_insert('test')
->fields(array(
- 'name' => $this->randomMachineName(),
+ 'name' => $name,
'age' => 20,
- 'job' => $job,
+ 'job' => 'Dancer',
))->execute();
- $from_database = db_query('SELECT job FROM {test} WHERE job = :job', array(':job' => $job))->fetchField();
- $this->assertIdentical($job, $from_database, 'The database handles UTF-8 characters cleanly.');
+ $from_database = db_query('SELECT name FROM {test} WHERE name = :name', array(':name' => $name))->fetchField();
+ $this->assertIdentical($name, $from_database, 'The database handles UTF-8 characters cleanly.');
}
/**
diff --git a/core/modules/system/src/Tests/Database/SchemaTest.php b/core/modules/system/src/Tests/Database/SchemaTest.php
index df1b0b6..9a234ed 100644
--- a/core/modules/system/src/Tests/Database/SchemaTest.php
+++ b/core/modules/system/src/Tests/Database/SchemaTest.php
@@ -72,7 +72,7 @@ class SchemaTest extends KernelTestBase {
$columns = db_query('SHOW FULL COLUMNS FROM {test_table}');
foreach ($columns as $column) {
if ($column->Field == 'test_field_string') {
- $string_check = ($column->Collation == 'utf8mb4_general_ci');
+ $string_check = ($column->Collation == 'utf8_general_ci');
}
if ($column->Field == 'test_field_string_ascii') {
$string_ascii_check = ($column->Collation == 'ascii_general_ci');
diff --git a/core/modules/system/tests/modules/database_test/database_test.install b/core/modules/system/tests/modules/database_test/database_test.install
index cfd72d5..7c74c1c 100644
--- a/core/modules/system/tests/modules/database_test/database_test.install
+++ b/core/modules/system/tests/modules/database_test/database_test.install
@@ -24,7 +24,7 @@ function database_test_schema() {
),
'name' => array(
'description' => "A person's name",
- 'type' => 'varchar_ascii',
+ 'type' => 'varchar',
'length' => 255,
'not null' => TRUE,
'default' => '',
@@ -75,7 +75,7 @@ function database_test_schema() {
),
'job' => array(
'description' => "The person's job",
- 'type' => 'varchar_ascii',
+ 'type' => 'varchar',
'length' => 255,
'not null' => TRUE,
'default' => '',
@@ -106,7 +106,7 @@ function database_test_schema() {
),
'job' => array(
'description' => "The person's job",
- 'type' => 'varchar_ascii',
+ 'type' => 'varchar',
'length' => 255,
'not null' => TRUE,
'default' => '',
@@ -197,7 +197,7 @@ function database_test_schema() {
),
'name' => array(
'description' => "A person's name.",
- 'type' => 'varchar_ascii',
+ 'type' => 'varchar',
'length' => 255,
'not null' => FALSE,
'default' => '',
@@ -228,7 +228,7 @@ function database_test_schema() {
),
'name' => array(
'description' => "A person's name.",
- 'type' => 'varchar_ascii',
+ 'type' => 'varchar',
'length' => 255,
'not null' => FALSE,
'default' => '',
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php
index d6b6c59..7e057d4 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php
@@ -45,10 +45,7 @@ class EntityTestStringId extends EntityTest {
$fields['id'] = BaseFieldDefinition::create('string')
->setLabel(t('ID'))
->setDescription(t('The ID of the test entity.'))
- ->setReadOnly(TRUE)
- // In order to work around the InnoDB 191 character limit on utf8mb4
- // primary keys, we set the character set for the field to ASCII.
- ->setSetting('is_ascii', TRUE);
+ ->setReadOnly(TRUE);
return $fields;
}
diff --git a/core/modules/user/src/UserStorageSchema.php b/core/modules/user/src/UserStorageSchema.php
index 6247b10..447469d 100644
--- a/core/modules/user/src/UserStorageSchema.php
+++ b/core/modules/user/src/UserStorageSchema.php
@@ -52,9 +52,6 @@ class UserStorageSchema extends SqlContentEntityStorageSchema {
// Improves the performance of the user__name index defined
// in getEntitySchema().
$schema['fields'][$field_name]['not null'] = TRUE;
- // Make sure the field is no longer than 191 characters so we can
- // add a unique constraint in MySQL.
- $schema['fields'][$field_name]['length'] = USERNAME_MAX_LENGTH;
break;
case 'mail':
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 7a3e843..1e6de88 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -26,8 +26,6 @@ use Drupal\user\UserInterface;
/**
* Maximum length of username text field.
- *
- * Keep this under 191 characters so we can use a unique constraint in MySQL.
*/
const USERNAME_MAX_LENGTH = 60;
diff --git a/core/modules/views/src/Tests/ViewTestData.php b/core/modules/views/src/Tests/ViewTestData.php
index 34fcd44..4b5340e 100644
--- a/core/modules/views/src/Tests/ViewTestData.php
+++ b/core/modules/views/src/Tests/ViewTestData.php
@@ -75,7 +75,7 @@ class ViewTestData {
),
'name' => array(
'description' => "A person's name",
- 'type' => 'varchar_ascii',
+ 'type' => 'varchar',
'length' => 255,
'not null' => TRUE,
'default' => '',
diff --git a/core/scripts/dump-database-d6.sh b/core/scripts/dump-database-d6.sh
index d0a89d7..ace93d9 100644
--- a/core/scripts/dump-database-d6.sh
+++ b/core/scripts/dump-database-d6.sh
@@ -53,11 +53,6 @@ $output .= " */\n\n";
$schema = drupal_get_schema();
ksort($schema);
-// Override the field type of the filename primary key to bypass the
-// InnoDB 191 character limitation.
-if (isset($schema['system']['primary key']) && $schema['system']['primary key'] == 'filename' && isset($schema['system']['fields']['filename']['type']) && $schema['system']['fields']['filename']['type'] == 'varchar') {
- $schema['system']['fields']['filename']['type'] = 'varchar_ascii';
-}
// Export all the tables in the schema.
foreach ($schema as $table => $data) {
// Remove descriptions to save time and code.
diff --git a/core/tests/Drupal/Tests/Core/Routing/RoutingFixtures.php b/core/tests/Drupal/Tests/Core/Routing/RoutingFixtures.php
index 0576235..54cd70d 100644
--- a/core/tests/Drupal/Tests/Core/Routing/RoutingFixtures.php
+++ b/core/tests/Drupal/Tests/Core/Routing/RoutingFixtures.php
@@ -172,7 +172,7 @@ class RoutingFixtures {
'fields' => array(
'name' => array(
'description' => 'Primary Key: Machine name of this route',
- 'type' => 'varchar_ascii',
+ 'type' => 'varchar',
'length' => 255,
'not null' => TRUE,
'default' => '',
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index d894b11..ef83939 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -75,7 +75,7 @@
* 'host' => 'localhost',
* 'port' => 3306,
* 'prefix' => 'myprefix_',
- * 'collation' => 'utf8mb4_general_ci',
+ * 'collation' => 'utf8_general_ci',
* );
* @endcode
*
@@ -127,7 +127,7 @@
* 'password' => 'password',
* 'host' => 'localhost',
* 'prefix' => 'main_',
- * 'collation' => 'utf8mb4_general_ci',
+ * 'collation' => 'utf8_general_ci',
* );
* @endcode
*