Skip to content

Commit 7802f8d

Browse files
committed
Backporting bugfix from 1.1
2 parents 9e503c7 + 6ad45ed commit 7802f8d

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/SQLParser/Query/Select.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ public function toSql(array $parameters = array(), Connection $dbConnection = nu
350350
}
351351

352352
if (!empty($this->group)) {
353-
$groupBy = NodeFactory::toSql($this->group, $dbConnection, $parameters, ' ', false, $indent + 2, $conditionsMode);
353+
$groupBy = NodeFactory::toSql($this->group, $dbConnection, $parameters, ',', false, $indent + 2, $conditionsMode);
354354
if ($groupBy) {
355355
$sql .= "\nGROUP BY ".$groupBy;
356356
}

tests/Mouf/Database/MagicQueryTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ public function testStandardSelect()
121121
$sql = "SELECT Substring_index(ee.`data`, ':', -1) as foo FROM users";
122122
$this->assertEquals("SELECT Substring_index(ee.data, ':', -1) AS foo FROM users", self::simplifySql($magicQuery->build($sql)));
123123

124+
$sql = 'SELECT * FROM users GROUP BY id, login';
125+
$this->assertEquals('SELECT * FROM users GROUP BY id, login', self::simplifySql($magicQuery->build($sql)));
124126
}
125127

126128
/**

0 commit comments

Comments
 (0)