Skip to content

Commit 7d91464

Browse files
jsteemannjsteemann
committed
Merge pull request arangodb#19 from frankmayer/Branch_1.0.0beta1
Fix for issue arangodb#18 and some other small changes
2 parents 2fc4c1f + f19af5d commit 7d91464

Some content is hidden

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

43 files changed

+4617
-4271
lines changed

‎CHANGELOG

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
v1.0.0 (XXXX-XX-XX)
2+
-------------------
3+
4+
* issue #18: Implemented revision check with policy = "error"
5+
for update/replace and delete/remove methods.
6+
7+
* issue #17: Implemented basic edges support
8+
9+
* issue #14: Refactored function names to better match the server api.
10+
This results in sevaral methods being deprecated:
11+
12+
DocumentHandler:
13+
update(), updateById() => These are replaced by replace() and replaceById(). They will have their behavior changed in api version 1.1 in favor for the update method that has been added in ArangoDb 1.1
14+
15+
delete(), deleteById() => These are replaced by remove() and removeById(). They will be removed in api version 2.0.
16+
17+
add() => This is being replaced by the new save() method. add() will be removed in api version 2.0.
18+
19+
getByExample() => This is being replaced by CollectionHandler::byExample(). byExample() will be removed in api version 2.0.
20+
21+
getAllIds() => This is being replaced by CollectionHandler::getAllIds(). getAllIds() will be removed in api version 2.0.
22+
23+
CollectionHandler:
24+
25+
add() => This is being replaced by the new create() method. add() will be removed in api version 2.0.
26+
27+
delete() => This is being replaced by the new drop() method. delete() will be removed in api version 2.0.
28+
29+
getCount() => This is being replaced by the new count() method. getCount() will be removed in api version 2.0.
30+
31+
getFigures() => This is being replaced by the new figures() method. getFigures() will be removed in api version 2.0.
32+
33+
34+
35+
* issue #11: Written initial unit tests for api.
36+
* issue #10: Implemented api version info constant and a getVersion() method to go with it.
37+

‎docs/classes.svg

