From 74abdec18b15575c6fc69fa558870d44aea42986 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 19 May 2011 11:35:56 +1200 Subject: [PATCH] BUGFIX Allow omitting FROM clause in sqlQueryToString() --- code/PostgreSQLDatabase.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/PostgreSQLDatabase.php b/code/PostgreSQLDatabase.php index 744f6e3..5f17539 100755 --- a/code/PostgreSQLDatabase.php +++ b/code/PostgreSQLDatabase.php @@ -1554,15 +1554,13 @@ class PostgreSQLDatabase extends SS_Database { * helper function in Database? */ 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) . " )";