Initial import

Author: rkrx

LICENSE

@@ -137,7 +137,7 @@ public function having($expression) {
 	 */
 	public function orderBy($expression, $direction = 'asc') {
 		if(strtolower($direction) != 'desc') {
-			$direction = 'asc';
+			$direction = 'ASC';
 		}
 		if(is_array($expression)) {
 			if(!count($expression)) {
@@ -317,7 +317,7 @@ private function buildOrder($query) {
 		$arr = array();
 		foreach($this->orderBy as $order) {
 			list($expression, $direction) = $order;
-			$arr[] = "\t{$expression} {$direction}";
+			$arr[] = sprintf("\t%s %s", $expression, strtoupper($direction));
 		}
 		return $query . join(",\n", $arr) . "\n";
 	}
@@ -327,7 +327,7 @@ private function buildOrder($query) {
 	 * @return string
 	 */
 	private function buildGroups($query) {
-		if(!count($this->orderBy)) {
+		if(!count($this->groupBy)) {
 			return $query;
 		}
 		$query .= "GROUP BY\n";

src/Kir/MySQL/Builder/Select.php

@@ -66,6 +66,24 @@ public function testHaving() {
 		$this->assertEquals('SELECT a FROM test t HAVING a+1<2 ;', $str);
 	}
 
+	public function testOrder() {
+		$str = TestSelect::create()
+		->field('a')
+		->from('t', 'test')
+		->orderBy('a', 'desc')
+		->asString();
+		$this->assertEquals('SELECT a FROM test t ORDER BY a DESC ;', $str);
+	}
+
+	public function testGroup() {
+		$str = TestSelect::create()
+		->field('a')
+		->from('t', 'test')
+		->groupBy('a', 'b', 'c')
+		->asString();
+		$this->assertEquals('SELECT a FROM test t GROUP BY a, b, c ;', $str);
+	}
+
 	public function testLimit() {
 		$str = TestSelect::create()
 		->field('a')