tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11078 from creative-commoners/pulls/5/mariadb-unit-test

Browse Source 
MNT Add sort order to unit test so it passes with mariadb
This commit is contained in:
Sabina Talipova 2023-11-29 08:32:12 +13:00 committed by GitHub
commit 654b793780
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/php/ORM/SQLSelectTest.php
View File

@ -1174,13 +1174,19 @@ class SQLSelectTest extends SapphireTest
'name' => 'hierarchy', 'name' => 'hierarchy',
'query' => ( 'query' => (
new SQLSelect( new SQLSelect(
['parent_id' => '"SQLSelectTestCteRecursive"."ParentID"'], [
'parent_id' => '"SQLSelectTestCteRecursive"."ParentID"',
'sort_order' => 0,
],
"SQLSelectTestCteRecursive", "SQLSelectTestCteRecursive",
[['"SQLSelectTestCteRecursive"."ParentID" > 0 AND "SQLSelectTestCteRecursive"."Title" = ?' => 'child of child1']] [['"SQLSelectTestCteRecursive"."ParentID" > 0 AND "SQLSelectTestCteRecursive"."Title" = ?' => 'child of child1']]
) )
)->addUnion( )->addUnion(
new SQLSelect( new SQLSelect(
[
'"SQLSelectTestCteRecursive"."ParentID"', '"SQLSelectTestCteRecursive"."ParentID"',
'sort_order + 1',
],
// Note that we select both the CTE and the real table in the FROM statement. // Note that we select both the CTE and the real table in the FROM statement.
// We could also select one of these and JOIN on the other. // We could also select one of these and JOIN on the other.
['"hierarchy"', '"SQLSelectTestCteRecursive"'], ['"hierarchy"', '"SQLSelectTestCteRecursive"'],
@ -1194,6 +1200,7 @@ class SQLSelectTest extends SapphireTest
'selectFrom' => '"SQLSelectTestCteRecursive"', 'selectFrom' => '"SQLSelectTestCteRecursive"',
'extraManipulations' => [ 'extraManipulations' => [
'addInnerJoin' => ['hierarchy', '"SQLSelectTestCteRecursive"."ID" = "hierarchy"."parent_id"'], 'addInnerJoin' => ['hierarchy', '"SQLSelectTestCteRecursive"."ID" = "hierarchy"."parent_id"'],
'setOrderBy' => ['sort_order', 'ASC'],
], ],
'expected' => [ 'expected' => [
['Title' => 'child1'], ['Title' => 'child1'],
@ -1205,24 +1212,31 @@ class SQLSelectTest extends SapphireTest
'name' => 'hierarchy', 'name' => 'hierarchy',
'query' => ( 'query' => (
new SQLSelect( new SQLSelect(
[
'"SQLSelectTestCteRecursive"."ParentID"', '"SQLSelectTestCteRecursive"."ParentID"',
0
],
"SQLSelectTestCteRecursive", "SQLSelectTestCteRecursive",
[['"SQLSelectTestCteRecursive"."ParentID" > 0 AND "SQLSelectTestCteRecursive"."Title" = ?' => 'child of child1']] [['"SQLSelectTestCteRecursive"."ParentID" > 0 AND "SQLSelectTestCteRecursive"."Title" = ?' => 'child of child1']]
) )
)->addUnion( )->addUnion(
new SQLSelect( new SQLSelect(
[
'"SQLSelectTestCteRecursive"."ParentID"', '"SQLSelectTestCteRecursive"."ParentID"',
'sort_order + 1'
],
['"hierarchy"', '"SQLSelectTestCteRecursive"'], ['"hierarchy"', '"SQLSelectTestCteRecursive"'],
['"SQLSelectTestCteRecursive"."ParentID" > 0 AND "SQLSelectTestCteRecursive"."ID" = "hierarchy"."parent_id"'] ['"SQLSelectTestCteRecursive"."ParentID" > 0 AND "SQLSelectTestCteRecursive"."ID" = "hierarchy"."parent_id"']
), ),
SQLSelect::UNION_ALL SQLSelect::UNION_ALL
), ),
'cteFields' => ['parent_id'], 'cteFields' => ['parent_id', 'sort_order'],
'recursive' => true, 'recursive' => true,
'selectFields' => ['"SQLSelectTestCteRecursive"."Title"'], 'selectFields' => ['"SQLSelectTestCteRecursive"."Title"'],
'selectFrom' => '"SQLSelectTestCteRecursive"', 'selectFrom' => '"SQLSelectTestCteRecursive"',
'extraManipulations' => [ 'extraManipulations' => [
'addInnerJoin' => ['hierarchy', '"SQLSelectTestCteRecursive"."ID" = "hierarchy"."parent_id"'], 'addInnerJoin' => ['hierarchy', '"SQLSelectTestCteRecursive"."ID" = "hierarchy"."parent_id"'],
'setOrderBy' => ['sort_order', 'ASC'],
], ],
'expected' => [ 'expected' => [
['Title' => 'child1'], ['Title' => 'child1'],