Author: jwage
Date: 2008-08-26 00:37:32 +0100 (Tue, 26 Aug 2008)
New Revision: 4811
Modified:
branches/1.0/lib/Doctrine/Query.php
branches/1.0/lib/Doctrine/Query/Abstract.php
Log:
Adding mssql identifier quotes
Modified: branches/1.0/lib/Doctrine/Query/Abstract.php
===================================================================
--- branches/1.0/lib/Doctrine/Query/Abstract.php 2008-08-25 23:29:21 UTC
(rev 4810)
+++ branches/1.0/lib/Doctrine/Query/Abstract.php 2008-08-25 23:37:32 UTC
(rev 4811)
@@ -880,7 +880,7 @@
*/
public function getComponentAlias($sqlTableAlias)
{
- $sqlTableAlias = trim($sqlTableAlias, '`"');
+ $sqlTableAlias = trim($sqlTableAlias, '[]`"');
if ( ! isset($this->_tableAliasMap[$sqlTableAlias])) {
throw new Doctrine_Query_Exception('Unknown table alias ' .
$sqlTableAlias);
}
Modified: branches/1.0/lib/Doctrine/Query.php
===================================================================
--- branches/1.0/lib/Doctrine/Query.php 2008-08-25 23:29:21 UTC (rev 4810)
+++ branches/1.0/lib/Doctrine/Query.php 2008-08-25 23:37:32 UTC (rev 4811)
@@ -1004,8 +1004,7 @@
unset($this->_pendingJoinConditions[$k]);
}
- $tableAlias = trim($e[3], '`"');
- $componentAlias = $this->getComponentAlias($tableAlias);
+ $componentAlias = $this->getComponentAlias($e[3]);
$string = $this->getInheritanceCondition($componentAlias);
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
