From: Joas Schilling Date: Mon, 8 Jun 2020 06:01:44 +0000 (+0200) Subject: Remove dropped " ON " when join has no condition X-Git-Tag: v20.0.0beta1~434^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c68718f90cfb8a6d704c568ef47e2a799255659d;p=nextcloud-server.git Remove dropped " ON " when join has no condition Signed-off-by: Joas Schilling --- diff --git a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php index a9542e2d616..7b1fee38db3 100644 --- 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`',