Ticket #1195: RawSql_p1.patch

RawSql.php

@@ -72 +72 @@
             $this->_parseSelectFields($queryPart);
             return $this;
         }
-        if ( ! isset($this->parts[$queryPartName])) {
+        if ( ! isset($this->_sqlParts[$queryPartName])) {
             $this->_sqlParts[$queryPartName] = array();
         }
         
@@ -220 +220 @@
             }
         }
         
+        $q = 'SELECT ';
+        if($this->_sqlParts['distinct'] == true) $q .= 'DISTINCT ';
+
         // first add the fields of the root component
         reset($this->_queryComponents);
         $componentAlias = key($this->_queryComponents);
-
-        $q = 'SELECT ' . implode(', ', $select[$componentAlias]);
+        $q .= implode(', ', $select[$componentAlias]);
         unset($select[$componentAlias]);
 
         foreach ($select as $component => $fields) {
@@ -237 +239 @@
         if ( ! empty($string)) {
             $this->_sqlParts['where'][] = $string;
         }
-        $copy = $this->_sqlParts;
-        unset($copy['select']);
 
         $q .= ( ! empty($this->_sqlParts['from']))?    ' FROM '     . implode(' ', $this->_sqlParts['from']) : '';
         $q .= ( ! empty($this->_sqlParts['where']))?   ' WHERE '    . implode(' AND ', $this->_sqlParts['where']) : '';