QueryBuilder: Fixing error when sorting by multiple columns

Nik Barham · Nik Barham · commit 1bed3da5a55c · 2016-05-25T13:48:14.000Z
diff --git a/src/Automatorm/Database/QueryBuilder.php b/src/Automatorm/Database/QueryBuilder.php
@@ -386,15 +386,16 @@ public function resolveLimit()
 
     public function resolveSort()
     {
-        if (!$this->sortBy) return '';
+        $sortlist = [];
+        foreach ($this->sortBy as $sort) {
+            if ($sort['sort']) $sortlist[] = $this->escapeColumn($sort['sort']) . ' ' . $sort['dir'];
+        }
         
-        $string = ' ORDER BY ';
-        foreach ($this->sortBy as $sort)
-        {
-            if ($sort['sort']) $string .= $this->escapeColumn($sort['sort']) . ' ' . $sort['dir'];
+        if ($sortlist) {
+            return ' ORDER BY ' . implode(', ', $sortlist);
         }
         
-        return $string;
+        return '';
     }
     
     public function escapeTable($table)

Original file line number	Diff line number	Diff line change
`@@ -386,15 +386,16 @@ public function resolveLimit()`
`386`	`386`
`387`	`387`	`public function resolveSort()`
`388`	`388`	`{`
`389`		`- if (!$this->sortBy) return '';`
	`389`	`+ $sortlist = [];`
	`390`	`+ foreach ($this->sortBy as $sort) {`
	`391`	`+ if ($sort['sort']) $sortlist[] = $this->escapeColumn($sort['sort']) . ' ' . $sort['dir'];`
	`392`	`+ }`
`390`	`393`
`391`		`- $string = ' ORDER BY ';`
`392`		`- foreach ($this->sortBy as $sort)`
`393`		`- {`
`394`		`- if ($sort['sort']) $string .= $this->escapeColumn($sort['sort']) . ' ' . $sort['dir'];`
	`394`	`+ if ($sortlist) {`
	`395`	`+ return ' ORDER BY ' . implode(', ', $sortlist);`
`395`	`396`	`}`
`396`	`397`
`397`		`- return $string;`
	`398`	`+ return '';`
`398`	`399`	`}`
`399`	`400`
`400`	`401`	`public function escapeTable($table)`