Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -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, ', ') . '}';
|
||||
|
10
README.md
10
README.md
@@ -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 [
|
||||
...
|
||||
];
|
||||
```
|
||||
|
||||
|
||||
[](https://bitdeli.com/free "Bitdeli Badge")
|
||||
|
||||
|
Reference in New Issue
Block a user