Merge #279 - fix php error undefined index

Pull-request: #279
Fixes: #249

Signed-off-by: William Desportes <williamdes@wdes.fr>

2 files changed, 15 insertions, 1 deletions

diff --git a/src/Utils/Query.php b/src/Utils/Query.php
index 2e623aa..9494d96 100644
--- a/src/Utils/Query.php
+++ b/src/Utils/Query.php
@@ -591,7 +591,7 @@ class Query
          *
          * @var int
          */
-        $clauseIdx = $clauses[$clauseType];
+        $clauseIdx = isset($clauses[$clauseType]) ? $clauses[$clauseType] : -1;
 
         $firstClauseIdx = $clauseIdx;
         $lastClauseIdx = $clauseIdx;
diff --git a/tests/Utils/QueryTest.php b/tests/Utils/QueryTest.php
index 3bc1783..f4676ec 100644
--- a/tests/Utils/QueryTest.php
+++ b/tests/Utils/QueryTest.php
@@ -598,6 +598,20 @@ class QueryTest extends TestCase
         );
     }
 
+    public function testReplaceNonExistingPart()
+    {
+        $parser = new Parser('ALTER TABLE `sale_mast` OPTIMIZE PARTITION p3');
+        $this->assertEquals(
+            '  ALTER TABLE `sale_mast` OPTIMIZE PARTITION p3',
+            Query::replaceClause(
+                $parser->statements[0],
+                $parser->list,
+                'ORDER BY',
+                ''
+            )
+        );
+    }
+
     public function testReplaceClauses()
     {
         $this->assertEquals('', Query::replaceClauses(null, null, array()));