Fixing orderBy direction is not rendered when optional direction is o…

…mitted (#165) (#172)
FaaPz · Aug 11, 2022 · 89d1478 · 89d1478
1 parent 3029492
commit 89d1478
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 7 deletions.
diff --git a/src/AdvancedStatement.php b/src/AdvancedStatement.php
@@ -95,13 +95,19 @@ public function orderBy(string $column, string $direction = ''): self
     protected function renderOrderBy(): string
     {
         $sql = '';
-        if ($direction = reset($this->orderBy)) {
+        if (($direction = reset($this->orderBy)) !== false) {
             $column = key($this->orderBy);
-            $sql = " ORDER BY {$column} {$direction}";
+            $sql = " ORDER BY {$column}";
+            if (!empty($direction)) {
+                $sql .= " {$direction}";
+            }
 
-            while ($direction = next($this->orderBy)) {
+            while (($direction = next($this->orderBy)) !== false) {
                 $column = key($this->orderBy);
-                $sql .= ", {$column} {$direction}";
+                $sql .= ", {$column}";
+                if (!empty($direction)) {
+                    $sql .= " {$direction}";
+                }
             }
         }
 

diff --git a/tests/Statement/DeleteTest.php b/tests/Statement/DeleteTest.php
@@ -101,8 +101,17 @@ public function testToStringWithOrderBy()
             ->orderBy('id', 'ASC')
             ->orderBy('name', 'DESC');
 
-        // FIXME This seems broken...
-        $this->assertStringEndsWith('test ORDER BY id ASC, name DESC', $this->subject->__toString());
+        $this->assertStringEndsWith(' ORDER BY id ASC, name DESC', $this->subject->__toString());
+    }
+
+    public function testToStringWithOrderByWithoutDirection()
+    {
+        $this->subject
+            ->from('test')
+            ->orderBy('id')
+            ->orderBy('name');
+
+        $this->assertStringEndsWith(' ORDER BY id, name', $this->subject->__toString());
     }
 
     public function testToStringWithLimit()

diff --git a/tests/Statement/SelectTest.php b/tests/Statement/SelectTest.php
@@ -186,7 +186,17 @@ public function testToStringWithOrderBy()
             ->orderBy('id', 'ASC')
             ->orderBy('name', 'DESC');
 
-        $this->assertStringEndsWith('test ORDER BY id ASC, name DESC', $this->subject->__toString());
+        $this->assertStringEndsWith(' ORDER BY id ASC, name DESC', $this->subject->__toString());
+    }
+
+    public function testToStringWithOrderByWithoutDirection()
+    {
+        $this->subject
+            ->from('test')
+            ->orderBy('id')
+            ->orderBy('name');
+
+        $this->assertStringEndsWith(' ORDER BY id, name', $this->subject->__toString());
     }
 
     public function testToStringWithLimit()

diff --git a/tests/Statement/UpdateTest.php b/tests/Statement/UpdateTest.php
@@ -117,6 +117,17 @@ public function testToStringWithOrderBy()
         $this->assertStringEndsWith(' ORDER BY id ASC, name DESC', $this->subject->__toString());
     }
 
+    public function testToStringWithOrderByWithoutDirection()
+    {
+        $this->subject
+            ->table('test')
+            ->set('col', 'value')
+            ->orderBy('id')
+            ->orderBy('name');
+
+        $this->assertStringEndsWith(' ORDER BY id, name', $this->subject->__toString());
+    }
+
     public function testToStringWithLimit()
     {
         $this->subject