Changeset 4708

Timestamp:

07/24/08 01:13:07 (4 months ago)

Author:

guilhermeblanco

Message:

fixes #1262 and fixes #1272

Location:

branches

Files:

• 0.11/lib/Doctrine/Query.php (modified) (1 diff)
• 0.11/lib/Doctrine/Query/JoinCondition.php (modified) (1 diff)
• 1.0/lib/Doctrine/Query.php (modified) (1 diff)
• 1.0/lib/Doctrine/Query/JoinCondition.php (modified) (1 diff)

branches/0.11/lib/Doctrine/Query.php

@@ -1545 +1545 @@
                     $assocPath = $prevPath . '.' . $asf->getComponentName();
 
-                    $this->_queryComponents[$assocPath] = array('parent' => $prevPath, 'relation' => $relation, 'table' => $asf);
+                    $this->_queryComponents[$assocPath] = array(
+                        'parent' => $prevPath, 
+                        'relation' => $relation,
+                        'table' => $asf
+                    );
 
                     $assocAlias = $this->getTableAlias($assocPath, $asf->getTableName());
 
-                    $queryPart = $join . $assocTableName . ' ' . $assocAlias;
-
-                    $queryPart .= ' ON ' . $localAlias
-                                . '.'
-                                . $localTable->getColumnName($localTable->getIdentifier()) // what about composite keys?
+                    $queryPart = $join . $this->_conn->quoteIdentifier($assocTableName) 
+                               . ' ' . $this->_conn->quoteIdentifier($assocAlias);
+
+                    $queryPart .= ' ON ' 
+                                . $this->_conn->quoteIdentifier($localAlias . '.'
+                                // what about composite keys?
+                                . $localTable->getColumnName($localTable->getIdentifier()))
                                 . ' = '
-                                . $assocAlias . '.' . $relation->getLocal();
+                                . $this->_conn->quoteIdentifier($assocAlias . '.' . $relation->getLocal());
 
                     if ($relation->isEqual()) {
                         // equal nest relation needs additional condition
-                        $queryPart .= ' OR ' . $localAlias
-                                    . '.'
-                                    . $table->getColumnName($table->getIdentifier())
+                        $queryPart .= ' OR ' 
+                                    . $this->_conn->quoteIdentifier($localAlias . '.'
+                                    . $table->getColumnName($table->getIdentifier()))
                                     . ' = '
-                                    . $assocAlias . '.' . $relation->getForeign();
+                                    . $this->_conn->quoteIdentifier($assocAlias . '.' . $relation->getForeign());
                     }
 

branches/0.11/lib/Doctrine/Query/JoinCondition.php

@@ -140 +140 @@
                 default:
                     $leftExpr = (($hasLeftAggExpression) ? $leftMatches[1] . '(' : '') 
-                              . $alias . '.' . $field
+                              . $conn->quoteIdentifier($alias . '.' . $field)
                               . (($hasLeftAggExpression) ? $leftMatches[3] . ')' : '') ;
 

branches/1.0/lib/Doctrine/Query.php

@@ -1545 +1545 @@
                     $assocPath = $prevPath . '.' . $asf->getComponentName();
 
-                    $this->_queryComponents[$assocPath] = array('parent' => $prevPath, 'relation' => $relation, 'table' => $asf);
+                    $this->_queryComponents[$assocPath] = array(
+                        'parent' => $prevPath, 
+                        'relation' => $relation,
+                        'table' => $asf
+                    );
 
                     $assocAlias = $this->getTableAlias($assocPath, $asf->getTableName());
 
-                    $queryPart = $join . $assocTableName . ' ' . $assocAlias;
-
-                    $queryPart .= ' ON ' . $localAlias
-                                . '.'
-                                . $localTable->getColumnName($localTable->getIdentifier()) // what about composite keys?
+                    $queryPart = $join . $this->_conn->quoteIdentifier($assocTableName) 
+                               . ' ' . $this->_conn->quoteIdentifier($assocAlias);
+
+                    $queryPart .= ' ON '
+                                . $this->_conn->quoteIdentifier($localAlias . '.'
+                                // what about composite keys?
+                                . $localTable->getColumnName($localTable->getIdentifier()))
                                 . ' = '
-                                . $assocAlias . '.' . $relation->getLocal();
+                                . $this->_conn->quoteIdentifier($assocAlias . '.' . $relation->getLocal());
 
                     if ($relation->isEqual()) {
                         // equal nest relation needs additional condition
-                        $queryPart .= ' OR ' . $localAlias
-                                    . '.'
-                                    . $table->getColumnName($table->getIdentifier())
+                        $queryPart .= ' OR '
+                                    . $this->_conn->quoteIdentifier($localAlias . '.'
+                                    . $table->getColumnName($table->getIdentifier()))
                                     . ' = '
-                                    . $assocAlias . '.' . $relation->getForeign();
+                                    . $this->_conn->quoteIdentifier($assocAlias . '.' . $relation->getForeign());
                     }
 

branches/1.0/lib/Doctrine/Query/JoinCondition.php

@@ -140 +140 @@
                 default:
                     $leftExpr = (($hasLeftAggExpression) ? $leftMatches[1] . '(' : '') 
-                              . $alias . '.' . $field
+                              . $conn->quoteIdentifier($alias . '.' . $field)
                               . (($hasLeftAggExpression) ? $leftMatches[3] . ')' : '') ;