1
0
Fork 0
Commit Graph

17106 Commits

Author SHA1 Message Date
Max Neunhoeffer fcab5b9357 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-09-16 17:03:58 +02:00
Jan Steemann 92814c418e fixed script 2014-09-16 17:03:35 +02:00
Jan Steemann 5c820cea34 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
2014-09-16 16:33:47 +02:00
Jan Steemann f0b2a9e946 removed index_iterator 2014-09-16 16:23:55 +02:00
Max Neunhoeffer 0d5a1bf354 Merge branch 'skiplistback' into aql2 2014-09-16 16:16:22 +02:00
Max Neunhoeffer 7b100ef30a Unuse index-iterator.h 2014-09-16 16:15:55 +02:00
Max Neunhoeffer ed63d2f58c Fix a bug introduced in the skiplist code when C++izing it. 2014-09-16 15:57:47 +02:00
Jan Steemann 71e0d51ffe added bounds tests 2014-09-16 15:56:16 +02:00
Jan Steemann 992ac23450 fixed ranges 2014-09-16 15:48:33 +02:00
Lucas Dohmen a9e674b368 Merge pull request #1024 from triAGENS/repo-methods
Made Foxx.Repository methods behave more consistently (fixes #975)
2014-09-16 15:44:31 +02:00
Jan Steemann 13fbd82e12 fixed test 2014-09-16 15:13:58 +02:00
Jan Steemann 83819407ba Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-09-16 15:10:59 +02:00
Jan Steemann 54b5e7b034 slightly improved access to dynamic bounds 2014-09-16 15:10:43 +02:00
Alan Plum 0de1da4cc8 Adjusted tests to reflect corrected behaviour. 2014-09-16 14:58:24 +02:00
Max Neunhoeffer aa584e6c86 Merge branch 'aql2' into skiplistback 2014-09-16 14:57:35 +02:00
Max Neunhoeffer 2b18e0379f C++-ize skip lists and introduce a backward link. 2014-09-16 14:57:16 +02:00
Willi Goesgens ce08c58718 add the ability to run the test themselves in valgrind. 2014-09-16 14:25:25 +02:00
Alan Plum 6f357edb67 Made Foxx.Repository methods behave more consistently. Fixes #975. 2014-09-16 14:05:20 +02:00
Lucas Dohmen a2e56535f1 Merge pull request #1021 from triAGENS/easy-params
Allow passing joi params directly
2014-09-16 12:58:02 +02:00
Alan Plum 54e5333590 Provided examples for ctrl.allRoutes. 2014-09-16 11:45:08 +02:00
Alan Plum cd8af52859 Added documentation for ctrl.before interrupts. 2014-09-16 11:45:08 +02:00
Alan Plum e04cfebfe2 Added tests and docs for param shorthand syntax, allow passing 'allowMultiple' via joi.meta, fixed joi.required/optional being ignored. 2014-09-16 11:33:35 +02:00
Willi Goesgens 96c9132f93 - Fix queries so they can actually be executed.
- add cross test for deserializing plans
2014-09-16 11:27:36 +02:00
Willi Goesgens 0d376ab37a Errormessages: show which execution state we're in so the user can better tell appart runtime from syntax errors. 2014-09-16 11:05:43 +02:00
Lucas Dohmen 7abbb58ac2 Merge pull request #1023 from triAGENS/foxx-before-guard
Allow ctrl.before to prevent further processing of the request
2014-09-16 10:51:36 +02:00
scottashton b12d7f99cd added resolving from example strings to objects in GRAPH_NEIGHBORS 2014-09-16 10:36:56 +02:00
Alan Plum cf3c219f22 Revert "Allow specifying "_" as collection prefix."
This reverts commit ebc5c1490d14471b04b8398b44a06896a9460ea8.
2014-09-16 10:27:08 +02:00
Max Neunhoeffer 23dc7ef617 Fix the AqlValue Range type leak. 2014-09-16 10:25:25 +02:00
Alan Plum 6e3e5d47fc Allow ctrl.before to prevent further processing of the request. 2014-09-16 00:17:46 +02:00
Max Neunhoeffer c57569a27c Start to reintroduce backpointers in skiplist.
Also need an non-nullptr end node now.
2014-09-16 00:17:04 +02:00
Alan Plum b1a0098c03 Allow passing joi params directly. 2014-09-15 23:34:41 +02:00
Alan Plum c145ede1a2 Don't use applicationContext.collection for system apps. 2014-09-15 23:31:05 +02:00
Frank Celler b7278820ce Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-09-15 23:18:35 +02:00
Frank Celler c577193ae4 added log of exception 2014-09-15 23:18:10 +02:00
Jan Steemann 6fad76928d Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-09-15 18:17:53 +02:00
Jan Steemann 677e681b23 adjusted test 2014-09-15 18:17:42 +02:00
Jan Steemann 60f2136b8d fixed reporting error position in queries with newlines 2014-09-15 18:17:20 +02:00
Willi Goesgens 7e44fa03d0 Try to add a human readable representation to an expression if it throws. 2014-09-15 16:44:55 +02:00
Max Neunhoeffer 6cf8b0cf75 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-09-15 16:16:33 +02:00
Max Neunhoeffer 855a695764 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/RangeInfo.cpp
	arangod/Aql/RangeInfo.h
2014-09-15 16:16:21 +02:00
Jan Steemann 69d0703a68 fixed teardown 2014-09-15 16:13:35 +02:00
Jan Steemann bc7c7c5c60 fixed construction of bounds from json 2014-09-15 16:11:59 +02:00
Max Neunhoeffer 77d6f41b5c Fix more bugs in variable bounds. 2014-09-15 16:10:54 +02:00
Max Neunhoeffer 7e09d9a39e Make more const. 2014-09-15 16:10:47 +02:00
Max Neunhoeffer e0cc389f23 Make more const. 2014-09-15 16:08:00 +02:00
Jan Steemann 2571d075b7 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-09-15 15:29:02 +02:00
Jan Steemann a31cb2af30 disable sort optimizations under certain conditions 2014-09-15 15:28:41 +02:00
Jan Steemann 99683e3021 added test for dynamic bounds 2014-09-15 15:28:31 +02:00
Willi Goesgens 215e9bf1b4 Use 'list' in plural variables 2014-09-15 15:06:38 +02:00
Willi Goesgens 6d3753f7ca use 'list' in plural names 2014-09-15 15:06:10 +02:00