tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-18 07:26:40 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Return empty string from SQLQuery->sql() if SELECT is the default value, and no FROM is set (moved logic from DB-specific implementations)

Browse Source
This commit is contained in:
Ingo Schommer 2011-05-19 14:34:01 +12:00
parent 01f5b3d212
commit 1704e42d51
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/model/SQLQuery.php
View File

@ -378,6 +378,10 @@ class SQLQuery {
* @return string * @return string
*/ */
function sql() { function sql() {
// Don't process empty queries
$select = is_array($this->select) ? $this->select[0] : $this->select;
if($select == '*' && !$this->from) return '';
$sql = DB::getConn()->sqlQueryToString($this); $sql = DB::getConn()->sqlQueryToString($this);
if($this->replacementsOld) $sql = str_replace($this->replacementsOld, $this->replacementsNew, $sql); if($this->replacementsOld) $sql = str_replace($this->replacementsOld, $this->replacementsNew, $sql);
return $sql; return $sql;