tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '4.3' into 4.4

This commit is contained in:
Guy Marriott 2019-05-03 09:45:25 +12:00
parent 1f78e8ae80 e7bb508391
commit 82c8225502
No known key found for this signature in database
GPG Key ID: A80F9ACCB86D3DA7
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,6 +287,13 @@ abstract class SQLConditionalExpression extends SQLExpression
continue;
}
if (preg_match('/AS\s+(?:"[^"]+"|[A-Z0-9_]+)\s*$/i', $join)) {
// 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, '"')) {

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

@ -841,10 +841,22 @@ class SQLSelectTest extends SapphireTest
$sql = $query->sql();
$this->assertSQLEquals(
'SELECT *
FROM "MyTable" AS "MyTableAlias"
'SELECT *
FROM "MyTable" AS "MyTableAlias"
LEFT JOIN "OtherTable" AS "OtherTableAlias" ON "Thing" = "OtherThing"',
$sql
);
$query = SQLSelect::create('*', [
'MyTableAlias' => '"MyTable"',
'ignoredAlias' => ', (SELECT * FROM "MyTable" where "something" = "whatever") as "CrossJoin"'
]);
$sql = $query->sql();
$this->assertSQLEquals(
'SELECT * FROM "MyTable" AS "MyTableAlias" , '.
'(SELECT * FROM "MyTable" where "something" = "whatever") as "CrossJoin"',
$sql
);
}
}