From fb5f76f0256a926a09113213993ae74a9aa25078 Mon Sep 17 00:00:00 2001 From: Mike Meier Date: Fri, 15 Mar 2013 14:19:41 +0100 Subject: [PATCH] rewrite tablePrefixAlias --- lib/Doctrine/ORM/Query/SqlWalker.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index e85d9caec..31151debe 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -291,10 +291,7 @@ class SqlWalker implements TreeWalker $tableName .= ($dqlAlias) ? '@[' . $dqlAlias . ']' : ''; if ( ! isset($this->tableAliasMap[$tableName])) { - $tablePrefixAlias = strtolower(substr($tableName, 0, 1)); - if( ! preg_match("/[a-z]/", $tablePrefixAlias)) { - $tablePrefixAlias = 't'; - } + $tablePrefixAlias = preg_match('~[a-z]~i', $tableName[0]) ? strtolower($tableName[0]) : 't'; $this->tableAliasMap[$tableName] = $tablePrefixAlias . $this->tableAliasCounter++ . '_'; }