From ebc996c8206c5de5f556fe19ffab24ba16f2d25f Mon Sep 17 00:00:00 2001 From: Mike Meier Date: Fri, 15 Mar 2013 13:53:22 +0100 Subject: [PATCH] Update SqlWalker.php Always be sure that only a-z characters are used for table alias, otherwise use generic "t" for "table" --- lib/Doctrine/ORM/Query/SqlWalker.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 35ac87c38..e85d9caec 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -291,7 +291,11 @@ class SqlWalker implements TreeWalker $tableName .= ($dqlAlias) ? '@[' . $dqlAlias . ']' : ''; if ( ! isset($this->tableAliasMap[$tableName])) { - $this->tableAliasMap[$tableName] = strtolower(substr($tableName, 0, 1)) . $this->tableAliasCounter++ . '_'; + $tablePrefixAlias = strtolower(substr($tableName, 0, 1)); + if( ! preg_match("/[a-z]/", $tablePrefixAlias)) { + $tablePrefixAlias = 't'; + } + $this->tableAliasMap[$tableName] = $tablePrefixAlias . $this->tableAliasCounter++ . '_'; } return $this->tableAliasMap[$tableName];