Skip to content

Commit 8a8e174

Browse files
frankmayerfrankmayer
committed
Backported newest commits from devel:
* Implemented Explain function (arangodb#29) and also the query validation function New Statement methods: $statement->explain(); $statement->validate(); * Implemented skip-list and geo queries (issue arangodb#28) The following methods were added to CollectionHandler.php CollectionHandler->range($collectionId, $attribute, $left, $right, $options = array()) CollectionHandler->near($collectionId, $latitude, $longitude, $options = array()) CollectionHandler->within($collectionId, $latitude, $longitude, $radius, $options = array()) Also, since there was no index creation functionality in ArangoDB-PHP, this was also created. CollectionHandler->index($collectionId, $type="", $attributes=array(), $unique=false) * Documentation for arangodb#28 and arangodb#29 + some small doc fixes Signed-off-by: Frank Mayer <frank@frankmayer.net>
1 parent 89c4843 commit 8a8e174

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1893
-468
lines changed

‎docs/classes/triagens.ArangoDb.Autoloader.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
3838
<ul></ul></a></li>
3939
<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
40-
<span class="label label-info">11</span></a></li>
40+
<span class="label label-info">9</span></a></li>
4141
</ul>
4242
</li>
4343
</ul></div>
@@ -170,7 +170,7 @@ <h2>Class file extension</h2>
170170
<div class="row"><footer class="span12">
171171
Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
172172
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a10</a> and<br>
173-
generated on 2012-11-18T00:58:44+02:00.<br></footer></div>
173+
generated on 2012-12-05T20:49:15+02:00.<br></footer></div>
174174
</div>
175175
</body>
176176
</html>

‎docs/classes/triagens.ArangoDb.BindVars.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
3838
<ul></ul></a></li>
3939
<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
40-
<span class="label label-info">11</span></a></li>
40+
<span class="label label-info">9</span></a></li>
4141
</ul>
4242
</li>
4343
</ul></div>
@@ -176,7 +176,7 @@ <h2>Current bind values</h2>
176176
<div class="row"><footer class="span12">
177177
Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
178178
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a10</a> and<br>
179-
generated on 2012-11-18T00:58:44+02:00.<br></footer></div>
179+
generated on 2012-12-05T20:49:15+02:00.<br></footer></div>
180180
</div>
181181
</body>
182182
</html>

‎docs/classes/triagens.ArangoDb.ClientException.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
3838
<ul></ul></a></li>
3939
<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
40-
<span class="label label-info">11</span></a></li>
40+
<span class="label label-info">9</span></a></li>
4141
</ul>
4242
</li>
4343
</ul></div>
@@ -271,7 +271,7 @@ <h2>getTraceAsString()
271271
<div class="row"><footer class="span12">
272272
Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
273273
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a10</a> and<br>
274-
generated on 2012-11-18T00:58:44+02:00.<br></footer></div>
274+
generated on 2012-12-05T20:49:15+02:00.<br></footer></div>
275275
</div>
276276
</body>
277277
</html>

‎docs/classes/triagens.ArangoDb.Collection.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
3838
<ul></ul></a></li>
3939
<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
40-
<span class="label label-info">11</span></a></li>
40+
<span class="label label-info">9</span></a></li>
4141
</ul>
4242
</li>
4343
</ul></div>
@@ -444,7 +444,7 @@ <h2>edge collection type</h2>
444444
<div class="row"><footer class="span12">
445445
Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
446446
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a10</a> and<br>
447-
generated on 2012-11-18T00:58:44+02:00.<br></footer></div>
447+
generated on 2012-12-05T20:49:15+02:00.<br></footer></div>
448448
</div>
449449
</body>
450450
</html>

‎docs/classes/triagens.ArangoDb.CollectionHandler.html

Lines changed: 281 additions & 2 deletions
Large diffs are not rendered by default.

‎docs/classes/triagens.ArangoDb.ConnectException.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
3838
<ul></ul></a></li>
3939
<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
40-
<span class="label label-info">11</span></a></li>
40+
<span class="label label-info">9</span></a></li>
4141
</ul>
4242
</li>
4343
</ul></div>
@@ -271,7 +271,7 @@ <h2>getTraceAsString()
271271
<div class="row"><footer class="span12">
272272
Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
273273
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a10</a> and<br>
274-
generated on 2012-11-18T00:58:44+02:00.<br></footer></div>
274+
generated on 2012-12-05T20:49:15+02:00.<br></footer></div>
275275
</div>
276276
</body>
277277
</html>

‎docs/classes/triagens.ArangoDb.Connection.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
3838
<ul></ul></a></li>
3939
<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
40-
<span class="label label-info">11</span></a></li>
40+
<span class="label label-info">9</span></a></li>
4141
</ul>
4242
</li>
4343
</ul></div>
@@ -231,7 +231,7 @@ <h4>$url</h4>
231231
<div class="subelement argument">
232232
<h4>$data</h4>
233233
<code>string</code><ul>
234-
<li>body to post</li>
234+
<li>patch body</li>
235235
</ul>
236236
</div>
237237
<h3>Exceptions</h3>
@@ -403,7 +403,7 @@ <h2>Flag if keep-alive connections are used</h2>
403403
<div class="row"><footer class="span12">
404404
Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
405405
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a10</a> and<br>
406-
generated on 2012-11-18T00:58:44+02:00.<br></footer></div>
406+
generated on 2012-12-05T20:49:15+02:00.<br></footer></div>
407407
</div>
408408
</body>
409409
</html>

‎docs/classes/triagens.ArangoDb.ConnectionOptions.html

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
3838
<ul></ul></a></li>
3939
<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
40-
<span class="label label-info">11</span></a></li>
40+
<span class="label label-info">9</span></a></li>
4141
</ul>
4242
</li>
4343
</ul></div>
@@ -93,13 +93,16 @@
9393
<li class="constant "><a href="#constant_OPTION_AUTH_USER" title="OPTION_AUTH_USER :: Authentication user name"><span class="description">Authentication user name</span><pre>OPTION_AUTH_USER</pre></a></li>
9494
<li class="constant "><a href="#constant_OPTION_CONNECTION" title="OPTION_CONNECTION :: Connection"><span class="description">Connection</span><pre>OPTION_CONNECTION</pre></a></li>
9595
<li class="constant "><a href="#constant_OPTION_CREATE" title="OPTION_CREATE :: &quot;Create collections if they don't exist&quot; index constant"><span class="description">"Create collections if they don't exist" index constant</span><pre>OPTION_CREATE</pre></a></li>
96+
<li class="constant "><a href="#constant_OPTION_DELETE_POLICY" title="OPTION_DELETE_POLICY :: Delete policy index constant"><span class="description">Delete policy index constant</span><pre>OPTION_DELETE_POLICY</pre></a></li>
9697
<li class="constant "><a href="#constant_OPTION_ENDPOINT" title="OPTION_ENDPOINT :: Endpoint string index constant"><span class="description">Endpoint string index constant</span><pre>OPTION_ENDPOINT</pre></a></li>
9798
<li class="constant "><a href="#constant_OPTION_HOST" title="OPTION_HOST :: Host name string index constant (deprecated, use endpoint instead)"><span class="description">Host name string index constant (deprecated, use endpoint instead)</span><pre>OPTION_HOST</pre></a></li>
9899
<li class="constant "><a href="#constant_OPTION_PORT" title="OPTION_PORT :: Port number index constant (deprecated, use endpoint instead)"><span class="description">Port number index constant (deprecated, use endpoint instead)</span><pre>OPTION_PORT</pre></a></li>
99100
<li class="constant "><a href="#constant_OPTION_RECONNECT" title="OPTION_RECONNECT :: Reconnect flag"><span class="description">Reconnect flag</span><pre>OPTION_RECONNECT</pre></a></li>
101+
<li class="constant "><a href="#constant_OPTION_REPLACE_POLICY" title="OPTION_REPLACE_POLICY :: Replace policy index constant"><span class="description">Replace policy index constant</span><pre>OPTION_REPLACE_POLICY</pre></a></li>
100102
<li class="constant "><a href="#constant_OPTION_REVISION" title="OPTION_REVISION :: Update revision constant"><span class="description">Update revision constant</span><pre>OPTION_REVISION</pre></a></li>
101103
<li class="constant "><a href="#constant_OPTION_TIMEOUT" title="OPTION_TIMEOUT :: Timeout value index constant"><span class="description">Timeout value index constant</span><pre>OPTION_TIMEOUT</pre></a></li>
102104
<li class="constant "><a href="#constant_OPTION_TRACE" title="OPTION_TRACE :: Trace function index constant"><span class="description">Trace function index constant</span><pre>OPTION_TRACE</pre></a></li>
105+
<li class="constant "><a href="#constant_OPTION_UPDATE_KEEPNULL" title="OPTION_UPDATE_KEEPNULL :: Update keepnull constant"><span class="description">Update keepnull constant</span><pre>OPTION_UPDATE_KEEPNULL</pre></a></li>
103106
<li class="constant "><a href="#constant_OPTION_UPDATE_POLICY" title="OPTION_UPDATE_POLICY :: Update policy index constant"><span class="description">Update policy index constant</span><pre>OPTION_UPDATE_POLICY</pre></a></li>
104107
<li class="constant "><a href="#constant_OPTION_WAIT_SYNC" title="OPTION_WAIT_SYNC :: Wait for sync index constant"><span class="description">Wait for sync index constant</span><pre>OPTION_WAIT_SYNC</pre></a></li>
105108
</ul>
@@ -355,6 +358,12 @@ <h2>"Create collections if they don't exist" index constant</h2>
355358
<div class="labels"></div>
356359
<div class="row collapse"><div class="detail-description"><div class="long_description"></div></div></div>
357360
</div>
361+
<a id="constant_OPTION_DELETE_POLICY"> </a><div class="element clickable constant constant_OPTION_DELETE_POLICY" data-toggle="collapse" data-target=".constant_OPTION_DELETE_POLICY .collapse">
362+
<h2>Delete policy index constant</h2>
363+
<pre>OPTION_DELETE_POLICY </pre>
364+
<div class="labels"></div>
365+
<div class="row collapse"><div class="detail-description"><div class="long_description"></div></div></div>
366+
</div>
358367
<a id="constant_OPTION_ENDPOINT"> </a><div class="element clickable constant constant_OPTION_ENDPOINT" data-toggle="collapse" data-target=".constant_OPTION_ENDPOINT .collapse">
359368
<h2>Endpoint string index constant</h2>
360369
<pre>OPTION_ENDPOINT </pre>
@@ -379,6 +388,12 @@ <h2>Reconnect flag</h2>
379388
<div class="labels"></div>
380389
<div class="row collapse"><div class="detail-description"><div class="long_description"></div></div></div>
381390
</div>
391+
<a id="constant_OPTION_REPLACE_POLICY"> </a><div class="element clickable constant constant_OPTION_REPLACE_POLICY" data-toggle="collapse" data-target=".constant_OPTION_REPLACE_POLICY .collapse">
392+
<h2>Replace policy index constant</h2>
393+
<pre>OPTION_REPLACE_POLICY </pre>
394+
<div class="labels"></div>
395+
<div class="row collapse"><div class="detail-description"><div class="long_description"></div></div></div>
396+
</div>
382397
<a id="constant_OPTION_REVISION"> </a><div class="element clickable constant constant_OPTION_REVISION" data-toggle="collapse" data-target=".constant_OPTION_REVISION .collapse">
383398
<h2>Update revision constant</h2>
384399
<pre>OPTION_REVISION </pre>
@@ -397,6 +412,12 @@ <h2>Trace function index constant</h2>
397412
<div class="labels"></div>
398413
<div class="row collapse"><div class="detail-description"><div class="long_description"></div></div></div>
399414
</div>
415+
<a id="constant_OPTION_UPDATE_KEEPNULL"> </a><div class="element clickable constant constant_OPTION_UPDATE_KEEPNULL" data-toggle="collapse" data-target=".constant_OPTION_UPDATE_KEEPNULL .collapse">
416+
<h2>Update keepnull constant</h2>
417+
<pre>OPTION_UPDATE_KEEPNULL </pre>
418+
<div class="labels"></div>
419+
<div class="row collapse"><div class="detail-description"><div class="long_description"></div></div></div>
420+
</div>
400421
<a id="constant_OPTION_UPDATE_POLICY"> </a><div class="element clickable constant constant_OPTION_UPDATE_POLICY" data-toggle="collapse" data-target=".constant_OPTION_UPDATE_POLICY .collapse">
401422
<h2>Update policy index constant</h2>
402423
<pre>OPTION_UPDATE_POLICY </pre>
@@ -416,7 +437,7 @@ <h2>Wait for sync index constant</h2>
416437
<div class="row"><footer class="span12">
417438
Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
418439
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a10</a> and<br>
419-
generated on 2012-11-18T00:58:44+02:00.<br></footer></div>
440+
generated on 2012-12-05T20:49:15+02:00.<br></footer></div>
420441
</div>
421442
</body>
422443
</html>

‎docs/classes/triagens.ArangoDb.Cursor.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
3838
<ul></ul></a></li>
3939
<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
40-
<span class="label label-info">11</span></a></li>
40+
<span class="label label-info">9</span></a></li>
4141
</ul>
4242
</li>
4343
</ul></div>
@@ -395,7 +395,7 @@ <h2>sanitize option entry</h2>
395395
<div class="row"><footer class="span12">
396396
Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
397397
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a10</a> and<br>
398-
generated on 2012-11-18T00:58:44+02:00.<br></footer></div>
398+
generated on 2012-12-05T20:49:15+02:00.<br></footer></div>
399399
</div>
400400
</body>
401401
</html>

‎docs/classes/triagens.ArangoDb.DefaultValues.html

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
3838
<ul></ul></a></li>
3939
<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
40-
<span class="label label-info">11</span></a></li>
40+
<span class="label label-info">9</span></a></li>
4141
</ul>
4242
</li>
4343
</ul></div>
@@ -59,7 +59,9 @@
5959
<ul>
6060
<li class="constant "><a href="#constant_DEFAULT_CONNECTION" title="DEFAULT_CONNECTION :: Default value for HTTP Connection header"><span class="description">Default value for HTTP Connection header</span><pre>DEFAULT_CONNECTION</pre></a></li>
6161
<li class="constant "><a href="#constant_DEFAULT_CREATE" title="DEFAULT_CREATE :: Default value for createCollection (create the collection on the fly when the first document is added to an unknown collection)"><span class="description">Default value for createCollection (create the collection on the fly when the first document is added to an unknown collection)</span><pre>DEFAULT_CREATE</pre></a></li>
62+
<li class="constant "><a href="#constant_DEFAULT_DELETE_POLICY" title="DEFAULT_DELETE_POLICY :: Default delete policy"><span class="description">Default delete policy</span><pre>DEFAULT_DELETE_POLICY</pre></a></li>
6263
<li class="constant "><a href="#constant_DEFAULT_PORT" title="DEFAULT_PORT :: Default port number (used if no port specified)"><span class="description">Default port number (used if no port specified)</span><pre>DEFAULT_PORT</pre></a></li>
64+
<li class="constant "><a href="#constant_DEFAULT_REPLACE_POLICY" title="DEFAULT_REPLACE_POLICY :: Default replace policy"><span class="description">Default replace policy</span><pre>DEFAULT_REPLACE_POLICY</pre></a></li>
6365
<li class="constant "><a href="#constant_DEFAULT_TIMEOUT" title="DEFAULT_TIMEOUT :: Default timeout value (used if no timeout value specified)"><span class="description">Default timeout value (used if no timeout value specified)</span><pre>DEFAULT_TIMEOUT</pre></a></li>
6466
<li class="constant "><a href="#constant_DEFAULT_UPDATE_POLICY" title="DEFAULT_UPDATE_POLICY :: Default update policy"><span class="description">Default update policy</span><pre>DEFAULT_UPDATE_POLICY</pre></a></li>
6567
<li class="constant "><a href="#constant_DEFAULT_WAIT_SYNC" title="DEFAULT_WAIT_SYNC :: Default value for waitForSync (fsync all data to disk on document updates/insertions/deletions)"><span class="description">Default value for waitForSync (fsync all data to disk on document updates/insertions/deletions)</span><pre>DEFAULT_WAIT_SYNC</pre></a></li>
@@ -101,12 +103,24 @@ <h2>Default value for createCollection (create the collection on the fly when th
101103
<div class="labels"></div>
102104
<div class="row collapse"><div class="detail-description"><div class="long_description"></div></div></div>
103105
</div>
106+
<a id="constant_DEFAULT_DELETE_POLICY"> </a><div class="element clickable constant constant_DEFAULT_DELETE_POLICY" data-toggle="collapse" data-target=".constant_DEFAULT_DELETE_POLICY .collapse">
107+
<h2>Default delete policy</h2>
108+
<pre>DEFAULT_DELETE_POLICY </pre>
109+
<div class="labels"></div>
110+
<div class="row collapse"><div class="detail-description"><div class="long_description"></div></div></div>
111+
</div>
104112
<a id="constant_DEFAULT_PORT"> </a><div class="element clickable constant constant_DEFAULT_PORT" data-toggle="collapse" data-target=".constant_DEFAULT_PORT .collapse">
105113
<h2>Default port number (used if no port specified)</h2>
106114
<pre>DEFAULT_PORT </pre>
107115
<div class="labels"></div>
108116
<div class="row collapse"><div class="detail-description"><div class="long_description"></div></div></div>
109117
</div>
118+
<a id="constant_DEFAULT_REPLACE_POLICY"> </a><div class="element clickable constant constant_DEFAULT_REPLACE_POLICY" data-toggle="collapse" data-target=".constant_DEFAULT_REPLACE_POLICY .collapse">
119+
<h2>Default replace policy</h2>
120+
<pre>DEFAULT_REPLACE_POLICY </pre>
121+
<div class="labels"></div>
122+
<div class="row collapse"><div class="detail-description"><div class="long_description"></div></div></div>
123+
</div>
110124
<a id="constant_DEFAULT_TIMEOUT"> </a><div class="element clickable constant constant_DEFAULT_TIMEOUT" data-toggle="collapse" data-target=".constant_DEFAULT_TIMEOUT .collapse">
111125
<h2>Default timeout value (used if no timeout value specified)</h2>
112126
<pre>DEFAULT_TIMEOUT </pre>
@@ -132,7 +146,7 @@ <h2>Default value for waitForSync (fsync all data to disk on document updates/in
132146
<div class="row"><footer class="span12">
133147
Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
134148
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a10</a> and<br>
135-
generated on 2012-11-18T00:58:44+02:00.<br></footer></div>
149+
generated on 2012-12-05T20:49:15+02:00.<br></footer></div>
136150
</div>
137151
</body>
138152
</html>

0 commit comments

Comments
 (0)