Merge pull request #10439 from KorsaR-ZN/patch-16

[2.0.x] [BUG] fix doesn't correct column domain
phalcon · Jun 2, 2015 · e18e790 · e18e790
2 parents d1e5695 + 1cbf375
commit e18e790
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Fixed bug that added two ? in Mvc\Url::get when using query parameters (#10421)
 - Now string attributes in models can be marked to allow empty string values (#440)
 - Added an option to return the SQL to be generated from a Mvc\Model\Query instance (#1908)
+- Fix doesn't correct column domain in `Phalcon\Db\Dialect::select()` see [#10439](https://github.com/phalcon/cphalcon/pull/10439)
 
 # 2.0.2 (2015-05-26)
  - Added `stats()` methods to Beanstalk

diff --git a/phalcon/db/dialect.zep b/phalcon/db/dialect.zep
@@ -495,7 +495,7 @@ abstract class Dialect implements DialectInterface
 			"type": "all"
 		];
 
-		if (fetch domain, expression["balias"] || fetch domain, expression["domain"]) && domain != "" {
+		if (fetch domain, expression["column"] || fetch domain, expression["domain"]) && domain != "" {
 			let objectExpression["domain"] = domain;
 		}