diff -u b/core/includes/update.inc b/core/includes/update.inc --- b/core/includes/update.inc +++ b/core/includes/update.inc @@ -158,7 +158,7 @@ ), 'primary key' => array('collection', 'name'), ); - db_create_table('keyvalue', $specs); + db_create_table('key_value', $specs); } // Bootstrap variables so we can update theme while preparing the update // process. diff -u b/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php b/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php --- b/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php +++ b/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php @@ -44,7 +44,7 @@ } } catch (\Exception $e) { - // @todo: Perhaps ff the database is never going to be available, + // @todo: Perhaps if the database is never going to be available, // key/value requests should return FALSE in order to allow exception // handling to occur but for now, keep it an array, always. } diff -u b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageTest.php b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageTest.php --- b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageTest.php @@ -31,11 +31,11 @@ parent::setUp(); module_load_install('system'); $schema = system_schema(); - db_create_table('keyvalue', $schema['keyvalue']); + db_create_table('key_value', $schema['key_value']); } protected function tearDown() { - db_drop_table('keyvalue'); + db_drop_table('key_value'); parent::tearDown(); }