escape spaces in custom field names #24 (#26)

devmoath · Oct 9, 2022 · c3511f3 · c3511f3
1 parent f0412e5
commit c3511f3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/Jql.php b/src/Jql.php
@@ -42,7 +42,7 @@ public function where(
 
         $this->invalidBooleanOrOperator($boolean, $operator, $value);
 
-        $this->appendQuery("$column $operator {$this->quote($operator, $value)}", $boolean);
+        $this->appendQuery("{$this->escapeSpaces($column)} $operator {$this->quote($operator, $value)}", $boolean);
 
         return $this;
     }
@@ -82,7 +82,7 @@ public function whenNot(mixed $value, callable $callback): self
 
     public function orderBy(string $column, string $direction): self
     {
-        $this->appendQuery(Keyword::ORDER_BY." $column $direction");
+        $this->appendQuery(Keyword::ORDER_BY." {$this->escapeSpaces($column)} $direction");
 
         return $this;
     }
@@ -104,6 +104,15 @@ public function __toString(): string
         return $this->getQuery();
     }
 
+    private function escapeSpaces(string $column): string
+    {
+        if (! str_contains($column, ' ')) {
+            return $column;
+        }
+
+        return "\"$column\"";
+    }
+
     private function quote(string $operator, mixed $value): string
     {
         if (in_array($operator, [Operator::IN, Operator::NOT_IN, Operator::WAS_IN, Operator::WAS_NOT_IN])) {

diff --git a/tests/JqlTest.php b/tests/JqlTest.php
@@ -130,4 +130,10 @@ public function it_will_throw_exception_when_invalid_operator_passed(): void
 
         (new Jql())->where('project', '=', ['MY PROJECT']);
     }
+
+    /** @test */
+    public function it_will_qoute_custom_field_that_coontains_spaces(): void
+    {
+        $this->assertEquals('"project name" = "MY PROJECT"', (new Jql())->where('project name', '=', 'MY PROJECT')->getQuery());
+    }
 }