Add SQL order clause

Author: technicalguru

src/TgDatabase/Order.php

@@ -7,10 +7,11 @@
   */
 class Order {
 
-	public function __construct($propertyName, $ascending = TRUE) {
+	public function __construct($propertyName, $ascending = TRUE, $isSql = FALSE) {
 		$this->propertyName = $propertyName;
 		$this->ascending    = $ascending;
 		$this->ignoreCase   = FALSE;
+		$this->sql          = $isSql;
 	}
 
 	/*
@@ -31,16 +32,20 @@ public function toSqlString($localQuery, $overallQuery) {
 		$lower = $this->ignoreCase;
 
 		$rc = '';
-		if ($lower) {
-			$rc .= 'LOWER(';
-		}
-		$rc .= $overallQuery->quoteName($localQuery->getAlias(), $this->propertyName);
-		if ($lower) {
-			$rc .= ')';
-		}
+		if (!$this->sql) {
+			if ($lower) {
+				$rc .= 'LOWER(';
+			}
+			$rc .= $overallQuery->quoteName($localQuery->getAlias(), $this->propertyName);
+			if ($lower) {
+				$rc .= ')';
+			}
 
-		if (!$this->ascending) {
-			$rc .= ' DESC';
+			if (!$this->ascending) {
+				$rc .= ' DESC';
+			}
+		} else {
+			$rc = $this->propertyName;
 		}
 		return $rc;
 	}
@@ -53,6 +58,10 @@ public static function desc($propertyName) {
 		return new Order($propertyName, FALSE);
 	}
 
+	public static function sql($sql) {
+		return new Order($sql, TRUE, TRUE);
+	}
+
 	/**
 	 * Creates the order object.
 	 * @param mixed $orders - string or order object (fieldname ASC/DESC)
@@ -67,9 +76,8 @@ public static function toOrder($order) {
             $lastWord = strtolower(substr($s, $pos+1));
             if ($lastWord == 'desc') return Order::desc(substr($s, 0, $pos));
             if ($lastWord == 'asc') return Order::asc(substr($s, 0, $pos));
-            return Order::asc($s);
         }
-		return Order::asc($s);
+		return Order::sql($s);
 	}
 
 }