Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3119910 by mondrake: Change hardcoded quote identifier in EntityQueryTest to square brackets

merge-requests/2419/head
catch 2020-03-16 07:52:43 +00:00
parent 1af1f11738
commit bc295bf22d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
View File

@ -1228,16 +1228,17 @@ class EntityQueryTest extends EntityKernelTestBase {
$expected = $connection->select("entity_test_mulrev", "base_table"); $expected = $connection->select("entity_test_mulrev", "base_table");
$expected->addField("base_table", "revision_id", "revision_id"); $expected->addField("base_table", "revision_id", "revision_id");
$expected->addField("base_table", "id", "id"); $expected->addField("base_table", "id", "id");
$expected->join("entity_test_mulrev__$figures", "entity_test_mulrev__$figures", '"entity_test_mulrev__' . $figures . '"."entity_id" = "base_table"."id"'); $expected->join("entity_test_mulrev__$figures", "entity_test_mulrev__$figures", '[entity_test_mulrev__' . $figures . '].[entity_id] = [base_table].[id]');
$expected->join("entity_test_mulrev__$figures", "entity_test_mulrev__{$figures}_2", '"entity_test_mulrev__' . $figures . '_2"."entity_id" = "base_table"."id"'); $expected->join("entity_test_mulrev__$figures", "entity_test_mulrev__{$figures}_2", '[entity_test_mulrev__' . $figures . '_2].[entity_id] = [base_table].[id]');
$expected->addJoin("LEFT", "entity_test_mulrev__$figures", "entity_test_mulrev__{$figures}_3", '"entity_test_mulrev__' . $figures . '_3"."entity_id" = "base_table"."id"'); $expected->addJoin("LEFT", "entity_test_mulrev__$figures", "entity_test_mulrev__{$figures}_3", '[entity_test_mulrev__' . $figures . '_3].[entity_id] = [base_table].[id]');
$expected->condition("entity_test_mulrev__$figures.{$figures}_color", ["blue"], "IN"); $expected->condition("entity_test_mulrev__$figures.{$figures}_color", ["blue"], "IN");
$expected->condition("entity_test_mulrev__{$figures}_2.{$figures}_color", ["red"], "IN"); $expected->condition("entity_test_mulrev__{$figures}_2.{$figures}_color", ["red"], "IN");
$expected->isNull("entity_test_mulrev__{$figures}_3.{$figures}_color"); $expected->isNull("entity_test_mulrev__{$figures}_3.{$figures}_color");
$expected->orderBy("base_table.id"); $expected->orderBy("base_table.id");
// Apply table prefixes to the expected SQL. // Apply table prefixes and quote identifiers for the expected SQL.
$expected_string = \Drupal::database()->prefixTables((string) $expected); $expected_string = $connection->prefixTables((string) $expected);
$expected_string = $connection->quoteIdentifiers($expected_string);
// Resolve placeholders in the expected SQL to their values. // Resolve placeholders in the expected SQL to their values.
$quoted = []; $quoted = [];
foreach ($expected->getArguments() as $key => $value) { foreach ($expected->getArguments() as $key => $value) {