hinting for select query;

Author: Mon1k

framework/db/ar/CActiveFinder.php

@@ -1274,6 +1274,8 @@ class CJoinQuery
 	 */
 	public $elements=array();
 
+	public $hints=array();
+
 	/**
 	 * Constructor.
 	 * @param CJoinElement $joinElement The root join tree.
@@ -1303,6 +1305,9 @@ public function __construct($joinElement,$criteria=null)
 			$this->conditions[]=$joinElement->getPrimaryKeyRange();
 		}
 		$this->elements[$joinElement->id]=true;
+
+		if ($criteria!==null && $criteria->hints)
+			$this->hints=array_merge($this->hints,$criteria->hints);
 	}
 
 	/**
@@ -1330,6 +1335,10 @@ public function join($element)
 				$this->params=$element->relation->params;
 		}
 		$this->elements[$element->id]=true;
+
+
+		if (!empty($element->relation->hints))
+			$this->hints[]=$element->relation->hints;
 	}
 
 	/**
@@ -1339,7 +1348,18 @@ public function join($element)
 	 */
 	public function createCommand($builder)
 	{
-		$sql=($this->distinct ? 'SELECT DISTINCT ':'SELECT ') . implode(', ',$this->selects);
+		$sql='SELECT ';
+		if($this->hints)
+		{
+			$sql.='/*+';
+			foreach($this->hints as $hint)
+			{
+				$sql.=$hint.' ';
+			}
+			$sql.='*/ ';
+		}
+
+		$sql.=($this->distinct?'DISTINCT ':'').implode(', ',$this->selects);
 		$sql.=' FROM ' . implode(' ',array_unique($this->joins));
 
 		$conditions=array();

framework/db/ar/CActiveRecord.php

@@ -1999,6 +1999,8 @@ class CBaseActiveRelation extends CComponent
 	 */
 	public $order='';
 
+	public $hints=array();
+
 	/**
 	 * Constructor.
 	 * @param string $name name of the relation

framework/db/schema/CDbCriteria.php

@@ -150,6 +150,9 @@ class CDbCriteria extends CComponent
 	 */
 	public $scopes;
 
+
+	public $hints=array();
+
 	/**
 	 * Constructor.
 	 * @param array $data criteria initial property values (indexed by property name)