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

FIX ORDER BY cannot be part of a subselect

Browse Source
This commit is contained in:
Will Rossiter 2020-10-13 16:52:56 +13:00
parent 0cc9a140cd
commit 367fc172e8
No known key found for this signature in database
GPG Key ID: F24330E3B4B95B75
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/MSSQLQueryBuilder.php
View File

@ -5,6 +5,8 @@ namespace SilverStripe\MSSQL;
use InvalidArgumentException; use InvalidArgumentException;
use SilverStripe\ORM\Queries\SQLSelect; use SilverStripe\ORM\Queries\SQLSelect;
use SilverStripe\ORM\Connect\DBQueryBuilder; use SilverStripe\ORM\Connect\DBQueryBuilder;
use SilverStripe\ORM\Queries\SQLConditionalExpression;
use SilverStripe\ORM\Queries\SQLUpdate;
/** /**
* Builds a SQL query string from a SQLExpression object * Builds a SQL query string from a SQLExpression object
@ -69,6 +71,7 @@ class MSSQLQueryBuilder extends DBQueryBuilder
$parameters[] = $offset + 1; $parameters[] = $offset + 1;
$parameters[] = $offset + $limit; $parameters[] = $offset + $limit;
} }
return "SELECT * FROM ($sql) AS Numbered WHERE $limitCondition ORDER BY Number"; return "SELECT * FROM ($sql) AS Numbered WHERE $limitCondition ORDER BY Number";
} }
@ -88,6 +91,21 @@ class MSSQLQueryBuilder extends DBQueryBuilder
return ''; return '';
} }
public function buildWhereFragment(SQLConditionalExpression $query, array &$parameters)
{
// Get parameterised elements
$where = parent::buildWhereFragment($query, $parameters);
if (!$where) {
return '';
}
// remove explict order in where
$where = preg_replace("/ORDER BY ([^\)])+ [ASC|DESC]+/", '', $where);
return $where;
}
/** /**
* Extracts the limit and offset from the limit clause * Extracts the limit and offset from the limit clause
* *
@ -99,6 +117,7 @@ class MSSQLQueryBuilder extends DBQueryBuilder
{ {
$limit = ''; $limit = '';
$offset = '0'; $offset = '0';
if (is_array($query->getLimit())) { if (is_array($query->getLimit())) {
$limitArr = $query->getLimit(); $limitArr = $query->getLimit();
if (isset($limitArr['limit'])) { if (isset($limitArr['limit'])) {
@ -119,6 +138,7 @@ class MSSQLQueryBuilder extends DBQueryBuilder
$limit = $bits[0]; $limit = $bits[0];
} }
} }
return array($limit, $offset); return array($limit, $offset);
} }
} }