Merge remote-tracking branch 'origin/master'

This commit is contained in:
evgen-d
2014-11-26 09:22:17 +03:00
2 changed files with 9 additions and 7 deletions

View File

@@ -551,11 +551,7 @@ class Query extends Component implements QueryInterface
$names = '';
foreach ($columns as $name => $column) {
if (is_int($name)) {
$names .= $column . ', ';
} else {
$names .= "\"$name\": $this->from.$column, ";
}
$names .= "\"$name\": $this->from.$column, ";
}
return 'RETURN {' . trim($names, ', ') . '}';