Merge remote-tracking branch 'origin/master'

This commit is contained in:
evgen-d 2014-11-26 09:22:17 +03:00
commit aa029952b4
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, ', ') . '}';

View File

@ -38,8 +38,10 @@ return [
'arangodb' => [
'class' => '\devgroup\arangodb\Connection',
'connectionOptions' => [
ArangoConnectionOptions::OPTION_DATABASE => "mydatabase",
ArangoConnectionOptions::OPTION_ENDPOINT => 'tcp://127.0.0.1:8529',
triagens\ArangoDb\ConnectionOptions::OPTION_DATABASE => "mydatabase",
triagens\ArangoDb\ConnectionOptions::OPTION_ENDPOINT => 'tcp://127.0.0.1:8529',
//triagens\ArangoDb\ConnectionOptions::OPTION_AUTH_USER => '',
//triagens\ArangoDb\ConnectionOptions::OPTION_AUTH_PASSWD => '',
],
],
],
@ -177,3 +179,7 @@ return [
...
];
```
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/DevGroup-ru/yii2-arangodb/trend.png)](https://bitdeli.com/free "Bitdeli Badge")