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

Fix SQLConditionalExpression::getJoins so it always adds explicit aliases

Browse Source 
This is a revert of https://github.com/silverstripe/silverstripe-framework/pull/8956
This commit is contained in:
Serge Latyntcev 2019-05-06 15:19:21 +12:00 committed by Guy Sartorelli
parent 3b758a8a4c
commit e07671a890
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ORM/Queries/SQLConditionalExpression.php
View File

@ -287,14 +287,7 @@ abstract class SQLConditionalExpression extends SQLExpression
continue; continue;
} }
if (preg_match('/AS\s+(?:"[^"]+"|[A-Z0-9_]+)\s*$/i', $join ?? '')) { $trimmedAlias = trim($alias, '"');
// custom aliases override the ones defined through array keys
// this is only meant to keep backward compatibility with SS <= 4.3,
// to be removed in SS5
continue;
}
$trimmedAlias = trim($alias ?? '', '"');
if ($trimmedAlias !== trim($join ?? '', '"')) { if ($trimmedAlias !== trim($join ?? '', '"')) {
$joins[$alias] = "{$join} AS \"{$trimmedAlias}\""; $joins[$alias] = "{$join} AS \"{$trimmedAlias}\"";

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

@ -814,15 +814,18 @@ class SQLSelectTest extends SapphireTest
$sql $sql
); );
// This feature is a bug that used to exist in SS4 and was removed in SS5
// so now we test it does not exist and we end up with incorrect SQL because of that
// In SS4 the "explicitAlias" would be ignored
$query = SQLSelect::create('*', [ $query = SQLSelect::create('*', [
'MyTableAlias' => '"MyTable"', 'MyTableAlias' => '"MyTable"',
'ignoredAlias' => ', (SELECT * FROM "MyTable" where "something" = "whatever") as "CrossJoin"' 'explicitAlias' => ', (SELECT * FROM "MyTable" where "something" = "whatever") as "CrossJoin"'
]); ]);
$sql = $query->sql(); $sql = $query->sql();
$this->assertSQLEquals( $this->assertSQLEquals(
'SELECT * FROM "MyTable" AS "MyTableAlias" , ' . 'SELECT * FROM "MyTable" AS "MyTableAlias" , ' .
'(SELECT * FROM "MyTable" where "something" = "whatever") as "CrossJoin"', '(SELECT * FROM "MyTable" where "something" = "whatever") as "CrossJoin" AS "explicitAlias"',
$sql $sql
); );
} }