Remove dropped " ON " when join has no condition

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
index a9542e2d616dc761cf65b0a3048e0a2475f62eaf..7b1fee38db3d399989ea4f81adb9d0faff2a7721 100644 (file)
--- a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
+++ b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
@@ -516,12 +516,12 @@ class QueryBuilderTest extends \Test\TestCase {
                        [
                                'd1', 'data2', null, null,
                                ['`d1`' => [['joinType' => 'inner', 'joinTable' => '`*PREFIX*data2`', 'joinAlias' => null, 'joinCondition' => null]]],
-                               '`*PREFIX*data1` `d1` INNER JOIN `*PREFIX*data2`  ON '
+                               '`*PREFIX*data1` `d1` INNER JOIN `*PREFIX*data2` '
                        ],
                        [
                                'd1', 'data2', 'd2', null,
                                ['`d1`' => [['joinType' => 'inner', 'joinTable' => '`*PREFIX*data2`', 'joinAlias' => '`d2`', 'joinCondition' => null]]],
-                               '`*PREFIX*data1` `d1` INNER JOIN `*PREFIX*data2` `d2` ON '
+                               '`*PREFIX*data1` `d1` INNER JOIN `*PREFIX*data2` `d2`'
                        ],
                        [
                                'd1', 'data2', 'd2', '`d1`.`field1` = `d2`.`field2`',
@@ -597,12 +597,12 @@ class QueryBuilderTest extends \Test\TestCase {
                        [
                                'd1', 'data2', null, null,
                                ['`d1`' => [['joinType' => 'left', 'joinTable' => '`*PREFIX*data2`', 'joinAlias' => null, 'joinCondition' => null]]],
-                               '`*PREFIX*data1` `d1` LEFT JOIN `*PREFIX*data2`  ON '
+                               '`*PREFIX*data1` `d1` LEFT JOIN `*PREFIX*data2` '
                        ],
                        [
                                'd1', 'data2', 'd2', null,
                                ['`d1`' => [['joinType' => 'left', 'joinTable' => '`*PREFIX*data2`', 'joinAlias' => '`d2`', 'joinCondition' => null]]],
-                               '`*PREFIX*data1` `d1` LEFT JOIN `*PREFIX*data2` `d2` ON '
+                               '`*PREFIX*data1` `d1` LEFT JOIN `*PREFIX*data2` `d2`'
                        ],
                        [
                                'd1', 'data2', 'd2', '`d1`.`field1` = `d2`.`field2`',
@@ -647,12 +647,12 @@ class QueryBuilderTest extends \Test\TestCase {
                        [
                                'd1', 'data2', null, null,
                                ['`d1`' => [['joinType' => 'right', 'joinTable' => '`*PREFIX*data2`', 'joinAlias' => null, 'joinCondition' => null]]],
-                               '`*PREFIX*data1` `d1` RIGHT JOIN `*PREFIX*data2`  ON '
+                               '`*PREFIX*data1` `d1` RIGHT JOIN `*PREFIX*data2` '
                        ],
                        [
                                'd1', 'data2', 'd2', null,
                                ['`d1`' => [['joinType' => 'right', 'joinTable' => '`*PREFIX*data2`', 'joinAlias' => '`d2`', 'joinCondition' => null]]],
-                               '`*PREFIX*data1` `d1` RIGHT JOIN `*PREFIX*data2` `d2` ON '
+                               '`*PREFIX*data1` `d1` RIGHT JOIN `*PREFIX*data2` `d2`'
                        ],
                        [
                                'd1', 'data2', 'd2', '`d1`.`field1` = `d2`.`field2`',