Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Fixing the problem with order and \Zend\Db\Sql\Expression #3017

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions library/Zend/Db/Sql/Select.php
Expand Up @@ -340,6 +340,8 @@ public function order($order)
} else {
$order = (array) $order;
}
} elseif ($order instanceof Expression){
$order = array($order);
}
foreach ($order as $k => $v) {
if (is_string($k)) {
Expand Down
4 changes: 4 additions & 0 deletions tests/ZendTest/Db/Sql/SelectTest.php
Expand Up @@ -260,6 +260,10 @@ public function testOrder()
$select = new Select;
$select->order(array('name ASC', 'age DESC'));
$this->assertEquals(array('name ASC', 'age DESC'), $select->getRawState('order'));

$select = new Select;
$select->order(new \Zend\db\sql\Expression('id DESC'));
$this->assertEquals('id DESC', current($select->getRawState('order'))->getExpression());
}

/**
Expand Down