Skip to content

Commit

Permalink
Merge pull request #10480 from dreamsxin/bug_2113
Browse files Browse the repository at this point in the history
Fix bug #2113
  • Loading branch information
andresgutierrez committed Jun 8, 2015
2 parents 2f86624 + 77b1e6f commit 888ebac
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions phalcon/mvc/model/query.zep
Original file line number Diff line number Diff line change
Expand Up @@ -689,8 +689,8 @@ class Query implements QueryInterface, InjectionAwareInterface
protected final function _getSelectColumn(array! column)
{
var sqlColumns, columnType, sqlAliases, modelName, source,
columnDomain, sqlColumnAlias, bestAlias, preparedAlias, sqlExprColumn,
sqlAliasesModels, sqlModelsAliases, sqlColumn, columnData, balias;
columnDomain, sqlColumnAlias, preparedAlias, sqlExprColumn,
sqlAliasesModels, sqlColumn, columnData, balias;

if !fetch columnType, column["type"] {
throw new Exception("Corrupted SELECT AST");
Expand Down Expand Up @@ -743,19 +743,13 @@ class Query implements QueryInterface, InjectionAwareInterface
let sqlAliasesModels = this->_sqlAliasesModels,
modelName = sqlAliasesModels[columnDomain];

/**
* Get the best alias for the column
*/
let sqlModelsAliases = this->_sqlModelsAliases,
bestAlias = sqlModelsAliases[modelName];

/**
* If the best alias is the model name we lowercase the first letter
*/
if bestAlias == modelName {
if columnDomain == modelName {
let preparedAlias = lcfirst(modelName);
} else {
let preparedAlias = bestAlias;
let preparedAlias = columnDomain;
}

/**
Expand Down

0 comments on commit 888ebac

Please sign in to comment.