BUGFIX Allow omitting FROM clause in sqlQueryToString()

silverstripe · May 18, 2011 · cfe0066 · cfe0066
1 parent a2d334c
commit cfe0066
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/model/Database.php b/model/Database.php
@@ -707,15 +707,13 @@ function alterationMessage($message,$type=""){
 	 * Convert a SQLQuery object into a SQL statement
 	 */
 	public function sqlQueryToString(SQLQuery $sqlQuery) {
-		if (!$sqlQuery->from) return '';
 		$distinct = $sqlQuery->distinct ? "DISTINCT " : "";
 		if($sqlQuery->delete) {
 			$text = "DELETE ";
 		} else if($sqlQuery->select) {
 			$text = "SELECT $distinct" . 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) . " )";