From 31519453de62dc698b18ca52b0b239c39e379f4b Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Wed, 3 Jun 2020 15:11:53 +0200 Subject: [PATCH 1/2] Bump doctrine/dbal from 2.9.2 to 2.10.2 Signed-off-by: Christoph Wurst --- 3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty b/3rdparty index eeffe4706d..123f925a42 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit eeffe4706df60c703453adde9f2fbd3d3da593f4 +Subproject commit 123f925a42d6ce5e2ce7a0da67300d6534303eb8 From c68718f90cfb8a6d704c568ef47e2a799255659d Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 8 Jun 2020 08:01:44 +0200 Subject: [PATCH 2/2] Remove dropped " ON " when join has no condition Signed-off-by: Joas Schilling --- tests/lib/DB/QueryBuilder/QueryBuilderTest.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php index a9542e2d61..7b1fee38db 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`',