MINOR Fixed syntax errors from SQLQuery/DataQuery cleanup

silverstripe · May 16, 2012 · 8f2ede8 · 8f2ede8
1 parent 4da9e72
commit 8f2ede8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/model/DataQuery.php b/model/DataQuery.php
@@ -325,7 +325,7 @@ function count() {
 	 * @param String $field Unquoted database column name (will be escaped automatically)
 	 */
 	function Max($field) {
-	    return $this->getFinalisedQuery()->aggregate(sprintf('MAX("%s")', Convert::raw2sql($field))->execute()->value();
+	    return $this->getFinalisedQuery()->aggregate(sprintf('MAX("%s")', Convert::raw2sql($field)))->execute()->value();
 	}
 
 	/**
@@ -334,7 +334,7 @@ function Max($field) {
 	 * @param String $field Unquoted database column name (will be escaped automatically)
 	 */
 	function Min($field) {
-	    return $this->getFinalisedQuery()->aggregate(sprintf('MIN("%s")', Convert::raw2sql($field))->execute()->value();
+	    return $this->getFinalisedQuery()->aggregate(sprintf('MIN("%s")', Convert::raw2sql($field)))->execute()->value();
 	}
 
 	/**
@@ -343,7 +343,7 @@ function Min($field) {
 	 * @param String $field Unquoted database column name (will be escaped automatically)
 	 */
 	function Avg($field) {
-	    return $this->getFinalisedQuery()->aggregate(sprintf('AVG("%s")', Convert::raw2sql($field))->execute()->value();
+	    return $this->getFinalisedQuery()->aggregate(sprintf('AVG("%s")', Convert::raw2sql($field)))->execute()->value();
 	}
 
 	/**
@@ -352,7 +352,7 @@ function Avg($field) {
 	 * @param String $field Unquoted database column name (will be escaped automatically)
 	 */
 	function Sum($field) {
-	    return $this->getFinalisedQuery()->aggregate((sprintf('SUM("%s")', Convert::raw2sql($field)))->execute()->value();
+	    return $this->getFinalisedQuery()->aggregate(sprintf('SUM("%s")', Convert::raw2sql($field)))->execute()->value();
 	}
 
 	/**

diff --git a/model/SQLQuery.php b/model/SQLQuery.php
@@ -848,7 +848,7 @@ function sql() {
 				else $filter = "(" . implode(") AND (", $join['filter']) . ")";
 
 				$aliasClause = ($alias != $join['table']) ? " AS \"" . Convert::raw2sql($alias) . "\"" : "";
-				$this->from[$alias] = strtoupper($join['type']) . " JOIN \"{" . Convert::raw2sql($join['table']) . "}\"$aliasClause ON $filter";
+				$this->from[$alias] = strtoupper($join['type']) . " JOIN \"" . Convert::raw2sql($join['table']) . "\"$aliasClause ON $filter";
 			}
 		}