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

BUGFIX Fixing broken SS3 query code in MSSQLDatabase

Browse Source
This commit is contained in:
Sean Harvey 2012-05-03 12:01:50 +12:00
parent a872e30256
commit 731874772c
1 changed files with 11 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
code/MSSQLDatabase.php
View File

@ -1214,8 +1214,6 @@ class MSSQLDatabase extends SS_Database {
// DELETE queries // DELETE queries
if($sqlQuery->delete) { if($sqlQuery->delete) {
$text = 'DELETE '; $text = 'DELETE ';
// SELECT queries
} else { } else {
$distinct = $sqlQuery->distinct ? "DISTINCT " : ""; $distinct = $sqlQuery->distinct ? "DISTINCT " : "";
@ -1227,10 +1225,11 @@ class MSSQLDatabase extends SS_Database {
// If there's a limit and an offset, then we need to do a subselect // If there's a limit and an offset, then we need to do a subselect
} else if($limit && $offset) { } else if($limit && $offset) {
if($sqlQuery->orderby) { if($sqlQuery->orderby) {
$orderByFields = (method_exists($sqlQuery, 'prepareOrderBy')) ? $sqlQuery->prepareOrderBy() : $sqlQuery->orderby; $orderByFields = $sqlQuery->prepareOrderBy();
$rowNumber = "ROW_NUMBER() OVER (ORDER BY $orderByFields) AS Number"; $rowNumber = "ROW_NUMBER() OVER (ORDER BY $orderByFields) AS Number";
} else { } else {
$firstCol = reset($sqlQuery->select); $selects = $sqlQuery->itemisedSelect();
$firstCol = reset($selects);
$rowNumber = "ROW_NUMBER() OVER (ORDER BY $firstCol) AS Number"; $rowNumber = "ROW_NUMBER() OVER (ORDER BY $firstCol) AS Number";
} }
$text = "SELECT * FROM ( SELECT $distinct$rowNumber, "; $text = "SELECT * FROM ( SELECT $distinct$rowNumber, ";
@ -1244,40 +1243,16 @@ class MSSQLDatabase extends SS_Database {
} }
// Now add the columns to be selected // Now add the columns to be selected
$text .= implode(", ", $sqlQuery->select); $text .= $sqlQuery->prepareSelect();
} }
if($sqlQuery->from) $text .= ' FROM ' . implode(' ', $sqlQuery->from); if($sqlQuery->from) $text .= ' FROM ' . implode(' ', $sqlQuery->from);
if($sqlQuery->where) $text .= ' WHERE (' . $sqlQuery->prepareWhere() . ')';
// method_exists is done here for legacy reasons, so we can use this on SS 2.4 and 3.0 if($sqlQuery->groupby) $text .= ' GROUP BY ' . $sqlQuery->prepareGroupBy();
if($sqlQuery->where) { if($sqlQuery->having) $text .= ' HAVING ( ' . $sqlQuery->prepareHaving() . ' )';
if(method_exists($sqlQuery, 'prepareWhere')) {
$text .= ' WHERE (' . $sqlQuery->prepareWhere() . ')';
} else {
$text .= ' WHERE (' . $sqlQuery->getFilter() . ')';
}
}
if($sqlQuery->groupby) {
if(method_exists($sqlQuery, 'prepareGroupBy')) {
$text .= ' GROUP BY ' . $sqlQuery->prepareGroupBy();
} else {
$text .= ' GROUP BY ' . implode(', ', $sqlQuery->groupby);
}
}
if($sqlQuery->having) {
if(method_exists($sqlQuery, 'prepareHaving')) {
$text .= ' HAVING ( ' . $sqlQuery->prepareHaving() . ' )';
} else {
$text .= ' HAVING ( ' . implode(' ) AND ( ', $sqlQuery->having) . ' )';
}
}
if(!$nestedQuery && $sqlQuery->orderby) { if(!$nestedQuery && $sqlQuery->orderby) {
if(method_exists($sqlQuery, 'prepareOrderBy')) { $text .= ' ORDER BY ' . $sqlQuery->prepareOrderBy();
$text .= ' ORDER BY ' . $sqlQuery->prepareOrderBy();
} else {
$text .= ' ORDER BY ' . $sqlQuery->orderby;
}
} }
// $suffixText is used by the nested queries to create an offset limit // $suffixText is used by the nested queries to create an offset limit
@ -1803,7 +1778,6 @@ class MSSQLQuery extends SS_Query {
} }
public function nextRecord() { public function nextRecord() {
if(!is_resource($this->handle)) return false; if(!is_resource($this->handle)) return false;
// Coalesce rather than replace common fields. // Coalesce rather than replace common fields.
@ -1826,7 +1800,7 @@ class MSSQLQuery extends SS_Query {
return $output; return $output;
} }
} else { } else {
if($this->handle && $data = sqlsrv_fetch_array($this->handle, SQLSRV_FETCH_NUMERIC)) { if($data = sqlsrv_fetch_array($this->handle, SQLSRV_FETCH_NUMERIC)) {
$fields = sqlsrv_field_metadata($this->handle); $fields = sqlsrv_field_metadata($this->handle);
foreach($fields as $columnIdx => $field) { foreach($fields as $columnIdx => $field) {
$value = $data[$columnIdx]; $value = $data[$columnIdx];
@ -1842,10 +1816,8 @@ class MSSQLQuery extends SS_Query {
return $output; return $output;
} else { } else {
// Free the handle if there are no more results - sqlsrv crashes if there are too many handles // Free the handle if there are no more results - sqlsrv crashes if there are too many handles
if($this->handle) { sqlsrv_free_stmt($this->handle);
sqlsrv_free_stmt($this->handle); $this->handle = null;
$this->handle = null;
}
} }
} }