Author: romanb
Date: 2008-09-05 20:55:24 +0100 (Fri, 05 Sep 2008)
New Revision: 4876
Modified:
branches/1.0/lib/Doctrine/Query/Abstract.php
Log:
Fixed #1427. Thanks for the patch.
Modified: branches/1.0/lib/Doctrine/Query/Abstract.php
===================================================================
--- branches/1.0/lib/Doctrine/Query/Abstract.php 2008-09-03 05:28:53 UTC
(rev 4875)
+++ branches/1.0/lib/Doctrine/Query/Abstract.php 2008-09-05 19:55:24 UTC
(rev 4876)
@@ -336,18 +336,29 @@
public function getDql()
{
$q = '';
- $q .= ( ! empty($this->_dqlParts['select']))? 'SELECT ' .
implode(', ', $this->_dqlParts['select']) : '';
- $q .= ( ! empty($this->_dqlParts['from']))? ' FROM ' .
implode(' ', $this->_dqlParts['from']) : '';
- $q .= ( ! empty($this->_dqlParts['where']))? ' WHERE ' .
implode(' ', $this->_dqlParts['where']) : '';
- $q .= ( ! empty($this->_dqlParts['groupby']))? ' GROUP BY ' .
implode(', ', $this->_dqlParts['groupby']) : '';
- $q .= ( ! empty($this->_dqlParts['having']))? ' HAVING ' .
implode(' AND ', $this->_dqlParts['having']) : '';
- $q .= ( ! empty($this->_dqlParts['orderby']))? ' ORDER BY ' .
implode(', ', $this->_dqlParts['orderby']) : '';
- $q .= ( ! empty($this->_dqlParts['limit']))? ' LIMIT ' .
implode(' ', $this->_dqlParts['limit']) : '';
- $q .= ( ! empty($this->_dqlParts['offset']))? ' OFFSET ' .
implode(' ', $this->_dqlParts['offset']) : '';
+ if ($this->_type == self::SELECT) {
+ $q .= ( ! empty($this->_dqlParts['select'])) ? 'SELECT ' .
implode(', ', $this->_dqlParts['select']) : '';
+ $q .= ( ! empty($this->_dqlParts['from'])) ? ' FROM ' . implode('
', $this->_dqlParts['from']) : '';
+ } else if ($this->_type == self::DELETE) {
+ $q .= 'DELETE';
+ $q .= ( ! empty($this->_dqlParts['from'])) ? ' FROM ' . implode('
', $this->_dqlParts['from']) : '';
+ } else if ($this->_type == self::UPDATE) {
+ $q .= 'UPDATE ';
+ $q .= ( ! empty($this->_dqlParts['from'])) ? implode(' ',
$this->_dqlParts['from']) : '';
+ $q .= ( ! empty($this->_dqlParts['set'])) ? ' SET ' . implode(' ',
$this->_dqlParts['set']) : '';
+ }
+ $q .= ( ! empty($this->_dqlParts['where'])) ? ' WHERE ' . implode(' ',
$this->_dqlParts['where']) : '';
+ $q .= ( ! empty($this->_dqlParts['groupby'])) ? ' GROUP BY ' .
implode(', ', $this->_dqlParts['groupby']) : '';
+ $q .= ( ! empty($this->_dqlParts['having'])) ? ' HAVING ' . implode('
AND ', $this->_dqlParts['having']) : '';
+ $q .= ( ! empty($this->_dqlParts['orderby'])) ? ' ORDER BY ' .
implode(', ', $this->_dqlParts['orderby']) : '';
+ $q .= ( ! empty($this->_dqlParts['limit'])) ? ' LIMIT ' . implode(' ',
$this->_dqlParts['limit']) : '';
+ $q .= ( ! empty($this->_dqlParts['offset'])) ? ' OFFSET ' . implode('
', $this->_dqlParts['offset']) : '';
return $q;
}
+
+
/**
* getQueryPart
* gets a query part from the query part array
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"doctrine-svn" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.co.uk/group/doctrine-svn?hl=en-GB
-~----------~----~----~----~------~----~------~--~---
