diff options
author | Joas Schilling <coding@schilljs.com> | 2020-06-08 08:01:44 +0200 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2020-06-08 08:03:35 +0200 |
commit | c68718f90cfb8a6d704c568ef47e2a799255659d (patch) | |
tree | a59941d1ea36fbb796729ed1e1ab722995704cea | |
parent | 31519453de62dc698b18ca52b0b239c39e379f4b (diff) | |
download | nextcloud-server-c68718f90cfb8a6d704c568ef47e2a799255659d.tar.gz nextcloud-server-c68718f90cfb8a6d704c568ef47e2a799255659d.zip |
Remove dropped " ON " when join has no condition
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r-- | tests/lib/DB/QueryBuilder/QueryBuilderTest.php | 12 |
1 files changed, 6 insertions, 6 deletions
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`', |