Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug join alias #2433

Merged
merged 3 commits into from
May 26, 2014
Merged

Bug join alias #2433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac79f9d
Fix bug #2113 #1803 #2113
dreamsxin May 15, 2014
8cdd276
Updated
dreamsxin May 15, 2014
02e2fa6
Updated ModelsQueryExecuteTest.php
dreamsxin May 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions ext/mvc/model/query.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,7 +1179,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _getSelectColumn){
zval *source = NULL, *model_name = NULL, *sql_column = NULL;
zval *column_domain, *exception_message = NULL;
zval *sql_column_alias = NULL;
zval *best_alias, *prepared_alias = NULL;
zval *prepared_alias = NULL;
zval *column_data, *sql_expr_column = NULL;
HashTable *ah0;
HashPosition hp0;
Expand Down Expand Up @@ -1234,7 +1234,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _getSelectColumn){
* Check if selected column is qualified.*
*/
if (PHALCON_IS_LONG(column_type, PHQL_T_DOMAINALL)) {
zval *source, *sql_aliases_models, *sql_models_aliases;
zval *source, *sql_aliases_models;
zval *sql_aliases = phalcon_fetch_nproperty_this(this_ptr, SL("_sqlAliases"), PH_NOISY TSRMLS_CC);

/**
Expand Down Expand Up @@ -1264,22 +1264,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _getSelectColumn){
PHALCON_OBS_VAR(model_name);
phalcon_array_fetch(&model_name, sql_aliases_models, column_domain, PH_NOISY);

/**
* Get the best alias for the column
*/
sql_models_aliases = phalcon_fetch_nproperty_this(this_ptr, SL("_sqlModelsAliases"), PH_NOISY TSRMLS_CC);

PHALCON_OBS_VAR(best_alias);
phalcon_array_fetch(&best_alias, sql_models_aliases, model_name, PH_NOISY);

/**
* If the best alias is the model name we lowercase the first letter
*/
if (PHALCON_IS_EQUAL(best_alias, model_name)) {
if (PHALCON_IS_EQUAL(column_domain, model_name)) {
PHALCON_INIT_VAR(prepared_alias);
phalcon_lcfirst(prepared_alias, model_name);
} else {
PHALCON_CPY_WRT(prepared_alias, best_alias);
PHALCON_CPY_WRT(prepared_alias, column_domain);
}

/**
Expand Down Expand Up @@ -2026,7 +2015,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _getJoins){
phalcon_array_update_zval(&sql_models_aliases, model_name, alias, PH_COPY | PH_SEPARATE);

/**
* Update model => model
* Update alias => model
*/
phalcon_array_update_zval(&sql_aliases_models, alias, model_name, PH_COPY | PH_SEPARATE);

Expand Down
13 changes: 13 additions & 0 deletions unit-tests/ModelsQueryExecuteTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ public function testExecuteMysql()
$this->_testDeleteRenamedExecute($di);

$this->_testIssue2019($di);
$this->_testIssue1803($di);
}

public function testExecutePostgresql()
Expand Down Expand Up @@ -889,4 +890,16 @@ public function _testDeleteRenamedExecute($di)

}

public function _testIssue1803($di)
{
$manager = $di->getShared('modelsManager');

$result = $manager->executeQuery('SELECT r1.*, r2.*, r3.* FROM Robots AS r1 LEFT JOIN Robots AS r2 ON r2.id = r1.id LEFT JOIN Robots AS r3 ON r3.id = r1.id LIMIT 1');

$this->assertInstanceOf('Phalcon\Mvc\Model\Resultset\Complex', $result);
$this->assertEquals(gettype($result[0]->r1), 'object');
$this->assertEquals(get_class($result[0]->r1), 'Robots');
$this->assertEquals(count($result[0]), 3);
}

}