Merge pull request #2018 from bobdenotter/patch-1

Return `parent` instead of throwing Exception for Translatable

Author: AkenRoberts

CHANGELOG.md

@@ -23,6 +23,10 @@ a release.
 #### Fixed
 - Added missing string casting of `objectId` in `LogEntryRepository::revert()` method (#2009)
 
+### Translatable
+#### Fixed
+- Return default AST executor instead of throwing Exception in Walker (#2018)
+
 ### Tree
 #### Fixed
 - Remove hard-coded parent column name in repository prev/next sibling queries [#2020]

lib/Gedmo/Translatable/Query/TreeWalker/TranslationWalker.php

@@ -104,8 +104,10 @@ public function __construct($query, $parserResult, array $queryComponents)
      */
     public function getExecutor($AST)
     {
+        // If it's not a Select, the TreeWalker ought to skip it, and just return the parent.
+        // @see https://github.com/Atlantic18/DoctrineExtensions/issues/2013
         if (!$AST instanceof SelectStatement) {
-            throw new \Gedmo\Exception\UnexpectedValueException('Translation walker should be used only on select statement');
+            return parent::getExecutor($AST);
         }
         $this->prepareTranslatedComponents();