#011786: Database: quoteIdentifier() incorrectly quotes inambiguous idenitifers

Index: Database/src/sqlabstraction/expression.php
===================================================================
--- Database/src/sqlabstraction/expression.php (revision 6624)
+++ Database/src/sqlabstraction/expression.php (working copy)
@@ -114,19 +114,13 @@
{
$aliasParts = explode( '.', $alias );
$identifiers = array();
- foreach ( $aliasParts as $singleAliasName )
+ // Alias either table name for table.column submits or column name
+ if ( $this->aliases !== null &&
+ array_key_exists( $aliasParts[0], $this->aliases ) )
{
- if ( $this->aliases !== null &&
- array_key_exists( $singleAliasName, $this->aliases ) )
- {
- $identifiers[]= $this->aliases[$singleAliasName];
- }
- else
- {
- $identifiers[]= $singleAliasName;
- }
+ $aliasParts[0] = $this->aliases[$aliasParts[0]];
}
- $alias = join( '.', $identifiers );
+ $alias = join( '.', $aliasParts );
return $alias;
}

Index: Database/src/sqlabstraction/query.php
===================================================================
--- Database/src/sqlabstraction/query.php (revision 6624)
+++ Database/src/sqlabstraction/query.php (working copy)
@@ -169,19 +169,13 @@
{
$aliasParts = explode( '.', $alias );
$identifiers = array();
- foreach ( $aliasParts as $singleAliasName )
+ // Alias either table name for table.column submits or column name
+ if ( $this->aliases !== null &&
+ array_key_exists( $aliasParts[0], $this->aliases ) )
{
- if ( $this->aliases !== null &&
- array_key_exists( $singleAliasName, $this->aliases ) )
- {
- $identifiers[]= $this->aliases[$singleAliasName];
- }
- else
- {
- $identifiers[]= $singleAliasName;
- }
+ $aliasParts[0] = $this->aliases[$aliasParts[0]];
}
- $alias = join( '.', $identifiers );
+ $alias = join( '.', $aliasParts );
return $alias;
}