Lines changed: 181 additions & 181 deletions
Loading

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ <h2>Class file extension</h2>
169169
<div class="row"><footer class="span12">
170170
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>
171171
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a10</a> and<br>
172-
generated on 2012-10-15T10:57:55+02:00.<br></footer></div>
172+
generated on 2012-10-28T21:56:52+02:00.<br></footer></div>
173173
</div>
174174
</body>
175175
</html>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ <h2>Current bind values</h2>
177177
<div class="row"><footer class="span12">
178178
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>
179179
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a10</a> and<br>
180-
generated on 2012-10-15T10:57:55+02:00.<br></footer></div>
180+
generated on 2012-10-28T21:56:52+02:00.<br></footer></div>
181181
</div>
182182
</body>
183183
</html>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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-10-15T10:57:55+02:00.<br></footer></div>
274+
generated on 2012-10-28T21:56:52+02:00.<br></footer></div>
275275
</div>
276276
</body>
277277
</html>

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

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
Returns the collection as JSON-encoded string</span><pre>__toString()</pre></a></li>
6868
<li class="method public "><a href="#method_createFromArray" title="createFromArray :: Factory method to construct a new collection"><span class="description">Factory method to construct a new collection</span><pre>createFromArray()</pre></a></li>
6969
<li class="method public "><a href="#method_getAll" title="getAll :: Get all collection attributes"><span class="description">Get all collection attributes</span><pre>getAll()</pre></a></li>
70-
<li class="method public "><a href="#method_getDefaultType" title="getDefaultType :: Get the default collection type"><span class="description">Get the default collection type</span><pre>getDefaultType()</pre></a></li>
7170
<li class="method public "><a href="#method_getId" title="getId :: Get the collection id (if already known)
7271
Collection ids are generated on the server only."><span class="description">Get the collection id (if already known)
7372
Collection ids are generated on the server only.</span><pre>getId()</pre></a></li>
@@ -105,8 +104,6 @@
105104
<li class="constant "><a href="#constant_ENTRY_TYPE" title="ENTRY_TYPE :: Collection type index"><span class="description">Collection type index</span><pre>ENTRY_TYPE</pre></a></li>
106105
<li class="constant "><a href="#constant_ENTRY_WAIT_SYNC" title="ENTRY_WAIT_SYNC :: Collection 'waitForSync' index"><span class="description">Collection 'waitForSync' index</span><pre>ENTRY_WAIT_SYNC</pre></a></li>
107106
<li class="constant "><a href="#constant_OPTION_PROPERTIES" title="OPTION_PROPERTIES :: properties option"><span class="description">properties option</span><pre>OPTION_PROPERTIES</pre></a></li>
108-
<li class="constant "><a href="#constant_TYPE_DOCUMENT" title="TYPE_DOCUMENT :: document collection type"><span class="description">document collection type</span><pre>TYPE_DOCUMENT</pre></a></li>
109-
<li class="constant "><a href="#constant_TYPE_EDGE" title="TYPE_EDGE :: edge collection type"><span class="description">edge collection type</span><pre>TYPE_EDGE</pre></a></li>
110107
</ul>
111108
</li>
112109
</ul>
@@ -192,17 +189,6 @@ <h3>Returns</h3>
192189
<code>array</code>- array of all collection attributes</div>
193190
</div></div>
194191
</div>
195-
<a id="method_getDefaultType"></a><div class="element clickable method public method_getDefaultType" data-toggle="collapse" data-target=".method_getDefaultType .collapse">
196-
<h2>Get the default collection type</h2>
197-
<pre>getDefaultType() : string</pre>
198-
<div class="labels"><span class="label">Static</span></div>
199-
<div class="row collapse"><div class="detail-description">
200-
<div class="long_description"></div>
201-
<h3>Returns</h3>
202-
<div class="subelement response">
203-
<code>string</code>- name</div>
204-
</div></div>
205-
</div>
206192
<a id="method_getId"></a><div class="element clickable method public method_getId" data-toggle="collapse" data-target=".method_getId .collapse">
207193
<h2>Get the collection id (if already known)
208194
Collection ids are generated on the server only.</h2>
@@ -434,26 +420,14 @@ <h2>properties option</h2>
434420
<div class="labels"></div>
435421
<div class="row collapse"><div class="detail-description"><div class="long_description"></div></div></div>
436422
</div>
437-
<a id="constant_TYPE_DOCUMENT"> </a><div class="element clickable constant constant_TYPE_DOCUMENT" data-toggle="collapse" data-target=".constant_TYPE_DOCUMENT .collapse">
438-
<h2>document collection type</h2>
439-
<pre>TYPE_DOCUMENT </pre>
440-
<div class="labels"></div>
441-
<div class="row collapse"><div class="detail-description"><div class="long_description"></div></div></div>
442-
</div>
443-
<a id="constant_TYPE_EDGE"> </a><div class="element clickable constant constant_TYPE_EDGE" data-toggle="collapse" data-target=".constant_TYPE_EDGE .collapse">
444-
<h2>edge collection type</h2>
445-
<pre>TYPE_EDGE </pre>
446-
<div class="labels"></div>
447-
<div class="row collapse"><div class="detail-description"><div class="long_description"></div></div></div>
448-
</div>
449423
</div>
450424
</div>
451425
</div>
452426
</div>
453427
<div class="row"><footer class="span12">
454428
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>
455429
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a10</a> and<br>
456-
generated on 2012-10-15T10:57:55+02:00.<br></footer></div>
430+
generated on 2012-10-28T21:56:52+02:00.<br></footer></div>
457431
</div>
458432
</body>
459433
</html>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ <h2>truncate option</h2>
618618
<div class="row"><footer class="span12">
619619
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>
620620
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a10</a> and<br>
621-
generated on 2012-10-15T10:57:55+02:00.<br></footer></div>
621+
generated on 2012-10-28T21:56:52+02:00.<br></footer></div>
622622
</div>
623623
</body>
624624
</html>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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-10-15T10:57:55+02:00.<br></footer></div>
274+
generated on 2012-10-28T21:56:52+02:00.<br></footer></div>
275275
</div>
276276
</body>
277277
</html>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ <h2>Flag if keep-alive connections are used</h2>
405405
<div class="row"><footer class="span12">
406406
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>
407407
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a10</a> and<br>
408-
generated on 2012-10-15T10:57:55+02:00.<br></footer></div>
408+
generated on 2012-10-28T21:56:52+02:00.<br></footer></div>
409409
</div>
410410
</body>
411411
</html>

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
<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>
9898
<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>
9999
<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>
100+
<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>
100101
<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>
101102
<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>
102103
<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>
@@ -378,6 +379,12 @@ <h2>Reconnect flag</h2>
378379
<div class="labels"></div>
379380
<div class="row collapse"><div class="detail-description"><div class="long_description"></div></div></div>
380381
</div>
382+
<a id="constant_OPTION_REVISION"> </a><div class="element clickable constant constant_OPTION_REVISION" data-toggle="collapse" data-target=".constant_OPTION_REVISION .collapse">
383+
<h2>Update revision constant</h2>
384+
<pre>OPTION_REVISION </pre>
385+
<div class="labels"></div>
386+
<div class="row collapse"><div class="detail-description"><div class="long_description"></div></div></div>
387+
</div>
381388
<a id="constant_OPTION_TIMEOUT"> </a><div class="element clickable constant constant_OPTION_TIMEOUT" data-toggle="collapse" data-target=".constant_OPTION_TIMEOUT .collapse">
382389
<h2>Timeout value index constant</h2>
383390
<pre>OPTION_TIMEOUT </pre>
@@ -409,7 +416,7 @@ <h2>Wait for sync index constant</h2>
409416
<div class="row"><footer class="span12">
410417
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>
411418
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a10</a> and<br>
412-
generated on 2012-10-15T10:57:55+02:00.<br></footer></div>
419+
generated on 2012-10-28T21:56:52+02:00.<br></footer></div>
413420
</div>
414421
</body>
415422
</html>

0 commit comments

Comments
 (0)