open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove dropped " ON " when join has no condition

Browse Source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/21208/head
Joas Schilling 5 years ago
parent 31519453de
commit c68718f90c
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
1 changed files with 6 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      tests/lib/DB/QueryBuilder/QueryBuilderTest.php

12
tests/lib/DB/QueryBuilder/QueryBuilderTest.php
Unescape View File

@ -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`',

Write Preview
Loading…
Cancel
Save