Skip to content

Commit ba72d7e

Browse files
authored
Merge pull request #30 from dalibert42/1.1
Fixes order by with multiple colums
2 parents 5a90ee0 + 6ad45ed commit ba72d7e

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
@@ -118,6 +118,8 @@ public function testStandardSelect()
118118
$sql = 'SELECT \'hello\' as toto FROM users';
119119
$this->assertEquals('SELECT \'hello\' AS toto FROM users', self::simplifySql($magicQuery->build($sql)));
120120

121+
$sql = 'SELECT * FROM users GROUP BY id, login';
122+
$this->assertEquals('SELECT * FROM users GROUP BY id, login', self::simplifySql($magicQuery->build($sql)));
121123
}
122124

123125
/**

0 commit comments

Comments
 (0)