tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-02 14:18:46 +02:00
Code Issues Projects Releases Wiki Activity

MINOR FIX: columns quoted properly + database agnostic version of RANDOM() created

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86509 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Geoff Munn 2009-09-17 00:07:32 +00:00
parent 9ec8c5c310
commit 5b2eb11d4b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/model/SQLQuery.php
View File

@ -87,6 +87,9 @@ class SQLQuery extends Object {
* @param array $groupby An array of fields to group by. * @param array $groupby An array of fields to group by.
* @param array $having An array of having clauses. * @param array $having An array of having clauses.
* @param string $limit A LIMIT clause. * @param string $limit A LIMIT clause.
*
* TODO: perhaps we can quote things here instead of requiring all the parameters to be quoted
* by this stage.
*/ */
function __construct($select = "*", $from = array(), $where = "", $orderby = "", $groupby = "", $having = "", $limit = "") { function __construct($select = "*", $from = array(), $where = "", $orderby = "", $groupby = "", $having = "", $limit = "") {
$this->select($select); $this->select($select);
@ -157,7 +160,7 @@ class SQLQuery extends Object {
* @return SQLQuery This instance * @return SQLQuery This instance
*/ */
public function innerJoin($table, $onPredicate) { public function innerJoin($table, $onPredicate) {
$this->from[$table] = "INNER JOIN $table ON $onPredicate"; $this->from[$table] = "INNER JOIN \"$table\" ON $onPredicate";
return $this; return $this;
} }
@ -207,7 +210,7 @@ class SQLQuery extends Object {
// If sort contains a function call, let's move the sort clause into a separate selected field. // If sort contains a function call, let's move the sort clause into a separate selected field.
// Some versions of MySQL choke if you have a group function referenced directly in the ORDER BY // Some versions of MySQL choke if you have a group function referenced directly in the ORDER BY
if($combinedOrderby && strpos($combinedOrderby,'(') !== false && strtoupper(trim($combinedOrderby)) != 'RAND()') { if($combinedOrderby && strpos($combinedOrderby,'(') !== false && strtoupper(trim($combinedOrderby)) != DB::getConn()->random()) {
// Sort can be "Col1 DESC|ASC, Col2 DESC|ASC", we need to handle that // Sort can be "Col1 DESC|ASC, Col2 DESC|ASC", we need to handle that
$sortParts = explode(",", $combinedOrderby); $sortParts = explode(",", $combinedOrderby);
@ -381,7 +384,7 @@ class SQLQuery extends Object {
* @return Query * @return Query
*/ */
function execute() { function execute() {
return DB::query($this->sql()); return DB::query($this->sql(), E_USER_ERROR, $params);
} }
/** /**