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

[2.0.x] [BUG] fix doesn't correct column domain #10439

Merged
merged 1 commit into from
Jun 2, 2015
Merged

[2.0.x] [BUG] fix doesn't correct column domain #10439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion phalcon/db/dialect.zep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down