added collection/table to InvalidFieldException (#956)

directus · May 15, 2019 · 7393cb8 · 7393cb8
1 parent 77fb20f
commit 7393cb8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/core/Directus/Database/Exception/InvalidFieldException.php b/src/core/Directus/Database/Exception/InvalidFieldException.php
@@ -8,9 +8,9 @@ class InvalidFieldException extends UnprocessableEntityException
 {
     const ERROR_CODE = 202;
 
-    public function __construct($field)
+    public function __construct($field, $collection)
     {
-        $message = sprintf('Invalid field "%s"', $field);
+        $message = sprintf('Invalid field "%s" in "%s"', $field, $collection);
 
         parent::__construct($message);
     }

diff --git a/src/core/Directus/Database/TableGateway/RelationalTableGateway.php b/src/core/Directus/Database/TableGateway/RelationalTableGateway.php
@@ -1352,7 +1352,7 @@ protected function doFilter(Builder $query, $column, $condition, $table)
         );
 
         if (!$field) {
-            throw new Exception\InvalidFieldException($fieldName);
+            throw new Exception\InvalidFieldException($fieldName, $table);
         }
 
         $condition = $this->parseCondition($condition);
@@ -1641,7 +1641,7 @@ protected function processSort(Builder $query, array $columns)
 
             $field = SchemaService::getField($this->table, $orderBy, false, $this->acl === null);
             if ($orderBy !== '?' && !$field) {
-                throw new Exception\InvalidFieldException($column);
+                throw new Exception\InvalidFieldException($column, $this->table);
             }
 
             if ($field && $field->isAlias()) {
@@ -2102,7 +2102,7 @@ public function validateFields(array $fields)
 
         foreach ($selectedFields as $field) {
             if (!$collection->hasField($field)) {
-                throw new Exception\InvalidFieldException($field);
+                throw new Exception\InvalidFieldException($field, $collection->getName());
             }
         }
     }

diff --git a/src/core/Directus/Services/TablesService.php b/src/core/Directus/Services/TablesService.php
@@ -1683,7 +1683,7 @@ protected function getAllFieldsParams(array $params)
             foreach ($sort as $field) {
                 $field = (string)$field;
                 if (!$collection->hasField($field)) {
-                    throw new InvalidFieldException($field);
+                    throw new InvalidFieldException($field, $collection->getName());
                 }
             }
         }