Fixes #12971

Refs: #13124
phalcon · Oct 21, 2017 · 85d87d2 · 85d87d2
1 parent 07f02ab
commit 85d87d2
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 4 deletions.
diff --git a/CHANGELOG-3.2.md b/CHANGELOG-3.2.md
@@ -1,5 +1,6 @@
 # [3.2.4](https://github.com/phalcon/cphalcon/releases/tag/v3.2.4) (2017-21-12)
 - Fixed regression of [#13046](https://github.com/phalcon/cphalcon/issues/13046) by removing injection of dispatcher's parameters (which were never available anyway) [#13121](https://github.com/phalcon/cphalcon/issues/13121)
+- Fixed `Phalcon/Mvc/Model/Query::_getQualified` to correct replace field names in `WHERE` [#12971](https://github.com/phalcon/cphalcon/issues/12971)
 
 # [3.2.3](https://github.com/phalcon/cphalcon/releases/tag/v3.2.3) (2017-10-12)
 - Fixed `Phalcon\Mvc\Model\Query::_executeSelect` threw RuntimeException, if db:beforeQuery() returned false

diff --git a/phalcon/mvc/model/query.zep b/phalcon/mvc/model/query.zep
@@ -206,10 +206,14 @@ class Query implements QueryInterface, InjectionAwareInterface
 		 */
 		let sqlColumnAliases = this->_sqlColumnAliases;
 		if isset sqlColumnAliases[columnName] {
-			return [
-				"type": "qualified",
-				"name": columnName
-			];
+			var domain;
+
+			if !fetch domain, expr["domain"] {
+				return [
+					"type": "qualified",
+					"name": columnName
+				];
+			}
 		}
 
 		let metaData = this->_metaData;

diff --git a/tests/unit/Mvc/Model/QueryTest.php b/tests/unit/Mvc/Model/QueryTest.php
@@ -6914,7 +6914,54 @@ function ($phql, $expected) {
                                 ),
                             ),
                         )
+                    ],
+                    [
+                        // PR #13124, ISSUE #12971
+                        "phql"     => 'SELECT UPPER('. Robots::class . '.name) AS name FROM ' . Robots::class . 'WHERE ' . Robots::class .'.name = Robotina',
+                        "expected" => [
+                            'distinct' => 0,
+                            'models' => [
+                                Robots::class,
+                            ],
+                            'tables' => [
+                                'robots'
+                            ],
+                            'columns' => [
+                                'id' => [
+                                    'type' => 'scalar',
+                                    'balias' => 'name',
+                                    'sqlAlias' => 'name',
+                                    'column' => [
+                                        'type' => 'functionCall',
+                                        'name' => 'UPPER',
+                                        'arguments' => [
+                                            [
+                                                'type' => 'qualified',
+                                                'domain' => 'robots',
+                                                'name' => 'name',
+                                                'balias' => 'name'
+                                            ]
+                                        ],
+                                    ],
+                                ]
+                            ],
+                            'where' => [
+                                'type' => 'binary-op',
+                                'op' => '=',
+                                'left' => [
+                                    'type' => 'qualified',
+                                    'domain' => 'robots',
+                                    'name' => 'name',
+                                    'balias' => 'name'
+                                ],
+                                'right' => [
+                                    'type' => 'literal',
+                                    'value' => 'Robotina'
+                                ]
+                            ]
+                        ]
                     ]
+
                 ]
             ]
         );