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

Issue #2844595 by ohthehugemanatee, Jo Fitzgerald, heddn, moshe weitzman: SQLBase breaks GROUP BY queries

8.4.x
Gabor Hojtsy 2017-05-19 11:41:20 +02:00
parent 2b7b8b3569
commit 61d5b465f6
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
View File

@ -234,6 +234,7 @@ abstract class SqlBase extends SourcePluginBase implements ContainerFactoryPlugi
// OR above high water). // OR above high water).
$conditions = $this->query->orConditionGroup(); $conditions = $this->query->orConditionGroup();
$condition_added = FALSE; $condition_added = FALSE;
$added_fields = [];
if (empty($this->configuration['ignore_map']) && $this->mapJoinable()) { if (empty($this->configuration['ignore_map']) && $this->mapJoinable()) {
// Build the join to the map table. Because the source key could have // Build the join to the map table. Because the source key could have
// multiple fields, we need to build things up. // multiple fields, we need to build things up.
@ -259,14 +260,17 @@ abstract class SqlBase extends SourcePluginBase implements ContainerFactoryPlugi
for ($count = 1; $count <= $n; $count++) { for ($count = 1; $count <= $n; $count++) {
$map_key = 'sourceid' . $count; $map_key = 'sourceid' . $count;
$this->query->addField($alias, $map_key, "migrate_map_$map_key"); $this->query->addField($alias, $map_key, "migrate_map_$map_key");
$added_fields[] = "$alias.$map_key";
} }
if ($n = count($this->migration->getDestinationIds())) { if ($n = count($this->migration->getDestinationIds())) {
for ($count = 1; $count <= $n; $count++) { for ($count = 1; $count <= $n; $count++) {
$map_key = 'destid' . $count++; $map_key = 'destid' . $count++;
$this->query->addField($alias, $map_key, "migrate_map_$map_key"); $this->query->addField($alias, $map_key, "migrate_map_$map_key");
$added_fields[] = "$alias.$map_key";
} }
} }
$this->query->addField($alias, 'source_row_status', 'migrate_map_source_row_status'); $this->query->addField($alias, 'source_row_status', 'migrate_map_source_row_status');
$added_fields[] = "$alias.source_row_status";
} }
// 2. If we are using high water marks, also include rows above the mark. // 2. If we are using high water marks, also include rows above the mark.
// But, include all rows if the high water mark is not set. // But, include all rows if the high water mark is not set.
@ -279,6 +283,15 @@ abstract class SqlBase extends SourcePluginBase implements ContainerFactoryPlugi
if ($condition_added) { if ($condition_added) {
$this->query->condition($conditions); $this->query->condition($conditions);
} }
// If the query has a group by, our added fields need it too, to keep the
// query valid.
// @see https://dev.mysql.com/doc/refman/5.7/en/group-by-handling.html
$group_by = $this->query->getGroupBy();
if ($group_by && $added_fields) {
foreach ($added_fields as $added_field) {
$this->query->groupBy($added_field);
}
}
} }
// Download data in batches for performance. // Download data in batches for performance.

6
core/modules/migrate/tests/modules/migrate_high_water_test/src/Plugin/migrate/source/HighWaterTest.php
View File

@ -17,9 +17,13 @@ class HighWaterTest extends SqlBase {
* {@inheritdoc} * {@inheritdoc}
*/ */
public function query() { public function query() {
$field_names = array_keys($this->fields());
$query = $this $query = $this
->select('high_water_node', 'm') ->select('high_water_node', 'm')
->fields('m', array_keys($this->fields())); ->fields('m', $field_names);
foreach ($field_names as $field_name) {
$query->groupBy($field_name);
}
return $query; return $query;
} }