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

BUGFIX Allow omitting FROM clause in sqlQueryToString()

Browse Source
This commit is contained in:
Ingo Schommer 2011-05-19 11:36:14 +12:00
parent 6f5de764d2
commit b772956ce8
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/MSSQLDatabase.php
View File

@ -1186,8 +1186,6 @@ class MSSQLDatabase extends SS_Database {
* Convert a SQLQuery object into a SQL statement.
*/
public function sqlQueryToString(SQLQuery $sqlQuery) {
if (!$sqlQuery->from) return '';
if($sqlQuery->orderby && strtoupper(trim($sqlQuery->orderby)) == 'RAND()') $sqlQuery->orderby = "NEWID()";
//Get the limit and offset
@ -1250,7 +1248,7 @@ class MSSQLDatabase extends SS_Database {
$text .= implode(", ", $sqlQuery->select);
}
$text .= " FROM " . implode(" ", $sqlQuery->from);
if($sqlQuery->from) $text .= " FROM " . implode(" ", $sqlQuery->from);
if($sqlQuery->where) $text .= " WHERE (" . $sqlQuery->getFilter(). ")";
if($sqlQuery->groupby) $text .= " GROUP BY " . implode(", ", $sqlQuery->groupby);
if($sqlQuery->having) $text .= " HAVING ( " . implode(" ) AND ( ", $sqlQuery->having) . " )";